Skip to content

Commit 392d652

Browse files
ab9rfab9rf
authored
Merge pull request #885 from ab9rf/53.13
Update structures for 53.13
2 parents ab0b764 + 0e53255 commit 392d652

10 files changed

Lines changed: 127 additions & 24 deletions

‎df.announcement.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
comment='When split into multiple lines, set on all but the first'/>
3434
<flag-bit name='unconscious' original-name='KO' comment='units.active[0]'/>
3535
<flag-bit name='announcement' original-name='DISPLAYED'/>
36+
<flag-bit name='high_prio_removal' original-name='HIGH_PRIO_REMOVAL'/>
3637
</bitfield-type>
3738

3839
<struct-type type-name='report' original-name='announcementst'
@@ -64,6 +65,8 @@
6465
<int32_t name='activity_id' ref-target='activity_entry' since='v0.40.01'/>
6566
<int32_t name='activity_event_id' ref-target='activity_event' since='v0.40.01'/>
6667
<int32_t name='speaker_id' original-name='speaker_unid' ref-target='unit' since='v0.40.01' comment='unit speaking the conversation'/>
68+
69+
<size_t name='pool_id'/>
6770
</struct-type>
6871

6972
<struct-type type-name='popup_message' original-name='mega_announcementst'>

‎df.army_controller.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<enum-item name='ABDUCT_HF'/>
8484
<enum-item name='SABOTAGE_ENTITY'/>
8585
<enum-item name='INFILTRATE_SOCIETY'/>
86+
<enum-item name='DIPLOMACY'/>
8687
</enum-type>
8788

8889
<enum-type type-name='invasion_intent_type' base-type='int32_t'> bay12: InvasionIntentType
@@ -218,6 +219,39 @@
218219
<int32_t name='source_abs_smm_y' init-value='-1'/>
219220
</struct-type>
220221

222+
<enum-type type-name='meeting_topic' original-name='diplomacy_topic_type' base-type='int16_t'> bay12: DiplomacyTopicType
223+
<enum-item name="DiscussCurrent" original-name='AGREEMENT'/>
224+
<enum-item name="RequestPeace" original-name='PEACETREATY'/>
225+
<enum-item name="TreeQuota" original-name='TREECOUNT'/>
226+
<enum-item name="BecomeLandHolder" original-name='ESTABLISH_LAND_HOLDER'/>
227+
<enum-item name="PromoteLandHolder" original-name='ELEVATE_LAND_HOLDER'/>
228+
<enum-item name="ExportAgreement" original-name='MAKE_REQUESTS'/>
229+
<enum-item name="ImportAgreement" original-name='TAKE_REQUESTS'/>
230+
<enum-item name="PleasantPlace" original-name='PLEASANTRIES'/>
231+
<enum-item name="WorldStatus" original-name='DISCUSS_WORLD'/>
232+
<enum-item name="TributeAgreement" original-name='TRIBUTE'/>
233+
<enum-item name="DemandSurrender" original-name='DEMAND_UNCONDITIONAL_SURRENDER'/>
234+
<enum-item name="InduceWar" original-name='SET_ENTITY_1_AGAINST_ENTITY_2'/>
235+
<enum-item name="InducePeace" original-name='ENTITY_1_SHOULD_LOVE_ENTITY_2'/>
236+
<enum-item name="DeclareWar" original-name='DECLARE_WAR'/>
237+
<enum-item name="SeekAlliance" original-name='SEEK_ALLIANCE'/>
238+
<enum-item name="OpenTrade" original-name='OPEN_TRADE'/>
239+
<enum-item name="ImproveTrade" original-name='IMPROVE_TRADE'/>
240+
</enum-type>
241+
242+
<bitfield-type type-name='ac_goal_diplomacy_flag' base-type='uint32_t'> bay12: AC_GOAL_DIPLOMACY_FLAG_*
243+
<flag-bit name='RETURNING_HOME'/>
244+
</bitfield-type>
245+
246+
<struct-type type-name='ac_goal_diplomacyst'>
247+
<stl-vector type-name='meeting_topic' name='topic'/>
248+
<stl-vector type-name='int32_t' name='topic_id1'/>
249+
<stl-vector type-name='int32_t' name='topic_id2'/>
250+
<bitfield base-type='uint32_t' type-name='ac_goal_diplomacy_flag' name='flag'/>
251+
<int32_t name='source_abs_smm_x'/>
252+
<int32_t name='source_abs_smm_y'/>
253+
</struct-type>
254+
221255
<bitfield-type type-name='ac_goal_hunting_flag' base-type='uint32_t'> bay12: AC_GOAL_HUNTING_FLAG_*
222256
<flag-bit name='RETURNING_HOME'/>
223257
<flag-bit name='DAWN_PERMITTED'/>
@@ -446,6 +480,7 @@
446480
<pointer type-name='army_controller_goal_abduct_hfst' name='goal_abduct_hf'/>
447481
<pointer type-name='army_controller_goal_sabotage_entityst' name='goal_sabotage_entity'/>
448482
<pointer type-name='army_controller_goal_infiltrate_societyst' name='goal_infiltrate_society'/>
483+
<pointer type-name='ac_goal_diplomacyst' name='goal_diplomacy'/>
449484
</compound>
450485
<enum type-name='army_controller_goal_type' name='goal'/>
451486

