Merge pull request #852 from quietust/orders

Add missing standing orders

Author: ab9rf

df.game_v.xml

@@ -212,11 +212,11 @@
     <global-object name='standing_orders_forbid_other_nohunt' original-name='standingorder_autoforbid_other_corpse' type-name='uint8_t'/>
     <global-object name='standing_orders_forbid_own_dead_items' original-name='standingorder_autoforbid_your_items' type-name='uint8_t'/>
     <global-object name='standing_orders_forbid_other_dead_items' original-name='standingorder_autoforbid_other_items' type-name='uint8_t'/>
-    -- Skipped: standingorder_forbid_floor_and_wall_cleaning
-    -- Skipped: standingorder_forbid_trap_cleaning
-    -- Skipped: standingorder_forbid_rearming_traps
-    -- Skipped: standingorder_forbid_cages_from_sprung_traps
-    -- Skipped: standingorder_forbid_toppled_building_items
+    <global-object name='standing_orders_forbid_floor_and_wall_cleaning' original-name='standingorder_forbid_floor_and_wall_cleaning' type-name='uint8_t'/>
+    <global-object name='standing_orders_forbid_trap_cleaning' original-name='standingorder_forbid_trap_cleaning' type-name='uint8_t'/>
+    <global-object name='standing_orders_forbid_rearming_traps' original-name='standingorder_forbid_rearming_traps' type-name='uint8_t'/>
+    <global-object name='standing_orders_forbid_cages_from_sprung_traps' original-name='standingorder_forbid_cages_from_sprung_traps' type-name='uint8_t'/>
+    <global-object name='standing_orders_forbid_toppled_building_items' original-name='standingorder_forbid_toppled_building_items' type-name='uint8_t'/>
     -- Skipped: index2_*
 
     <global-object name='created_item_type' original-name='itemmade'>

symbols.xml

@@ -283,21 +283,21 @@
         <global-address name='standing_orders_job_cancel_announce' value='0x14181021d'/>
         <global-address name='standing_orders_mix_food' value='0x14181021c'/>
         <global-address name='selection_rect' value='0x1418101f8'/>
-        <global-address name='standingorder_forbid_rearming_traps' value='0x1418101f7'/>
+        <global-address name='standing_orders_forbid_rearming_traps' value='0x1418101f7'/>
         <global-address name='standing_orders_auto_collect_webs' value='0x1418101f6'/>
         <global-address name='standing_orders_auto_fishery' value='0x1418101f5'/>
         <global-address name='standing_orders_auto_tan' value='0x1418101f4'/>
         <global-address name='cursor' value='0x1418101e8'/>
         <global-address name='standing_orders_gather_bodies' value='0x1418101e7'/>
-        <global-address name='standingorder_forbid_cages_from_sprung_traps' value='0x1418101e6'/>
+        <global-address name='standing_orders_forbid_cages_from_sprung_traps' value='0x1418101e6'/>
         <global-address name='standing_orders_forbid_used_ammo' value='0x1418101e5'/>
         <global-address name='standing_orders_auto_slaughter' value='0x1418101e4'/>
         <global-address name='standing_orders_gather_wood' value='0x14181011f'/>
         <global-address name='standing_orders_auto_kitchen' value='0x14181011e'/>
-        <global-address name='standingorder_forbid_floor_and_wall_cleaning' value='0x14181011d'/>
+        <global-address name='standing_orders_forbid_floor_and_wall_cleaning' value='0x14181011d'/>
         <global-address name='standing_orders_auto_butcher' value='0x14181011c'/>
-        <global-address name='standingorder_forbid_trap_cleaning' value='0x141810117'/>
-        <global-address name='standingorder_forbid_toppled_building_items' value='0x141810116'/>
+        <global-address name='standing_orders_forbid_trap_cleaning' value='0x141810117'/>
+        <global-address name='standing_orders_forbid_toppled_building_items' value='0x141810116'/>
 
         <vtable-address name='MacroScreenLoad' value='0x14168d3f8'/>
         <vtable-address name='MacroScreenSave' value='0x14168d450'/>
@@ -1376,10 +1376,10 @@
         <global-address name='standing_orders_auto_slaughter' value='0x14180823f'/>
         <global-address name='standing_orders_gather_wood' value='0x14180823e'/>
         <global-address name='standing_orders_auto_kitchen' value='0x14180823d'/>
