From d83c9f51c3f483beb63330d9158591baba07a010 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 3 Oct 2023 00:01:49 +0200
Subject: [PATCH] added texture and class definitions for the 18 items that
 have no coded function

---
 source/games/blood/src/namelist.h             |  32 +++
 .../static/filter/blood/rmapinfo.spawnclasses |  18 ++
 .../zscript/games/blood/actors/items.zs       | 233 +++++++++++++++---
 3 files changed, 249 insertions(+), 34 deletions(-)

diff --git a/source/games/blood/src/namelist.h b/source/games/blood/src/namelist.h
index af5a19476..68db336cf 100644
--- a/source/games/blood/src/namelist.h
+++ b/source/games/blood/src/namelist.h
@@ -43,6 +43,38 @@ x(AmmoIcon9, 525)
 x(AmmoIcon10, 811)
 x(AmmoIcon11, 810)
 
+x(MedPouchIcon, 822)
+x(LifeSeedIcon, 2433)
+x(RedPotionIcon, 517)
+x(FeatherFallIcon, 783)
+x(ShadowCloakIcon, 896)
+x(DeathMaskIcon, 825)
+x(RavenFlightIcon, 828)
+x(GunsAkimboIcon, 829)
+x(GasMaskIcon, 831)
+x(CloneIcon, 863)
+x(DecoyIcon, 836)
+x(DoppleIcon, 851)
+x(ReflectiveIcon, 2428)
+x(UselessIcon, 768)
+x(RageShroomIcon, 840)
+x(DeliriumIcon, 841)
+x(GrowShroomIcon, 842)
+x(ShrinkShroomIcon, 843)
+x(UselessIcon2, 683)
+x(WineGobletIcon, 521)
+x(WineBottleIcon, 604)
+x(SkullGrailIcon, 520)
+x(SilverGrailIcon, 803)
+x(TomeIcon, 518)
+x(BlackChestIcon, 522)
+x(WoodenChestIcon, 523)
+x(AsbestIcon, 837)
+x(BasicArmorIcon, 2628)
+x(SuperArmorIcon, 2594)
+x(FlagBaseIcon, 753)
+x(FlagIcon, 3558)
+
 x(SBPlayerSlot, 2229)
 
 x(FlagHave, 3558)
diff --git a/wadsrc/static/filter/blood/rmapinfo.spawnclasses b/wadsrc/static/filter/blood/rmapinfo.spawnclasses
index 635b5695e..552ed28e6 100644
--- a/wadsrc/static/filter/blood/rmapinfo.spawnclasses
+++ b/wadsrc/static/filter/blood/rmapinfo.spawnclasses
@@ -69,6 +69,24 @@ spawnclasses
 	147 = BloodItemFlagA
 	148 = BloodItemFlagB
 
+	// other items
+	116 = BloodItemRavenFlight
+	120 = BloodItemClone
+	122 = BloodItemDecoy
+	123 = BloodItemDoppleganger
+	126 = BloodItemShadowCloakUseless
+	127 = BloodItemRageShroom
+	129 = BloodItemGrowShroom
+	130 = BloodItemShrinkShroom
+	131 = BloodItemDeathMaskUseless
+	132 = BloodItemWineGoblet
+	133 = BloodItemWineBottle
+	134 = BloodItemSkullGrail
+	135 = BloodItemSilverGrail
+	136 = BloodItemTome
+	137 = BloodItemBlackChest
+	138 = BloodItemWoodenChest
+
 	// dudes
 	201 = BloodDudeCultistTommy
 	202 = BloodDudeCultistShotgun
diff --git a/wadsrc/static/zscript/games/blood/actors/items.zs b/wadsrc/static/zscript/games/blood/actors/items.zs
index e7e7ea590..e345488a7 100644
--- a/wadsrc/static/zscript/games/blood/actors/items.zs
+++ b/wadsrc/static/zscript/games/blood/actors/items.zs
@@ -1,44 +1,209 @@
+class BloodItemBase : BloodActor
+{
+}
 
 // items (keys)
-class BloodItemKeySkull : BloodActor {}
-class BloodItemKeyEye : BloodActor {}
-class BloodItemKeyFire : BloodActor {}
-class BloodItemKeyDagger : BloodActor {}
-class BloodItemKeySpider : BloodActor {}
-class BloodItemKeyMoon : BloodActor {}
-class BloodItemKeyKey7 : BloodActor {}
+class BloodItemKeySkull : BloodItemBase
+{
+}
+
+class BloodItemKeyEye : BloodItemBase
+{
+}
+
+class BloodItemKeyFire : BloodItemBase
+{
+}
+
+class BloodItemKeyDagger : BloodItemBase
+{
+}
+
+class BloodItemKeySpider : BloodItemBase
+{
+}
+
+class BloodItemKeyMoon : BloodItemBase
+{
+}
+
+class BloodItemKeyKey7 : BloodItemBase
+{
+}
+
 
 // items (health)
