Merge pull request #65 from Alando1-doom/Toby_V7_Update_1-28-2024

Toby V7 Update 1-28-2024
Alando1-doom · Jan 28, 2024 · 3916105 · 3916105
2 parents 04d17f2 + 3de52c8
commit 3916105
Show file tree

Hide file tree

Showing 110 changed files with 169 additions and 2,758 deletions.
diff --git a/Compass-V2-0_A.wad b/Compass-V2-0_A.wad
diff --git a/DECORATE.dec b/DECORATE.dec
@@ -1,15 +1,11 @@
-#include decorate/DEC_WEAP.dec
 #include decorate/DEC_HLTH.dec
 #include decorate/DEC_ARMR.dec
-#include decorate/DEC_AMMO.dec
 #include decorate/DEC_PRX1.dec
 #include decorate/DEC_POW.dec
 #include decorate/DEC_KEYS.dec
-#include decorate/DEC_MONS.dec
 #include decorate/DEC_DECO.dec
 #include decorate/DEC_BEAC.dec
 //Player
-#include decorate/DEC_PLAYER.dec
 #include decorate/Detectors/FloorChecker.dec
 #include decorate/Detectors/WalkThing.dec
 #include decorate/Detectors/WallHit.dec
diff --git a/HealthAmmoCheck_MOD.wad b/HealthAmmoCheck_MOD.wad
diff --git a/KEYCONF.txt b/KEYCONF.txt
@@ -1,9 +1,3 @@
-//Toby Player Class
-
-weaponsection compilation
-clearplayerclasses
-addplayerclass Player_TO
-
 //Toby Compass
 
 addkeysection "Compass Options" CompassMod
@@ -17,6 +11,11 @@ addmenukey "Turn Right" "pukename TurnCompass 0"
 defaultbind R "pukename TurnCompass 0"
 
 
+//Special Movement
+addkeysection "Toby Special Movement" TobyMove
+alias turnaround "turn180; give 180Giver"
+addmenukey "Quick Turn / 180 Degree Turn" "turnaround"
+
 
 //Stat Checker - Health, Armor, Ammo, Keys
 
@@ -31,20 +30,17 @@ defaultbind K "netevent Toby_CheckKeys"
 
 
 //God Mode Hotkey
-
+addkeysection "Quick Cheats" TobyCheats
 alias godmode "iddqd; give GodModeGiver"
+addmenukey "Toggle God Mode" "godmode"
 defaultbind KP5 "godmode"
-
-
 //IDKFA Hotkey
-
 alias allstuff "give IDKFAGiver"
+addmenukey "Give All" "allstuff"
 defaultbind KP7 "allstuff"
-
-
 //Level Warp Hotkey
-
 alias levelwarp "give MapWarpSound; wait 52; changemap +"
+addmenukey "Change to Next Level" "levelwarp"
 defaultbind KP9 "levelwarp"
 
 

diff --git a/SNDINFO.compass b/SNDINFO.compass
@@ -0,0 +1,10 @@
+//COMPASS
+
+compass/north				"sounds/Compass/cmpnorth.ogg"
+compass/northeast		"sounds/Compass/cmpneast.ogg"
+compass/northwest		"sounds/Compass/cmpnwest.ogg"
+compass/south			"sounds/Compass/cmpsouth.ogg"
+compass/southeast		"sounds/Compass/cmpseast.ogg"
+compass/southwest		"sounds/Compass/cmpswest.ogg"
+compass/east				"sounds/Compass/cmpeast.ogg"
+compass/west				"sounds/Compass/cmpwest.ogg"
diff --git a/SNDINFO.itemsounds b/SNDINFO.itemsounds
@@ -0,0 +1,32 @@
+//Beacon Sounds
+$rolloff misc/health	linear	56 300
+misc/health						"sounds/Items/dshlthbc.ogg"
+$rolloff misc/health/medium	linear	56 300
+misc/health/medium		"sounds/Items/dshlthm.ogg"
+$rolloff misc/health/large	linear	56 300
+misc/health/large				"sounds/Items/dshlthlg.ogg"
+$rolloff misc/armor/small	linear	56 300
+misc/armor/small				"sounds/Items/dsarmsm.ogg"
+$rolloff misc/armor	linear	56 300
+misc/armor						"sounds/Items/dsarmbc.ogg"
+$rolloff misc/armor/large	linear	56 300
+misc/armor/large				"sounds/Items/dsarmlg.ogg"
+
+//Pickup Sounds
+health/bonus					"sounds/Items/dsbonus.wav"
+health/stim						"sounds/Items/dsmdhlth.wav"
+health/medkit					"sounds/Items/dshealth.wav"
+armor/bonus					"sounds/Items/dsarmbon.wav"
+armor/green						"sounds/Items/dsarm1.ogg"
+armor/blue						"sounds/Items/dsarm2.wav"
+
+//Announcer
+ann/healthbonus				"sounds/Items/dshbonan.ogg"
+ann/stimpack					"sounds/Items/dsstiman.ogg"
+ann/medikit						"sounds/Items/dsmedann.ogg"
+ann/armorbonus				"sounds/Items/dsabonan.ogg"
+ann/armor						"sounds/Items/dsarm1an.ogg"
+ann/armor2						"sounds/Items/dsarm2an.ogg"
+
+//Status Full - Same sound used for other items, not just armor
+stat/armor/full		armfull
diff --git a/SNDINFO.markers b/SNDINFO.markers
@@ -25,28 +25,28 @@ marker/cleared      "sounds/Markers/dsmclear.ogg"
 
 //Interface
 
