Skip to content

Add original-name attributes to everything #872

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

Add original-name attributes to everything #872

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
60 changes: 60 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,66 @@ Template for new versions:
# Future

## Structures
- added ``original-name`` attributes to all relevant objects
- fixed numerous structure errors
- 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
- specific changes: assigned explicit "UNUSED" names to anonymous enum/bitfield members which are unused
- specific changes: expanded ``builtin_mats`` to include 640 new elements for CREATURE_1-200, HIST_FIG_1-200, PLANT_1-200, and UNUSED01-40
- specific changes: assigned proper placeholder names to ``interface_key`` section labels
- specific changes: promoted several inline-defined types to top-level (intrigue_corruption_flag, job_posting_flag, unitproperyplacementst)
- specific changes: ``plant_raw.stockpile_growth_flags`` now uses ``ras_crop_flag``
- specific changes: added ``stockpile_category`` element "ALL"
- specific changes: fixed structure layouts for ``adventure_interface_companionsst``, ``caste_raw``, ``entity_position_assignment``, ``message_order_to_perform_actionst``, and ``workshop_graphics_infost``
- specific changes: renamed ``army_controller_goal_infiltrate_societyst`` field "agoal_ab_id" to "goal_ab_id"
- specific changes: renamed ``creature_graphics_layer`` field "dye_color_iuse_palette_rowndex" to "use_palette_row"
- specific changes: assigned proper names to ``hf_religious_datast.anon_1``, ``pet_profilest.anon_1``, and ``unit_vision_arcst.anon_1``
- specific changes: renamed ``historical_entity`` field "unkarmy_reeling_defense" to "army_reeling_defense"
- specific changes: renamed ``history_event_hf_learns_secretst`` field "interaction_effect" to "interaction_source"
- specific changes: renamed ``item_craft_graphics_flag`` field "size" to "material"
- specific changes: renamed ``lookinfo_spatterst`` field "extend" to "extent"
- specific changes: renamed ``personality_ethicst`` field "reponse" to "response"
- specific changes: renamed ``personality_facet_type`` enum member "PERSEVERENCE" to "PERSEVERANCE"
- specific changes: renamed ``value_type`` enum member "PERSEVERENCE" to "PERSEVERANCE"
- specific changes: renamed ``poetic_form_action`` enum member "MakeConsession" to "MakeConcession"
- specific changes: renamed ``simple_action_type`` enum member "performe_horrible_experiments" to "performed_horrible_experiments"
- specific changes: renamed ``stair_graphics_flag_material`` enum member "FOZEN" to "FROZEN"
- specific changes: renamed ``timbre_type`` enum member "PURE_" to "PURE"
- specific changes: renamed ``tissue_style_type`` enum member "PONY_TAILS" to "PONY_TAIL"
- specific changes: renamed ``unit`` field "pool_index" to "pool_id"
- specific changes: renamed ``viewscreen_choose_start_sitest`` field "def_candidate_nearst" to "def_candidate_near_st"
- specific changes: changed ``caste_raw.extracts.blood_state`` and ``caste_raw.extracts.pus_state`` to use the ``matter_state`` enum
- specific changes: changed ``d_init.display.track_tile_invert`` and ``d_init.display.track_ramp_invert`` to use a bitfield
- 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)
- specific changes: changed ``intrigue_perspectivest.potential_corrupt_circumstance_target[]`` to contain ``circumstance_id`` unions instead of plain integers
- 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
- specific changes: changed ``game.main_interface.last_displayed_hover_inst`` to use the ``main_hover_instruction`` enum
- specific changes: changed ``world.raws.music.all[N].m_event[]`` and ``world.raws.music.all[N].context[]`` to hold enums
- specific changes: changed ``widget_job_details_button.jb`` to correctly point at a ``job`` instead of a generic pointer
- specific changes: changed ``world.worldgen_status.rejection_reason`` to use the ``map_reject_type`` enum
- specific changes: changed ``world.history.first_[research]_flag[N]`` to use the various ``knowledge_scholar_flags_N`` bitfields
- specific changes: changed the ``history_event`` vmethods ``getSentence`` and ``getPhrase`` to add 2 new boolean arguments (to which the game always passes "true, false")
- specific changes: changed the ``interaction_target`` vmethod ``affects_unit`` first parameter from an integer to a unit pointer
- specific changes: changed the ``item`` vmethod ``getGloveHandedness`` return type from int8_t to uint32_t
- specific changes: changed the ``item`` vmethod ``getAmmoType`` to take no parameters and to return an ``std::string`` by value
- specific changes: changed the ``item`` vmethod ``getDyeAmount`` to take an integer parameter
- specific changes: changed the ``unit`` vmethod ``getCreatureTile`` to take a boolean parameter
- specific changes: add ``ref-target`` attributes to various fields that were missing them, for use by ``gui/gm-editor`` and similar tools
- specific changes: changed ``caste_raw.extracts.vermin_bite_chance`` to ``vermin_bite_state`` and changed its type to ``matter_state``
- specific changes: changed ``ci_personal_reputation_profilest`` field ``entity_id`` to ``cultural_identity`` (now referring to a ``cultural_identity``)
- specific changes: changed ``cultural_identity.events[]`` to ``cultural_identity.rumor_info.events[]``
- specific changes: changed ``dance_form`` field ``entity`` to ``event`` (now referring to at a ``history_event``)
- specific changes: changed ``dance_form_section`` field ``acts_out_civ`` to ``acts_out_event`` (now referring to a ``history_event``)
- specific changes: changed ``entity_burial_request`` field ``civ`` to ``hfid`` (now referring to a ``historical_figure``)
- specific changes: changed ``entity_pop_specifierst`` field ``squad_id`` to `squad_enid`` (now referring to a ``historical_entity``)
- specific changes: changed ``gps.color[x][y]`` to ``gps.default_palette.color[x*16+y]``
- specific changes: changed ``history_event_modified_buildingst`` field ``modification`` to use a different bitfield ``abstract_building_tower_flag``
- specific changes: changed ``itemdef_ammost``, ``itemdef_siegeammost``, ``itemdef_toolst``, ``itemdef_trapcompst``, and ``itemdef_weaponst`` fields "texpos" (and "texpos2") into longer lists of specific fields
- specific changes: changed ``knowledge_profilest.known_events[]`` to ``knowledge_profilest.rumor_info.events[]``
- specific changes: changed ``relationship_event_supplement`` integer field ``occasion_type`` to ``circumstance`` of type ``unit_thought_type`` (an enum)
- specific changes: changed ``relationship_event_supplement`` integer field ``site`` to ``circumstance_id`` field of type ``circumstance_id`` (a union)
- 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[]``

# 53.07-r1

Expand Down
17 changes: 10 additions & 7 deletions data-definition.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
<xs:attributeGroup ref="SharedAttributes" />
<xs:attribute name="type-name" type="xs:ID" use="required">
</xs:attribute>
<xs:attribute name="original-name">
</xs:attribute>
</xs:complexType>
<xs:complexType name="EnumTypeDef" mixed="true">
<xs:complexContent>
Expand Down Expand Up @@ -119,8 +121,6 @@

<xs:attribute name="is-union" type="xs:boolean">
</xs:attribute>
<xs:attribute name="original-name">
</xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
Expand All @@ -144,9 +144,6 @@
</xs:choice>
<xs:group ref="SharedElements" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>

<xs:attribute name="original-name">
</xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
Expand Down Expand Up @@ -177,8 +174,6 @@
<xs:extension base="CompoundFieldType">
<xs:attribute name="pointer-type">
</xs:attribute>
<xs:attribute name="original-name">
</xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
Expand Down Expand Up @@ -285,6 +280,8 @@
<xs:attributeGroup ref="SharedAttributes" />
<xs:attribute name="name">
</xs:attribute>
<xs:attribute name="original-name">
</xs:attribute>
<xs:attribute name="ret-type">
</xs:attribute>
<xs:attribute name="is-destructor">
Expand All @@ -296,6 +293,8 @@
<xs:attributeGroup ref="SharedAttributes" />
<xs:attribute name="name">
</xs:attribute>
<xs:attribute name="original-name">
</xs:attribute>
<xs:attribute name="ref-target">
</xs:attribute>
<xs:attribute name="refers-to">
Expand Down Expand Up @@ -589,6 +588,8 @@
<xs:attributeGroup ref="SharedAttributes" />
<xs:attribute name="name">
</xs:attribute>
<xs:attribute name="original-name">
</xs:attribute>
<xs:attribute name="value" type="xs:integer">
</xs:attribute>
</xs:complexType>
Expand All @@ -605,6 +606,8 @@
<xs:attributeGroup ref="SharedAttributes" />
<xs:attribute name="name">
</xs:attribute>
<xs:attribute name="original-name">
</xs:attribute>
<xs:attribute name="type-name">
</xs:attribute>
<xs:attribute name="count" type="xs:positiveInteger">
Expand Down
Loading
Loading