commit 6c105ade84928bce264661776b0b41315bc66a41 Author: Nicole O'Connor Date: Sat Feb 3 13:26:11 2024 -0800 init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39781f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.vscode/settings.json +.vscode/gzdoom.log + +## doom builder spam +maps/*.wad.backup* +maps/*.wad.*.autosave* +# this is just a local settings file but uses absolute paths +maps/*.dbs \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..8a994b0 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,21 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Launch GZDoom", + "type": "shell", + "command": "${config:pth_gzdoom} +logfile \"${workspaceFolder}/.vscode/gzdoom.log\" -iwad ${config:pth_chex3} -file ${workspaceFolder} ${input:gzdoom_args}", + "problemMatcher": [] + } + ], + "inputs": [ + { + "id": "gzdoom_args", + "description": "Additional arguments to pass to GZDoom", + "type": "promptString", + "default": "" + } + ] +} \ No newline at end of file diff --git a/ANIMDEFS.txt b/ANIMDEFS.txt new file mode 100644 index 0000000..96e3d20 --- /dev/null +++ b/ANIMDEFS.txt @@ -0,0 +1,23 @@ +TEXTURE FFDBBLU0 + PIC FFDBBLU1 TICS 20 + PIC TNT1A0 TICS 20 + +TEXTURE FFDFBLU0 + PIC FFDFBLU1 TICS 20 + PIC TNT1A0 TICS 20 + +TEXTURE FFDBYLW0 + PIC FFDBYLW1 TICS 20 + PIC TNT1A0 TICS 20 + +TEXTURE FFDFYLW0 + PIC FFDFYLW1 TICS 20 + PIC TNT1A0 TICS 20 + +TEXTURE FFDBRED0 + PIC FFDBRED1 TICS 20 + PIC TNT1A0 TICS 20 + +TEXTURE FFDFRED0 + PIC FFDFRED1 TICS 20 + PIC TNT1A0 TICS 20 \ No newline at end of file diff --git a/DECORATE.txt b/DECORATE.txt new file mode 100644 index 0000000..f39b2ff --- /dev/null +++ b/DECORATE.txt @@ -0,0 +1,18 @@ +Actor InvGranolaBar : HealthPickup 11901 { + //$Category "Powerups" + //$Title "Granola Bar" + +COUNTITEM + + Tag "$TAG_GRANOLABAR" + Inventory.PickupMessage "$TXT_GRANOLABAR" + + Health 25 + HealthPickup.AutoUse 2 + Inventory.Icon GRNOINV + Inventory.AltHUDIcon GRNOAINV + States { + Spawn: + GRNO A -1 + Stop + } +} \ No newline at end of file diff --git a/GAMEINFO.txt b/GAMEINFO.txt new file mode 100644 index 0000000..7bb20a5 --- /dev/null +++ b/GAMEINFO.txt @@ -0,0 +1 @@ +IWAD = "chex3.wad" \ No newline at end of file diff --git a/LANGUAGE b/LANGUAGE new file mode 100644 index 0000000..a5defae --- /dev/null +++ b/LANGUAGE @@ -0,0 +1,37 @@ +// howdy y'all +[enu default] + +// // inventory +// item names +TAG_GRANOLABAR = "Granola Bar"; +TAG_POWERMODULATOR = "Power Modulator"; +TAG_BLASTBOOTS = "Blast Boots"; + +// pickup messages +TXT_GRANOLABAR = "Picked up a granola bar."; +TXT_POWERMODULATOR = "Picked up the prototype Power Modulator!"; +TXT_BLASTBOOTS = "Picked up some Blast Boots!"; + +// // level data +// map strings +HUSTR_XE1M1 = "Bazoik Cistern"; +HUSTR_XE1M2 = "Warrius Plaza"; +HUSTR_XE1M3 = "Snailshell Ravine"; +HUSTR_XE1M4 = "Nightmare Sequence"; +HUSTR_XE1M5 = "Bazoik Starport"; +HUSTR_XE1M6 = "Last Descent"; +HUSTR_XE1M7 = "Lypi"; // "Λύπη", or "sorrow"; romanized for piclump generator compatibility +HUSTR_XE1M8 = "Infusion Chamber"; // secret level + +// exposition strings +EXPO_XE1_OPEN = + "Over forty years have passed since the Flemoid Wars. In that time, small scouting parties of Flemoids\n" + "have appeared on occasion, to attempt to take a foothold into our dimension. The IFOC established a\n" + "network of military units, known as Zorch Squadrons, to patrol areas sensitive to Flemoid invasion, and\n" + "to respond to Flemoid threats as they appear. At first, these squadrons were trained as an elite fighting\n" + "force, but over time, Zorch Squadrons became little more than beat cops with unique uniforms." + "\n\n" + "You are a Corporal in the Zorch Squadrons on Bazoik. You have been dispatched to an underground cistern\n" + "in the city of Warrius, named after the Chex(R) Warrior of legend from the Flemoid Wars. According to intel,\n" + "the infestation is said to be 'heavier than usual', but you were only issued your standard zorcher. Still,\n" + "the ominous green ooze at the entrance of the cistern is setting you on edge..."; \ No newline at end of file diff --git a/LICENSE.TXT b/LICENSE.TXT new file mode 100644 index 0000000..45515e0 --- /dev/null +++ b/LICENSE.TXT @@ -0,0 +1,4 @@ +All ZScript files by Nicole O'Connor, licensed under the Apache License version +2 (available at zscript/LICENSE.txt, or at [apache-license]). + +[apache-license]: https://www.apache.org/licenses/LICENSE-2.0 \ No newline at end of file diff --git a/MAPINFO b/MAPINFO new file mode 100644 index 0000000..c36eed4 --- /dev/null +++ b/MAPINFO @@ -0,0 +1,48 @@ +gameinfo { + AddQuitMessages = "What happened?\nRun out of granola bars?", + "Zorch Squadron soldiers\nnever run from a fight!" + + PlayerClasses = "ChexPlayerHGA" +} + +defaultmap { + Author = "Nicole O'Connor" +} + +episode XE1M1 { + name = "Zorch Squadron" +} + +cluster 11 { + EnterText = lookup, EXPO_XE1_OPEN + Music = D_E1M1 + Flat = ENDFLAT2 +} + +map XE1M1 lookup HUSTR_XE1M1 { + Cluster = 11 + Music = D_E1M5 + Next = XE1M2 + InterMusic = D_HGAINT +} + +map XE1M2 lookup HUSTR_XE1M2 { + Cluster = 11 + Music = D_E3M1 + InterMusic = D_HGAINT + Next = XE1M3 + Sky1 = "CJSKY3A" +} + +map XE1M3 lookup HUSTR_XE1M3 { + Cluster = 11 + InterMusic = D_HGAINT + Sky1 = "CJSKY3A" +} + +DoomEdNums { + 2001 = LargeZorcherHGA + 2002 = RapidZorcherHGA + 11902 = InvPowerModulator + 11903 = InvBlastBoots +} \ No newline at end of file diff --git a/PNAMES.lmp b/PNAMES.lmp new file mode 100644 index 0000000..34fef28 Binary files /dev/null and b/PNAMES.lmp differ diff --git a/SECRETS b/SECRETS new file mode 100644 index 0000000..6dff851 --- /dev/null +++ b/SECRETS @@ -0,0 +1,11 @@ +[XE1M1] +$s16;1: Did someone leave their beeper in the warehouse again? +$s160;2: There's ants running around the air vent in Scarlett's office again. She needs to quit stashing snacks there. +$s87;3: Are you sure that was a dead end? Sure looks like a shortcut... +$s96;4: After the Flemoid invasion, IFOC regulations require PPE to be present at all mining sites. +$s94;5: ...some people choose to bring non-standard PPE to work. +$s80;6: Mining is hard work, and requires a strong, healthy breakfast. + +[XE1M2] +$s4;1: Where does BLU Warehousing get all their dang cereal bars? +$s155;2: Hello, Dr. Crookes! Your tracking number is: 119Z201014PLAS155 \ No newline at end of file diff --git a/SNDINFO b/SNDINFO new file mode 100644 index 0000000..8cf8a28 --- /dev/null +++ b/SNDINFO @@ -0,0 +1,6 @@ +BEEPUTER sfx/BEEPUTER +$ambient 1 BEEPUTER point random 1.8 3.3 0.4 +HUMPUTER sfx/HUMPUTER +$ambient 2 HUMPUTER point continuous 0.4 +ROCKFALL sfx/ROCKFALL +FFLDOFF sfx/FFLDOFF \ No newline at end of file diff --git a/TEXTURES.txt b/TEXTURES.txt new file mode 100644 index 0000000..c7db099 --- /dev/null +++ b/TEXTURES.txt @@ -0,0 +1,104 @@ +// Texture definitions generated by SLADE3 +// on Wed Jan 17 19:08:52 2024 + +Texture "GRNOA0", 64, 45 +{ + Patch "GRNOA0", 0, 0 +} + +Texture "FFLD2BLU", 128, 128 +{ + Patch "FFLD2BLU", 0, 0 +} + +Texture "FFLD2RED", 128, 128 +{ + Patch "FFLD2RED", 0, 0 +} + +Texture "FFLD2YLW", 128, 128 +{ + Patch "FFLD2YLW", 0, 0 +} + +Texture "FFLDBLU", 128, 128 +{ + Patch "FFLDBLU", 0, 0 +} + +Texture "FFLDRED", 128, 128 +{ + Patch "FFLDRED", 0, 0 +} + +Texture "FFLDYLW", 128, 128 +{ + Patch "FFLDYLW", 0, 0 +} + +Texture "FFDBBLU0", 128, 128 +{ + Patch "FFDBBLU0", 0, 0 +} + +Texture "FFDBBLU1", 128, 128 +{ + Patch "FFDBBLU1", 0, 0 +} + +Texture "FFDFBLU0", 128, 128 +{ + Patch "FFDFBLU0", 0, 0 +} + +Texture "FFDFBLU1", 128, 128 +{ + Patch "FFDFBLU1", 0, 0 +} + +Texture "FFDBRED0", 128, 128 +{ + Patch "FFDBRED0", 0, 0 +} + +Texture "FFDBRED1", 128, 128 +{ + Patch "FFDBRED1", 0, 0 +} + +Texture "FFDBYLW0", 128, 128 +{ + Patch "FFDBYLW0", 0, 0 +} + +Texture "FFDBYLW1", 128, 128 +{ + Patch "FFDBYLW1", 0, 0 +} + +Texture "FFDFRED0", 128, 128 +{ + Patch "FFDFRED0", 0, 0 +} + +Texture "FFDFRED1", 128, 128 +{ + Patch "FFDFRED1", 0, 0 +} + +Texture "FFDFYLW0", 128, 128 +{ + Patch "FFDFYLW0", 0, 0 +} + +Texture "FFDFYLW1", 128, 128 +{ + Patch "FFDFYLW1", 0, 0 +} + +Texture "FFLDFLEM", 128, 128 +{ + Patch "FFLDFLEM", 0, 0 +} + +// End of texture definitions diff --git a/maps/XE1M3.wad b/maps/XE1M3.wad new file mode 100644 index 0000000..56b32d2 Binary files /dev/null and b/maps/XE1M3.wad differ diff --git a/maps/ffdemo.wad b/maps/ffdemo.wad new file mode 100644 index 0000000..3b7d135 Binary files /dev/null and b/maps/ffdemo.wad differ diff --git a/maps/xe1m1.wad b/maps/xe1m1.wad new file mode 100644 index 0000000..46d5ea6 Binary files /dev/null and b/maps/xe1m1.wad differ diff --git a/maps/xe1m2.wad b/maps/xe1m2.wad new file mode 100644 index 0000000..53c5949 Binary files /dev/null and b/maps/xe1m2.wad differ diff --git a/music/D_HGAINT.mid b/music/D_HGAINT.mid new file mode 100644 index 0000000..3efc844 Binary files /dev/null and b/music/D_HGAINT.mid differ diff --git a/res/skj/D_HGAINT.skj b/res/skj/D_HGAINT.skj new file mode 100644 index 0000000..153e5b0 Binary files /dev/null and b/res/skj/D_HGAINT.skj differ diff --git a/res/xcf/FFLDFLEM.xcf b/res/xcf/FFLDFLEM.xcf new file mode 100644 index 0000000..dfa1dd3 Binary files /dev/null and b/res/xcf/FFLDFLEM.xcf differ diff --git a/res/xcf/keyed-force-field.xcf b/res/xcf/keyed-force-field.xcf new file mode 100644 index 0000000..c3731d2 Binary files /dev/null and b/res/xcf/keyed-force-field.xcf differ diff --git a/sfx/BEEPUTER b/sfx/BEEPUTER new file mode 100644 index 0000000..4111b88 Binary files /dev/null and b/sfx/BEEPUTER differ diff --git a/sfx/FFLDOFF.ogg b/sfx/FFLDOFF.ogg new file mode 100644 index 0000000..59c6795 Binary files /dev/null and b/sfx/FFLDOFF.ogg differ diff --git a/sfx/HUMPUTER b/sfx/HUMPUTER new file mode 100644 index 0000000..c0314a8 Binary files /dev/null and b/sfx/HUMPUTER differ diff --git a/sfx/ROCKFALL.wav b/sfx/ROCKFALL.wav new file mode 100644 index 0000000..71ac06a Binary files /dev/null and b/sfx/ROCKFALL.wav differ diff --git a/sprites/GRNOA0.png b/sprites/GRNOA0.png new file mode 100644 index 0000000..ffab231 Binary files /dev/null and b/sprites/GRNOA0.png differ diff --git a/sprites/GRNOAINV.png b/sprites/GRNOAINV.png new file mode 100644 index 0000000..e43ab61 Binary files /dev/null and b/sprites/GRNOAINV.png differ diff --git a/sprites/GRNOINV.png b/sprites/GRNOINV.png new file mode 100644 index 0000000..4d2c255 Binary files /dev/null and b/sprites/GRNOINV.png differ diff --git a/sprites/NULLA0.png b/sprites/NULLA0.png new file mode 100644 index 0000000..587bbe7 Binary files /dev/null and b/sprites/NULLA0.png differ diff --git a/sprites/SBE1A0.png b/sprites/SBE1A0.png new file mode 100644 index 0000000..ae2f2cc Binary files /dev/null and b/sprites/SBE1A0.png differ diff --git a/sprites/SBE1B0.png b/sprites/SBE1B0.png new file mode 100644 index 0000000..d1c87c1 Binary files /dev/null and b/sprites/SBE1B0.png differ diff --git a/sprites/SBE1C0.png b/sprites/SBE1C0.png new file mode 100644 index 0000000..a2110d3 Binary files /dev/null and b/sprites/SBE1C0.png differ diff --git a/sprites/SBE1D0.png b/sprites/SBE1D0.png new file mode 100644 index 0000000..27b68b8 Binary files /dev/null and b/sprites/SBE1D0.png differ diff --git a/sprites/SBE1E0.png b/sprites/SBE1E0.png new file mode 100644 index 0000000..f61b1c2 Binary files /dev/null and b/sprites/SBE1E0.png differ diff --git a/sprites/SBE1F0.png b/sprites/SBE1F0.png new file mode 100644 index 0000000..6863d8c Binary files /dev/null and b/sprites/SBE1F0.png differ diff --git a/sprites/SBE2A0.png b/sprites/SBE2A0.png new file mode 100644 index 0000000..cc9a07d Binary files /dev/null and b/sprites/SBE2A0.png differ diff --git a/sprites/SBE2B0.png b/sprites/SBE2B0.png new file mode 100644 index 0000000..6e8afac Binary files /dev/null and b/sprites/SBE2B0.png differ diff --git a/sprites/SBE2C0.png b/sprites/SBE2C0.png new file mode 100644 index 0000000..4331d14 Binary files /dev/null and b/sprites/SBE2C0.png differ diff --git a/sprites/SBE2D0.png b/sprites/SBE2D0.png new file mode 100644 index 0000000..3eb5d65 Binary files /dev/null and b/sprites/SBE2D0.png differ diff --git a/sprites/SBGFA0.png b/sprites/SBGFA0.png new file mode 100644 index 0000000..54edf56 Binary files /dev/null and b/sprites/SBGFA0.png differ diff --git a/sprites/SBGFB0.png b/sprites/SBGFB0.png new file mode 100644 index 0000000..7d3ed78 Binary files /dev/null and b/sprites/SBGFB0.png differ diff --git a/sprites/SBGGA0.png b/sprites/SBGGA0.png new file mode 100644 index 0000000..af5bda4 Binary files /dev/null and b/sprites/SBGGA0.png differ diff --git a/sprites/SBGGB0.png b/sprites/SBGGB0.png new file mode 100644 index 0000000..fd839b6 Binary files /dev/null and b/sprites/SBGGB0.png differ diff --git a/sprites/SBGGC0.png b/sprites/SBGGC0.png new file mode 100644 index 0000000..f5a33fc Binary files /dev/null and b/sprites/SBGGC0.png differ diff --git a/sprites/SBS1A0.png b/sprites/SBS1A0.png new file mode 100644 index 0000000..b71016d Binary files /dev/null and b/sprites/SBS1A0.png differ diff --git a/sprites/SBS1B0.png b/sprites/SBS1B0.png new file mode 100644 index 0000000..642d792 Binary files /dev/null and b/sprites/SBS1B0.png differ diff --git a/sprites/SCHFA0.png b/sprites/SCHFA0.png new file mode 100644 index 0000000..3bd0576 Binary files /dev/null and b/sprites/SCHFA0.png differ diff --git a/sprites/SCHFB0.png b/sprites/SCHFB0.png new file mode 100644 index 0000000..4faaa5c Binary files /dev/null and b/sprites/SCHFB0.png differ diff --git a/sprites/SCHGA0.png b/sprites/SCHGA0.png new file mode 100644 index 0000000..ba4a02e Binary files /dev/null and b/sprites/SCHGA0.png differ diff --git a/sprites/SCHGB0.png b/sprites/SCHGB0.png new file mode 100644 index 0000000..4dfc5c0 Binary files /dev/null and b/sprites/SCHGB0.png differ diff --git a/sprites/SMSFA0.png b/sprites/SMSFA0.png new file mode 100644 index 0000000..5e74881 Binary files /dev/null and b/sprites/SMSFA0.png differ diff --git a/sprites/SMSFB0.png b/sprites/SMSFB0.png new file mode 100644 index 0000000..afe24f1 Binary files /dev/null and b/sprites/SMSFB0.png differ diff --git a/sprites/SMSFC0.png b/sprites/SMSFC0.png new file mode 100644 index 0000000..d0539cb Binary files /dev/null and b/sprites/SMSFC0.png differ diff --git a/sprites/SMSFD0.png b/sprites/SMSFD0.png new file mode 100644 index 0000000..07874cb Binary files /dev/null and b/sprites/SMSFD0.png differ diff --git a/sprites/SMSGA0.png b/sprites/SMSGA0.png new file mode 100644 index 0000000..7066051 Binary files /dev/null and b/sprites/SMSGA0.png differ diff --git a/sprites/SMSGB0.png b/sprites/SMSGB0.png new file mode 100644 index 0000000..3a97122 Binary files /dev/null and b/sprites/SMSGB0.png differ diff --git a/sprites/SMSLA1.png b/sprites/SMSLA1.png new file mode 100644 index 0000000..12a7877 Binary files /dev/null and b/sprites/SMSLA1.png differ diff --git a/sprites/SMSLA5.png b/sprites/SMSLA5.png new file mode 100644 index 0000000..81bd0c9 Binary files /dev/null and b/sprites/SMSLA5.png differ diff --git a/sprites/SMSLA6A4.png b/sprites/SMSLA6A4.png new file mode 100644 index 0000000..885d20e Binary files /dev/null and b/sprites/SMSLA6A4.png differ diff --git a/sprites/SMSLA7A3.png b/sprites/SMSLA7A3.png new file mode 100644 index 0000000..81dfe47 Binary files /dev/null and b/sprites/SMSLA7A3.png differ diff --git a/sprites/SMSLA8A2.png b/sprites/SMSLA8A2.png new file mode 100644 index 0000000..90b53aa Binary files /dev/null and b/sprites/SMSLA8A2.png differ diff --git a/sprites/SPLEA0.png b/sprites/SPLEA0.png new file mode 100644 index 0000000..70dcbd8 Binary files /dev/null and b/sprites/SPLEA0.png differ diff --git a/sprites/SPLEB0.png b/sprites/SPLEB0.png new file mode 100644 index 0000000..3e1c323 Binary files /dev/null and b/sprites/SPLEB0.png differ diff --git a/sprites/SPLEC0.png b/sprites/SPLEC0.png new file mode 100644 index 0000000..702f2af Binary files /dev/null and b/sprites/SPLEC0.png differ diff --git a/sprites/SPLED0.png b/sprites/SPLED0.png new file mode 100644 index 0000000..5a40774 Binary files /dev/null and b/sprites/SPLED0.png differ diff --git a/sprites/SPLEE0.png b/sprites/SPLEE0.png new file mode 100644 index 0000000..27bcf29 Binary files /dev/null and b/sprites/SPLEE0.png differ diff --git a/sprites/SPLFA0.png b/sprites/SPLFA0.png new file mode 100644 index 0000000..929cdd6 Binary files /dev/null and b/sprites/SPLFA0.png differ diff --git a/sprites/SPLFB0.png b/sprites/SPLFB0.png new file mode 100644 index 0000000..ec13b96 Binary files /dev/null and b/sprites/SPLFB0.png differ diff --git a/sprites/SPLGA0.png b/sprites/SPLGA0.png new file mode 100644 index 0000000..b57ab26 Binary files /dev/null and b/sprites/SPLGA0.png differ diff --git a/sprites/SPLGB0.png b/sprites/SPLGB0.png new file mode 100644 index 0000000..fb079fc Binary files /dev/null and b/sprites/SPLGB0.png differ diff --git a/sprites/SPLSA0.png b/sprites/SPLSA0.png new file mode 100644 index 0000000..ba46eae Binary files /dev/null and b/sprites/SPLSA0.png differ diff --git a/sprites/SPLSB0.png b/sprites/SPLSB0.png new file mode 100644 index 0000000..1d309a1 Binary files /dev/null and b/sprites/SPLSB0.png differ diff --git a/sprites/SSAWA0.png b/sprites/SSAWA0.png new file mode 100644 index 0000000..4c9ffff Binary files /dev/null and b/sprites/SSAWA0.png differ diff --git a/sprites/SSAWB0.png b/sprites/SSAWB0.png new file mode 100644 index 0000000..f8f627c Binary files /dev/null and b/sprites/SSAWB0.png differ diff --git a/sprites/SSAWC0.png b/sprites/SSAWC0.png new file mode 100644 index 0000000..f32060d Binary files /dev/null and b/sprites/SSAWC0.png differ diff --git a/sprites/SSAWD0.png b/sprites/SSAWD0.png new file mode 100644 index 0000000..0146b0d Binary files /dev/null and b/sprites/SSAWD0.png differ diff --git a/sprites/SSHFA0.png b/sprites/SSHFA0.png new file mode 100644 index 0000000..2bfe50e Binary files /dev/null and b/sprites/SSHFA0.png differ diff --git a/sprites/SSHFB0.png b/sprites/SSHFB0.png new file mode 100644 index 0000000..5e03a0a Binary files /dev/null and b/sprites/SSHFB0.png differ diff --git a/sprites/SSHTA0.png b/sprites/SSHTA0.png new file mode 100644 index 0000000..5f87c68 Binary files /dev/null and b/sprites/SSHTA0.png differ diff --git a/sprites/SSHTB0.png b/sprites/SSHTB0.png new file mode 100644 index 0000000..94f0e64 Binary files /dev/null and b/sprites/SSHTB0.png differ diff --git a/sprites/SSHTC0.png b/sprites/SSHTC0.png new file mode 100644 index 0000000..1d0b02b Binary files /dev/null and b/sprites/SSHTC0.png differ diff --git a/sprites/SSHTD0.png b/sprites/SSHTD0.png new file mode 100644 index 0000000..ca05c2c Binary files /dev/null and b/sprites/SSHTD0.png differ diff --git a/textures/FFDBBLU0.png b/textures/FFDBBLU0.png new file mode 100644 index 0000000..df3c501 Binary files /dev/null and b/textures/FFDBBLU0.png differ diff --git a/textures/FFDBBLU1.png b/textures/FFDBBLU1.png new file mode 100644 index 0000000..4b43345 Binary files /dev/null and b/textures/FFDBBLU1.png differ diff --git a/textures/FFDBRED0.png b/textures/FFDBRED0.png new file mode 100644 index 0000000..5496bf7 Binary files /dev/null and b/textures/FFDBRED0.png differ diff --git a/textures/FFDBRED1.png b/textures/FFDBRED1.png new file mode 100644 index 0000000..e3229a1 Binary files /dev/null and b/textures/FFDBRED1.png differ diff --git a/textures/FFDBYLW0.png b/textures/FFDBYLW0.png new file mode 100644 index 0000000..5ea71f8 Binary files /dev/null and b/textures/FFDBYLW0.png differ diff --git a/textures/FFDBYLW1.png b/textures/FFDBYLW1.png new file mode 100644 index 0000000..8a8687c Binary files /dev/null and b/textures/FFDBYLW1.png differ diff --git a/textures/FFDFBLU0.png b/textures/FFDFBLU0.png new file mode 100644 index 0000000..7e766e1 Binary files /dev/null and b/textures/FFDFBLU0.png differ diff --git a/textures/FFDFBLU1.png b/textures/FFDFBLU1.png new file mode 100644 index 0000000..38c3d6d Binary files /dev/null and b/textures/FFDFBLU1.png differ diff --git a/textures/FFDFRED0.png b/textures/FFDFRED0.png new file mode 100644 index 0000000..2b2a8c6 Binary files /dev/null and b/textures/FFDFRED0.png differ diff --git a/textures/FFDFRED1.png b/textures/FFDFRED1.png new file mode 100644 index 0000000..8d535e8 Binary files /dev/null and b/textures/FFDFRED1.png differ diff --git a/textures/FFDFYLW0.png b/textures/FFDFYLW0.png new file mode 100644 index 0000000..72d173c Binary files /dev/null and b/textures/FFDFYLW0.png differ diff --git a/textures/FFDFYLW1.png b/textures/FFDFYLW1.png new file mode 100644 index 0000000..8068d75 Binary files /dev/null and b/textures/FFDFYLW1.png differ diff --git a/textures/FFLD2BLU.png b/textures/FFLD2BLU.png new file mode 100644 index 0000000..5753c39 Binary files /dev/null and b/textures/FFLD2BLU.png differ diff --git a/textures/FFLD2RED.png b/textures/FFLD2RED.png new file mode 100644 index 0000000..49e70a6 Binary files /dev/null and b/textures/FFLD2RED.png differ diff --git a/textures/FFLD2YLW.png b/textures/FFLD2YLW.png new file mode 100644 index 0000000..2772720 Binary files /dev/null and b/textures/FFLD2YLW.png differ diff --git a/textures/FFLDBLU.png b/textures/FFLDBLU.png new file mode 100644 index 0000000..b82fdd2 Binary files /dev/null and b/textures/FFLDBLU.png differ diff --git a/textures/FFLDFLEM.png b/textures/FFLDFLEM.png new file mode 100644 index 0000000..aeec66b Binary files /dev/null and b/textures/FFLDFLEM.png differ diff --git a/textures/FFLDRED.png b/textures/FFLDRED.png new file mode 100644 index 0000000..b8916ea Binary files /dev/null and b/textures/FFLDRED.png differ diff --git a/textures/FFLDYLW.png b/textures/FFLDYLW.png new file mode 100644 index 0000000..80c98c1 Binary files /dev/null and b/textures/FFLDYLW.png differ diff --git a/zscript.txt b/zscript.txt new file mode 100644 index 0000000..d6c850c --- /dev/null +++ b/zscript.txt @@ -0,0 +1,7 @@ +version "4.10.0" + +#include "zscript/weapon/lgzorcherhga.zs" +#include "zscript/weapon/rpdzorcherhga.zs" +#include "zscript/actor/playerhga.zs" +#include "zscript/actor/power_modulator.zs" +#include "zscript/actor/blast_boots.zs" diff --git a/zscript/LICENSE.TXT b/zscript/LICENSE.TXT new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/zscript/LICENSE.TXT @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/zscript/actor/blast_boots.zs b/zscript/actor/blast_boots.zs new file mode 100644 index 0000000..b86056f --- /dev/null +++ b/zscript/actor/blast_boots.zs @@ -0,0 +1,42 @@ +/* + * Copyright © 2024 Nicole O'Connor + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class PowerBlastJump : Powerup { + override void InitEffect() { + let ply = ChexPlayerHGA(Owner); + ply.AddZ(72); // double std jump height + } +} + +class InvBlastBoots : PowerupGiver { + Default { + //$Category "Powerups" + //$Title "Blast Boots" + +COUNTITEM + Tag "$TAG_BLASTBOOTS"; + + Inventory.Icon "NULLA0"; + Inventory.AltHUDIcon "NULLA0"; + Inventory.PickupMessage "$TXT_BLASTBOOTS"; + } + + States { + Spawn: + NULL A -1; + Stop; + } +} + \ No newline at end of file diff --git a/zscript/actor/playerhga.zs b/zscript/actor/playerhga.zs new file mode 100644 index 0000000..f2fd332 --- /dev/null +++ b/zscript/actor/playerhga.zs @@ -0,0 +1,29 @@ +/* + * Copyright © 2024 Nicole O'Connor + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class ChexPlayerHGA : ChexPlayer { + bool PowerModulatorCooling; + int PowerModulatorCooldownTicker; + property PowerModulatorCooling: PowerModulatorCooling; + property PowerModulatorCooldownTicker: PowerModulatorCooldownTicker; + Default { + Player.WeaponSlot 3, "LargeZorcherHGA"; + Player.WeaponSlot 4, "RapidZorcherHGA"; + + ChexPlayerHGA.PowerModulatorCooling false; + ChexPlayerHGA.PowerModulatorCooldownTicker 0; + } +} diff --git a/zscript/actor/power_modulator.zs b/zscript/actor/power_modulator.zs new file mode 100644 index 0000000..a1df2fe --- /dev/null +++ b/zscript/actor/power_modulator.zs @@ -0,0 +1,53 @@ +/* + * Copyright © 2024 Nicole O'Connor + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class PowerWeaponLevel2HGA : PowerWeaponLevel2 { + override void EndEffect() { + let ply = ChexPlayerHGA(Owner); + ply.PowerModulatorCooling = false; // placeholder for secondary cooldown effect logic + Super.EndEffect(); + } +} + +class InvPowerModulator : PowerupGiver { + Default { + //$Category "Powerups" + //$Title "Power Modulator" + +COUNTITEM + Tag "$TAG_POWERMODULATOR"; + Powerup.Type "PowerWeaponLevel2HGA"; + Powerup.Duration -15; + Inventory.Icon "NULLA0"; + Inventory.AltHUDIcon "NULLA0"; + Inventory.PickupMessage "$TXT_POWERMODULATOR"; + } + + States { + Spawn: + NULL A -1; + Stop; + } + + override bool Use(bool pickup) { + let ply = ChexPlayerHGA(Owner); + + if (ply.PowerModulatorCooling) { return false; } + else { + ply.PowerModulatorCooling = true; // start the cooldown + return Super.Use(pickup); // hand off to zdoom for std "weaponlevel2" effect + } + } +} \ No newline at end of file diff --git a/zscript/weapon/lgzorcherhga.zs b/zscript/weapon/lgzorcherhga.zs new file mode 100644 index 0000000..9a10a86 --- /dev/null +++ b/zscript/weapon/lgzorcherhga.zs @@ -0,0 +1,86 @@ +/* + * Copyright © 2024 Nicole O'Connor + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class LargeZorcherHGA : LargeZorcher replaces LargeZorcher { + Default { + Weapon.SisterWeapon "LargeZorcherBuffed"; + } + + action void A_FireShotgunBuffed() { + // largely the same as the standard A_FireShotgun, with some changes because it's... buffed... + if (player == null) { return; } + + A_StartSound("weapons/shotgf", CHAN_WEAPON); + Weapon weap = player.ReadyWeapon; + if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite) { + if (!weap.DepleteAmmo (weap.bAltFire, true, 1)) { return; } + + player.SetPsprite(PSP_FLASH, weap.FindState('Flash'), true); + } + player.mo.PlayAttacking2 (); + + double pitch = BulletSlope (); + for (int i = 0; i < 7; i++) { + int damage = 7 * random[GunShot](2, 4); + double ang = angle; + let accurate = false; + if (!accurate) { + ang += Random2[GunShot]() * (3.125 / 256); + if (GetCVar ("vertspread") && !sv_novertspread) { + pitch += Random2[GunShot]() * (1.675 / 256); + } + } + LineAttack(ang, PLAYERMISSILERANGE, pitch, damage, 'Hitscan', "BulletPuff"); + } + } +} + +class LargeZorcherBuffed : LargeZorcherHGA { + Default { + +WEAPON.POWERED_UP; + Weapon.SisterWeapon "LargeZorcherHGA"; + + Weapon.AmmoUse 2; + Weapon.AmmoGive 0; + } + + States { + Ready: + SSHT A 1 A_WeaponReady; + Loop; + Deselect: + SSHT A 1 A_Lower; + Loop; + Select: + SSHT A 1 A_Raise; + Loop; + Fire: + SSHT A 3; + SSHT A 7 A_FireShotgunBuffed; + SSHT A 3; + SSHT A 7 A_FireShotgunBuffed; + SSHT BC 5; + SSHT D 4; + SSHT CB 3; + SSHT A 3; + SSHT A 7 A_ReFire; + Goto Ready; + Flash: + SSHF A 4 Bright A_Light1; + SSHF B 3 Bright A_Light2; + Goto LightDone; + } +} \ No newline at end of file diff --git a/zscript/weapon/rpdzorcherhga.zs b/zscript/weapon/rpdzorcherhga.zs new file mode 100644 index 0000000..81b5648 --- /dev/null +++ b/zscript/weapon/rpdzorcherhga.zs @@ -0,0 +1,72 @@ +/* + * Copyright © 2024 Nicole O'Connor + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class RapidZorcherHGA : RapidZorcher replaces RapidZorcher { + Default { + Weapon.SisterWeapon "RapidZorcherBuffed"; + } + + action void A_FireRailgun() { + if (player == null) { return; } + + // every time i use this weapon sound, i think fondly of my wife + //A_StartSound("weapons/railgf", CHAN_WEAPON); + Weapon weap = player.ReadyWeapon; + if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite) { + if (!weap.DepleteAmmo (weap.bAltFire, true, 6)) { return; } + + player.SetPsprite(PSP_FLASH, weap.FindState('Flash'), true); + } + player.mo.PlayAttacking2(); + + A_RailAttack(70, 0, false, "1f91ff", "b7dcff", RGF_SILENT | RGF_FULLBRIGHT, 1.5, range:16384); + } +} + +class RapidZorcherBuffed : RapidZorcherHGA { + Default { + +WEAPON.POWERED_UP; + Weapon.SisterWeapon "RapidZorcherHGA"; + + Weapon.AmmoUse 6; + Weapon.AmmoGive 0; + } + + States + { + Ready: + SCHG A 1 A_WeaponReady; + Loop; + Deselect: + SCHG A 1 A_Lower; + Loop; + Select: + SCHG A 1 A_Raise; + Loop; + Fire: + SCHG AB 4 A_FireRailgun; + SCHG B 0 A_ReFire; + Goto Ready; + Flash: + SCHF A 5 Bright A_Light1; + Goto LightDone; + SCHF B 5 Bright A_Light2; + Goto LightDone; + Spawn: + MGUN A -1; + Stop; + } +} \ No newline at end of file