-marker/Markers/maxout       dsmaxout
-marker/Markers/undofail     dsnoundo
+marker/Markers/maxout       "sounds/Markers/dsmaxout.ogg"
+marker/Markers/undofail     "sounds/Markers/dsnoundo.ogg"
 
 //Map Marker Sounds
 
 $rolloff marker/beacon1     linear	96 640
-marker/beacon1              dsmark1
+marker/beacon1              "sounds/Markers/dsmark1.wav"
 $rolloff marker/beacon2     linear	96 640
-marker/beacon2              dsmark2
+marker/beacon2              "sounds/Markers/dsmark2.ogg"
 $rolloff marker/beacon3     linear	96 640
-marker/beacon3              dsmark3
+marker/beacon3              "sounds/Markers/dsmark3.ogg"
 $rolloff marker/beacon4     linear	96 640
-marker/beacon4              dsmark4
+marker/beacon4              "sounds/Markers/dsmark4.ogg"
 $rolloff marker/beacon5     linear	96 640
-marker/beacon5              dsmark5
+marker/beacon5              "sounds/Markers/dsmark5.wav"
 $rolloff marker/beacon6     linear	96 640
-marker/beacon6              dsmark6
+marker/beacon6              "sounds/Markers/dsmark6.ogg"
 $rolloff marker/beacon7     linear	96 640
-marker/beacon7              dsmark7
+marker/beacon7              "sounds/Markers/dsmark7.wav"
 $rolloff marker/beacon8     linear	96 640
-marker/beacon8              dsmark8
+marker/beacon8              "sounds/Markers/dsmark8.ogg"
 $rolloff marker/beacon9     linear	96 640
-marker/beacon9              dsmark9
+marker/beacon9              "sounds/Markers/dsmark9.ogg"
 $rolloff marker/beacon10    linear	96 640
-marker/beacon10             dsmark10
+marker/beacon10             "sounds/Markers/dsmark10.ogg"
diff --git a/SNDINFO.markers.txt b/SNDINFO.markers.txt
diff --git a/SNDINFO.menus b/SNDINFO.menus
@@ -404,6 +404,13 @@ $volume menu/controls/compleft      0.5
 menu/controls/compright             "sounds/Menus/TobyOptions/mtrnrit.ogg"
 $volume menu/controls/compright     0.5
 
+menu/controls/togglegod              "sounds/Menus/TobyOptions/mtgglgod.ogg"
+$volume menu/controls/togglegod      0.5
+menu/controls/idkfa              "sounds/Menus/TobyOptions/midkfa.ogg"
+$volume menu/controls/idkfa      0.5
+menu/controls/levelwarp              "sounds/Menus/TobyOptions/mmapwarp.ogg"
+$volume menu/controls/levelwarp      0.5
+
 menu/controls/keychecker            "sounds/Menus/TobyOptions/mkeychk.ogg"
 $volume menu/controls/keychecker    0.5
 

diff --git a/SNDINFO.monsters b/SNDINFO.monsters
@@ -69,3 +69,12 @@ toby/actorsinviewport/monsters/hangingcommanderkeens    "sounds/ActorsInViewport
 
 toby/actorsinviewport/monsters/marine     "sounds/ActorsInViewport/Monsters/Marine.ogg"
 toby/actorsinviewport/monsters/marines    "sounds/ActorsInViewport/Monsters/Marines.ogg"
