samsara_dukesoundboard is implemented, and gives Duke inventory items…

… that allows him to spout different types of quotes at will.
SamsaraDevs · Nov 15, 2013 · 703df18 · 703df18
1 parent 44b1408
commit 703df18
Show file tree

Hide file tree

Showing 17 changed files with 239 additions and 1 deletion.
diff --git a/pk3/SNDINFO.txt b/pk3/SNDINFO.txt
@@ -1088,6 +1088,19 @@ duke/boss38			DKBSST38
 duke/boss39			DKBSST39
 duke/boss40			DKBSST40
 
+$random doug/huggem { d/huggem1 d/huggem2 d/huggem3 d/huggem4 d/huggem5 d/huggem6 d/huggem7 d/huggem8 d/huggem9 d/huggem10 d/huggem11 }
+d/huggem1            DHUGGEM1
+d/huggem2            DHUGGEM2
+d/huggem3            DHUGGEM3
+d/huggem4            DHUGGEM4
+d/huggem5            DHUGGEM5
+d/huggem6            DHUGGEM6
+d/huggem7            DHUGGEM7
+d/huggem8            DHUGGEM8
+d/huggem9            DHUGGEM9
+d/huggem10           DHUGGEMA
+d/huggem11           DHUGGEMB
+
 
 ////////////////////
 // Marathon sounds

diff --git a/pk3/acs/samsara.c b/pk3/acs/samsara.c
@@ -303,6 +303,7 @@ script SAMSARA_CLIENT_DECORATE (int which, int a1, int a2) clientside
 {
     int i, j, k;
     int x, y, z;
+	int result;
 
     SetFont("SMALLFONT");
     switch (which)
@@ -378,7 +379,13 @@ script SAMSARA_CLIENT_DECORATE (int which, int a1, int a2) clientside
         if(GetCvar("samsara_cl_bloodyhell") == 1) { SetActorState(0,"DeathNashgore"); }
         if(GetCvar("samsara_cl_bloodyhell") == 2) { SetActorState(0,"DeathBrutal"); }
         break;
+
+	case 12:
+        result = GetCVar("samsara_cl_bloodyhell");
+        break;
     }
+
+    SetResultValue(result);
 }
 
 script SAMSARA_GETSETTINGS (void) net

diff --git a/pk3/acs/samsara.o b/pk3/acs/samsara.o
diff --git a/pk3/acs/script_auto.h b/pk3/acs/script_auto.h
@@ -265,6 +265,10 @@ script SAMSARA_OPEN open
         if (!GetCVar("samsara_pistolammo"))
         {   ConsoleCommand("set samsara_pistolammo 0");
         ConsoleCommand("archivecvar samsara_pistolammo"); }
+
+        if (!GetCVar("samsara_dukesoundboard"))
+        {   ConsoleCommand("set samsara_dukesoundboard 0");
+        ConsoleCommand("archivecvar samsara_dukesoundboard"); }
 
         opd = pd;
         pd = !!GetCVar("samsara_punchdrunk");
@@ -391,6 +395,34 @@ script SAMSARA_SPAWN (int respawning)
 
         if (GetCVar("samsara_pistolammo") == 1) { GiveInventory("PistolModeOn", 1); }
         else { TakeInventory("PistolModeOn", 0x7FFFFFFF); }
+
+        if (GetCVar("samsara_dukesoundboard") == 1) { if (CheckInventory("DukeClass") == 1) {
+		GiveInventory("Soundboard - Boss Kill",1);
+		GiveInventory("Soundboard - Deathmatch Kill",1);
+		GiveInventory("Soundboard - Dukematch Kill",1);
+		GiveInventory("Soundboard - Boss Sight",1);
+		GiveInventory("Soundboard - Enemy Kill",1);
+		GiveInventory("Soundboard - Boot Kill",1);
+		GiveInventory("Soundboard - Gib Kill",1);
+		GiveInventory("Soundboard - Weapon Acquired",1);
+		GiveInventory("Soundboard - Level Intro",1);
+		GiveInventory("Soundboard - Idle Taunt",1);
+		GiveInventory("Soundboard - Critical Heal",1);
+		GiveInventory("Soundboard - Death Taunt",1);
+		GiveInventory("Soundboard - Doug Huggem",1); }}
+        else { TakeInventory("Soundboard - Boss Kill",1);
+		TakeInventory("Soundboard - Deathmatch Kill",1);
+		TakeInventory("Soundboard - Dukematch Kill",1);
+		TakeInventory("Soundboard - Boss Sight",1);
+		TakeInventory("Soundboard - Enemy Kill",1);
+		TakeInventory("Soundboard - Boot Kill",1);
+		TakeInventory("Soundboard - Gib Kill",1);
+		TakeInventory("Soundboard - Weapon Acquired",1);
+		TakeInventory("Soundboard - Level Intro",1);
+		TakeInventory("Soundboard - Idle Taunt",1);
+		TakeInventory("Soundboard - Critical Heal",1);
+		TakeInventory("Soundboard - Death Taunt",1);
+		TakeInventory("Soundboard - Doug Huggem",1); }
 
         HandleBans();
         HandleBuffCVars(respawning);

