Skip to content

Commit 6cfe9bf

Browse files
ab9rfab9rf
authored
Merge pull request #913 from quietust/update-item-attributes
audit all item array usages
2 parents 01e8862 + 7ee1e7e commit 6cfe9bf

1 file changed

Lines changed: 48 additions & 33 deletions

File tree

‎df.item.xml‎

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@
17171717

17181718
-- Unused: ItemSaveCompat
17191719

1720-
-- Helper type for item_handlerst
1720+
-- Helper type for item_handlerst, not actually from bay12
17211721
<enum-type type-name='items_other_id'>
17221722
<enum-attr name='item' type-name='item_type' default-value='NONE'
17231723
comment='if the vector is the master vector for an item type'/>
@@ -1739,30 +1739,31 @@
17391739
<item-attr name='generic_item' value='TRAPCOMP'/>
17401740
</enum-item>
17411741
<enum-item name='ANY_SPIKE' original-name='spike'>
1742+
is_valid_upright_weapon:
17421743
<item-attr name='generic_item' value='WEAPON'/>
17431744
<item-attr name='generic_item' value='TRAPCOMP'/>
17441745
</enum-item>
17451746

17461747
<enum-item name='ANY_TRUE_ARMOR' original-name='armor'>
1747-
<item-attr name='generic_item' value='ARMOR'/>
1748+
<item-attr name='generic_item' value='ARMOR'/> ARMORLEVEL 1+
17481749
</enum-item>
17491750
<enum-item name='ANY_ARMOR_HELM' original-name='helm'>
1750-
<item-attr name='generic_item' value='HELM'/>
1751+
<item-attr name='generic_item' value='HELM'/> ARMORLEVEL 1+
17511752
</enum-item>
17521753
<enum-item name='ANY_ARMOR_SHOES' original-name='boots'>
1753-
<item-attr name='generic_item' value='SHOES'/>
1754+
<item-attr name='generic_item' value='SHOES'/> ARMORLEVEL 1+
17541755
</enum-item>
17551756
<enum-item name='SHIELD' original-name='shield'>
17561757
<item-attr name='item' value='SHIELD'/>
17571758
</enum-item>
17581759
<enum-item name='ANY_ARMOR_GLOVES' original-name='gauntlets'>
1759-
<item-attr name='generic_item' value='GLOVES'/>
1760+
<item-attr name='generic_item' value='GLOVES'/> ARMORLEVEL 1+
17601761
</enum-item>
17611762

17621763
-- 10
17631764

17641765
<enum-item name='ANY_ARMOR_PANTS' original-name='pants'>
1765-
<item-attr name='generic_item' value='PANTS'/>
1766+
<item-attr name='generic_item' value='PANTS'/> ARMORLEVEL 1+
17661767
</enum-item>
17671768
<enum-item name='QUIVER' original-name='quiver'>
17681769
<item-attr name='item' value='QUIVER'/>
@@ -1800,6 +1801,7 @@
18001801
</enum-item>
18011802
<enum-item name='ANY_REFUSE' original-name='refuse'>
18021803
<item-attr name='generic_item' value='CORPSE'/>
1804+
worn out:
18031805
<item-attr name='generic_item' value='ARMOR'/>
18041806
<item-attr name='generic_item' value='SHOES'/>
18051807
<item-attr name='generic_item' value='HELM'/>
@@ -1817,11 +1819,9 @@
18171819
<item-attr name='generic_item' value='CHEESE'/>
18181820
<item-attr name='generic_item' value='FOOD'/>
18191821
<item-attr name='generic_item' value='EGG'/>
1820-
do_not_clean:
1821-
<item-attr name='generic_item' value='GLOB'/>
1822+
<item-attr name='generic_item' value='GLOB'/> not DO_NOT_CLEAN_GLOB
18221823
</enum-item>
1823-
<enum-item name='ANY_GOOD_FOOD' original-name='good'>
1824-
<item-attr name='generic_item' value='BOX'/>
1824+
<enum-item name='ANY_GOOD_FOOD' original-name='food'>
18251825
<item-attr name='generic_item' value='BAG'/>
18261826
not rotten:
18271827
<item-attr name='generic_item' value='MEAT'/>
@@ -1838,8 +1838,8 @@
18381838
if on_ground, deleted on tick 1 of every season
18391839
<item-attr name='generic_item' value='DRINK'/>
18401840
<item-attr name='generic_item' value='POWDER_MISC'/>
1841-
<item-attr name='generic_item' value='LIQUID_MISC'/>
1842-
<item-attr name='generic_item' value='GLOB'/>
1841+
<item-attr name='generic_item' value='LIQUID_MISC'/> not EVAPORATES
1842+
<item-attr name='generic_item' value='GLOB'/> not DO_NOT_CLEAN_GLOB
18431843
</enum-item>
18441844
<enum-item name='ANY_EXTRACTABLE' original-name='i_extractable'>
18451845
<item-attr name='generic_item' value='CAGE'/>
@@ -1858,43 +1858,57 @@
18581858
</enum-item>
18591859
<enum-item name='ANY_FURNITURE' original-name='furniture'/>
18601860
<enum-item name='ANY_CAGE_OR_TRAP' original-name='animal'>
1861-
<item-attr name='generic_item' value='CAGE'/>
1862-
<item-attr name='generic_item' value='ANIMALTRAP'/>
1861+
is_animal_holder:
1862+
<item-attr name='generic_item' value='CAGE'/> not BURY
1863+
<item-attr name='generic_item' value='ANIMALTRAP'/> not BURY
18631864
</enum-item>
18641865
<enum-item name='ANY_EDIBLE_RAW' original-name='edible_all'/>
18651866
<enum-item name='ANY_EDIBLE_CARNIVORE' original-name='edible_carn'/>
18661867