-        <global-address name='standingorder_forbid_floor_and_wall_cleaning' value='0x14180823c'/>
+        <global-address name='standing_orders_forbid_floor_and_wall_cleaning' value='0x14180823c'/>
         <global-address name='standing_orders_auto_butcher' value='0x14180823b'/>
-        <global-address name='standingorder_forbid_toppled_building_items' value='0x14180823a'/>
-        <global-address name='standingorder_forbid_trap_cleaning' value='0x141808239'/>
+        <global-address name='standing_orders_forbid_toppled_building_items' value='0x14180823a'/>
+        <global-address name='standing_orders_forbid_trap_cleaning' value='0x141808239'/>
         <global-address name='standing_orders_auto_kiln' value='0x141808238'/>
         <global-address name='standing_orders_auto_other' value='0x141808237'/>
         <global-address name='standing_orders_gather_minerals' value='0x141808236'/>
@@ -1393,12 +1393,12 @@
         <global-address name='standing_orders_auto_smelter' value='0x14180820b'/>
         <global-address name='standing_orders_job_cancel_announce' value='0x14180820a'/>
         <global-address name='standing_orders_mix_food' value='0x141808209'/>
-        <global-address name='standingorder_forbid_rearming_traps' value='0x141808208'/>
+        <global-address name='standing_orders_forbid_rearming_traps' value='0x141808208'/>
         <global-address name='standing_orders_auto_collect_webs' value='0x141808207'/>
         <global-address name='standing_orders_auto_fishery' value='0x141808206'/>
         <global-address name='standing_orders_auto_tan' value='0x141808205'/>
         <global-address name='standing_orders_gather_bodies' value='0x141808204'/>
-        <global-address name='standingorder_forbid_cages_from_sprung_traps' value='0x141808203'/>
+        <global-address name='standing_orders_forbid_cages_from_sprung_traps' value='0x141808203'/>
         <global-address name='standing_orders_forbid_used_ammo' value='0x141808202'/>
         <global-address name='start_dwarf_count' value='0x1418081e0'/>
         <global-address name='cursor' value='0x1418081b8'/>
@@ -2480,10 +2480,10 @@
         <global-address name='standing_orders_auto_slaughter' value='0x14180823f'/>
         <global-address name='standing_orders_gather_wood' value='0x14180823e'/>
         <global-address name='standing_orders_auto_kitchen' value='0x14180823d'/>
-        <global-address name='standingorder_forbid_floor_and_wall_cleaning' value='0x14180823c'/>
+        <global-address name='standing_orders_forbid_floor_and_wall_cleaning' value='0x14180823c'/>
         <global-address name='standing_orders_auto_butcher' value='0x14180823b'/>
-        <global-address name='standingorder_forbid_toppled_building_items' value='0x14180823a'/>
-        <global-address name='standingorder_forbid_trap_cleaning' value='0x141808239'/>
+        <global-address name='standing_orders_forbid_toppled_building_items' value='0x14180823a'/>
+        <global-address name='standing_orders_forbid_trap_cleaning' value='0x141808239'/>
         <global-address name='standing_orders_auto_kiln' value='0x141808238'/>
         <global-address name='standing_orders_auto_other' value='0x141808237'/>
         <global-address name='standing_orders_gather_minerals' value='0x141808236'/>
@@ -2497,12 +2497,12 @@
         <global-address name='standing_orders_auto_smelter' value='0x14180820b'/>
         <global-address name='standing_orders_job_cancel_announce' value='0x14180820a'/>
         <global-address name='standing_orders_mix_food' value='0x141808209'/>
-        <global-address name='standingorder_forbid_rearming_traps' value='0x141808208'/>
+        <global-address name='standing_orders_forbid_rearming_traps' value='0x141808208'/>
         <global-address name='standing_orders_auto_collect_webs' value='0x141808207'/>
         <global-address name='standing_orders_auto_fishery' value='0x141808206'/>
         <global-address name='standing_orders_auto_tan' value='0x141808205'/>
         <global-address name='standing_orders_gather_bodies' value='0x141808204'/>
-        <global-address name='standingorder_forbid_cages_from_sprung_traps' value='0x141808203'/>
+        <global-address name='standing_orders_forbid_cages_from_sprung_traps' value='0x141808203'/>
         <global-address name='standing_orders_forbid_used_ammo' value='0x141808202'/>
         <global-address name='start_dwarf_count' value='0x1418081e0'/>
         <global-address name='cursor' value='0x1418081b8'/>