Merge pull request #1 from UndeadZeratul/main

Minor Clean up, Refactor ZScript files, add debug logging to Spawn Handler
HDest-Community · Jun 9, 2023 · d60b425 · d60b425
2 parents 0017b62 + c356df6
commit d60b425
Show file tree

Hide file tree

Showing 68 changed files with 435 additions and 343 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,23 @@
+name: Release PK3s
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  buildAndRelease:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: build PK3
+        uses: montudor/action-zip@v1
+        with:
+          args: zip -r "hexadoken's-legacy-continued-${{ github.ref_name }}.pk3" . -i graphics/* patches/* sounds/* sprites/* zscript/* CVARINFO KEYCONF LANGUAGE LICENSE MAPINFO MENUDEF readme.md SNDINFO TEXTURES zscript.zsc
+      - name: Release PK3
+        uses: softprops/[email protected]
+        with:
+          generate_release_notes: true
+          discussion_category_name: 'Releases'
+          files: ./*.pk3
diff --git a/cvarinfo → CVARINFO b/cvarinfo → CVARINFO
@@ -23,6 +23,11 @@ server bool bas_persistent_spawning = false;
 // Shotbossting
 server bool hd_shitbossting_spawn = false;
 
+// Dedicated Medical Scanner
+server int dms_stimpack_bias = 49;
+server int dms_medikit_bias = 19;
+server bool dms_persistent_spawning = false;
+
 // Speed Reloader
 server int hdspeedrunloader_capacity = 30;
 server int hdspeedrunloader_breakchance = 32;
diff --git a/keyconf → KEYCONF b/keyconf → KEYCONF
@@ -1,4 +1,5 @@
 alias nsb_reset_cvars "resetcvar nsb_boss_spawn_bias; resetcvar nsb_persistent_spawning"
 alias bog_reset_cvars "resetcvar bog_plasma_spawn_bias; resetcvar bog_ssg_spawn_bias; resetcvar bog_chaingun_spawn_bias; resetcvar bog_persistent_spawning"
+alias dms_reset_cvars "resetcvar dms_stimpack_bias; resetcvar dms_medikit_bias; resetcvar dms_persistent_spawning"
 
-alias Hexa_Reset_Cvars "nsb_reset_cvars; bog_reset_cvars"
+alias Hexa_Reset_Cvars "nsb_reset_cvars; bog_reset_cvars; dms_reset_cvars"
diff --git a/language → LANGUAGE b/language → LANGUAGE
@@ -18,14 +18,15 @@ TAG_WORSTBOSS = "Boss Rifle But It's The Worst";
 // Item Tags
 TAG_50OMGCLIP = ".50 OMG clip";
 TAG_7MMSPEEDLOADER = "7.76mm Speed-Reloader Prototype";
-TAG_DMS = "Medical scanner";
+TAG_DMS = "Medical Scanner";
 TAG_GARANDCLIP = "M1 Garand clip";
 
 // Menu Titles
 TITLE_NSBMENU = "------ Scopeless Boss Rifle Options ------";
 TITLE_BOGRIFLEMENU = "------ .50 OMG Boss Rifle Options ------";
 TITLE_BOSSMERGMENU = "------ Bossmerg 12 gauge Shotgun Options ------";
 TITLE_GARANDMENU = "------ M1 Garand Options ------";
+TITLE_DMSMENU = "------ Medical Scanner Options ------";
 
 // Scopeless Boss
 MENU_NSBSPAWNTEXT = "Control the spawn rate of the No-Scope Boss on Boss Rifles";
@@ -55,12 +56,19 @@ MENU_GARANDRELOADERCAPACITYTEXT = "Control how much ammo the M1 Garand's reloade
 MENU_GARANDRELOADERCAPACITY = "M1 Garand Reloader Capacity: ";
 MENU_RESETGARANDRELOADERCAPACITY = "Reset Reloader Capacity";
 
+// Medical Scanner
+MENU_DMSSTIMPACK = "Control the spawn rate of the Medical Scanner on Stimpacks";
+MENU_DMSMEDIKIT = "Control the spawn rate of the Medical Scanner on Medikits";
+MENU_DMSSPAWNRATE = "Bossmerg Spawn Rate: ";
+
 // Various Resets
 MENU_RESETTB = "Reset Thunderbuster spawn options";
 MENU_RESETSLAYER = "Reset Slayer spawn options";
 MENU_RESETVULC = "Reset Vulcanette spawn options";
 MENU_RESETHUNTER = "Reset Hunter spawn options";
 MENU_RESETLIB = "Reset Liberator spawn options";
+MENU_RESETSTIMPACK = "Reset Stimpack spawn options";
+MENU_RESETMEDIKIT = "Reset Medikit spawn options";
 
 // Persistency
 MENU_REPLACEAFTERMAPLOAD = "Control whether replacements happen after a mapload.";
@@ -86,4 +94,9 @@ BAS_LORE4 = "If you get one, make sure it's the custom chamber version. These'll
 GARAND_LORE1 = "An old M1 Garand from the early 1X40 times. Some have been recently rechambered to 7.76mm also.";
 GARAND_LORE2 = "It mostly serves now as an inbetween of the Mk. IV Boss Rifle and  the ZM7 Liberator.";
 GARAND_LORE3 = "The original cartridge it was chambered for of .30-06 hits a hefty punch,";
-GARAND_LORE4 = "though its rarity and incompatibility with other 7.76mm guns makes the 7.76mm version a bit more economical.";
+GARAND_LORE4 = "though its rarity and incompatibility with other 7.76mm guns makes the 7.76mm version a bit more economical.";
+
+DMS_LORE1 = "TODO: Enter Lore.";
+DMS_LORE2 = "";
+DMS_LORE3 = "";
+DMS_LORE4 = "";
diff --git a/mapinfo → MAPINFO b/mapinfo → MAPINFO
diff --git a/menudef → MENUDEF b/menudef → MENUDEF
@@ -28,6 +28,8 @@ OptionMenu HexadokenLegacyContinued
     StaticText ""
 	Option "Spawn boss variants (TEMP)","hd_shitbossting_spawn","YesNo"
 	StaticText ""
+    Submenu "$TAG_DMS", "DMS", 0, 1
+	StaticText ""
 	StaticText "--- Reset Options ---", "Red"
 	StaticText ""
 	SafeCommand "Reset every option", "Hexa_Reset_Cvars", "This resets every option for Hexa's Legacy Continued, are you sure you want to do this?"
@@ -162,6 +164,38 @@ OptionMenu M1Garand
 	StaticText "$GARAND_LORE4", "white"
 }
 
+OptionMenu DMS
+{
+    Title "$TITLE_DMSMENU"
+   	StaticText "Notice:", "Orange"
+    StaticText  "Setting 'spawn rate' to Replace All will suppress", "white"
+    StaticText  "all spawns of that given type.", "white"
+    StaticText ""
+	StaticText "Spawn Options", "Orange"
+    StaticText  "$MENU_DMSSTIMPACK", "white"
+	Option "$MENU_DMSSPAWNRATE", "dms_stimpack_bias", "SpawnBias"
+	SafeCommand "$MENU_RESETSTIMPACK", "resetcvar dms_stimpack_bias"
+    StaticText ""
+    StaticText  "$MENU_DMSMEDIKIT", "white"
+	Option "$MENU_DMSSPAWNRATE", "dms_medikit_bias", "SpawnBias"
+	SafeCommand "$MENU_RESETMEDIKIT", "resetcvar dms_medikit_bias"
+    StaticText ""
+    StaticText  "$MENU_REPLACEAFTERMAPLOAD", "white"
+	Option "$MENU_PERSISTENCY", "dms_persistent_spawning", "OnOff"
+	SafeCommand "$MENU_RESETPERSISTENCY", "resetcvar dms_persistent_spawning"
+ 	StaticText ""
+   	StaticText ""
+	StaticText "Reset Options", "Orange"
+	SafeCommand "Reset all options", "dms_reset_cvars"
+	StaticText ""
+	StaticText "--- Lore ---", "Orange"
+	StaticText ""
+	StaticText "$DMS_LORE1", "white"
+	StaticText "$DMS_LORE2", "white"
+	StaticText "$DMS_LORE3", "white"
+	StaticText "$DMS_LORE4", "white"
+}
+
 // Spawn Bias (for items that do replace)
 OptionValue "SpawnBias"
 {

diff --git a/sndinfo → SNDINFO b/sndinfo → SNDINFO
diff --git a/textures → TEXTURES b/textures → TEXTURES
diff --git a/Graphics/garbkst.png → graphics/garbkst.png b/Graphics/garbkst.png → graphics/garbkst.png
diff --git a/Graphics/garfrst.png → graphics/garfrst.png b/Graphics/garfrst.png → graphics/garfrst.png
diff --git a/Patches/barga0.png → patches/barga0.png b/Patches/barga0.png → patches/barga0.png
diff --git a/Patches/bgunpk.png → patches/bgunpk.png b/Patches/bgunpk.png → patches/bgunpk.png
diff --git a/Sounds/5BOGFIRE.wav → sounds/5BOGFIRE.wav b/Sounds/5BOGFIRE.wav → sounds/5BOGFIRE.wav
diff --git a/Sounds/M1PING.ogg → sounds/M1PING.ogg b/Sounds/M1PING.ogg → sounds/M1PING.ogg
diff --git a/Sprites/Bossmerg/BORGG0.png → sprites/Bossmerg/BORGG0.png b/Sprites/Bossmerg/BORGG0.png → sprites/Bossmerg/BORGG0.png
diff --git a/Sprites/Bossmerg/borga0.png → sprites/Bossmerg/borga0.png b/Sprites/Bossmerg/borga0.png → sprites/Bossmerg/borga0.png
diff --git a/Sprites/Bossmerg/borgb0.png → sprites/Bossmerg/borgb0.png b/Sprites/Bossmerg/borgb0.png → sprites/Bossmerg/borgb0.png
diff --git a/Sprites/Bossmerg/borgc0.png → sprites/Bossmerg/borgc0.png b/Sprites/Bossmerg/borgc0.png → sprites/Bossmerg/borgc0.png
diff --git a/Sprites/Bossmerg/borgd0.png → sprites/Bossmerg/borgd0.png b/Sprites/Bossmerg/borgd0.png → sprites/Bossmerg/borgd0.png
diff --git a/Sprites/Bossmerg/borge0.png → sprites/Bossmerg/borge0.png b/Sprites/Bossmerg/borge0.png → sprites/Bossmerg/borge0.png
diff --git a/Sprites/M1 Garand/GCLPY0.png → sprites/M1 Garand/GCLPY0.png b/Sprites/M1 Garand/GCLPY0.png → sprites/M1 Garand/GCLPY0.png
diff --git a/Sprites/M1 Garand/GCLPZ0.png → sprites/M1 Garand/GCLPZ0.png b/Sprites/M1 Garand/GCLPZ0.png → sprites/M1 Garand/GCLPZ0.png
diff --git a/Sprites/M1 Garand/M1A1A0.png → sprites/M1 Garand/M1A1A0.png b/Sprites/M1 Garand/M1A1A0.png → sprites/M1 Garand/M1A1A0.png
diff --git a/Sprites/M1 Garand/M1A1F0.png → sprites/M1 Garand/M1A1F0.png b/Sprites/M1 Garand/M1A1F0.png → sprites/M1 Garand/M1A1F0.png
diff --git a/Sprites/M1 Garand/M1A1Y0.png → sprites/M1 Garand/M1A1Y0.png b/Sprites/M1 Garand/M1A1Y0.png → sprites/M1 Garand/M1A1Y0.png
diff --git a/Sprites/M1 Garand/M1A1Z0.png → sprites/M1 Garand/M1A1Z0.png b/Sprites/M1 Garand/M1A1Z0.png → sprites/M1 Garand/M1A1Z0.png
diff --git a/Sprites/No-Scope Boss/barfb0.png → sprites/No-Scope Boss/barfb0.png b/Sprites/No-Scope Boss/barfb0.png → sprites/No-Scope Boss/barfb0.png
diff --git a/Sprites/No-Scope Boss/bargg0.png → sprites/No-Scope Boss/bargg0.png b/Sprites/No-Scope Boss/bargg0.png → sprites/No-Scope Boss/bargg0.png
diff --git a/Sprites/No-Scope Boss/bargh0.png → sprites/No-Scope Boss/bargh0.png b/Sprites/No-Scope Boss/bargh0.png → sprites/No-Scope Boss/bargh0.png
diff --git a/Sprites/No-Scope Boss/bargi0.png → sprites/No-Scope Boss/bargi0.png b/Sprites/No-Scope Boss/bargi0.png → sprites/No-Scope Boss/bargi0.png
diff --git a/Sprites/No-Scope Boss/bargj0.png → sprites/No-Scope Boss/bargj0.png b/Sprites/No-Scope Boss/bargj0.png → sprites/No-Scope Boss/bargj0.png
diff --git a/Sprites/No-Scope Boss/bargk0.png → sprites/No-Scope Boss/bargk0.png b/Sprites/No-Scope Boss/bargk0.png → sprites/No-Scope Boss/bargk0.png
diff --git a/Sprites/No-Scope Boss/borfb0.png → sprites/No-Scope Boss/borfb0.png b/Sprites/No-Scope Boss/borfb0.png → sprites/No-Scope Boss/borfb0.png
diff --git a/Sprites/Shitbossting/bojg[0.png → sprites/Shitbossting/bojg[0.png b/Sprites/Shitbossting/bojg[0.png → sprites/Shitbossting/bojg[0.png
diff --git a/Sprites/Shitbossting/bojg]0.png → sprites/Shitbossting/bojg]0.png b/Sprites/Shitbossting/bojg]0.png → sprites/Shitbossting/bojg]0.png
diff --git a/Sprites/Shitbossting/bojga0.png → sprites/Shitbossting/bojga0.png b/Sprites/Shitbossting/bojga0.png → sprites/Shitbossting/bojga0.png
diff --git a/Sprites/Shitbossting/bojgb0.png → sprites/Shitbossting/bojgb0.png b/Sprites/Shitbossting/bojgb0.png → sprites/Shitbossting/bojgb0.png
diff --git a/Sprites/Shitbossting/bojgc0.png → sprites/Shitbossting/bojgc0.png b/Sprites/Shitbossting/bojgc0.png → sprites/Shitbossting/bojgc0.png
diff --git a/Sprites/Shitbossting/bojgd0.png → sprites/Shitbossting/bojgd0.png b/Sprites/Shitbossting/bojgd0.png → sprites/Shitbossting/bojgd0.png
diff --git a/Sprites/Shitbossting/bojge0.png → sprites/Shitbossting/bojge0.png b/Sprites/Shitbossting/bojge0.png → sprites/Shitbossting/bojge0.png
diff --git a/Sprites/Shitbossting/bojgf0.png → sprites/Shitbossting/bojgf0.png b/Sprites/Shitbossting/bojgf0.png → sprites/Shitbossting/bojgf0.png
diff --git a/Sprites/Shitbossting/bojgg0.png → sprites/Shitbossting/bojgg0.png b/Sprites/Shitbossting/bojgg0.png → sprites/Shitbossting/bojgg0.png
diff --git a/Sprites/Shitbossting/bojgh0.png → sprites/Shitbossting/bojgh0.png b/Sprites/Shitbossting/bojgh0.png → sprites/Shitbossting/bojgh0.png
diff --git a/Sprites/Shitbossting/bojgi0.png → sprites/Shitbossting/bojgi0.png b/Sprites/Shitbossting/bojgi0.png → sprites/Shitbossting/bojgi0.png
diff --git a/Sprites/Shitbossting/bojgj0.png → sprites/Shitbossting/bojgj0.png b/Sprites/Shitbossting/bojgj0.png → sprites/Shitbossting/bojgj0.png
diff --git a/Sprites/Shitbossting/bojgk0.png → sprites/Shitbossting/bojgk0.png b/Sprites/Shitbossting/bojgk0.png → sprites/Shitbossting/bojgk0.png
diff --git a/Sprites/Shitbossting/bojgl0.png → sprites/Shitbossting/bojgl0.png b/Sprites/Shitbossting/bojgl0.png → sprites/Shitbossting/bojgl0.png
diff --git a/Sprites/Shitbossting/bojgm0.png → sprites/Shitbossting/bojgm0.png b/Sprites/Shitbossting/bojgm0.png → sprites/Shitbossting/bojgm0.png
diff --git a/Sprites/Shitbossting/bojgn0.png → sprites/Shitbossting/bojgn0.png b/Sprites/Shitbossting/bojgn0.png → sprites/Shitbossting/bojgn0.png
diff --git a/Sprites/Shitbossting/bojgo0.png → sprites/Shitbossting/bojgo0.png b/Sprites/Shitbossting/bojgo0.png → sprites/Shitbossting/bojgo0.png
diff --git a/Sprites/Shitbossting/bojgp0.png → sprites/Shitbossting/bojgp0.png b/Sprites/Shitbossting/bojgp0.png → sprites/Shitbossting/bojgp0.png
diff --git a/Sprites/Shitbossting/bojgq0.png → sprites/Shitbossting/bojgq0.png b/Sprites/Shitbossting/bojgq0.png → sprites/Shitbossting/bojgq0.png
diff --git a/Sprites/Shitbossting/bojgr0.png → sprites/Shitbossting/bojgr0.png b/Sprites/Shitbossting/bojgr0.png → sprites/Shitbossting/bojgr0.png
diff --git a/Sprites/Shitbossting/bojgs0.png → sprites/Shitbossting/bojgs0.png b/Sprites/Shitbossting/bojgs0.png → sprites/Shitbossting/bojgs0.png
diff --git a/Sprites/Shitbossting/bojgt0.png → sprites/Shitbossting/bojgt0.png b/Sprites/Shitbossting/bojgt0.png → sprites/Shitbossting/bojgt0.png
diff --git a/Sprites/Shitbossting/bojgy0.png → sprites/Shitbossting/bojgy0.png b/Sprites/Shitbossting/bojgy0.png → sprites/Shitbossting/bojgy0.png
diff --git a/Sprites/Shitbossting/bojgz0.png → sprites/Shitbossting/bojgz0.png b/Sprites/Shitbossting/bojgz0.png → sprites/Shitbossting/bojgz0.png
diff --git a/Sprites/medif0.png → sprites/medif0.png b/Sprites/medif0.png → sprites/medif0.png
diff --git a/Sprites/rldrb0.png → sprites/rldrb0.png b/Sprites/rldrb0.png → sprites/rldrb0.png