18671868
-- 30
18681869

18691870
<enum-item name='ANY_EDIBLE_BONECARN' original-name='edible_bonecarn'/>
1870-
<enum-item name='ANY_EDIBLE_VERMIN' original-name='verminfood'/>
1871+
<enum-item name='ANY_EDIBLE_VERMIN' original-name='verminfood'>
1872+
<item-attr name='generic_item' value='SEEDS'/>
1873+
<item-attr name='generic_item' value='CORPSE'/> not MURDERED
1874+
<item-attr name='generic_item' value='CORPSEPIECE'/> not MURDERED
1875+
<item-attr name='generic_item' value='FOOD'/>
1876+
<item-attr name='generic_item' value='FISH'/>
1877+
<item-attr name='generic_item' value='FISH_RAW'/>
1878+
<item-attr name='generic_item' value='PLANT'/> EDIBLE_VERMIN
1879+
<item-attr name='generic_item' value='PLANT_GROWTH'/> EDIBLE_VERMIN
1880+
<item-attr name='generic_item' value='MEAT'/>
1881+
<item-attr name='generic_item' value='EGG'/> EDIBLE_VERMIN
1882+
<item-attr name='generic_item' value='CHEESE'/>
1883+
<item-attr name='generic_item' value='POWDER_MISC'/> EDIBLE_VERMIN
1884+
<item-attr name='generic_item' value='REMAINS'/> not MURDERED
1885+
</enum-item>
18711886
<enum-item name='ANY_EDIBLE_VERMIN_BOX' original-name='verminitem'>
1887+
always:
18721888
<item-attr name='generic_item' value='BARREL'/>
1873-
<item-attr name='generic_item' value='BOX'/>
18741889
<item-attr name='generic_item' value='BAG'/>
1890+
is_verminfood:
18751891
<item-attr name='generic_item' value='SEEDS'/>
1876-
<item-attr name='generic_item' value='CORPSE'/>
1877-
<item-attr name='generic_item' value='CORPSEPIECE'/>
1892+
<item-attr name='generic_item' value='CORPSE'/> not MURDERED
1893+
<item-attr name='generic_item' value='CORPSEPIECE'/> not MURDERED
18781894
<item-attr name='generic_item' value='FOOD'/>
18791895
<item-attr name='generic_item' value='FISH'/>
1880-
<item-attr name='generic_item' value='PLANT'/>
1881-
<item-attr name='generic_item' value='PLANT_GROWTH'/>
1896+
<item-attr name='generic_item' value='FISH_RAW'/>
1897+
<item-attr name='generic_item' value='PLANT'/> EDIBLE_VERMIN
1898+
<item-attr name='generic_item' value='PLANT_GROWTH'/> EDIBLE_VERMIN
18821899
<item-attr name='generic_item' value='MEAT'/>
1883-
<item-attr name='generic_item' value='EGG'/>
1900+
<item-attr name='generic_item' value='EGG'/> EDIBLE_VERMIN
18841901
<item-attr name='generic_item' value='CHEESE'/>
1885-
<item-attr name='generic_item' value='POWDER_MISC'/>
1886-
<item-attr name='generic_item' value='REMAINS'/>
1887-
BASE*
1902+
<item-attr name='generic_item' value='POWDER_MISC'/> EDIBLE_VERMIN
1903+
<item-attr name='generic_item' value='REMAINS'/> not MURDERED
18881904
</enum-item>
18891905
<enum-item name='ANY_CAN_ROT' original-name='rottable'>
18901906
<item-attr name='generic_item' value='CORPSE'/>
18911907
<item-attr name='generic_item' value='CORPSEPIECE'/>
18921908
<item-attr name='generic_item' value='REMAINS'/>
1893-
18941909
<item-attr name='generic_item' value='MEAT'/>
18951910
<item-attr name='generic_item' value='FISH'/>
18961911
<item-attr name='generic_item' value='FISH_RAW'/>
1897-
<item-attr name='generic_item' value='SEEDS'/>
18981912
<item-attr name='generic_item' value='PLANT'/>
18991913
<item-attr name='generic_item' value='PLANT_GROWTH'/>
19001914
<item-attr name='generic_item' value='CHEESE'/>
@@ -1903,6 +1917,7 @@
19031917
<item-attr name='generic_item' value='GLOB'/>
19041918
</enum-item>
19051919
<enum-item name='ANY_MURDERED' original-name='murdered'>
1920+
if murdered:
19061921
<item-attr name='generic_item' value='CORPSE'/>
19071922
<item-attr name='generic_item' value='CORPSEPIECE'/>
19081923
<item-attr name='generic_item' value='REMAINS'/>
@@ -1929,7 +1944,7 @@
19291944
<item-attr name='generic_item' value='BRACELET'/>
19301945
<item-attr name='generic_item' value='GEM'/>
19311946
<item-attr name='generic_item' value='SKIN_TANNED'/>
1932-
<item-attr name='generic_item' value='THREAD'/>
1947+
<item-attr name='generic_item' value='THREAD'/> not UNDISTURBED
19331948
<item-attr name='generic_item' value='CLOTH'/>
19341949
<item-attr name='generic_item' value='TOTEM'/>
19351950
<item-attr name='generic_item' value='BACKPACK'/>
@@ -1942,6 +1957,7 @@
19421957
<item-attr name='generic_item' value='SHEET'/>
19431958
</enum-item>
19441959
<enum-item name='ANY_GOES_IN_CABINET' original-name='i_cabinet'>
1960+
ARMORLEVEL 0
19451961
<item-attr name='generic_item' value='ARMOR'/>
19461962
<item-attr name='generic_item' value='SHOES'/>
19471963
<item-attr name='generic_item' value='HELM'/>
@@ -1954,6 +1970,7 @@
19541970
<item-attr name='generic_item' value='SIEGEAMMO'/>
19551971
</enum-item>
19561972
<enum-item name='ANY_GOES_IN_ARMORSTAND' original-name='i_stand'>
1973+
ARMORLEVEL 1+
19571974
<item-attr name='generic_item' value='ARMOR'/>
19581975
<item-attr name='generic_item' value='SHOES'/>
19591976
<item-attr name='generic_item' value='SHIELD'/>
@@ -1993,7 +2010,7 @@
19932010
<item-attr name='item' value='INSTRUMENT'/>
19942011
</enum-item>
19952012
<enum-item name='INSTRUMENT_STATIONARY' original-name='building_instrument'>
1996-
<item-attr name='item' value='INSTRUMENT'/>
2013+
<item-attr name='item' value='INSTRUMENT'/> PLACED_AS_BUILDING
19972014
</enum-item>
19982015

