From 960895e24c09d34d8ae8a1279c73e7df3d965673 Mon Sep 17 00:00:00 2001 From: Kiri Date: Sun, 3 Sep 2023 15:17:19 -0700 Subject: [PATCH] Added caco plush to menu and made it use spawnflags. --- TODO.md | 5 ++++- menudef.txt | 1 + zscript/snektech.zs | 14 +++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index d64ea82..ab83033 100644 --- a/TODO.md +++ b/TODO.md @@ -6,9 +6,12 @@ - ~~Fix wiring kit brightmaps~~ - Caco plush + - ~~Caco plush spawnflags~~ + - ~~Add caco plush to menu~~ - Caco plush documentation - - Caco plush spawnflags - Brightmaps for caco plush + - Set actual chance for caco plush spawn - Organize source_data +- Fix upper/lowercase consistency between objects diff --git a/menudef.txt b/menudef.txt index 24f82a3..f920c88 100644 --- a/menudef.txt +++ b/menudef.txt @@ -9,5 +9,6 @@ OptionMenu "SnekTechMenu" StaticText "----- Item Spawns -----", "Teal" FlagOption "Gretchen Counter", "snektech_spawnflags", "YesNo", 0 FlagOption "Wiring Bypass Kit", "snektech_spawnflags", "YesNo", 1 + FlagOption "Cacodemon Plushie", "snektech_spawnflags", "YesNo", 2 } diff --git a/zscript/snektech.zs b/zscript/snektech.zs index a03c105..6070518 100644 --- a/zscript/snektech.zs +++ b/zscript/snektech.zs @@ -1,7 +1,8 @@ enum SnekTechSpawnFlags { SNEKTECH_GRETCHENCOUNTER = 0, - SNEKTECH_JUMPERCABLES = 1 + SNEKTECH_JUMPERCABLES = 1, + SNEKTECH_CACOPLUSHIE = 2 } class SnekTechEventHandler : EventHandler @@ -67,6 +68,11 @@ class SnekTechEventHandler : EventHandler e.Thing, SNEKTECH_JUMPERCABLES, "JumperCablesUsable"); + + DoSnekTechBackpackSpawnCheck( + e.Thing, + SNEKTECH_CACOPLUSHIE, + "KiriCacodemonPlushie"); } override void CheckReplacement(ReplaceEvent e) @@ -87,6 +93,12 @@ class SnekTechEventHandler : EventHandler DoSnekTechReplacement( SNEKTECH_JUMPERCABLES, "Allmap", "JumperCablesUsable", + 12, e); + + DoSnekTechReplacement( + SNEKTECH_CACOPLUSHIE, + "BlurSphere", "KiriCacodemonPlushie", + // FIXME: Chance. 256, e); }