‎df.d_interface.xml‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6934,6 +6934,11 @@
69346934

69356935
-- Unused: viewscreen_workquota_detailsst
69366936

6937+
-- Unused: CivlistModeType
6938+
-- Unused: CIVLIST_SQUAD_FLAG_*
6939+
-- Unused: CIVLIST_MESSENGER_FLAG_*
6940+
-- Unused: viewscreen_civlistst
6941+
69376942
<enum-type type-name='world_view_mode_type' base-type='int32_t'> bay12: WorldViewModeType
69386943
<enum-item name='NONE' value='-1'/>
69396944
<enum-item name='NORMAL'/>
@@ -6944,13 +6949,9 @@
69446949
<enum-item name='REPORTS'/>
69456950
<enum-item name='CITIZENS'/>
69466951
<enum-item name='ARTIFACTS'/>
6952+
<enum-item name='NEW_MISSION'/>
69476953
</enum-type>
69486954

6949-
-- Unused: CivlistModeType
6950-
-- Unused: CIVLIST_SQUAD_FLAG_*
6951-
-- Unused: CIVLIST_MESSENGER_FLAG_*
6952-
-- Unused: viewscreen_civlistst
6953-
69546955
<bitfield-type type-name='civlist_squad_flag' base-type='uint32_t'> bay12: CIVLIST_SQUAD_FLAG_*
69556956
<flag-bit name='LOCKED_IN'/>
69566957
</bitfield-type>
@@ -6959,6 +6960,31 @@
69596960
<flag-bit name='LOCKED_IN'/>
69606961
</bitfield-type>
69616962

6963+
<enum-type type-name='world_new_mission_type' base-type='int32_t'> bay12: WorldNewMissionType
6964+
<enum-item name='NONE' value='-1'/>
6965+
<enum-item name='OKAY'/>
6966+
<enum-item name='NOT_DISPLAYED'/>
6967+
<enum-item name='OWN_SITE'/>
6968+
<enum-item name='OWN_CIV'/>
6969+
<enum-item name='NOT_UNDER_YOUR_CONTROL'/>
6970+
<enum-item name='NO_CIV'/>
6971+
<enum-item name='NO_REQUESTABLE_WORKERS'/>
6972+
<enum-item name='INACCESSIBLE'/>
6973+
<enum-item name='NO_MILITARY_GOALS_HF'/>
6974+
<enum-item name='NO_MEET_WORKERS_HF'/>
6975+
<enum-item name='NOT_IN_CONTACT'/>
6976+
<enum-item name='ALREADY_IN_CONTACT'/>
6977+
<enum-item name='ALREADY_AT_WAR'/>
6978+
<enum-item name='ALREADY_HAVE_PEACE'/>
6979+
<enum-item name='ALREADY_HAVE_ALLIANCE'/>
6980+
<enum-item name='AT_WAR'/>
6981+
<enum-item name='CANNOT_COMMUNICATE'/>
6982+
<enum-item name='HOSTILE_ENTITY'/>
6983+
<enum-item name='NOT_TRADING'/>
6984+
<enum-item name='ALREADY_TRADING'/>
6985+
<enum-item name='NO_CIVILIZATION_MILITARY_GOALS_HF'/>
6986+
</enum-type>
6987+
69626988
<class-type type-name='viewscreen_worldst' inherits-from='viewscreen'>
69636989
<int32_t name='region_cent_x'/>
69646990
<int32_t name='region_cent_y'/>
@@ -6970,6 +6996,7 @@
69706996