19992016
-- 50
@@ -2089,7 +2106,7 @@
20892106
<item-attr name='item' value='TRAPPARTS'/>
20902107
</enum-item>
20912108
<enum-item name='ANY_WEBS' original-name='web'>
2092-
<item-attr name='generic_item' value='THREAD'/>
2109+
<item-attr name='generic_item' value='THREAD'/> UNDISTURBED
20932110
</enum-item>
20942111
<enum-item name='PIPE_SECTION' original-name='pipe_section'>
20952112
<item-attr name='item' value='PIPE_SECTION'/>
@@ -2117,7 +2134,6 @@
21172134
<item-attr name='generic_item' value='BARREL'/>
21182135
<item-attr name='generic_item' value='BUCKET'/>
21192136
<item-attr name='generic_item' value='ANIMALTRAP'/>
2120-
<item-attr name='generic_item' value='BOX'/>
21212137
<item-attr name='generic_item' value='BAG'/>
21222138
<item-attr name='generic_item' value='MEAT'/>
21232139
<item-attr name='generic_item' value='FISH'/>
@@ -2130,13 +2146,12 @@
21302146
<item-attr name='generic_item' value='POWDER_MISC'/>
21312147
<item-attr name='generic_item' value='CHEESE'/>
21322148
<item-attr name='generic_item' value='LIQUID_MISC'/>
2133-
<item-attr name='generic_item' value='GLOB'/>
2149+
<item-attr name='generic_item' value='GLOB'/> if EDIBLE_COOKED
21342150
<item-attr name='generic_item' value='TOOL'/>
21352151
<item-attr name='generic_item' value='EGG'/>
21362152
</enum-item>
21372153

21382154
<enum-item name='ANY_GLASSABLE' original-name='i_glassable'>
2139-
<item-attr name='generic_item' value='BOX'/>
21402155
<item-attr name='generic_item' value='BAG'/>
21412156
</enum-item>
21422157
<enum-item name='VERMIN' original-name='i_vermin'>
@@ -2316,7 +2331,7 @@
23162331
<enum-item name='ANY_MELT_DESIGNATED' original-name='melt_designated'/>
23172332
</enum-type>
23182333

2319-
-- Helper type for item_handlerst
2334+
-- Helper type for item_handlerst, not actually from bay12
23202335
<df-other-vectors-type type-name='items_other' index-enum='items_other_id' item-type='item'>
23212336
<stl-vector pointer-type='item_weaponst' name='WEAPON' original-name='weapon'/>
23222337
<stl-vector pointer-type='item_armorst' name='ANY_TRUE_ARMOR' original-name='armor'/>

0 commit comments

Comments
 (0)