-class BloodItemHealthDoctorBag : BloodActor {}
-class BloodItemHealthMedPouch : BloodActor {}
-class BloodItemHealthLifeEssense : BloodActor {}
-class BloodItemHealthLifeSeed : BloodActor {}
-class BloodItemHealthRedPotion : BloodActor {}
+class BloodItemHealthDoctorBag : BloodItemBase
+{
+}
+
+class BloodItemHealthMedPouch : BloodItemBase
+{
+}
+
+class BloodItemHealthLifeEssense : BloodItemBase
+{
+}
+
+class BloodItemHealthLifeSeed : BloodItemBase
+{
+}
+
+class BloodItemHealthRedPotion : BloodItemBase
+{
+}
+
 
 // items (misc)
-class BloodItemFeatherFall : BloodActor {}
-class BloodItemShadowCloak : BloodActor {}
-class BloodItemDeathMask : BloodActor {}
-class BloodItemJumpBoots : BloodActor {}
-class BloodItemTwoGuns : BloodActor {}
-class BloodItemDivingSuit : BloodActor {}
-class BloodItemGasMask : BloodActor {}
-class BloodItemCrystalBall : BloodActor {}
-class BloodItemReflectShots : BloodActor {}
-class BloodItemBeastVision : BloodActor {}
-class BloodItemShroomDelirium : BloodActor {}
+class BloodItemFeatherFall : BloodItemBase
+{
+}
 
-class BloodItemArmorAsbest : BloodActor {}
-class BloodItemArmorBasic : BloodActor {}
-class BloodItemArmorBody : BloodActor {}
-class BloodItemArmorFire : BloodActor {}
-class BloodItemArmorSpirit : BloodActor {}
-class BloodItemArmorSuper : BloodActor {}
+class BloodItemShadowCloak : BloodItemBase
+{
+}
 
-class BloodItemFlagABase : BloodActor {}
-class BloodItemFlagBBase : BloodActor {}
-class BloodItemFlagA : BloodActor {}
-class BloodItemFlagB : BloodActor {}
-class BloodItemMax : BloodActor {}
+class BloodItemDeathMask : BloodItemBase
+{
+}
+
+class BloodItemJumpBoots : BloodItemBase
+{
+}
+
+class BloodItemTwoGuns : BloodItemBase
+{
+}
+
+class BloodItemDivingSuit : BloodItemBase
+{
+}
+
+class BloodItemGasMask : BloodItemBase
+{
+}
+
+class BloodItemCrystalBall : BloodItemBase
+{
+}
+
+class BloodItemReflectShots : BloodItemBase
+{
+}
+
+class BloodItemBeastVision : BloodItemBase
+{
+}
+
+class BloodItemShroomDelirium : BloodItemBase
+{
+}
 
 
+class BloodItemArmorAsbest : BloodItemBase
+{
+}
+
+class BloodItemArmorBasic : BloodItemBase
+{
+}
+
+class BloodItemArmorBody : BloodItemBase
+{
+}
+
+class BloodItemArmorFire : BloodItemBase
+{
+}
+
+class BloodItemArmorSpirit : BloodItemBase
+{
+}
+
+class BloodItemArmorSuper : BloodItemBase
+{
+}
+
+
+class BloodItemFlagABase : BloodItemBase
+{
+}
+
+class BloodItemFlagBBase : BloodItemBase
+{
+}
+
+class BloodItemFlagA : BloodItemBase
+{
+}
+
+class BloodItemFlagB : BloodItemBase
+{
+}
+
+
+// others
+class BloodItemRavenFlight : BloodItemBase
+{
+}
+
+class BloodItemClone : BloodItemBase
+{
+}
+
+class BloodItemDecoy : BloodItemBase
+{
+}
+
+class BloodItemDoppleganger : BloodItemBase
+{
+}
+
+class BloodItemShadowCloakUseless : BloodItemBase
+{
+}
+
+class BloodItemRageShroom : BloodItemBase
+{
+}
+
+class BloodItemGrowShroom : BloodItemBase
+{
+}
+
+class BloodItemShrinkShroom : BloodItemBase
+{
+}
+
+class BloodItemDeathMaskUseless : BloodItemBase
+{
+}
+
+class BloodItemWineGoblet : BloodItemBase
+{
+}
+
+class BloodItemWineBottle : BloodItemBase
+{
+}
+
+class BloodItemSkullGrail : BloodItemBase
+{
+}
+
+class BloodItemSilverGrail : BloodItemBase
+{
+}
+
+class BloodItemTome : BloodItemBase
+{
+}
+
+class BloodItemBlackChest : BloodItemBase
+{
+}
+
+class BloodItemWoodenChest : BloodItemBase
+{
+}
+