69716997
<enum type-name='world_view_mode_type' name='view_mode'/>
69726998

6999+
<pointer type-name='historical_figure' name='civ_level_military_goals_hf'/>
69737000
<pointer type-name='historical_figure' name='military_goals_hf'/>
69747001
<pointer type-name='historical_figure' name='meet_workers_hf'/>
69757002

@@ -6996,6 +7023,8 @@
69967023
<bool name='scrolling_ac'/>
69977024
<int32_t name='scroll_position_ac'/>
69987025

7026+
<static-array type-name='world_new_mission_type' name='new_mission' index-enum='army_controller_goal_type'/>
7027+
69997028
<stl-vector pointer-type='squad' name='squad'/>
70007029
<stl-vector type-name='civlist_squad_flag' name='squad_flag'/>
70017030
<stl-vector pointer-type='entity_position_assignment' name='messenger_epp'/>
@@ -7010,6 +7039,8 @@
70107039
<int32_t name='scroll_position_request_nem'/>
70117040
<bool name='scrolling_request_nem'/>
70127041

7042+
<static-array type-name='world_new_mission_type' name='diplomacy_topic' index-enum='meeting_topic'/>
7043+
70137044
<stl-vector pointer-type='entity_event' name='rumor_master'/>
70147045
<compound type-name='region_print_datast' name='rumor_rpd'/>
70157046
<compound type-name='rpd_indicator_datast' name='rumor_rpd_indicator_data'/>

‎df.diplomacy.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
<data-definition>
2-
<enum-type type-name='meeting_topic' original-name='diplomacy_topic_type' base-type='int16_t'> bay12: DiplomacyTopicType
3-
<enum-item name="DiscussCurrent" original-name='AGREEMENT'/>
4-
<enum-item name="RequestPeace" original-name='PEACETREATY'/>
5-
<enum-item name="TreeQuota" original-name='TREECOUNT'/>
6-
<enum-item name="BecomeLandHolder" original-name='ESTABLISH_LAND_HOLDER'/>
7-
<enum-item name="PromoteLandHolder" original-name='ELEVATE_LAND_HOLDER'/>
8-
<enum-item name="ExportAgreement" original-name='MAKE_REQUESTS'/>
9-
<enum-item name="ImportAgreement" original-name='TAKE_REQUESTS'/>
10-
<enum-item name="PleasantPlace" original-name='PLEASANTRIES'/>
11-
<enum-item name="WorldStatus" original-name='DISCUSS_WORLD'/>
12-
<enum-item name="TributeAgreement" original-name='TRIBUTE'/>
13-
<enum-item name="DemandSurrender" original-name='DEMAND_UNCONDITIONAL_SURRENDER'/>
14-
<enum-item name="InduceWar" original-name='SET_ENTITY_1_AGAINST_ENTITY_2'/>
15-
<enum-item name="InducePeace" original-name='ENTITY_1_SHOULD_LOVE_ENTITY_2'/>
16-
</enum-type>
17-
182
<bitfield-type type-name='diplomacy_flag' base-type='uint32_t'> bay12: DIPLOMACYFLAG_*
193
<flag-bit name='dynamic_load' original-name='DELETESCRIPT' comment='destroy dipscript_info in destructor'/>
204
<flag-bit name='failure' original-name='FAILURE'/>

‎df.entity.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,6 +1385,7 @@
13851385
<flag-bit name='calculated_best_appointment_precedence' original-name='CALCULATED_BEST_APPOINTMENT_PRECEDENCE'/>
13861386
<flag-bit name='religious_devotion' original-name='RELIGIOUS_DEVOTION'/>
13871387
<flag-bit name='might_have_interaction_region_pops' original-name='MIGHT_HAVE_INTERACTION_REGION_POPS'/>
1388+
<flag-bit name='ignore_progress_triggers' original-name='IGNORE_PROGRESS_TRIGGERS'/>
13881389
</bitfield-type>
13891390

13901391
<enum-type type-name='historical_entity_type' original-name='entity_type' base-type='int16_t'> bay12: EntityType; no base type, but usually int16

