Testbeta 1.95F

+Added new wackymod
+Added color coding to context sensitive keys
*Fixed Pokemon HUD sometimes getting stuck
*Fixed missing gold ore rock
*Fixed the sky not scrolling during the boss fight
*Fixed door HUD text colors being wrong
-Removed Cyberdemon retaliation

ACS/MAP01.acs

@@ -63,12 +63,12 @@
 #define NUMBEROFTIEBREAKERS 3 	// Number Of 1v1 Tie Breakers
 #define NUMBEROFTIEBREAKERSM 3  // Number Of Non-1v1 Tie Breakers
 #define NUMBEROFHINTS 82        // Number of hints
-#define NUMBEROFWACKYMODS 6     // Number of wacky mods
+#define NUMBEROFWACKYMODS 7     // Number of wacky mods
 
 
 // Debugging single minigames (-1 to not debug, provide a different number to force that minigame number to play)
 
-#define DEBUG_GAME  -1
+#define DEBUG_GAME  45
 #define DEBUG_TIEB  -1
 #define DEBUG_TIEBM -1
 #define DEBUG_WACKY -1
@@ -259,13 +259,15 @@
 #define WACKYMOD_1HP     4
 #define WACKYMOD_SPEED   5
 #define WACKYMOD_INVERT  6
+#define WACKYMOD_D1UPS   7
 
 #define WACKYMOD_NAME1  "Boss Round"
 #define WACKYMOD_NAME2  "Double Jump"
 #define WACKYMOD_NAME3  "Flight"
 #define WACKYMOD_NAME4  "1 Health"
 #define WACKYMOD_NAME5  "Sonic Speed"
 #define WACKYMOD_NAME6  "Inverted Controls"
+#define WACKYMOD_NAME7  "1Ups are worth double"
 
 
 // Miscellaneous
@@ -278,14 +280,15 @@
 // Game changelog
 
 #define CHANGES "\
-Version Beta 1.95E\n\
+Version Beta 1.95F\n\
 What's new in the Beta?\n\n\
-+Added Unsafe database option\n\
-*Optimized server and client code\n\
-*Fixed arena walls blocking projectiles\n\
-*Miscellaneous minigame rebalancing and fixes\n\
-*Boss fight balance changes and fixes\n\
-*Beta tester hats should work now\n\
++Added new wackymod\n\
++Added color coding to context sensitive keys\n\
+*Fixed Pokemon HUD sometimes getting stuck\n\
+*Fixed missing gold ore rock\n\
+*Fixed the sky not scrolling during the boss fight\n\
+*Fixed door HUD text colors being wrong\n\
+-Removed Cyberdemon retaliation\n\
 "
 
 // Menu Text
@@ -1686,6 +1689,7 @@ Script "DoomWare_Client_GameLogic" (void)
         player_answer2[PlayerNumber()][3] = 0;
         player_viewsprite[PlayerNumber()] = "";
         ClearInventory();
+		fadeto(0, 0, 0, 0.0, 0.0);
         setplayerproperty(1, 0, prop_invulnerability);
         setplayerproperty(1, 0, prop_frozen);
 		if (game_wackymod != WACKYMOD_FLIGHT)
@@ -1818,6 +1822,7 @@ Script "DoomWare_Client_GameLogic" (void)
             player_musicwaiting[PlayerNumber()] = true;
             player_musicgameover[PlayerNumber()] = false;
         }
+		fadeto(0, 0, 0, 0.0, 0.0); // Pokemon HUD brutefix
     }
 
     // Play a minigame
