Merge branch 'master' of https://github.com/artvin01/TF2-Zombie-Riot

Author: artvin01

addons/sourcemod/configs/zombie_riot/challenges/bossrush/special.cfg

@@ -250,6 +250,39 @@
 			"is_health_scaling"	"1"
 			"plugin"		"npc_corruptedbarney"
 		}
+		"0.0"
+		{
+			"cash"					"0"
+			"count"					"0"
+			"health"				"2500000"
+			"is_boss"				"4"
+			"is_immune_to_nuke"		"1"
+			"is_health_scaling"		"1"
+			"data"					"sc30"
+			"plugin"				"npc_squad_master"
+		}
+		"0.0"
+		{
+			"cash"					"0"
+			"count"					"0"
+			"health"				"750000"
+			"is_boss"				"4"
+			"is_immune_to_nuke"		"1"
+			"is_health_scaling"		"1"
+			"data"					"sc40"
+			"plugin"				"npc_no_random_kranz"
+		}
+		"0.0"
+		{
+			"cash"					"0"
+			"count"					"0"
+			"health"				"4000000"
+			"is_boss"				"4"
+			"is_immune_to_nuke"		"1"
+			"is_health_scaling"		"1"
+			"data"					"sc40"
+			"plugin"				"npc_black_heavy_soul"
+		}
 		"0.5"
 		{
 			"count"			"3"

addons/sourcemod/configs/zombie_riot/challenges/bossrush/ultra.cfg

@@ -570,6 +570,40 @@
 	{
 		"setup"	"60"
 
+		
+		"0.0"
+		{
+			"cash"					"0"
+			"count"					"0"
+			"health"				"2500000"
+			"is_boss"				"4"
+			"is_immune_to_nuke"		"1"
+			"is_health_scaling"		"1"
+			"data"					"sc30"
+			"plugin"				"npc_squad_master"
+		}
+		"0.0"
+		{
+			"cash"					"0"
+			"count"					"0"
+			"health"				"750000"
+			"is_boss"				"4"
+			"is_immune_to_nuke"		"1"
+			"is_health_scaling"		"1"
+			"data"					"sc40"
+			"plugin"				"npc_no_random_kranz"
+		}
+		"0.0"
+		{
+			"cash"					"0"
+			"count"					"0"
+			"health"				"4000000"
+			"is_boss"				"4"
+			"is_immune_to_nuke"		"1"
+			"is_health_scaling"		"1"
+			"data"					"sc40"
+			"plugin"				"npc_black_heavy_soul"
+		}
 		"0.0"
 		{
 			"count"					"0"

addons/sourcemod/scripting/zombie_riot/freeplay.sp

@@ -593,23 +593,22 @@ void Freeplay_AddEnemy(int postWaves, Enemy enemy, int &count, bool alaxios = fa
 				enemy.ExtraSpeed = 1.10;
 				enemy.ExtraThinkSpeed = 0.85;
 			}
-			/*
 			case 36:
 			{
 				enemy.Index = NPC_GetByPlugin("npc_squad_master");
-				enemy.Health = RoundToFloor((5000000.0 + HealthBonus) / 70.0 * float(Waves_GetRound() * 2) * MultiGlobalHighHealthBoss);
+				enemy.Health = RoundToFloor((2000000.0 + HealthBonus) / 70.0 * float(Waves_GetRound() * 2) * MultiGlobalHighHealthBoss);
 				enemy.Data = "wave_40";
 			}
 			case 37:
 			{
 				enemy.Index = NPC_GetByPlugin("npc_no_random_kranz");
-				enemy.Health = RoundToFloor((500000.0 + HealthBonus) / 70.0 * float(Waves_GetRound() * 2) * MultiGlobalHighHealthBoss);
+				enemy.Health = RoundToFloor((750000.0 + HealthBonus) / 70.0 * float(Waves_GetRound() * 2) * MultiGlobalHighHealthBoss);
 				enemy.Data = "wave_40";
 			}
 			case 38:
 			{
 				enemy.Index = NPC_GetByPlugin("npc_black_heavy_soul");
-				enemy.Health = RoundToFloor((5000000.0 + HealthBonus) / 70.0 * float(Waves_GetRound() * 2) * MultiGlobalHighHealthBoss);
+				enemy.Health = RoundToFloor((4000000.0 + HealthBonus) / 70.0 * float(Waves_GetRound() * 2) * MultiGlobalHighHealthBoss);
 				enemy.Data = "wave_40";
 			}
 			case 39:
@@ -618,9 +617,7 @@ void Freeplay_AddEnemy(int postWaves, Enemy enemy, int &count, bool alaxios = fa
 				enemy.Health = RoundToFloor((5000000.0 + HealthBonus) / 70.0 * float(Waves_GetRound() * 2) * MultiGlobalHighHealthBoss);
 				enemy.ExtraThinkSpeed = 0.80;
 				enemy.ExtraDamage = 1.10;
-				enemy.MeleeMult = 1.25;
 			}
-			*/
 			default:
 			{
 				enemy.Index = NPC_GetByPlugin("npc_true_fusion_warrior");
@@ -1131,14 +1128,13 @@ static Action Freeplay_RouletteMessage(Handle timer)
 		{
 			CPrintToChatAll("{black}ZILIUS! {gold}- {snow}If you guys beat him, I'll join you as a thanks for saving me from him. {red}I made him stronger cause he doesn't have his army.");
 		}
-		/*
 		case 36:
 		{
 			CPrintToChatAll("{red}MAZEAT {green}FABULOUS {purple}SQUAD {crimson}X {red}E{orange}L{yellow}I{green}T{blue}E{purple}! {gold}- {red}Oh it's so over for you guys...");
 		}
 		case 37:
 		{
-			CPrintToChatAll("{purple}NO RANDOM KRANZ V3! {gold}- {red}Whats with the "no random" part? Also version 3?");
+			CPrintToChatAll("{purple}NO RANDOM KRANZ V3! {gold}- {red}Whats with the ''no random'' part? Also version 3?");
 		}
 		case 38:
 		{
@@ -1148,7 +1144,6 @@ static Action Freeplay_RouletteMessage(Handle timer)
 		{
 			CPrintToChatAll("{red}KEVINMERY2009! {gold}- {red}I took data of your strongest mercenary and turned him into a boss!");
 		}
-		*/
 		default:
 		{
 			CPrintToChatAll("{yellow}INFECTED SILVESTER! {gold}- {red}An infected menace!");