‎df.g_src.basics.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,10 +1122,10 @@
11221122
<enum-item name='DEITY_PRONOUNCEMENT' since='v0.51.01'>
11231123
<item-attr name='alert_type' value='GENERAL'/>
11241124
</enum-item>
1125-
<enum-item name='UNUSED_47'>
1125+
<enum-item name='CREATURE_STUCK'>
11261126
<item-attr name='alert_type' value='GENERAL'/>
11271127
</enum-item>
1128-
<enum-item name='UNUSED_48'>
1128+
<enum-item name='CITIZEN_STUCK'>
11291129
<item-attr name='alert_type' value='GENERAL'/>
11301130
</enum-item>
11311131
<enum-item name='UNUSED_49'>

‎df.g_src.init.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<enum-item name='SOUND_OFF'/>
8282
<enum-item name='PORTABLE_MODE'/>
8383
<enum-item name='COMPRESS_SAVES'/>
84+
<enum-item name='DISPLAY_ALL_ERRORLOGS'/>
8485
</enum-type>
8586

8687
<struct-type type-name='init_media' original-name='init_mediast'>

‎df.history.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,41 @@
11
<data-definition>
2+
<enum-type type-name='negotiation_result_difficulty_modifier_type' base-type='int32_t'> bay12: NegotiationResultDifficultyModifierType
3+
<enum-item name='NONE' value='-1'/>
4+
<enum-item name='INVASION_DEATHS'/>
5+
<enum-item name='TARGET_LARGER_CIV'/>
6+
<enum-item name='TARGET_SMALLER_CIV'/>
7+
</enum-type>
8+
9+
<enum-type type-name='negotiation_result_type' base-type='int32_t'> bay12: NegotiationResultType
10+
<enum-item name='NONE' value='-1'/>
11+
<enum-item name='SUCCESS'/>
12+
<enum-item name='FAILURE'/>
13+
<enum-item name='MUST_LIFT_CURRENT_SIEGE'/>
14+
</enum-type>
15+
16+
<struct-type type-name='negotiation_resultst'>
17+
<int32_t name='initiator_hfid' ref-target='historical_figure'/>
18+
<int32_t name='initiator_enid' ref-target='historical_entity'/>
19+
<int32_t name='target_hfid' ref-target='historical_figure'/>
20+
<int32_t name='target_enid' ref-target='historical_entity'/>
21+
<int32_t name='target_ep_id'/>
22+
<int32_t name='target_ep_enid'/>
23+
<enum type-name='meeting_topic' name='topic'/>
24+
<enum type-name='negotiation_result_type' name='result'/>
25+
<int32_t name='result_id'/>
26+
<int32_t name='result_magnitude'/>
27+
<int32_t name='initiator_negotiation_roll'/>
28+
<int32_t name='initiator_persuasion_roll'/>
29+
<int32_t name='initiator_extra_skill'/>
30+
<int32_t name='initiator_extra_skill_roll'/>
31+
<int32_t name='target_negotiation_roll'/>
32+
<int32_t name='target_judgment_roll'/>
33+
<int32_t name='target_extra_skill'/>
34+
<int32_t name='target_extra_skill_roll'/>
35+
<stl-vector type-name='negotiation_result_difficulty_modifier_type' name='difficulty_modifier'/>
36+
<stl-vector type-name='int32_t' name='difficulty_modifier_value'/>
37+
</struct-type>
38+
239
<bitfield-type type-name='intrigue_corruption_result_flag' base-type='uint32_t'> bay12: INTRIGUE_CORRUPTION_RESULT_FLAG_*
340
<flag-bit name='succeeded' original-name='SUCCESSFUL'/>
441
<flag-bit name='misread_target' original-name='FAILED_JUDGMENT_TEST'/>
@@ -138,6 +175,8 @@
138175

139176
<struct-type type-name='intrigue' instance-vector='$global.world.history.intrigues' key-field='event_id' original-name='history_support_eventst'>
140177
<int32_t name='event_id' original-name='global_id' ref-target='history_event' comment="NOTE: can be culled. Seen: failed_intrigue_corruption, event_agreement_formed, hfs_formed_intrigue_relationship"/>
178+
179+
<pointer type-name='negotiation_resultst' name='negotiation_result'/>
141180
<pointer type-name='intrigue_corruption' name='corruption' original-name='intcr' comment="Mutually exclusive with circumstance. Exactly one is present. Presumably 'bring into network' action doesn't provide membership"/>
142181
<compound name='reason'> not a compound
143182
<enum base-type='int32_t' type-name='history_event_reason' name='type' original-name='reason'/>