@@ -1880,8 +1885,16 @@ Script "DoomWare_Client_GameLogic" (void)
         // Give points if we ate a 1UP
         if (CheckInventory("1up") > 0)
         {
-            game_score[PlayerNumber()]++;
-            data_1ups[PlayerNumber()]++;
+			if (game_wackymod == WACKYMOD_D1UPS)
+			{
+				game_score[PlayerNumber()]+=2;
+				data_1ups[PlayerNumber()]+=2;
+			}
+			else
+			{
+				game_score[PlayerNumber()]++;
+				data_1ups[PlayerNumber()]++;
+			}
             TakeInventory("1up", 1000);
             SpawnSpotForced("1UPText", PlayerNumber()+TID_PLAYER, 0, 0);
             if (data_1ups[PlayerNumber()] == 50)
@@ -3302,11 +3315,11 @@ Script "DoomWare_Client_Minigame13" (void) // Enter the door
     if (minigame_wincondition1 == 0)
         minigame_instruction1[PlayerNumber()] = "Enter the No Key Door";
     else if (minigame_wincondition1 == 1)
-        minigame_instruction1[PlayerNumber()] = "Enter the \chBlue Key\cl Door";
+        minigame_instruction1[PlayerNumber()] = "Enter the \chBlue Key\ci Door";
     else if (minigame_wincondition1 == 2)
-        minigame_instruction1[PlayerNumber()] = "Enter the \cgRed Key\cl Door";
+        minigame_instruction1[PlayerNumber()] = "Enter the \cgRed Key\ci Door";
     else if (minigame_wincondition1 == 3)
-        minigame_instruction1[PlayerNumber()] = "Enter the \ckYellow Key\cl Door";
+        minigame_instruction1[PlayerNumber()] = "Enter the \ckYellow Key\ci Door";
 
     // Wait until the game's over
     while (game_status == STATUS_MINIGAME)
@@ -3355,7 +3368,7 @@ Script "DoomWare_Client_Minigame15" (void) // Reach The End (Swapping Boxes)
 Script "DoomWare_Client_Minigame16" (void) // Touch the sky
 {
     minigame_instruction1[PlayerNumber()] = "Touch the sky";
-    minigame_instruction2[PlayerNumber()] = "Spam your jump button";
+    minigame_instruction2[PlayerNumber()] = "Spam your \chjump button";
 
     // Wait until the game's over
     while (game_status == STATUS_MINIGAME)
@@ -3376,7 +3389,7 @@ Script "DoomWare_Client_Minigame16" (void) // Touch the sky
 Script "DoomWare_Client_Minigame17" (void) // Finish a lap (Ancient Lake DDKR)
 {
     minigame_instruction1[PlayerNumber()] = "Finish a lap";
-    minigame_instruction2[PlayerNumber()] = "Hold Shoot To Accelerate";
+    minigame_instruction2[PlayerNumber()] = "Hold \cdShoot\ci To Accelerate";
 
 	// Prevent a bug where some player's won't teleport after morphing
 	delay(1);
@@ -3766,7 +3779,7 @@ Script "DoomWare_Client_Minigame36" (void) // Get On The Colored Circle
 Script "DoomWare_Client_Minigame37" (void) // Swim Down
 {
     minigame_instruction1[PlayerNumber()] = "Swim";
-    minigame_instruction2[PlayerNumber()] = "Press your use key to dive deeper";
+    minigame_instruction2[PlayerNumber()] = "Press your \cguse key\ci to dive deeper";
 
 	// Prevent a bug where some player's won't teleport after morphing
 	delay(1);
@@ -3978,8 +3991,8 @@ Script "DoomWare_Client_Minigame44" (void) // Don't Equip Weapon
 
 Script "DoomWare_Client_Minigame45" (void) // Finish a lap (Rainbow Road)
 {
-    minigame_instruction1[PlayerNumber()] = "Finish a lap";
-    minigame_instruction2[PlayerNumber()] = "Hold Shoot To Accelerate";
+    minigame_instruction1[PlayerNumber()] = "\crF\cgi\cin\cki\cfs\cdh \cna \cvl\cha\ctp";
+    minigame_instruction2[PlayerNumber()] = "Hold \cdShoot\ci To Accelerate";
 
 	// Prevent a bug where some player's won't teleport after morphing
 	delay(1);
@@ -4901,7 +4914,7 @@ Script "DoomWare_Client_Minigame82" (void) // Whack a Diglett
 Script "DoomWare_Client_Minigame83" (void) // Charge your Lazor
 {
     minigame_instruction1[PlayerNumber()] = "Charge your Laz0r";
-    minigame_instruction2[PlayerNumber()] = "Spam shoot. 1 Point Per Frag";
+    minigame_instruction2[PlayerNumber()] = "Spam \cdshoot\ci. 1 Point Per Frag";
     player_viewsprite[PlayerNumber()] = "TNT2A0";
 
     // Wait until the minigame is over
@@ -4957,7 +4970,7 @@ Script "DoomWare_Client_Minigame83" (void) // Charge your Lazor
 Script "DoomWare_Client_Minigame84" (void) // Stay on the Road
 {
     minigame_instruction1[PlayerNumber()] = "Stay on the Road";
-    minigame_instruction2[PlayerNumber()] = "Strafe to steer";
+    minigame_instruction2[PlayerNumber()] = "\ccStrafe\ci to steer";
 
 	// Prevent a bug where some player's won't teleport after morphing
 	delay(1);
@@ -5118,7 +5131,7 @@ Script "DoomWare_Client_TieBreaker2" (void) // Rope Tug
     int plyx, plyy, plyz;
 
     minigame_instruction1[PlayerNumber()] = "Wait for the signal";
-    minigame_instruction2[PlayerNumber()] = "Press your Shoot key to repeatedly tug the rope";
+    minigame_instruction2[PlayerNumber()] = "Press your \cdShoot key\ci to repeatedly tug the rope";
 	minigame_wincondition1 = 0;
 
     // Move the players

ACS/MAP30.acs

@@ -414,6 +414,10 @@ Script "DoomWare_Server_InitMap" (void)
 	// Lava color and damage
 	Sector_SetColor(4, 255, 105, 0, 0);
 	Sector_SetDamage(4, 99999, mod_lava);
+
+	// Terry wad sky and floor scrolling
+	Scroll_Floor(3, 300, 2, 240);
+	Scroll_Ceiling(3, 300, 2, 90);
 
 	// Rotating spikes arena fog
 	Sector_SetFade(150, 255, 106, 0);
@@ -720,7 +724,7 @@ Script "DoomWare_Server_GameLogic" (void)
 					game_fakechatsound = CHATSOUND_MSG;
 					game_fakechat = "\cqB\csu\cdu\cq3\cs4\cd2\cd: You might survive this next one, but you won't what comes after!";
 					delay(SECOND*3);
-					round_nextgame = random(SECOND*8, SECOND*12);
+					round_nextgame = random(SECOND*5, SECOND*8);
 				}
 				break;
 		}
@@ -751,7 +755,7 @@ Script "DoomWare_Server_GameLogic" (void)
 		{
 			gametoplay = StrParam(s:"DoomWare_Server_Minigame", d:random(1, NUMBEROFGAMES));
 			ACS_NamedExecute(gametoplay, 0);
-			round_nextgame = random(SECOND*6, SECOND*11);
+			round_nextgame = random(SECOND*7, SECOND*12);
 		}
 		round_nextgame--;
 	}

DECORATE/DECORATE.txt

@@ -3091,8 +3091,8 @@ ACTOR TinOre 11142
 	}
 }
 
-// Golde ore rock
-ACTOR GoldeOre : TinOre 11143
+// Gold ore rock
+ACTOR GoldOre : TinOre 11143
 {
 	States
 	{
@@ -3106,7 +3106,7 @@ ACTOR GoldeOre : TinOre 11143
 			RSOR C 0 A_PAIN
 			goto See
 		Death:
-			RSOR B 0 A_GiveToTarget("GoldeOreItem",1)
+			RSOR B 0 A_GiveToTarget("GoldOreItem",1)
 			RSOR B 0 A_Scream
 			RSOR B 0 A_ChangeFlag("shootable",1)
 			RSOR B 0 A_ChangeFlag("SOLID",1)
@@ -3203,10 +3203,10 @@ ACTOR MithrilOreItem : Ammo
 	}
 }
 
-// Golde ore item
-ACTOR GoldeOreItem : Ammo
+// Gold ore item
+ACTOR GoldOreItem : Ammo
 {
-	Inventory.PickupMessage "Mined some Golde"
+	Inventory.PickupMessage "Mined some Gold"
 	Inventory.Amount 1
 	Inventory.MaxAmount 1
 	Inventory.PickupSound "DoomWare/Ring"
@@ -5057,14 +5057,22 @@ ACTOR CoopChaingun : Chaingun
 	}
 }
 
+// Double damage for boss battle
 actor DoubleDamagePickup : PowerDamage
 {
 	damagefactor "CoopBullet", 2
 	Powerup.Duration 0x7FFFFFFF
 }
 
+// Quad damage for boss battle
 actor QuadDamagePickup : PowerDamage
 {
 	damagefactor "CoopBullet", 4
 	Powerup.Duration 0x7FFFFFFF
+}
+
+// Cyberdemon, but doesn't infight
+actor Cyberdemon2 : Cyberdemon replaces Cyberdemon
+{
+	+NOINFIGHTING
 }

Other Lumps/ANIMDEFS.txt

@@ -27,5 +27,5 @@ pic 1 tics 4
 pic 2 tics 4
 pic 3 tics 4
 
-switch SOTESCHN on pic SOTESCHY tics 0 
+switch SOTESCHN on pic SOTESCHY tics 0
 switch SOTESCHY off pic SOTESCHN tics 0

Other Lumps/CREDITS.txt

@@ -1,4 +1,4 @@
-==================================
+==================================
              Credits
 ==================================