Skip to content

Commit 2dc8312

Browse files
committed
Add original-name attributes to everything
And fix a handful of other errors I encountered along the way.
1 parent 3826f45 commit 2dc8312

121 files changed

Lines changed: 19055 additions & 18277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

changelog.txt

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,69 @@ Template for new versions:
1919
# Future
2020

2121
## Structures
22+
- added ``original-name`` attributes to all relevant objects
23+
- fixed numerous structure errors
24+
- specific changes: added NONE entries to many enum types (may affect C++ code using switch() statements): abstract_building_reputation_type, adopt_region_stage_type, artifact_claim_type, block_square_event_type, building_profile_acquisition_method, civzone_type, dance_form_context, dance_form_group_size, dance_form_move_type, divination_outcome_type, dungeon_type, dungeon_wrestle_type, embark_finder_option, environment_type, era_type, flow_type, genetic_modifier_type, hf_artifact_action_type, history_event_collection_type, incident_artifact_location_type, incident_type, incident_written_content_location_type, insurrection_outcome, interaction_flags, interaction_source_type, intrigue_corruption_method_type, inventory_profile_skill_type, inv_item_role_type, journey_type, language_name_category, language_name_component, language_word_table_index, load_game_stage_type, main_choice_type, misc_trait_type, musical_form_melody_frequency, musical_form_melody_style, musical_form_purpose, occasion_schedule_feature, occasion_schedule_type, occupation_type, personality_preference_type, plant_material_def, poetic_form_persona_type, poetic_form_persona_type, prepare_rod_stage_type, projectile_type, region_weather_type, report_zoom_type, resource_allotment_specifier_type, save_substage, scale_construction_type, scale_naming_type, scale_type, secretion_condition, simple_action_type, site_dispute_type, squad_order_cannot_reason, squad_order_type, tactical_situation, talk_choice_type, theft_method_type, timbre_type, travel_log_itinerary_type, workquota_frequency_type, world_construction_type, wrestle_attack_type
25+
- specific changes: assigned explicit "UNUSED" names to anonymous enum/bitfield members which are unused
26+
- specific changes: expanded ``builtin_mats`` to include 640 new elements for CREATURE_1-200, HIST_FIG_1-200, PLANT_1-200, and UNUSED01-40
27+
- specific changes: assigned proper placeholder names to ``interface_key`` section labels
28+
- specific changes: promoted several inline-defined types to top-level (intrigue_corruption_flag, job_posting_flag, unitproperyplacementst)
29+
- specific changes: ``plant_raw.stockpile_growth_flags`` now uses ``ras_crop_flag``
30+
- specific changes: added ``entity_raw_flags`` element "SIEGE_SKILLED_MINERS"
31+
- specific changes: added ``stockpile_category`` element "ALL"
32+
- specific changes: fixed structure layouts for ``adventure_interface_companionsst``, ``caste_raw``, ``entity_position_assignment``, ``message_order_to_perform_actionst``, and ``workshop_graphics_infost``
33+
- specific changes: renamed ``army_controller_goal_infiltrate_societyst`` field "agoal_ab_id" to "goal_ab_id"
34+
- specific changes: renamed ``creature_graphics_layer`` field "dye_color_iuse_palette_rowndex" to "use_palette_row"
35+
- specific changes: renamed ``entity_raw_flags`` enum member "MISSING_UNDERWORLD_DISASTERS" to "MINING_UNDERWORLD_DISASTERS"
36+
- specific changes: assigned proper names to ``hf_religious_datast.anon_1``, ``pet_profilest.anon_1``, and ``unit_vision_arcst.anon_1``
37+
- specific changes: renamed ``historical_entity`` field "unkarmy_reeling_defense" to "army_reeling_defense"
38+
- specific changes: renamed ``history_event_hf_learns_secretst`` field "interaction_effect" to "interaction_source"
39+
- specific changes: renamed ``item_craft_graphics_flag`` field "size" to "material"
40+
- specific changes: renamed ``lookinfo_spatterst`` field "extend" to "extent"
41+
- specific changes: renamed ``personality_ethicst`` field "reponse" to "response"
42+
- specific changes: renamed ``personality_facet_type`` enum member "PERSEVERENCE" to "PERSEVERANCE"
43+
- specific changes: renamed ``value_type`` enum member "PERSEVERENCE" to "PERSEVERANCE"
44+
- specific changes: renamed ``poetic_form_action`` enum member "MakeConsession" to "MakeConcession"
45+
- specific changes: renamed ``simple_action_type`` enum member "performe_horrible_experiments" to "performed_horrible_experiments"
46+
- specific changes: renamed ``stair_graphics_flag_material`` enum member "FOZEN" to "FROZEN"
47+
- specific changes: renamed ``timbre_type`` enum member "PURE_" to "PURE"
48+
- specific changes: renamed ``tissue_style_type`` enum member "PONY_TAILS" to "PONY_TAIL"
49+
- specific changes: renamed ``unit`` field "job.siege_boulder" to "job.siege_builder"
50+
- specific changes: renamed ``unit`` field "pool_index" to "pool_id"
51+
- specific changes: renamed ``viewscreen_choose_start_sitest`` field "def_candidate_nearst" to "def_candidate_near_st"
52+
- specific changes: changed ``caste_raw.extracts.blood_state`` and ``caste_raw.extracts.pus_state`` to use the ``matter_state`` enum
53+
- specific changes: changed ``d_init.display.track_tile_invert`` and ``d_init.display.track_ramp_invert`` to use a bitfield
54+
- specific changes: changed ``interrogation_resultst.relationship_factor`` to use a new enum type (which DF itself actually isn't using yet due to a bug)
55+
- specific changes: changed ``intrigue_perspectivest.potential_corrupt_circumstance_target[]`` to contain ``circumstance_id`` unions instead of plain integers
56+
- specific changes: changed ``world.items.other.BAG``, ``world.items.other.BOLT_THROWER_PARTS``, ``world.items.other.ANY_DRINK``, ``world.items.other.ANY_CRITTER``, and ``world.items.other.FOOD_STORAGE`` to specify the correct element types
57+
- specific changes: changed ``game.main_interface.last_displayed_hover_inst`` to use the ``main_hover_instruction`` enum
58+
- specific changes: changed ``world.raws.music.all[N].m_event[]`` and ``world.raws.music.all[N].context[]`` to hold enums
59+
- specific changes: changed ``widget_job_details_button.jb`` to correctly point at a ``job`` instead of a generic pointer
60+
- specific changes: changed ``world.worldgen_status.rejection_reason`` to use the ``map_reject_type`` enum
61+
- specific changes: changed ``world.history.first_[research]_flag[N]`` to use the various ``knowledge_scholar_flags_N`` bitfields
62+
- specific changes: changed the ``history_event`` vmethods ``getSentence`` and ``getPhrase`` to add 2 new boolean arguments (to which the game always passes "true, false")
63+
- specific changes: changed the ``interaction_target`` vmethod ``affects_unit`` first parameter from an integer to a unit pointer
64+
- specific changes: changed the ``item`` vmethod ``getGloveHandedness`` return type from int8_t to uint32_t
65+
- specific changes: changed the ``item`` vmethod ``getAmmoType`` to take no parameters and to return an ``std::string`` by value
66+
- specific changes: changed the ``item`` vmethod ``getDyeAmount`` to take an integer parameter
67+
- specific changes: changed the ``unit`` vmethod ``getCreatureTile`` to take a boolean parameter
68+
- specific changes: add ``ref-target`` attributes to various fields that were missing them, for use by ``gui/gm-editor`` and similar tools
69+
- specific changes: changed ``caste_raw.extracts.vermin_bite_chance`` to ``vermin_bite_state`` and changed its type to ``matter_state``
70+
- specific changes: changed ``ci_personal_reputation_profilest`` field ``entity_id`` to ``cultural_identity`` (now referring to a ``cultural_identity``)
71+
- specific changes: changed ``cultural_identity.events[]`` to ``cultural_identity.rumor_info.events[]``
72+
- specific changes: changed ``dance_form`` field ``entity`` to ``event`` (now referring to at a ``history_event``)
73+
- specific changes: changed ``dance_form_section`` field ``acts_out_civ`` to ``acts_out_event`` (now referring to a ``history_event``)
74+
- specific changes: changed ``entity_burial_request`` field ``civ`` to ``hfid`` (now referring to a ``historical_figure``)
75+
- specific changes: changed ``entity_pop_specifierst`` field ``squad_id`` to `squad_enid`` (now referring to a ``historical_entity``)
76+
- specific changes: changed ``gps.color[x][y]`` to ``gps.default_palette.color[x*16+y]``
77+
- specific changes: changed ``history_event_modified_buildingst`` field ``modification`` to use a different bitfield ``abstract_building_tower_flag``
78+
- specific changes: changed ``itemdef_ammost``, ``itemdef_siegeammost``, ``itemdef_toolst``, ``itemdef_trapcompst``, and ``itemdef_weaponst`` fields "texpos" (and "texpos2") into longer lists of specific fields
79+
- specific changes: changed ``knowledge_profilest.known_events[]`` to ``knowledge_profilest.rumor_info.events[]``
80+
- specific changes: changed ``relationship_event_supplement`` integer field ``occasion_type`` to ``circumstance`` of type ``unit_thought_type`` (an enum)
81+
- specific changes: changed ``relationship_event_supplement`` integer field ``site`` to ``circumstance_id`` field of type ``circumstance_id`` (a union)
82+
- specific changes: changed ``relationship_event_supplement`` field ``profession`` to ``reason_id`` field of type ``history_event_reason_id``
83+
- 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``)
84+
- specific changes: changed ``unit.enemy.rumor[]`` to ``unit.enemy.rumor_info.events[]``
2285

2386
# 53.07-r1
2487

data-definition.xsd

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
<xs:attributeGroup ref="SharedAttributes" />
5858
<xs:attribute name="type-name" type="xs:ID" use="required">
5959
</xs:attribute>
60+
<xs:attribute name="original-name">
61+
</xs:attribute>
6062
</xs:complexType>
6163
<xs:complexType name="EnumTypeDef" mixed="true">
6264
<xs:complexContent>
@@ -119,8 +121,6 @@
119121

120122
<xs:attribute name="is-union" type="xs:boolean">
121123
</xs:attribute>
122-
<xs:attribute name="original-name">
123-
</xs:attribute>
124124
</xs:extension>
125125
</xs:complexContent>
126126
</xs:complexType>
@@ -144,9 +144,6 @@
144144
</xs:choice>
145145
<xs:group ref="SharedElements" minOccurs="0" maxOccurs="unbounded" />
146146
</xs:sequence>
147-
148-
<xs:attribute name="original-name">
149-
</xs:attribute>
150147
</xs:extension>
151148
</xs:complexContent>
152149
</xs:complexType>
@@ -177,8 +174,6 @@
177174
<xs:extension base="CompoundFieldType">
178175
<xs:attribute name="pointer-type">
179176
</xs:attribute>
180-
<xs:attribute name="original-name">
181-
</xs:attribute>
182177
</xs:extension>
183178
</xs:complexContent>
184179
</xs:complexType>
@@ -285,6 +280,8 @@
285280
<xs:attributeGroup ref="SharedAttributes" />
286281
<xs:attribute name="name">
287282
</xs:attribute>
283+
<xs:attribute name="original-name">
284+
</xs:attribute>
288285
<xs:attribute name="ret-type">
289286
</xs:attribute>
290287
<xs:attribute name="is-destructor">
@@ -296,6 +293,8 @@
296293
<xs:attributeGroup ref="SharedAttributes" />
297294
<xs:attribute name="name">
298295
</xs:attribute>
296+
<xs:attribute name="original-name">
297+
</xs:attribute>
299298
<xs:attribute name="ref-target">
300299
</xs:attribute>
301300
<xs:attribute name="refers-to">
@@ -589,6 +588,8 @@
589588
<xs:attributeGroup ref="SharedAttributes" />
590589
<xs:attribute name="name">
591590
</xs:attribute>
591+
<xs:attribute name="original-name">
592+
</xs:attribute>
592593
<xs:attribute name="value" type="xs:integer">
593594
</xs:attribute>
594595
</xs:complexType>
@@ -605,6 +606,8 @@
605606
<xs:attributeGroup ref="SharedAttributes" />
606607
<xs:attribute name="name">
607608
</xs:attribute>
609+
<xs:attribute name="original-name">
610+
</xs:attribute>
608611
<xs:attribute name="type-name">
609612
</xs:attribute>
610613
<xs:attribute name="count" type="xs:positiveInteger">

0 commit comments

Comments
 (0)