diff --git a/changelog.txt b/changelog.txt
index 476ab9405..51693174b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -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
diff --git a/data-definition.xsd b/data-definition.xsd
index 8b17d0161..a40aaaa8f 100644
--- a/data-definition.xsd
+++ b/data-definition.xsd
@@ -57,6 +57,8 @@
+
+
@@ -119,8 +121,6 @@
-
-
@@ -144,9 +144,6 @@
-
-
-
@@ -177,8 +174,6 @@
-
-
@@ -285,6 +280,8 @@
+
+
@@ -296,6 +293,8 @@
+
+
@@ -589,6 +588,8 @@
+
+
@@ -605,6 +606,8 @@
+
+
diff --git a/df.abstract_building.xml b/df.abstract_building.xml
index 88a43dc24..fb1cd16d5 100644
--- a/df.abstract_building.xml
+++ b/df.abstract_building.xml
@@ -1,49 +1,49 @@
bay12: LOCATION_INFO_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
the following is not saved:
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
bay12: LocationDeathType
@@ -72,7 +72,7 @@
-
+
-- Unused: struct blueprintst
@@ -80,16 +80,16 @@
-- Unused: struct general_blueprintst
-
-
-
-
-
+
+
+
+
+
-
+
bay12: AbstractBuildingOrderType
@@ -98,20 +98,20 @@
-
+
-
-
+
+
-
-
+
+
-
+
@@ -119,53 +119,53 @@
-
+
(find-by-id $(find-instance $world_site $$).buildings $id $)
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -173,18 +173,18 @@
not a compound
-
-
-
-
-
+
+
+
+
+
not a compound
-
-
-
-
-
+
+
+
+
+
@@ -194,19 +194,19 @@
-
+
-
+
bay12: ABSTRACT_BUILDING_TOWER_FLAG_*
-
-
-
-
+
+
+
+
@@ -223,15 +223,15 @@
bay12: AB_UNDERWORLD_SPIRE_FLAG_*
-
+
-
+
- -- Inline union
+ -- Inline union - not a real structure
@@ -239,36 +239,36 @@
-
-
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
@@ -277,18 +277,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/df.activity.xml b/df.activity.xml
index e26ab8a77..86a0dbae5 100644
--- a/df.activity.xml
+++ b/df.activity.xml
@@ -5,17 +5,17 @@
-
-
+
+
-- Seemingly units that are free to be grouped
-- away into subevents or sparring pairs.
-
-
+
+
-- Holder event
-
+
bay12: ActivityEventItemRoleType
@@ -36,7 +36,7 @@
-
+
bay12: ActivityEventBuildingRoleType
@@ -50,130 +50,132 @@
-
- bay12: ???
+ bay12: ???
bay12: ACTIVITY_EVENT_FLAG_*
-
-
+
+
bay12: ActivityEventType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
(let ((activity (find-instance $activity_entry $$)))
(find-by-id $activity.events $event_id $))
-
+
-
+
-
-
+
+
-
+
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -181,93 +183,93 @@
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
bay12: HARASSMENT_TARGET_PROFILE_FLAG_*
-
+
-
+
-
+
-
-
+
+
bay12: HarassmentStageType
-
-
-
-
+
+
+
+
-
+
@@ -278,61 +280,61 @@
bay12: EncounterUnitStageType
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
bay12: ENCOUNTERFLAG_ITEM_*
-
+
-
+
-
+
-
-
-
+
+
+
-
+
bay12: ACTIVITY_EVENT_REUNION_FLAG_*
-
+
-
-
+
+
@@ -341,30 +343,30 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
depends on conversation choice
-
+
@@ -488,112 +490,112 @@
bay12: ConversationStateType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bay12: ACTIVITY_EVENT_CONVERSATION_FLAG_*
-
-
+
+
-
-
+
+
-
+
@@ -622,139 +624,139 @@
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
bay12: PERFORMANCE_ROLE_FLAG_*
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
@@ -764,52 +766,52 @@
bay12: ACTIVITY_EVENT_READ_FLAG_*
-
+
-
-
-
-
+
+
+
+
-
+
bay12: ACTIVITY_EVENT_WRITE_FLAG_*
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
bay12: ACTIVITY_EVENT_COPY_WRITTEN_CONTENT_FLAG_*
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
@@ -824,24 +826,26 @@
+
+
-
+
-
+
bay12: ACTIVITY_EVENT_MAKE_BELIEVE_FLAG_*
-
-
+
+
-
+
@@ -854,12 +858,12 @@
bay12: ACTIVITY_EVENT_PLAY_WITH_TOY_FLAG_*
-
-
+
+
-
+
@@ -868,40 +872,40 @@
bay12: ACTIVITY_EVENT_PERFORMANCE_FLAG_*
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
@@ -913,40 +917,40 @@
-
+
- bay12: ActivityType
+ bay12: ActivityType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
+
@@ -962,7 +966,7 @@
-
+
@@ -971,7 +975,7 @@
-
+
diff --git a/df.activity_meeting.xml b/df.activity_meeting.xml
index 823feaf00..b999c67d0 100644
--- a/df.activity_meeting.xml
+++ b/df.activity_meeting.xml
@@ -1,21 +1,21 @@
bay12: ACTIVITYFLAG_*
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/df.adventure.xml b/df.adventure.xml
index e2eaadbfa..b8b0c08dd 100644
--- a/df.adventure.xml
+++ b/df.adventure.xml
@@ -13,8 +13,8 @@
bay12: SOUND_INDICATOR_FLAG_*
-
-
+
+
@@ -23,63 +23,63 @@
-
+
-
+
- bay12: AdventureViewModes
+ bay12: AdventureViewModes
- MAIN
- LOOK
- CONVERSATION_START_NEW
- CONVERSATION_LIST
- CONVERATION_TALK
- INVENTORY_LOOK
- INVENTORY_DROP
- INVENTORY_THROW
- INVENTORY_WEAR
- INVENTORY_REMOVE
- INVENTORY_INTERACT
- INVENTORY_PUTIN
- INVENTORY_PUTIN2
- INVENTORY_EATDRINK
- THROW
- SHOOET
- PICUP
- PICKUP_AMOUNT
- COMBAT
- COMPANIONS
- MOVEMENT
- SPEED_SNEAK
- INTERACT
- MOVE
- ANNOUNCEMENTS
- REGION_MAIN
- REGION_SLEEP
- SPOOR
- SLEEP_CONFIRM
- INTERACTION_TARGET
- REACTION_MOMENT_NO_ATTACKER
- LOOK_SPOOR
- ATTACKCREATURE_UNIT_CHOICE
- ATTACKCREATURE_CONFIRM
- ATTACKCREATURE_MOVE_CHOICE
- ATTACKCREATURE_AIM_TARGET
- ATTACKCREATURE_AIM_ATTACK
- ATTACKCREATURE_PARRY_CHOICE
- ATTACKCREATURE_BLOCK_CHOICE
- ATTACKCREATURE_DODGE_CHOICE
- START_PERFORMANCE
- MOVE_CONFIRM
- CONSTRUCTION
- ASSUME_IDENTITY
- NAME_ITEM
- BECOME_COMPANION
- COMPANION_TACTICAL_SETTINGS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-- Unused: DungeonAttackModes
@@ -144,12 +144,12 @@
-
-
-
+
+
+
-
-
+
+
for "pick up vermin":
@@ -165,50 +165,50 @@
argument 3 is set to true if a fire was started
returns nullptr
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -231,73 +231,73 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
bay12: ADVENTURE_OPTION_INVENTORY_ITEM_OPTION_FLAG_*
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
@@ -306,90 +306,90 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -408,13 +408,13 @@
-
+
-
+
@@ -426,17 +426,17 @@
-
-
-
+
+
+
-
+
-
+
@@ -444,43 +444,43 @@
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
@@ -488,7 +488,7 @@
-
+
@@ -508,7 +508,7 @@
-
+
@@ -523,13 +523,13 @@
-
+
-
+
@@ -553,14 +553,14 @@
-
+
-
+
@@ -569,19 +569,19 @@
-
-
-
+
+
+
-- Unused: talk_list_optionst
-
-
-
-
-
+
+
+
+
+
@@ -599,9 +599,9 @@
-
+
-
+
@@ -616,7 +616,7 @@
-
+
bay12: AdventureConstructionModeType
@@ -631,9 +631,9 @@
bay12: AC_EDIT_ZONE_FLAG_*
-
-
-
+
+
+
@@ -669,7 +669,7 @@
-
+
@@ -724,14 +724,14 @@
-- Unused: AdventureTravelCheckType
bay12: ADVENTURE_RUMOR_DATA_FLAG_*
-
-
+
+
-
+
@@ -758,38 +758,38 @@
bay12: TRACKING_FLAG_*
-
-
-
+
+
+
bay12: ADVENTURE_FLAG_*
-
-
+
+
bay12: ADVENTURE_CHOSEN_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bay12: AdventureTravelExceptionType
@@ -828,56 +828,56 @@
-
+
-
-
- Coordinates of the player on the map when the travel screen is opened. Determine the displayed position whilst travel_not_moved is set
-
+
+
+ Coordinates of the player on the map when the travel screen is opened. Determine the displayed position whilst travel_not_moved is set
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
@@ -887,17 +887,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -905,17 +905,17 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
@@ -928,7 +928,7 @@
-
+
?
@@ -937,26 +937,26 @@
?
-
-
- Coordinates of the player on the map right after their first fast travel move
-
-
+
+
+ Coordinates of the player on the map right after their first fast travel move
+
+
-
-
-
+
+
+
-
-
+
+
@@ -972,21 +972,21 @@
not a compound
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -998,14 +998,14 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
diff --git a/df.agreement.xml b/df.agreement.xml
index cd46fbf68..c49ea5c10 100644
--- a/df.agreement.xml
+++ b/df.agreement.xml
@@ -1,244 +1,244 @@
-
+
-
+
-
+
-
-
+
+
- bay12: AgreementSubjectType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: AgreementSubjectType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-- Here be unions!
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
- bay12: INTRIGUE_PLOT_INFILTRATE_SOCIETY_FLAG_* ?
+
+
+
+ bay12: INTRIGUE_PLOT_INFILTRATE_SOCIETY_FLAG_* ?
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
bay12: AGREEMENT_SUBJECT_BUILD_LOCATION_FLAG_*
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bay12: AGREEMENT_FLAG_*
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
diff --git a/df.alert_state.xml b/df.alert_state.xml
index cfef44435..4f995ac30 100644
--- a/df.alert_state.xml
+++ b/df.alert_state.xml
@@ -1,23 +1,23 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
- 0.50.01
-
+ 0.50.01
+
-
+
diff --git a/df.announcement.xml b/df.announcement.xml
index be8ce4033..ecf8cc282 100644
--- a/df.announcement.xml
+++ b/df.announcement.xml
@@ -3,10 +3,11 @@
- bay12: AnnouncementLocationType
-
-
-
+ bay12: AnnouncementLocationType
+
+
+
+
@@ -14,24 +15,24 @@
-
+
-
-
+
+
-
-
+
+
bay12: ANNOUNCEMENTFLAG_*
-
-
-
+
+
-
+
$.text
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -74,55 +75,55 @@
bay12: COMBAT_EVENT_STRIKE_INTRO_FLAG_*
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- bay12: CombatEventType
+ bay12: CombatEventType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -131,15 +132,15 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -150,13 +151,13 @@
bay12: REPORT_FLAG_*
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -165,42 +166,42 @@
bay12: ANNOUNCEMENT_TEMP_FLAG_*
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
diff --git a/df.army.xml b/df.army.xml
index dc369fc82..7e2219028 100644
--- a/df.army.xml
+++ b/df.army.xml
@@ -1,43 +1,43 @@
- bay12: ArmyFlag
-
-
-
-
-
-
-
-
+ bay12: ArmyFlag
+
+
+
+
+
+
+
+
-- Unused: ArmyGoalType
-
+
bay12: ARMY_NEMESIS_FLAG_*
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -53,50 +53,50 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
diff --git a/df.army_controller.xml b/df.army_controller.xml
index d08f1b35d..8cb78a330 100644
--- a/df.army_controller.xml
+++ b/df.army_controller.xml
@@ -1,59 +1,59 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
bay12: TRIBUTE_REPORT_FLAG_*
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
bay12: MISSION_REPORT_FLAG_*
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
bay12: ArmyControllerGoalType
@@ -143,7 +143,7 @@
-
+
@@ -345,7 +345,7 @@
bay12: AC_GOAL_RECLAIM_SITE_FLAG_*
-
+
@@ -356,7 +356,7 @@
bay12: AC_GOAL_CREATE_NEW_SITE_FLAG_*
-
+
@@ -368,11 +368,11 @@
bay12: ARMY_CONTROLLER_FLAG_*
-
-
-
-
-
+
+
+
+
+
Some army_controller research notes:
@@ -396,28 +396,28 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -453,7 +453,7 @@
-
+
diff --git a/df.army_tracking_info.xml b/df.army_tracking_info.xml
index f100dea7b..e0a65816d 100644
--- a/df.army_tracking_info.xml
+++ b/df.army_tracking_info.xml
@@ -5,7 +5,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/df.art_image.xml b/df.art_image.xml
index 7debb43ee..c2db95c71 100644
--- a/df.art_image.xml
+++ b/df.art_image.xml
@@ -1,43 +1,43 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
@@ -45,95 +45,95 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
+
+
bay12: ArtImageProperty
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
$(find-instance $art_image_chunk $$).images[$]
(describe-obj $.name)
-
-
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
+
+
@@ -142,13 +142,13 @@
-
+
-
+
-
+
diff --git a/df.battlefield.xml b/df.battlefield.xml
index 660f5a1a1..2ec056889 100644
--- a/df.battlefield.xml
+++ b/df.battlefield.xml
@@ -1,16 +1,16 @@
-
+
-
-
-
-
+
+
+
+
-
+
diff --git a/df.belief_system.xml b/df.belief_system.xml
index da1ac7f32..b343aa09b 100644
--- a/df.belief_system.xml
+++ b/df.belief_system.xml
@@ -17,15 +17,15 @@
-
+
-
-
+
+
SAVE_VALUENUM
-
+
diff --git a/df.block.xml b/df.block.xml
index c7f7888e0..990b8e4e7 100644
--- a/df.block.xml
+++ b/df.block.xml
@@ -1,77 +1,78 @@
- bay12: BLOCKFLAG_*
-
-
-
- bay12: BLOCKFLAG_*
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
bay12: BlockSquareEventType
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
bay12: MINERAL_EVENT_FLAG_*
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
+
@@ -84,25 +85,25 @@
-
-
-
+
+
+
-
-
+
+
- bay12: BLOCK_SQUARE_EVENT_ITEM_SPATTER_FLAG_*
-
+ bay12: BLOCK_SQUARE_EVENT_ITEM_SPATTER_FLAG_*
+
-
-
-
-
+
+
+
+
@@ -112,18 +113,18 @@
-
-
+
+
-
+
- bay12: BSESpoorType, defined as uint8_t but that won't work here because of NONE
+ bay12: BSESpoorType, defined as uint8_t but that won't work here because of NONE
@@ -131,31 +132,31 @@
- bay12: BSE_SPOOR_FLAG_*
-
-
-
-
-
-
+ bay12: BSE_SPOOR_FLAG_*
+
+
+
+
+
+
bay12: BSE_SPOOR_FLAG_DIR_*
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
bay12: BSE_SPOOR_FLAG_LEVEL_*
-
-
-
-
+
+
+
+
@@ -167,7 +168,7 @@
-
+
@@ -176,21 +177,21 @@
-
+
-
+
-
+
-
-
+
+
@@ -198,8 +199,8 @@
-
-
+
+
@@ -211,11 +212,11 @@
bay12: tlink{burrow_blockst}
-
+
-
+
-
+
@@ -223,34 +224,34 @@
-
+
-
+
-
+
-
-
-
+
+
+
This is compared to unit.animal.population.depth when a revealed
necromancer searches for a map edge tile to run away to:
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -266,41 +267,41 @@
-
+
-
+
flood; 256*cost for straight, 362*cost for diagonal
-
+
flood; sync to path_distance; same value; inc per run; reset to 0 on wraparound
-
+
0 = non-walkable; same nonzero at A and B = walkable from A to B
-
+
1 at walkable map edge; then +1 per 10 tiles it seems; 0 in dug tunnels
-
+
-
+
@@ -311,13 +312,13 @@
-
+
-
+
@@ -328,16 +329,17 @@
+
-
+
-
+
-
+
@@ -359,12 +361,12 @@
-
+
-
+
-
+
@@ -373,45 +375,44 @@
-
+
- bay12: BlockColumnFlagType
+ bay12: BlockColumnFlagType
-
-
-
-
+
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
diff --git a/df.breed.xml b/df.breed.xml
index a05073947..16f5203f0 100644
--- a/df.breed.xml
+++ b/df.breed.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/df.building.xml b/df.building.xml
index a23f08256..17d2a7ac1 100644
--- a/df.building.xml
+++ b/df.building.xml
@@ -8,189 +8,206 @@
- bay12: StockPileViewMode
+ bay12: StockPileViewMode
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
bay12: BuildingUseType
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -204,323 +221,323 @@
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
bay12: BUILDING_MACHINE_HOOKUP_DIR_*
-
-
-
-
-
-
+
+
+
+
+
+
-
+
bay12: BUILDING_MACHINE_INFO_FLAG_*
-
+
-
-
+
+
bay12: BUILDING_ARCHFLAG_*
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
bay12: BUILDINGFLAG_*
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
bay12: WORKSHOP_PROFILE_FLAG_*
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
not a compound
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-- 14
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-- 24
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-- 34
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 44
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-- 54
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-- 64
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-- 74
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-- 85
-
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-- 95
@@ -528,55 +545,56 @@
- bay12: DefaultStockPiles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: DefaultStockPiles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: STOCKPILE_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: STOCKPILE_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -585,11 +603,11 @@
index-refers-to='(food-mat-by-idx $Meat $)'/>
-
-
@@ -601,47 +619,47 @@
index-refers-to='(food-mat-by-idx $CreatureCheese $)'/>
-
-
-
-
-
-
-
-
+
- bay12: StockpileFurnitureStorageType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: StockpileFurnitureStorageType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: StockpileFurnitureItemType
+ bay12: StockpileFurnitureItemType
subset of item_type
@@ -675,155 +693,155 @@
tool types
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
+
- bay12: StockpileAmmoStorageType
-
-
-
+ bay12: StockpileAmmoStorageType
+
+
+
-
-
-
+
-
-
+
+
-
-
+
+
-
- bay12: StockpileBarStorageType
-
-
-
-
-
-
+ bay12: StockpileBarStorageType
+
+
+
+
+
+
- bay12: StockpileBlockStorageType
-
-
-
-
-
+ bay12: StockpileBlockStorageType
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
- bay12: StockpileFinishedStorageType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: StockpileFinishedStorageType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
+
+
-
@@ -831,21 +849,21 @@
-
-
-
-
-
-
-
-
@@ -853,27 +871,27 @@
-
-
+
+
-
- bay12: StockpileWeaponStorageType
-
-
-
-
-
-
-
-
-
-
-
+ bay12: StockpileWeaponStorageType
+
+
+
+
+
+
+
+
+
+
+
@@ -881,116 +899,116 @@
index-refers-to='$global.world.raws.itemdefs.weapons[$]'/>
-
-
+
-
-
+
+
-
+
- bay12: StockpileArmorStorageType
-
-
-
-
-
-
-
-
-
-
-
+ bay12: StockpileArmorStorageType
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
bay12: BUILDINGFLAG_STOCKPILE_FLAG_*
-
+
-
+
-
+
-
+
bay12: CIVZONE_PEN_FLAG_*
-
+
-
+
bay12: CIVZONE_POND_FLAG_*
-
-
+
+
@@ -999,23 +1017,23 @@
bay12: CIVZONE_TOMB_FLAG_*
-
-
+
+
-
+
bay12: CIVZONE_GATHER_FLAG_*
-
-
-
+
+
+
-
-
+
+
@@ -1027,7 +1045,7 @@
-
+
@@ -1039,13 +1057,13 @@
-
-
+
+
-
+
@@ -1054,16 +1072,16 @@
-
+
-
-
-
+
+
+
-
-
+
+
bay12: BuildingItemRoles, no base type
@@ -1073,21 +1091,21 @@
-
-
+
+
-
-
+
-
+
-
+
@@ -1095,239 +1113,239 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
bay12: BUILDINGFLAG_DOOR_*
-
+
-
-
-
-
+
+
+
+
-
-
+
+
bay12: BUILDINGFLAG_HATCH_*
-
+
-
-
-
-
+
+
+
+
-
-
+
+
bay12: BUILDINGFLAG_BRIDGE_*
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
+
bay12: BUILDINGFLAG_FLOODGATE_*
-
-
-
+
+
+
-
-
+
+
bay12: BUILDINGFLAG_GRATE_WALL_*
-
-
-
+
+
+
-
-
+
+
bay12: BUILDINGFLAG_GRATE_FLOOR_*
-
-
-
+
+
+
-
-
+
+
bay12: BUILDINGFLAG_BARS_VERTICAL_*
-
-
-
+
+
+
-
-
+
+
bay12: BUILDINGFLAG_BARS_FLOOR_*
-
-
-
+
+
+
-
-
+
+
bay12: BUILDINGFLAG_TRAP_TRIGGER_*
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
bay12: TRACK_STOP_PROFILE_FLAG_*
-
+
-
-
-
+
+
+
- bay12: BuildingTrapType
+ bay12: BuildingTrapType
-
-
-
-
-
-
+
+
+
+
+
+
bay12: BUILDINGFLAG_TRAP_*
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
+
+
bay12: BUILDINGFLAG_GEAR_ASSEMBLY_*
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
bay12: BUILDINGFLAG_SUPPORT_*
-
+
-
+
bay12: BUILDINGFLAG_WEAPON_*
-
-
-
+
+
+
-
-
+
+
@@ -1337,69 +1355,68 @@
bay12: BUILDING_SCREW_PUMP_DIR_*
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
+
-
-
-
+
+
-
+
+
+
+
bay12: BUILDINGFLAG_CHAIN_*
-
+
-
+
-
+
bay12: BUILDINGFLAG_CAGE_*
-
-
-
+
+
+
-
-
-
+
+
+
- bay12: BuildingSiegeEngineType, no base type
+ bay12: BuildingSiegeEngineType, no base type
-
-
-
+
+
+
no bay12 enum
@@ -1422,82 +1439,82 @@
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
bay12: BUILDINGFLAG_TABLE_*
-
+
-
-
+
+
-
+
bay12: BUILDINGFLAG_SHOP_*
-
+
- bay12: BuildingShopType
-
-
-
-
+ bay12: BuildingShopType
+
+
+
+
-
-
-
-
+
+
+
+
bay12: WELLTAG_*
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
bay12: BUILDINGFLAG_WELL_*
-
-
+
+
-
+
-
-
+
+
@@ -1517,163 +1534,163 @@
bay12: BUILDINGFLAG_FARMPLOT_*
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
- bay12: BuildingFurnaceType
+ bay12: BuildingFurnaceType
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
-
+
-
+
- bay12: BuildingWorkshopType
+ bay12: BuildingWorkshopType
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
bay12: BUILDINGFLAG_DEPOT_*
-
-
+
+
-
-
+
+
-
+
-
-
+
+
@@ -1681,80 +1698,80 @@
-
+
bay12: BUILDING_HIVE_FLAG_*
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
- bay12: BuildingConstructionType
+ bay12: BuildingConstructionType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-- Helper type for building_handlerst
@@ -1769,421 +1786,421 @@
-- 0
-
-
+
+
-
+
-
+
-- 98 different civzone subtypes: array of length BUILDING_CIVZONENUM
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- everything but stockpile and civzone
-
+
@@ -2194,19 +2211,19 @@
-
+
-- speculated
-
+
-- speculated
-
+
@@ -2216,596 +2233,597 @@
-- 11
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 21
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 33
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 43
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 53
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 63
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 73
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 83
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- Helper type for building_handlerst
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
+
+
+
+
-
-
-
-
+
-
+
-
+
@@ -2816,16 +2834,16 @@
E.g. Soap Maker's workshop requires a bucket and a building material.
-
+
-
-
+
+
-
+
-
-
-
+
+
+
bay12: BuildReqMode
@@ -2860,29 +2878,29 @@
bay12: BuildReqChoice
-
-
+
+
One choice in the build item selector.
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -2891,13 +2909,13 @@
-
-
+
+
-
-
+
+
-
+
(let* ((selector $global.buildreq)
@@ -2907,13 +2925,13 @@
-
+
-
-
+
+
(let* ((selector $global.buildreq)
(req $selector.requirements[$selector.req_index]))
@@ -2923,34 +2941,30 @@
-
-
-
+
+
- Toady used the actual enum rather than the matching typedef
-
-
-
-
-
-
-
+ Toady used the actual enum rather than the matching typedef
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
-
-
+
+
+
@@ -2958,15 +2972,18 @@
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
@@ -2983,7 +3000,7 @@
-
+
diff --git a/df.building_def.xml b/df.building_def.xml
index aceca7dd7..66d761129 100644
--- a/df.building_def.xml
+++ b/df.building_def.xml
@@ -1,50 +1,50 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
+
$.code
-
+
-
+
-
+
@@ -52,49 +52,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -109,10 +109,10 @@
bay12: BUILDING_BRIDGE_GRAPHICS_FLAG_*
-
-
-
-
+
+
+
+
bay12: BUILDING_BRIDGE_GRAPHICS_FLAG_MATERIAL_*
@@ -123,16 +123,16 @@
-
+
bay12: BUILDING_WAGON_GRAPHICS_FLAG_*
-
-
-
-
-
+
+
+
+
+
bay12: BUILDING_WAGON_GRAPHICS_FLAG_DIRECTION_*
@@ -144,13 +144,13 @@
-
+
bay12: BUILDING_TRAP_GRAPHICS_FLAG_*
-
-
+
+
bay12: BUILDING_TRAP_GRAPHICS_FLAG_TYPE_*
@@ -173,43 +173,43 @@
-
+
bay12: BUILDING_AXLE_GRAPHICS_FLAG_*
-
-
-
+
+
+
-
+
bay12: BUILDING_GEAR_ASSEMBLY_GRAPHICS_FLAG_*
-
-
-
-
-
-
+
+
+
+
+
+
-
+
bay12: BUILDING_SCREWPUMP_GRAPHICS_FLAG_*
-
-
-
-
-
-
-
+
+
+
+
+
+
+
bay12: BUILDING_SCREWPUMP_GRAPHICS_FLAG_DIR_*
@@ -220,17 +220,17 @@
-
+
bay12: BUILDING_WINDMILL_GRAPHICS_FLAG_*
-
-
-
-
-
-
+
+
+
+
+
+
bay12: BUILDING_WINDMILL_GRAPHICS_FLAG_FACING_*
@@ -245,32 +245,32 @@
-
+
bay12: BUILDING_WATER_WHEEL_GRAPHICS_FLAG_*
-
-
-
-
-
-
+
+
+
+
+
+
-
+
bay12: BUILDING_BALLISTA_GRAPHICS_FLAG_*
-
+
-
-
-
-
-
+
+
+
+
+
bay12: BUILDING_BALLISTA_GRAPHICS_FLAG_FACING_*
@@ -289,18 +289,18 @@
-
+
bay12: BUILDING_CATAPULT_GRAPHICS_FLAG_*
-
+
-
-
-
-
-
+
+
+
+
+
bay12: BUILDING_CATAPULT_GRAPHICS_FLAG_FACING_*
@@ -319,17 +319,17 @@
-
+
bay12: BUILDING_BOLT_THROWER_GRAPHICS_FLAG_*
-
-
-
-
-
-
+
+
+
+
+
+
bay12: BUILDING_BOLT_THROWER_GRAPHICS_FLAG_FACING_*
@@ -344,83 +344,83 @@
-
+
bay12: BUILDING_ROLLERS_GRAPHICS_FLAG_*
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
bay12: BUILDING_TRACK_STOP_GRAPHICS_FLAG_*
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
bay12: BUILDING_WEAPON_RACK_GRAPHICS_FLAG_*
-
-
-
-
-
+
+
+
+
+
-
+
bay12: BUILDING_ARMOR_STAND_GRAPHICS_FLAG_*
-
-
-
-
-
+
+
+
+
+
-
+
bay12: BUILDING_SUPPORT_GRAPHICS_FLAG_*
-
-
-
-
+
+
+
+
-
+
bay12: BUILDING_BARS_VERTICAL_GRAPHICS_FLAG_*
-
-
-
+
+
+
bay12: BUILDING_BARS_VERTICAL_GRAPHICS_FLAG_TYPE_*
@@ -439,29 +439,33 @@
-
+
bay12: BUILDING_WORKSHOP_GRAPHICS_FLAG_*
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
0.50.01
0.50.01
diff --git a/df.building_use_controller.xml b/df.building_use_controller.xml
index 452c27b23..fe6c3acde 100644
--- a/df.building_use_controller.xml
+++ b/df.building_use_controller.xml
@@ -1,6 +1,6 @@
-
diff --git a/df.burrow.xml b/df.burrow.xml
index 25e916c35..ef4151115 100644
--- a/df.burrow.xml
+++ b/df.burrow.xml
@@ -1,27 +1,28 @@
bay12: BURROW_FLAG_*
-
-
+
+
-
-
+
+
(describe-obj $.name)
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
-
-
@@ -34,24 +35,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/df.civagreement.xml b/df.civagreement.xml
index 7f697bd13..b249af2dd 100644
--- a/df.civagreement.xml
+++ b/df.civagreement.xml
@@ -1,25 +1,25 @@
-
-
+
+
-
+
-
+
- yes, actually int16 even though matgloss should be int32
+ yes, actually int16 even though matgloss should be int32
- bay12: AgreementTypes, no base type
-
-
-
-
-
-
+ bay12: AgreementTypes, no base type
+
+
+
+
+
+
@@ -35,22 +35,22 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -58,15 +58,15 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
diff --git a/df.coinbatch.xml b/df.coinbatch.xml
index 15b8db9d5..a0dd383ef 100644
--- a/df.coinbatch.xml
+++ b/df.coinbatch.xml
@@ -1,22 +1,22 @@
-
-
-
-
+
+
+
+
not a compound
-
-
+
+
not a compound
-
-
+
+
-
+
diff --git a/df.contaminant.xml b/df.contaminant.xml
index 88879a947..c5c12a457 100644
--- a/df.contaminant.xml
+++ b/df.contaminant.xml
@@ -1,41 +1,41 @@
bay12: CONTAMINANT_FLAG_*
-
+
-
-
-
+
+
+
-
-
+
+
bay12: ITEM_CONTAMINANT_FLAG_*
-
+
- sub-element, NOT subclass!
- sub-element, NOT subclass!
+
-
+
bay12: UNIT_CONTAMINANT_FLAG_*
-
+
- sub-element, NOT subclass!
- sub-element, NOT subclass!
+
-
+
- sub-element, NOT subclass!
+ sub-element, NOT subclass!
diff --git a/df.creation_zone.xml b/df.creation_zone.xml
index 95e2f7071..56789cef1 100644
--- a/df.creation_zone.xml
+++ b/df.creation_zone.xml
@@ -1,19 +1,19 @@
bay12: CreationZonePWGAlterationType
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
@@ -24,97 +24,103 @@
-
+
bay12: CREATION_ZONE_PWG_ALTERATION_CAMP_FLAG_*
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
bay12: CREATION_ZONE_ITEM_FLAG_*
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
- none yet
+
+
+
+
+ none yet
-
-
-
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
+
-
+
+
+
-
+
not a compound
-
-
-
-
-
-
+
+
+
+
+
+
not a compound
-
-
-
-
+
+
+
+
diff --git a/df.creature.xml b/df.creature.xml
index 4e06025e4..ad6e4e355 100644
--- a/df.creature.xml
+++ b/df.creature.xml
@@ -10,8 +10,8 @@
-
-
+
+
@@ -19,8 +19,8 @@
-
-
+
+
@@ -28,95 +28,101 @@
$.type
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
$.part
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
-
+
$.token
-
-
-
+
-
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-- unit can be sheared at farmers if it has one u.appearance.bp_modifiers[$.bp_modifiers_idx[i]] >= $.length
- bay12: TissueFlagType
+ bay12: TissueFlagType
@@ -145,127 +151,150 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
bay12: ATTACKDEFFLAG_*
-
-
-
-
-
-
+
+
+
+
+
+
bay12: SpecialAttackType, actually int16_t but Toady never uses the typedef
@@ -276,27 +305,27 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
@@ -305,63 +334,66 @@
-- Unused: attackst
bay12: EBO_FLAG_*
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
- bay12: TissueLayerFlagType
+ bay12: TissueLayerFlagType
-
+
$.layer_name
-
+
-
+
-
+
+
-
-
+
For subordinate layers:
-
-
+
+
+
+
+
-
-
-
-
+
+
+
@@ -372,45 +404,45 @@
bay12: int16[BodyPartShorts]
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+
bay12: BodyActionType
@@ -422,7 +454,7 @@
-
+
bay12: GaitType
@@ -435,114 +467,112 @@
bay12: GAIT_FLAG_*
-
-
-
+
+
+
-
+
-
-
+
+
-
+
bay12: BODY_FLAG_*
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
Index in nonsolid_layers if applicable
-
+
For blood, magma, iron men etc, lists BLOOD/MAGMA/GAS layers.
For other titans and FBs, lists all layers. For ordinary, empty.
-
+
-
+
-
+
Sums of values in the parts:
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
bay12: SecretionCondition, no base type
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
@@ -559,7 +589,7 @@
bay12: CGL_TISSUE_LAYER_CONDITION_FLAG_*
-
+
@@ -569,7 +599,7 @@
-
+
@@ -581,9 +611,9 @@
bay12: CGL_BODYPART_CONDITION_FLAG_*
-
-
-
+
+
+
@@ -592,26 +622,27 @@
-
-
-
+
+
+
-
+
bay12: CGL_ITEM_FLAG_*
-
-
-
+
+
+
+
-
+
@@ -623,28 +654,31 @@
-
-
-
-
-
+
+
+
+
+
bay12: CREATURE_GRAPHICS_LAYER_FLAG_*
-
-
-
-
-
+
+
+
+
+
bay12: PCGLayeringType, gigantic enum
+
+
+
@@ -652,6 +686,7 @@
+
@@ -664,10 +699,10 @@
-
+
-
+
@@ -676,12 +711,12 @@
bay12: CREATURE_GRAPHICS_LAYER_SET_FLAG_*
-
+
-
-
+
+
@@ -689,7 +724,8 @@
-
+
+
@@ -711,28 +747,31 @@
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
@@ -745,7 +784,7 @@
- bay12: CreatureCasteFlagType
+ bay12: CreatureCasteFlagType
@@ -810,8 +849,8 @@
-
-
+
+
@@ -956,98 +995,98 @@
-- Unused: CreatureCasteUChar
- bay12: string[CreatureCasteStrings]
+ bay12: string[CreatureCasteStrings]
(fmt "~:(~A ~A~)" $.caste_id $.caste_name[0])
$global.world.raws.creatures.all[$$].caste[$]
-
+
-
-
+
+
-
-
- // temporary
-
-
-
+
+
+ // temporary
+
+
+
fingers[2], nose, ear, head, eyes, mouth, hair, knuckles, lips, cheek, nails, f eet, arms, hands, tongue, leg
- bay12: uchar[CreatureCasteUChar]
-
-
-
-
-
- bay12: ushort[CreatureCasteUShort]
-
-
-
-
- bay12: short[CreatureCasteShort]
-
-
-
-
-
-
-
-
-
-
- bay12: uchar[CreatureCasteUChar]
+
+
+
+
+
+ bay12: ushort[CreatureCasteUShort]
+
+
+
+
+ bay12: short[CreatureCasteShort]
+
+ not a compound
+
+
+
+
+
+
+
+
+
- // NOT 32-bit!
-
-
-
-
-
-
-
-
-
-
- bay12: int32_t[CreatureCasteLong]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ // NOT 32-bit!
+
+
+
+
+
+
+
+
+
+
+ bay12: int32_t[CreatureCasteLong]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
learn_ip_perc, last_used, rust, demote
@@ -1070,41 +1109,43 @@
-
+
-
-
+
+
-
+
-
-
+ not a compound
+
-
-
-
-- Subset of modifiable layers, i.e. where layer_idx != -1
-
-
-
-
-
+
+
+
+
@@ -1114,148 +1155,146 @@
-
-
+
+
-
-
-
-
-
+
+
+
-
-
-
+ not a compound
+
+
-
+ not a compound
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
for world generation
-
-
-
-
-
+
+
+
+
+
muscle:
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
+ not a compound
+
+
-
-
-
-
-
+ not a compound
+
+
+
+
@@ -1276,14 +1315,14 @@
-
-
+
+
-- The comments indicate the creature raw tags whose presence/absence are
-- correlated with the flags. Tags with parameters, like those indicating
-- biomes, are currently not listed.
- bay12: CreatureDefFlagType
+ bay12: CreatureDefFlagType
@@ -1426,6 +1465,7 @@
-- Unused: CreatureDefUChar
bay12: GeneticModifierType
+
@@ -1433,101 +1473,101 @@
- bay12: string[CreatureDefStrings]
+ bay12: string[CreatureDefStrings]
$.creature_id
-
-
-
-
+
+
+
+
- bay12: uchar[CreatureDefUChar]
-
-
-
-
+ bay12: uchar[CreatureDefUChar]
+
+
+
+
- bay12: ushort[CreatureDefUShort]
-
+ bay12: ushort[CreatureDefUShort]
+
- bay12: short[CreatureDefShort]
-
-
-
-
-
+ bay12: short[CreatureDefShort]
+
+
+
+
+
- bay12: int32_t[CreatureDefLong]
+ bay12: int32_t[CreatureDefLong]
-
+
-
+
-
-
+
+
-
-
-
+ not a compound
+
+
-
-
+
+
-
-
+
-
-
-
+ not a compound
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-- Unused: creature_handling_informationst
-
-
+
+
-
+
-
-
+
-
+
@@ -1535,15 +1575,15 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
diff --git a/df.creaturebody.xml b/df.creaturebody.xml
index badde274d..a447d4455 100644
--- a/df.creaturebody.xml
+++ b/df.creaturebody.xml
@@ -2,19 +2,19 @@
-
-
-
-
-
- bay12: CreatureBodyPartParentTypes
+ bay12: CreatureBodyPartParentTypes
@@ -22,7 +22,7 @@
- bay12: CreatureBodyPartFlagType
+ bay12: CreatureBodyPartFlagType
@@ -67,20 +67,20 @@
-- string[CreateBodyPartStrings]
-
-
-
-
+
+
+
+
-- int16_t[CreateBodyPartShorts]
-
+
-
+
-
+
@@ -88,22 +88,22 @@
-- string[CreatureBodyStrings]
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/df.crime.xml b/df.crime.xml
index d3f0e3cda..b9d564414 100644
--- a/df.crime.xml
+++ b/df.crime.xml
@@ -1,77 +1,76 @@
bay12: PUNISHMENTFLAG_*
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
bay12: CRIMEFLAG_*
-
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
+
-
-
-
-
+
+
-
+
diff --git a/df.cultural_identity.xml b/df.cultural_identity.xml
index e915fc7ed..90f2eec29 100644
--- a/df.cultural_identity.xml
+++ b/df.cultural_identity.xml
@@ -1,17 +1,17 @@
- bay12: CULTURAL_IDENTITY_ENTITY_FLAG_*
-
-
+ bay12: CULTURAL_IDENTITY_ENTITY_FLAG_*
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -21,7 +21,7 @@
-
+
@@ -35,13 +35,14 @@
-
-
-
-
+
+
+
+
- SAVE_VALUENUM
-
+ SAVE_VALUENUM
+
+
@@ -49,11 +50,12 @@
+
-
+
diff --git a/df.d_basics.xml b/df.d_basics.xml
index 8df05d98a..b4fc479e4 100644
--- a/df.d_basics.xml
+++ b/df.d_basics.xml
@@ -1,6 +1,6 @@
-
+
@@ -49,106 +49,106 @@
- bay12: BuildingCivzoneType
-
-
-
-
-
- Invalid Type
- Invalid Type
-
-
- formerly ActivityZone
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: BuildingCivzoneType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bay12: TempDietInfoType
@@ -181,28 +181,28 @@
bay12: CrimeType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: AbstractBuildingFlag
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: AbstractBuildingFlag
@@ -240,14 +240,15 @@
bay12: IntrigueCorruptionMethodType
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
bay12: InterrogationMethodType
@@ -262,70 +263,72 @@
bay12: MessageType
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
bay12: MessageActionType
-
+
-
-
+
+
+
bay12: ???
bay12: MESSAGE_FLAG_*
-
+
-
+
+
-
+
-
+
@@ -334,7 +337,7 @@
-
+
bay12: ReligiousPracticeType
@@ -343,7 +346,8 @@
- bay12: ResourceAllotmentType
+ bay12: ResourceAllotmentType
+
@@ -446,60 +450,63 @@
- bay12: ItemTheftType
-
-
-
-
+ bay12: ItemTheftType
+
+
+
+
+
bay12: ArtifactClaimType
-
-
-
-
+
+
+
+
+
bay12: Moods
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: SEXUAL_ORIENTATION_FLAG_*
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: SEXUAL_ORIENTATION_FLAG_*
+
+
+
+
+
bay12: JobArtSpecifierType
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
bay12: SquadOrderType
+
@@ -514,7 +521,7 @@
- bay12: PersonalityValueType
+ bay12: PersonalityValueType
@@ -542,7 +549,7 @@
-
+
@@ -552,6 +559,7 @@
bay12: AbstractBuildingReputationType
+
@@ -563,6 +571,7 @@
bay12: TimbreType
+
@@ -595,7 +604,7 @@
-
+
@@ -635,7 +644,7 @@
- bay12: PerformanceRoleType
+ bay12: PerformanceRoleType
@@ -646,7 +655,7 @@
- bay12: PerformanceType
+ bay12: PerformanceType
@@ -659,6 +668,7 @@
bay12: OccupationType
+
@@ -676,7 +686,7 @@
-
+
@@ -833,7 +843,7 @@
-
+
@@ -927,7 +937,7 @@
-
+
@@ -1271,8 +1281,8 @@
-
-
+
+
@@ -1295,46 +1305,46 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
bay12: WitnessType
@@ -1350,7 +1360,7 @@
-- Unused: ClimbingAbilityType
- bay12: PersonalityGoalType
+ bay12: PersonalityGoalType
@@ -1362,39 +1372,39 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1402,27 +1412,28 @@
-
+
-
+
-
+
bay12: InsurrectionOutcomeType
-
-
-
+
+
+
+
- -- Helper type for history_event_reason
+ -- Helper type for history_event_reason - not a real structure
@@ -1430,336 +1441,337 @@
- bay12: ReasonType
+ bay12: ReasonType
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 10
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 20
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 30
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 40
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 50
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 60
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 70
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 80
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-- 90
-
+
-
+
-
+
-
+
-
+
-- Unused: ArmyStopReasonType
bay12: IncidentType
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
bay12: AdventureDesireStateType
@@ -1922,405 +1934,406 @@
-- Unused: TalkFactType
- bay12: UnitMoveType
+ bay12: UnitMoveType
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- bay12: CounterType
+ bay12: CounterType
+
-- 0 --
- for thirsty patients
- for hungry patients
-
-
-
-
-
-
-
- handled manually
+ for thirsty patients
+ for hungry patients
+
+
+
+
+
+
+
+ handled manually
-- 10 --
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 20 --
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 30 --
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 40 --
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 50 --
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 60 --
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 70 --
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 80 --
-
-
-
-
+
+
+
+
bay12: ChargeRestrictType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: PersonalReputationType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: PersonalReputationType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: AnimalTrainingStatusType
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: AnimalTrainingStatusType
+
+
+
+
+
+
+
+
-
- bay12: WritingFormType
+ bay12: WritingFormType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: WritingStyleType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: WritingStyleType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bay12: WritingStyleModifierType
-
-
-
+
+
+
bay12: WritingRoleType
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: ConflictStateType
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: ConflictStateType
+
+
+
+
+
+
+
+
-- Unused: RegionPrint
- bay12: LocationHintType
+ bay12: LocationHintType
@@ -2330,7 +2343,7 @@
- bay12: UsageHintType
+ bay12: UsageHintType
@@ -2349,7 +2362,7 @@
-- Unused: BodyPartPrintType
- bay12: TradeGoodPurposeType
+ bay12: TradeGoodPurposeType
@@ -2383,40 +2396,40 @@
-- Unused: PATH_DESPERATION_*
- bay12: PATH_PERMIT_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: PATH_PERMIT_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: Gender
+ bay12: Gender
Dwarf Fortress calls the functions that use this type to determine the pronouns for abstract_building, so it's not anything biology-related.
@@ -2425,19 +2438,19 @@
-
+
use same as NONE for now
-
+
-
+
using C-style escapes here as XML doesn't like having characters 11 and 12 in it, even if they're escaped
this currently works fine due to how the headers are generated, but a different solution may be needed if
the header generator is more robust in the future
@@ -2447,7 +2460,7 @@
-
+
@@ -2457,28 +2470,29 @@
-
-
+
+
-- Unused: CombatTrainingCategoryType
bay12: SquadWaterLevelType
-
-
-
-
+
+
+
+
bay12: DungeonType
-
+
+
bay12: FortressType
-
+
@@ -2519,7 +2533,7 @@
- bay12: ItemDefToolUseType
+ bay12: ItemDefToolUseType
@@ -2549,23 +2563,23 @@
- bay12: EntityUniformItemCategoryType
+ bay12: EntityUniformItemCategoryType
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- bay12: TissueLayerShapingType
+ bay12: TissueLayerShapingType
-
+
@@ -2576,7 +2590,7 @@
- bay12: TuningMethodType
+ bay12: TuningMethodType
@@ -2585,7 +2599,7 @@
- bay12: SoundProductionMethodType
+ bay12: SoundProductionMethodType
@@ -2612,7 +2626,7 @@
- bay12: PitchChoiceMethodType
+ bay12: PitchChoiceMethodType
@@ -2657,7 +2671,7 @@
- bay12: PhysicalForceType
+ bay12: PhysicalForceType
@@ -2667,14 +2681,14 @@
- bay12: EntityDefPositionFlagType
+ bay12: EntityDefPositionFlagType
-
-
+
+
@@ -2687,7 +2701,7 @@
-
+
@@ -2699,14 +2713,14 @@
- bay12: EntityPositionFlagType
+ bay12: EntityPositionFlagType
-
+
-
-
+
+
@@ -2715,15 +2729,15 @@
-
-
+
+
-
+
@@ -2740,169 +2754,169 @@
-- Unused: PronounType
- bay12: StockpileIndexType
+ bay12: StockpileIndexType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: ITEMNEEDEDFLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: ITEMNEEDEDFLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: ITEMNEEDEDFLAG2_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: ITEMNEEDEDFLAG2_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: ITEMNEEDEDFLAG3_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: ITEMNEEDEDFLAG3_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: JOB_ITEM_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: JOB_ITEM_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: BodyPartFlagType
+ bay12: BodyPartFlagType
@@ -2963,7 +2977,7 @@
- bay12: AppearanceModifierRateScaleType
+ bay12: AppearanceModifierRateScaleType
@@ -3039,11 +3053,11 @@
- bay12: BodyPartGroupType
+ bay12: BodyPartGroupType
-
-
-
+
+
+
bay12: BattleOutcomeType
@@ -3052,7 +3066,7 @@
- bay12: PositionResponsibilityType
+ bay12: PositionResponsibilityType
@@ -3099,46 +3113,47 @@
- bay12: SquadActivityIndexType
-
-
-
-
+ bay12: SquadActivityIndexType
+
+
+
+
- bay12: HF_KILL_FLAG_*
-
-
+ bay12: HF_KILL_FLAG_*
+
+
-- Unused: HFSpecialAttackType
- bay12: HistFigStateType
+ bay12: HistFigStateType
-
-
-
-
-
-
+
+
+
+
+
+
- bay12: SiteType
+ bay12: SiteType
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
bay12: WorldConstructionType
+
@@ -3207,121 +3222,121 @@
-- Unused: ArchitecturalConcept
- bay12: Justification
+ bay12: Justification
-
-
-
-
-
+
+
+
+
+
bay12: ArchitecturalElement
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: DestructionReason
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: DestructionReason
+
-
-
-
+
+
+
- bay12: FamilyRelationshipType
-
-
-
-
-
-
-
-
-
-
-
+ bay12: FamilyRelationshipType
+
+
+
+
+
+
+
+
+
+
+
-- 10
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 20
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 30
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 40
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 50
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 60
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-- 70
-
-
+
+
bay12: EthicType
@@ -3350,7 +3365,7 @@
- bay12: EthicResponseType
+ bay12: EthicResponseType
@@ -3389,392 +3404,392 @@
- bay12: SK_PHILOSOPHY_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_PHILOSOPHY_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_PHILOSOPHY_FLAG2_*
-
-
-
-
-
+ bay12: SK_PHILOSOPHY_FLAG2_*
+
+
+
+
+
- bay12: SK_MATHEMATICS_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_MATHEMATICS_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_MATHEMATICS_FLAG2_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_MATHEMATICS_FLAG2_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_HISTORY_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_HISTORY_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_ASTRONOMY_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_ASTRONOMY_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_NATURALIST_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_NATURALIST_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_CHEMISTRY_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_CHEMISTRY_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_GEOGRAPHY_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_GEOGRAPHY_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_MEDICINE_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_MEDICINE_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_MEDICINE_FLAG2_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_MEDICINE_FLAG2_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_MEDICINE_FLAG3_*
-
+ bay12: SK_MEDICINE_FLAG3_*
+
- bay12: SK_ENGINEERING_FLAG_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_ENGINEERING_FLAG_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- bay12: SK_ENGINEERING_FLAG2_*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: SK_ENGINEERING_FLAG2_*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bay12: TopicType
-
-
+
+
@@ -3790,56 +3805,56 @@
- bay12: ArtImageActionType
+ bay12: ArtImageActionType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bay12: ArtImageElement
@@ -3851,7 +3866,7 @@
- bay12: ItemImprovementType
+ bay12: ItemImprovementType
@@ -3870,7 +3885,7 @@
- bay12: ItemSpecificImprovementType
+ bay12: ItemSpecificImprovementType
@@ -3881,273 +3896,273 @@
-- Unused: CaveSupport
-- Unused: LightColumn
- bay12: StationType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: PathGoalType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: StationType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: PathGoalType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-- Unused: BuildPathResult
@@ -4178,17 +4193,17 @@
- bay12: MaterialStateType
-
-
-
-
-
-
-
+ bay12: MaterialStateType
+
+
+
+
+
+
+
- bay12: MaterialDefinitionFlagType
+ bay12: MaterialDefinitionFlagType
@@ -4214,7 +4229,7 @@
- also STOCKPILE_GLOB_SOLID
+
@@ -4246,11 +4261,11 @@
-
+
-
-
+
+
@@ -4289,13 +4304,13 @@
-
+
-
+
-
+
@@ -4308,12 +4323,13 @@
+
- bay12: MaterialType
+ bay12: MaterialType
@@ -4334,50 +4350,82 @@
- CREATURE_1 thru CREATURE_200
- HIST_FIG_1 thru HIST_FIG_200
- PLANT_1 thru PLANT_200
- UNUSED01 thru UNUSED40
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-- Unused: MatGlossCoal
- bay12: EntityMaterialType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ bay12: EntityMaterialType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-- Unused: TrampleType
@@ -4388,79 +4436,79 @@
-- Unused: SiteClean
bay12: GameClean
-
-
-
+
+
+
-- Unused: DigStyle
- bay12: CivRequestTabType
+ bay12: CivRequestTabType
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4506,15 +4554,16 @@
+ -- Unused: TradeDepotBringType
-- Unused: ConversationTask
bay12: RecordPrecisionLevelType, no actual base type
-
-
-
-
-
+
+
+
+
+
-- Unused: PrecisionRoundType
@@ -4535,10 +4584,10 @@
-
+
- bay12: GeologicalRegionType
+ bay12: GeologicalRegionType
@@ -4549,21 +4598,22 @@
- bay12: GeologicalLayerType
+ bay12: GeologicalLayerType
-
+
-
-
+
+
- bay12: StoneEnvironment, no base type
+ bay12: StoneEnvironment, no base type
+
@@ -4577,14 +4627,14 @@
-- Unused: LayerInclusionGoal
seems like a convenient name
-
-
+
+
-- Unused: FireState
-- Unused: GeneralGroupingType
- bay12: CreatureTextureType
+ bay12: CreatureTextureType
@@ -4651,28 +4701,28 @@
- bay12: RegionType
+ bay12: RegionType
-
-
-
-
-
-
-
-
-
-
-
-
- bay12: RegionField
+
+
+
+
+
+
+
+
+
+
+
+
+ bay12: RegionField
-
+
@@ -4971,16 +5021,16 @@
bay12: Schedule, no base type
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- bay12: UnitType
+ bay12: UnitType
@@ -6095,7 +6145,7 @@
- bay12: MapTileType
+ bay12: MapTileType
-- Declare attributes:
@@ -6107,96 +6157,96 @@
-- 0x000
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6206,54 +6256,54 @@
-- 0x010
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6261,26 +6311,26 @@
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
@@ -6289,90 +6339,90 @@
-- 0x020
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6381,85 +6431,85 @@
-- 0x030
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6467,95 +6517,95 @@
-- 0x040
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6564,52 +6614,52 @@
-- 0x050
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6617,47 +6667,47 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6666,98 +6716,98 @@
-- 0x060
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6766,95 +6816,95 @@
-- 0x070
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6863,49 +6913,49 @@
-- 0x080
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6913,56 +6963,56 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6972,55 +7022,55 @@
-- 0x090
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -7028,52 +7078,52 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -7083,56 +7133,56 @@
-- 0x0A0
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -7140,53 +7190,53 @@
-
+
-
+
-
+