Skip to content

Reorder attributes for consistency #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quietust wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reorder attributes for consistency #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ Template for new versions:
- specific changes: changed ``relationship_event_supplement`` field ``profession`` to ``reason_id`` field of type ``history_event_reason_id``
- specific changes: changed ``scholar_knowledge.knowledge_goal`` bitfield to a union of all ``knowledge_scholar_flags_N`` bitfields (selected by the value of ``scholar_knowledge.research_prject``)
- specific changes: changed ``unit.enemy.rumor[]`` to ``unit.enemy.rumor_info.events[]``
- reordered XML attributes for consistency: ret-type, base-type, type-name, and pointer-type now appear first (and in that exact order)

# 53.07-r1

Expand Down
106 changes: 53 additions & 53 deletions df.abstract_building.xml
View file
Open in desktop

Large diffs are not rendered by default.

278 changes: 139 additions & 139 deletions df.activity.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion df.activity_meeting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<int32_t name='unit_actor' original-name='actor_unid' ref-target='unit' init-value='-1' comment='diplomat or worker'/>
<int32_t name='unit_noble' original-name='target_unid' ref-target='unit' init-value='-1' comment='meeting recipient'/>
<int32_t name='place' original-name='civzone_id' ref-target='building' init-value='-1'/>
<bitfield base-type='int16_t' name='flags' original-name='flag' type-name='activity_flag'/>
<bitfield base-type='int16_t' type-name='activity_flag' name='flags' original-name='flag'/>
<int8_t name='worstroomrank' init-value='3'/>
<int16_t name='delay' original-name='discusscount' init-value='0'/>
<int32_t name='tree_quota' original-name='tempvalue' init-value='-1'/>
Expand Down
332 changes: 166 additions & 166 deletions df.adventure.xml
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions df.adventure_log.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,72 +17,72 @@

<struct-type type-name='bestiary_entryst'>
<int32_t name='alpha_index'/>
<pointer name='ck' type-name='creature_knowledgest'/>
<pointer type-name='creature_knowledgest' name='ck'/>
<stl-string name='list_name'/>

<stl-string name='p_list_name'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>
</struct-type>

<struct-type type-name='agreement_entryst'>
<pointer name='ag' type-name='agreement'/>
<pointer type-name='agreement' name='ag'/>

<pointer name='sq' type-name='squad'/>
<pointer name='so' type-name='squad_order'/>
<pointer type-name='squad' name='sq'/>
<pointer type-name='squad_order' name='so'/>
<bool name='squad_order_repeatable'/>

<stl-string name='list_name'/>
<stl-string name='simple_list_name'/>

<stl-string name='p_list_name'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>

<bool name='showing_commander'/>
<int32_t name='ax'/>
<int32_t name='ay'/>
</struct-type>

<struct-type type-name='histfig_entryst'>
<pointer name='hf' type-name='historical_figure'/>
<pointer type-name='historical_figure' name='hf'/>
<stl-string name='list_name'/>
<stl-string name='simple_list_name'/>

<stl-string name='p_list_name'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>

<pointer name='iden' type-name='identity'/>
<pointer type-name='identity' name='iden'/>
<int32_t name='value'/>
</struct-type>

<struct-type type-name='site_entryst'>
<pointer name='st' type-name='world_site'/>
<pointer type-name='world_site' name='st'/>
<stl-string name='list_name'/>
<stl-string name='simple_list_name'/>

<stl-string name='p_list_name'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>

<int32_t name='value'/>
</struct-type>

<struct-type type-name='entity_entryst'>
<pointer name='ent' type-name='historical_entity'/>
<pointer type-name='historical_entity' name='ent'/>
<stl-string name='list_name'/>
<stl-string name='simple_list_name'/>

<stl-string name='p_list_name'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>

<int32_t name='value'/>
</struct-type>

<struct-type type-name='subregion_entryst'>
<pointer name='sr' type-name='world_region'/>
<pointer type-name='world_region' name='sr'/>
<stl-string name='list_name'/>
<stl-string name='simple_list_name'/>

<stl-string name='p_list_name'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>
</struct-type>

<enum-type type-name='adventure_log_event_type' base-type='int32_t'> bay12: AdventureLogEventType
Expand All @@ -92,22 +92,22 @@
</enum-type>

<struct-type type-name='adventure_log_eventst'>
<enum name='type' type-name='adventure_log_event_type'/>
<pointer name='rumor' type-name='entity_event'/>
<pointer name='incident' type-name='incident'/>
<pointer name='ard' type-name='adventure_rumor_datast'/>
<enum type-name='adventure_log_event_type' name='type'/>
<pointer type-name='entity_event' name='rumor'/>
<pointer type-name='incident' name='incident'/>
<pointer type-name='adventure_rumor_datast' name='ard'/>
<int32_t name='year'/>
<int32_t name='season_count'/>