‎df.history_event.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,11 +665,14 @@
665665
<enum-item name='purchase_exceptional_equipment' original-name='BOUGHT_BETTER_EQUIPMENT_4'/>
666666
<enum-item name='purchase_masterwork_equipment' original-name='BOUGHT_BETTER_EQUIPMENT_5'/>
667667
<enum-item name='performed_horrible_experiments' original-name='PERFORMED_HORRIBLE_EXPERIMENTS'/>
668+
<enum-item name='diplomacy_failed_entity_not_at_location' original-name='DIPLOMACY_FAILED_ENTITY_NOT_AT_LOCATION'/>
669+
<enum-item name='diplomacy_failed_entity_no_hf_at_location' original-name='DIPLOMACY_FAILED_ENTITY_NO_HF_AT_LOCATION'/>
668670
</enum-type>
669671

670672
<class-type type-name='history_event_hist_figure_simple_actionst' inherits-from='history_event'>
671673
<stl-vector type-name='int32_t' name='group_hfs' original-name='group_hfid' ref-target='historical_figure' comment='binary'/>
672674
<enum type-name='simple_action_type' name='type' original-name='action'/>
675+
<int32_t name='entity' original-name='entity_id' ref-target='historical_entity'/>
673676
<int32_t name='site' original-name='site_id' ref-target='world_site'/>
674677
<int32_t name='structure' original-name='ab_id' ref-target='abstract_building'/>
675678
<int32_t name='region' original-name='subregion_id' ref-target='world_region'/>
@@ -1065,7 +1068,7 @@
10651068
<enum-item name='hardship' original-name='HARDSHIP'/>
10661069
<enum-item name='seized' original-name='SEIZURE'/>
10671070
<enum-item name='offended' original-name='OFFENDED'/>
1068-
<enum-item name='missing_goods' original-name='LOSTVALUE'/>
1071+
<enum-item name='unused_01_05' original-name='UNUSED_01_05' comment='formerly LOSTVALUE'/>
10691072
<enum-item name='tribute' original-name='IS_TRIBUTE'/>
10701073
</enum-type>
10711074

@@ -1074,6 +1077,8 @@
10741077
<int32_t name='destination' original-name='depot_civid' ref-target='historical_entity' comment='site government'/>
10751078
<int32_t name='site' original-name='site_id' ref-target='world_site'/>
10761079
<df-flagarray name='flags2' original-name='merchant_flag' index-enum='history_event_merchant_flags'/>
1080+
<int32_t name='goods_value_initial'/>
1081+
<int32_t name='goods_value_end'/>
10771082
</class-type>
10781083

10791084
<class-type type-name='history_event_tradest' inherits-from='history_event' since='v0.47.01'>

‎df.unit.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,6 +1478,7 @@
14781478
<flag-bit name='may_have_mythical_substance' original-name='MAY_HAVE_MYTHICAL_SUBSTANCE'/>
14791479
<flag-bit name='did_dungeon_move_unit' original-name='DID_DUNGEON_MOVE_UNIT'/>
14801480
<flag-bit name='carrying_somebody' original-name='CARRYING_SOMEBODY'/>
1481+
<flag-bit name='has_announced_stuck' original-name='HAS_ANNOUNCED_STUCK'/>
14811482
</bitfield-type>
14821483

14831484
<enum-type type-name='unitpref_type'> bay12: UnitPrefs, no base type
@@ -2374,6 +2375,7 @@
23742375
<stl-string name='undead_name' original-name='animated_name' comment='display name of reanimated creatures'/>
23752376
<int32_t name='initial_good_head_count' since='v0.43.01'/>
23762377
<int32_t name='initial_good_grasp_count' since='v0.43.01'/>
2378+
<int16_t name='disturbed_timer'/>
23772379
</struct-type>
23782380

23792381
<struct-type type-name='entity_pop_specifierst'>
@@ -2592,6 +2594,8 @@
25922594

25932595
<struct-type type-name='unit_cache_vars'>
25942596
<enum type-name='glowtile_type' name='cached_glowtile_type' original-name='glow_tile'/>
2597+
<int32_t name='path_cooldown'/>
2598+
<int32_t name='next_path_cooldown'/>
25952599
</struct-type>
25962600

25972601
<enum-type type-name='dungeon_control_state' base-type='int8_t'> bay12: DungeonControlState

0 commit comments

Comments
 (0)