Skip to content
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

canonicalize many world_data fields and substructures #760

Merged
merged 1 commit into from
May 21, 2024
Merged

canonicalize many world_data fields and substructures #760

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Template for new versions:
- ``plant_flags``: rename ``is_burning``, ``is_drowning``, ``is_dead`` to Bay12 names ``unused_01``, ``season_dead``, ``dead``
- ``job.item_category`` is now ``job.specflag``, contains a union of flag fields, and depends on the job type
- ``slab_engraving_type``: correct order of items (last two were swapped)
- ``world_data``: identify many fields and substructures

# 50.13-r2

Expand Down
83 changes: 67 additions & 16 deletions df.resource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<data-definition>
<enum-type type-name='resource_allotment_specifier_type'>
<enum-type type-name='resource_allotment_specifier_type' base-type='int32_t' comment='bay12: ResourceAllotment'>
<enum-item name='CROP'/>
<enum-item name='STONE'/>
<enum-item name='METAL'/>
Expand All @@ -8,7 +8,6 @@
<enum-item name='ARMOR_PANTS'/>
<enum-item name='ARMOR_GLOVES'/>
<enum-item name='ARMOR_BOOTS'/>

<enum-item name='ARMOR_HELM'/>
<enum-item name='CLOTHING_BODY'/>
<enum-item name='CLOTHING_PANTS'/>
Expand All @@ -17,7 +16,6 @@
<enum-item name='CLOTHING_HELM'/>
<enum-item name='WEAPON_MELEE'/>
<enum-item name='WEAPON_RANGED'/>

<enum-item name='ANVIL'/>
<enum-item name='GEMS'/>
<enum-item name='THREAD'/>
Expand All @@ -26,7 +24,6 @@
<enum-item name='QUIVER'/>
<enum-item name='BACKPACK'/>
<enum-item name='FLASK'/>

<enum-item name='BAG'/>
<enum-item name='TABLE'/>
<enum-item name='CABINET'/>
Expand All @@ -35,7 +32,6 @@
<enum-item name='BED'/>
<enum-item name='CRAFTS'/>
<enum-item name='MEAT'/>

<enum-item name='BONE'/>
<enum-item name='HORN'/>
<enum-item name='SHELL'/>
Expand All @@ -44,11 +40,66 @@
<enum-item name='PEARL'/>
<enum-item name='SOAP'/>
<enum-item name='EXTRACT'/>

<enum-item name='CHEESE'/>
<enum-item name='SKIN'/>
<enum-item name='POWDER'/>
<enum-item name='AMMO'/>
<enum-item name='UNUSED_44'/>
<enum-item name='UNUSED_45'/>
<enum-item name='UNUSED_46'/>
<enum-item name='UNUSED_47'/>
<enum-item name='UNUSED_48'/>
<enum-item name='UNUSED_49'/>
<enum-item name='UNUSED_50'/>
<enum-item name='UNUSED_51'/>
<enum-item name='UNUSED_52'/>
<enum-item name='UNUSED_53'/>
<enum-item name='UNUSED_54'/>
<enum-item name='UNUSED_55'/>
<enum-item name='UNUSED_56'/>
<enum-item name='UNUSED_57'/>
<enum-item name='UNUSED_58'/>
<enum-item name='UNUSED_59'/>
<enum-item name='UNUSED_60'/>
<enum-item name='UNUSED_61'/>
<enum-item name='UNUSED_62'/>
<enum-item name='UNUSED_63'/>
<enum-item name='UNUSED_64'/>
<enum-item name='UNUSED_65'/>
<enum-item name='UNUSED_66'/>
<enum-item name='UNUSED_67'/>
<enum-item name='UNUSED_68'/>
<enum-item name='UNUSED_69'/>
<enum-item name='UNUSED_70'/>
<enum-item name='UNUSED_71'/>
<enum-item name='UNUSED_72'/>
<enum-item name='UNUSED_73'/>
<enum-item name='UNUSED_74'/>
<enum-item name='UNUSED_75'/>
<enum-item name='UNUSED_76'/>
<enum-item name='UNUSED_77'/>
<enum-item name='UNUSED_78'/>
<enum-item name='UNUSED_79'/>
<enum-item name='UNUSED_80'/>
<enum-item name='UNUSED_81'/>
<enum-item name='UNUSED_82'/>
<enum-item name='UNUSED_83'/>
<enum-item name='UNUSED_84'/>
<enum-item name='UNUSED_85'/>
<enum-item name='UNUSED_86'/>
<enum-item name='UNUSED_87'/>
<enum-item name='UNUSED_88'/>
<enum-item name='UNUSED_89'/>
<enum-item name='UNUSED_90'/>
<enum-item name='UNUSED_91'/>
<enum-item name='UNUSED_92'/>
<enum-item name='UNUSED_93'/>
<enum-item name='UNUSED_94'/>
<enum-item name='UNUSED_95'/>
<enum-item name='UNUSED_96'/>
<enum-item name='UNUSED_97'/>
<enum-item name='UNUSED_98'/>
<enum-item name='UNUSED_99'/>
</enum-type>

<class-type type-name='resource_allotment_specifier' original-name='resource_allotment_specifierst'>
Expand Down Expand Up @@ -329,22 +380,22 @@
<int32_t name='unk_4'/>
</class-type>

<struct-type type-name='resource_allotment_data'
<struct-type type-name='resource_allotment_data' original-name='production_zonest'
instance-vector='$global.world.world_data.resource_allotments'>
<int32_t name='index'/>
<static-array name='resource_allotments' count='100'>
<stl-vector pointer-type='resource_allotment_specifier'/>
</static-array>
<int32_t name='unk1'/>
<int32_t name='unk2'/>
<int32_t name='unk3'/>
<int32_t name="unk_650"/>
<stl-vector name="unk_654">
<int32_t name='center_x'/>
<int32_t name='center_y'/>
<int32_t name='producing_civilization_enid'/>
<int32_t name="last_market_stid"/>
<stl-vector name="butchery_specifier">
<pointer>
<int32_t name="unk_0"/>
<stl-vector name="unk_4" type-name="int32_t"/>
<stl-vector name="unk_14" type-name="int32_t"/>
<stl-vector name="unk_24" type-name="int32_t"/>
<int32_t name="id_or_combined_caste_id"/>
<stl-vector name="resource_allotment" type-name="resource_allotment_specifier_type"/>
<stl-vector name="allotment_index" type-name="int32_t"/>
<stl-vector name="amount" type-name="int32_t"/>
</pointer>
</stl-vector>
</struct-type>
Expand Down
Loading