Merge pull request #756 from ab9rf/slab_engraving_type

correct `slab_engraving_type`
DFHack · May 18, 2024 · 7979fec · 7979fec
2 parents 2f04181 + afcb1ab
commit 7979fec
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -21,6 +21,7 @@ Template for new versions:
 ## Structures
 - ``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)
 
 # 50.13-r2
 

diff --git a/df.items.xml b/df.items.xml
@@ -106,35 +106,35 @@
         <enum-item name='Artifact'/>
     </enum-type>
 
-    <enum-type type-name='slab_engraving_type' base-type='int16_t'>
+    <enum-type type-name='slab_engraving_type' base-type='int16_t'> bay12: EngravingIntent/EngravingIntentType
         <enum-item name='Slab' value='-1'/>
         <enum-item name='Memorial'/>
-        <enum-item name='CraftShopSign'/>
-        <enum-item name='WeaponsmithShopSign'/>
-        <enum-item name='ArmorsmithShopSign'/>
-        <enum-item name='GeneralStoreSign'/>
-        <enum-item name='FoodShopSign'/>
-        <enum-item name='Secrets' comment='from the gods?'/>
-        <enum-item name='FoodImportsSign'/>
-        <enum-item name='ClothingImportsSign'/>
-        <enum-item name='GeneralImportsSign'/>
-        <enum-item name='ClothShopSign'/>
-        <enum-item name='LeatherShopSign'/>
-        <enum-item name='WovenClothingShopSign'/>
-        <enum-item name='LeatherClothingShopSign'/>
-        <enum-item name='BoneCarverShopSign'/>
-        <enum-item name='GemCutterShopSign'/>
-        <enum-item name='WeaponsmithShopSign2'/>
-        <enum-item name='BowyerShopSign'/>
-        <enum-item name='BlacksmithShopSign'/>
-        <enum-item name='ArmorsmithShopSign2'/>
-        <enum-item name='MetalCraftShopSign'/>
-        <enum-item name='LeatherGoodsShopSign'/>
-        <enum-item name='CarpenterShopSign'/>
-        <enum-item name='StoneFurnitureShopSign'/>
-        <enum-item name='MetalFurnitureShopSign'/>
-        <enum-item name='DemonIdentity' comment='when a demon assumes identity?'/>
-        <enum-item name='TavernSign'/>
+        <enum-item name='CraftShopSign' comment='STORE_CRAFTS'/>
+        <enum-item name='WeaponsmithShopSign' comment='STORE_WEAPON'/>
+        <enum-item name='ArmorsmithShopSign' comment='STORE_ARMOR'/>
+        <enum-item name='GeneralStoreSign' comment='STORE_GENERAL'/>
+        <enum-item name='FoodShopSign' comment='STORE_FOOD'/>
+        <enum-item name='Secrets' comment='from the gods? (SECRET)'/>
+        <enum-item name='FoodImportsSign' comment='SRB_SHOP_IMPORT_FOOD'/>
+        <enum-item name='ClothingImportsSign' comment='SRB_SHOP_IMPORT_CLOTHING'/>
+        <enum-item name='GeneralImportsSign' comment='SRB_SHOP_IMPORT_GENERAL'/>
+        <enum-item name='ClothShopSign' comment='SRB_SHOP_CLOTH'/>
+        <enum-item name='LeatherShopSign' comment='SRB_SHOP_LEATHER'/>
+        <enum-item name='WovenClothingShopSign' comment='SRB_SHOP_CLOTHING_CLOTH'/>
+        <enum-item name='LeatherClothingShopSign' comment='SRB_SHOP_CLOTHING_LEATHER'/>
+        <enum-item name='BoneCarverShopSign' comment='SRB_SHOP_CRAFTS_BONE_CARVER'/>
+        <enum-item name='GemCutterShopSign' comment='SRB_SHOP_GEM_CUTTER'/>
+        <enum-item name='WeaponsmithShopSign2' comment='SRB_SHOP_METAL_WEAPON_SMITH'/>
+        <enum-item name='BowyerShopSign' comment='SRB_SHOP_WOOD_WEAPON_SMITH'/>
+        <enum-item name='BlacksmithShopSign' comment='SRB_SHOP_BLACK_SMITH'/>
+        <enum-item name='ArmorsmithShopSign2' comment='SRB_SHOP_METAL_ARMOR_SMITH'/>
+        <enum-item name='MetalCraftShopSign' comment='SRB_SHOP_METAL_CRAFTER'/>
+        <enum-item name='LeatherGoodsShopSign' comment='SRB_SHOP_FURNITURE_WOOD'/>
+        <enum-item name='CarpenterShopSign' comment='SRB_SHOP_FURNITURE_WOOD'/>
+        <enum-item name='StoneFurnitureShopSign' comment='SRB_SHOP_FURNITURE_STONE'/>
+        <enum-item name='MetalFurnitureShopSign' comment='SRB_SHOP_FURNITURE_METAL'/>
+        <enum-item name='TavernSign' comment='AB_TAVERN'/>
+        <enum-item name='DemonIdentity' comment='when a demon assumes identity? (TRUE_NAME)'/>
     </enum-type>
 
     <enum-type type-name='trade_good_purpose' base-type='int16_t'>