+
+toby/actorsinviewport/monsters/cybruiser     "sounds/ActorsInViewport/Monsters/Cybruiser.ogg"
+toby/actorsinviewport/monsters/cybruisers    "sounds/ActorsInViewport/Monsters/Cybruisers.ogg"
+
+toby/actorsinviewport/monsters/icon     "sounds/ActorsInViewport/Monsters/IconOfSin.ogg"
+toby/actorsinviewport/monsters/icons    "sounds/ActorsInViewport/Monsters/IconsOfSin.ogg"
+
+toby/actorsinviewport/monsters/warlord     "sounds/ActorsInViewport/Monsters/Warlord.ogg"
+toby/actorsinviewport/monsters/warlords    "sounds/ActorsInViewport/Monsters/Warlords.ogg"
diff --git a/SNDINFO.player b/SNDINFO.player
@@ -0,0 +1,10 @@
+$random          misc/walk     { walk/p1  walk/p2  walk/p3 }
+walk/p1                                               stwalk1
+walk/p2                                               stwalk2
+walk/p3                                               stwalk3
+
+//MISC
+player/wound		dswound
+player/healthalert	dshalert
+player/danger		dsheart
+barrel/tooclose		dsbrprox
diff --git a/SNDINFO.powerups b/SNDINFO.powerups
@@ -0,0 +1,67 @@
+//powerup stuff
+
+//soulsphere
+
+misc/getsoul				"sounds/Powerups/dssoulsp.ogg"
+$rolloff misc/soulsnd	linear	56 300
+misc/soulsnd				"sounds/Powerups/dssoul.wav"
+misc/soulann				"sounds/Powerups/a2soul.ogg"
+
+
+//blursphere
+
+misc/getinvs				"sounds/Powerups/dsblur.ogg"
+$rolloff misc/invssnd	linear	56 300
+misc/invssnd				"sounds/Powerups/bluract.wav"
+misc/invsann				"sounds/Powerups/a2pinvs.ogg"
+blur/wearoff					"sounds/Powerups/dsblurou.ogg"
+
+
+//megasphere
+
+misc/getmega				"sounds/Powerups/dsmega2.ogg"
+$rolloff misc/megasnd	linear	56 300
+misc/megasnd				"sounds/Powerups/dsmega.wav"
+misc/megaann				"sounds/Powerups/a2mega.ogg"
+
+
+//berserk
+
+misc/getbers				"sounds/Powerups/dsbsrk.wav"
+$rolloff misc/berssnd	linear	56 300
+misc/berssnd				"sounds/Powerups/brskact.wav"
+misc/bersann				"sounds/Powerups/a2str.ogg"
+
+
+//invulnerability
+
+misc/getinv				"sounds/Powerups/dsinvul.wav"
+$rolloff misc/invsnd	linear	56 300
+misc/invsnd				"sounds/Powerups/dsinvlbc.ogg"
+misc/invann				"sounds/Powerups/a2invul.ogg"
+invul/wearoff			"sounds/Powerups/dsinvout.ogg"
+
+
+//computer map
+
+misc/getmap				"sounds/Powerups/dscmap.wav"
+$rolloff misc/mapsnd	linear	56 300
+misc/mapsnd				"sounds/Powerups/dsmap.ogg"
+ann/map						"sounds/Powerups/dscmapan.ogg"
+
+
+//infrared
+
+misc/getvisor				"sounds/Powerups/dsvisor.wav"
+$rolloff misc/visorsnd	linear	56 300
+misc/visorsnd				"sounds/Powerups/dsvisbc.wav"
+ann/visor						"sounds/Powerups/dsnvisan.ogg"
+
+
+//radsuit
+
+misc/getsuit				"sounds/Powerups/dsbios.wav"
+$rolloff misc/suitsnd	linear	56 300
+misc/suitsnd			"sounds/Powerups/dsbiosui.wav"
+ann/suit					"sounds/Powerups/dssuitan.ogg"
+suit/wearoff				"sounds/Powerups/dsenvout.ogg"
diff --git a/SNDINFO.targeter b/SNDINFO.targeter
@@ -0,0 +1,3 @@
+//Targeting System
+weapons/lock			dswlock
+weapons/barrellock			dstrgbar
diff --git a/SNDINFO.wallbump b/SNDINFO.wallbump
@@ -0,0 +1 @@
+misc/wallhit	"sounds/WallBump/dswall.ogg"
diff --git a/Toby_Door+Switch_V3-0.wad → TobyAccV7_Doors+Switches.wad b/Toby_Door+Switch_V3-0.wad → TobyAccV7_Doors+Switches.wad
diff --git a/TobyQuickCheatSystem.wad → TobyCheats_MiscV7.wad b/TobyQuickCheatSystem.wad → TobyCheats_MiscV7.wad
diff --git a/TobyPowerups_V7.wad b/TobyPowerups_V7.wad
diff --git a/Toby_Acc_ClassicMon_V7.wad b/Toby_Acc_ClassicMon_V7.wad