diff --git a/pk3/decorate/duke/player.dec b/pk3/decorate/duke/player.dec
@@ -2,7 +2,7 @@ actor DukePlayer : PlayerPawn
 {
     Player.DisplayName "Duke"
     Player.Face "DKN"
-    BloodColor "Red"
+    BloodColor "ff 40 00"
     Player.StartItem "M1911", 1
     Player.StartItem "Mighty Boot", 1
     Player.StartItem "DukeClass", 1

diff --git a/pk3/decorate/duke/taunts.dec b/pk3/decorate/duke/taunts.dec
@@ -22,6 +22,24 @@ actor DukeTaunt: CustomInventory
     }
 }
 
+actor DukeSoundbox: CustomInventory
+{
+    Inventory.MaxAmount 1
+    +INVBAR
+	+UNDROPPABLE
+
+    States
+    {
+       Spawn:
+         TNT1 A 0
+         stop
+
+       UseStop:
+         TNT1 A 0
+         fail
+    }
+}
+
 actor DukeBossKillTaunt: DukeTaunt
 {
     States
@@ -40,6 +58,19 @@ actor DukeBossKillTaunt: DukeTaunt
     }
 }
 
+actor "Soundboard - Boss Kill" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/bosskill", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
 actor DukeDMTaunt1: DukeTaunt
 {
     States
@@ -58,6 +89,19 @@ actor DukeDMTaunt1: DukeTaunt
     }
 }
 
+actor "Soundboard - Deathmatch Kill" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/mpkill", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
 actor DukeDMTauntDuke: DukeTaunt
 {
     States
@@ -78,6 +122,19 @@ actor DukeDMTauntDuke: DukeTaunt
     }
 }
 
+actor "Soundboard - Dukematch Kill" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/fragduke", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
 actor DukeDMTauntDoomguy: DukeTaunt
 {
     States
@@ -114,6 +171,19 @@ actor DukeBossSightTaunt: DukeTaunt
     }
 }
 
+actor "Soundboard - Boss Sight" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/bosssee", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
 actor DukeKillTaunt: DukeTaunt
 {
     States
@@ -132,6 +202,19 @@ actor DukeKillTaunt: DukeTaunt
     }
 }
 
+actor "Soundboard - Enemy Kill" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/killtaunt", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
 actor DukeBootTaunt: DukeTaunt
 {
     States
@@ -150,6 +233,19 @@ actor DukeBootTaunt: DukeTaunt
     }
 }
 
+actor "Soundboard - Boot Kill" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/bootkill", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
 actor DukeGibTaunt: DukeTaunt
 {
     States
@@ -168,3 +264,93 @@ actor DukeGibTaunt: DukeTaunt
     }
 }
 
+actor "Soundboard - Gib Kill" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/gibkill", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
+actor "Soundboard - Weapon Acquired" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/weapontaunt", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
+actor "Soundboard - Level Intro" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/introtaunt", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
+actor "Soundboard - Idle Taunt" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/waitingtoolong", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
+actor "Soundboard - Critical Heal" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/criticalheal", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
+actor "Soundboard - Death Taunt" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("duke/mpdeath", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
+
+actor "Soundboard - Doug Huggem" : DukeSoundbox
+{
+    States
+	{
+    Use:
+        TNT1 A 0 A_JumpIfInventory("DukeTauntCooldown", 1, "UseStop")
+        TNT1 A 0 A_PlaySoundEx("doug/huggem", 7)
+        TNT1 A 0 A_GiveInventory("DukeTauntCooldown", 5)
+        TNT1 A 0 ACS_ExecuteAlways(205)
+        fail
+	}
+}
diff --git a/pk3/sounds/duke/DHUGGEM1.ogg b/pk3/sounds/duke/DHUGGEM1.ogg
diff --git a/pk3/sounds/duke/DHUGGEM2.ogg b/pk3/sounds/duke/DHUGGEM2.ogg
diff --git a/pk3/sounds/duke/DHUGGEM3.ogg b/pk3/sounds/duke/DHUGGEM3.ogg
diff --git a/pk3/sounds/duke/DHUGGEM4.ogg b/pk3/sounds/duke/DHUGGEM4.ogg
diff --git a/pk3/sounds/duke/DHUGGEM5.ogg b/pk3/sounds/duke/DHUGGEM5.ogg
diff --git a/pk3/sounds/duke/DHUGGEM6.ogg b/pk3/sounds/duke/DHUGGEM6.ogg
diff --git a/pk3/sounds/duke/DHUGGEM7.ogg b/pk3/sounds/duke/DHUGGEM7.ogg
diff --git a/pk3/sounds/duke/DHUGGEM8.ogg b/pk3/sounds/duke/DHUGGEM8.ogg
diff --git a/pk3/sounds/duke/DHUGGEM9.ogg b/pk3/sounds/duke/DHUGGEM9.ogg
diff --git a/pk3/sounds/duke/DHUGGEMA.ogg b/pk3/sounds/duke/DHUGGEMA.ogg
diff --git a/pk3/sounds/duke/DHUGGEMB.ogg b/pk3/sounds/duke/DHUGGEMB.ogg