<stl-string name='list_name'/>
<stl-string name='simple_list_name'/>

<stl-string name='summary'/>
<stl-vector name='key_word' pointer-type='stl-string'/>
<stl-vector pointer-type='stl-string' name='key_word'/>

<stl-string name='p_list_name'/>
<compound name='p_list_box' type-name='curses_text_boxst'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='p_list_box'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>

<int32_t name='ax' init-value='-1'/>
<int32_t name='ay' init-value='-1'/>
Expand All @@ -116,14 +116,14 @@
</struct-type>

<struct-type type-name='artifact_entryst'>
<pointer name='art' type-name='artifact_record'/>
<pointer type-name='artifact_record' name='art'/>
<stl-string name='list_name'/>
<stl-string name='simple_list_name'/>

<stl-string name='p_list_name'/>
<compound name='main_text_box' type-name='curses_text_boxst'/>
<compound type-name='curses_text_boxst' name='main_text_box'/>

<compound name='arl' type-name='artifact_rumor_locationst'/>
<compound type-name='artifact_rumor_locationst' name='arl'/>

<int32_t name='ax'/>
<int32_t name='ay'/>
Expand All @@ -150,18 +150,18 @@
</enum-type>

<class-type type-name='viewscreen_adventure_logst' inherits-from='viewscreen'>
<stl-vector name='base_actor_entry' pointer-type='actor_entryst'/>
<stl-vector name='base_organization_entry' pointer-type='organization_entryst'/>
<stl-vector name='base_plot_entry' pointer-type='plot_entryst'/>
<compound name='evidence_repository' type-name='evidence_repositoryst'/>
<stl-vector pointer-type='actor_entryst' name='base_actor_entry'/>
<stl-vector pointer-type='organization_entryst' name='base_organization_entry'/>
<stl-vector pointer-type='plot_entryst' name='base_plot_entry'/>
<compound type-name='evidence_repositoryst' name='evidence_repository'/>

<compound name='map_display' type-name='adventure_log_map_displayst'/>
<compound type-name='adventure_log_map_displayst' name='map_display'/>

<int32_t name="selected"/>
<int8_t name="line_on"/>
<enum name='mode' type-name='adventure_log_mode'/>
<enum name='submode' type-name='adventure_log_mode'/>
<enum name='saved_submode_intrigue' type-name='adventure_log_mode'/>
<enum type-name='adventure_log_mode' name='mode'/>
<enum type-name='adventure_log_mode' name='submode'/>
<enum type-name='adventure_log_mode' name='saved_submode_intrigue'/>
<int32_t name='adventure_log_event_text_scroll'/>
<int32_t name='histfig_text_scroll'/>
<int32_t name='bestiary_text_scroll'/>
Expand All @@ -171,7 +171,7 @@
<int32_t name='artifact_text_scroll'/>

<bool name='expand_text'/>
<pointer name='selected_oen' type-name='organization_entry_nodest'/>
<pointer type-name='organization_entry_nodest' name='selected_oen'/>

<stl-string name='filter_str'/>
<bool name='entering_filter'/>
Expand All @@ -191,15 +191,15 @@
<int32_t name='scroll_position_intrigue_plots'/>
<bool name='scrolling'/>

<stl-vector name='base_site_entry' pointer-type='site_entryst'/>
<stl-vector name='base_entity_entry' pointer-type='entity_entryst'/>
<stl-vector name='base_subregion_entry' pointer-type='subregion_entryst'/>
<stl-vector name='base_feature_layer' pointer-type='world_underground_region'/>
<stl-vector name='base_agreement_entry' pointer-type='agreement_entryst'/>
<stl-vector name='base_bestiary_entry' pointer-type='bestiary_entryst'/>
<stl-vector name='base_adventure_log_event' pointer-type='adventure_log_eventst'/>
<stl-vector name='base_histfig_entry' pointer-type='histfig_entryst'/>
<stl-vector name='base_artifact_entry' pointer-type='artifact_entryst'/>
<stl-vector pointer-type='site_entryst' name='base_site_entry'/>
<stl-vector pointer-type='entity_entryst' name='base_entity_entry'/>
<stl-vector pointer-type='subregion_entryst' name='base_subregion_entry'/>
<stl-vector pointer-type='world_underground_region' name='base_feature_layer'/>
<stl-vector pointer-type='agreement_entryst' name='base_agreement_entry'/>
<stl-vector pointer-type='bestiary_entryst' name='base_bestiary_entry'/>
<stl-vector pointer-type='adventure_log_eventst' name='base_adventure_log_event'/>
<stl-vector pointer-type='histfig_entryst' name='base_histfig_entry'/>
<stl-vector pointer-type='artifact_entryst' name='base_artifact_entry'/>

<bool name='priority_sort_site'/>
<bool name='priority_sort_entity'/>
Expand All @@ -209,31 +209,31 @@
<bool name='set_priority_entity'/>
<bool name='set_priority_histfig'/>
<bool name='set_priority_event'/>
<stl-vector name='value_site_entry' pointer-type='site_entryst'/>
<stl-vector name='value_entity_entry' pointer-type='entity_entryst'/>
<stl-vector name='value_subregion_entry' pointer-type='subregion_entryst'/>
<stl-vector name='value_feature_layer' pointer-type='world_underground_region'/>
<stl-vector name='value_agreement_entry' pointer-type='agreement_entryst'/>
<stl-vector name='value_bestiary_entry' pointer-type='bestiary_entryst'/>
<stl-vector name='value_adventure_log_event' pointer-type='adventure_log_eventst'/>
<stl-vector name='value_histfig_entry' pointer-type='histfig_entryst'/>
<stl-vector name='value_artifact_entry' pointer-type='artifact_entryst'/>
<stl-vector name='value_actor_entry' pointer-type='actor_entryst'/>
<stl-vector name='value_organization_entry' pointer-type='organization_entryst'/>
<stl-vector name='value_plot_entry' pointer-type='plot_entryst'/>

<stl-vector name='site_entry' pointer-type='site_entryst'/>
<stl-vector name='entity_entry' pointer-type='entity_entryst'/>
<stl-vector name='subregion_entry' pointer-type='subregion_entryst'/>
<stl-vector name='feature_layer' pointer-type='world_underground_region'/>
<stl-vector name='agreement_entry' pointer-type='agreement_entryst'/>
<stl-vector name='bestiary_entry' pointer-type='bestiary_entryst'/>
<stl-vector name='adventure_log_event' pointer-type='adventure_log_eventst'/>
<stl-vector name='histfig_entry' pointer-type='histfig_entryst'/>
<stl-vector name='artifact_entry' pointer-type='artifact_entryst'/>
<stl-vector name='actor_entry' pointer-type='actor_entryst'/>
<stl-vector name='organization_entry' pointer-type='organization_entryst'/>
<stl-vector name='plot_entry' pointer-type='plot_entryst'/>
<stl-vector pointer-type='site_entryst' name='value_site_entry'/>
<stl-vector pointer-type='entity_entryst' name='value_entity_entry'/>
<stl-vector pointer-type='subregion_entryst' name='value_subregion_entry'/>
<stl-vector pointer-type='world_underground_region' name='value_feature_layer'/>
<stl-vector pointer-type='agreement_entryst' name='value_agreement_entry'/>
<stl-vector pointer-type='bestiary_entryst' name='value_bestiary_entry'/>
<stl-vector pointer-type='adventure_log_eventst' name='value_adventure_log_event'/>
<stl-vector pointer-type='histfig_entryst' name='value_histfig_entry'/>
<stl-vector pointer-type='artifact_entryst' name='value_artifact_entry'/>
<stl-vector pointer-type='actor_entryst' name='value_actor_entry'/>
<stl-vector pointer-type='organization_entryst' name='value_organization_entry'/>
<stl-vector pointer-type='plot_entryst' name='value_plot_entry'/>

<stl-vector pointer-type='site_entryst' name='site_entry'/>
<stl-vector pointer-type='entity_entryst' name='entity_entry'/>
<stl-vector pointer-type='subregion_entryst' name='subregion_entry'/>
<stl-vector pointer-type='world_underground_region' name='feature_layer'/>
<stl-vector pointer-type='agreement_entryst' name='agreement_entry'/>
<stl-vector pointer-type='bestiary_entryst' name='bestiary_entry'/>
<stl-vector pointer-type='adventure_log_eventst' name='adventure_log_event'/>
<stl-vector pointer-type='histfig_entryst' name='histfig_entry'/>
<stl-vector pointer-type='artifact_entryst' name='artifact_entry'/>
<stl-vector pointer-type='actor_entryst' name='actor_entry'/>
<stl-vector pointer-type='organization_entryst' name='organization_entry'/>
<stl-vector pointer-type='plot_entryst' name='plot_entry'/>
</class-type>
</data-definition>

Expand Down
Loading