Mostly Combine Army changes

addons/sourcemod/configs/zombie_riot/downloads.cfg

@@ -858,11 +858,11 @@
 			"sound/npc/hunter/strider_legstretch1.mp3"	""
 			"sound/npc/hunter/strider_legstretch2.mp3"	""
 			"sound/npc/hunter/strider_legstretch3.mp3"	""
-			"models/zombie_riot/hl2/hunter.dx80.vtx"	""
-			"models/zombie_riot/hl2/hunter.dx90.vtx"	""
-			"models/zombie_riot/hl2/hunter.mdl"	""
-			"models/zombie_riot/hl2/hunter.phy"	""
-			"models/zombie_riot/hl2/hunter.vvd"	""
+			"models/zombie_riot/hl2/hunter_fix.dx80.vtx"	""
+			"models/zombie_riot/hl2/hunter_fix.dx90.vtx"	""
+			"models/zombie_riot/hl2/hunter_fix.mdl"	""
+			"models/zombie_riot/hl2/hunter_fix.phy"	""
+			"models/zombie_riot/hl2/hunter_fix.vvd"	""
 			"models/zombie_riot/hl2/hunter_animations.ani"	""
 			"models/zombie_riot/hl2/hunter_animations.mdl"	""
 			"materials/models/zombie_riot/hl2/mini_armor_basecolor.vmt"	""

addons/sourcemod/configs/zombie_riot/maps/zr_nova/fastomega.cfg

@@ -290,6 +290,13 @@
 			"plugin"	"npc_xeno_combine_soldier_overlord"
 		}
 		"1.0"
+		{
+			"count"		"1"
+			"health"	"75000"	
+			"is_boss"	"1"
+			"plugin"	"npc_combine_soldier_overlord"
+		}
+		"1.0"
 		{
 			"count"		"5"
 			"health"	"2000"	
@@ -331,19 +338,12 @@
 			"health"	"2500"	
 			"plugin"	"npc_xeno_combine_soldier_ar2"
 		}
-		"1.0"
+		"0.0"
 		{
 			"count"		"2"
 			"health"	"3000"	
 			"plugin"	"npc_xeno_combine_soldier_elite"
 		}
-		"0.0"
-		{
-			"count"		"1"
-			"health"	"50000"	
-			"is_boss"	"1"
-			"plugin"	"npc_combine_soldier_overlord"
-		}
 	}
 	"11"
 	{
@@ -596,13 +596,6 @@
 			"author"	"Kelly Bailey"
 		}
 		"1.0"
-		{
-			"count"		"1"
-			"health"	"125000"	
-			"is_boss"	"1"
-			"plugin"	"npc_hunter"
-		}
-		"1.0"
 		{
 			"count"		"3"
 			"health"	"2000"	
@@ -645,6 +638,13 @@
 			"plugin"	"npc_xeno_combine_soldier_elite"
 		}
 		"1.0"
+		{
+			"count"		"1"
+			"health"	"125000"	
+			"is_boss"	"1"
+			"plugin"	"npc_hunter"
+		}
+		"1.0"
 		{
 			"count"		"10"
 			"health"	"4000"	
@@ -950,22 +950,6 @@
 			"name"		"Escalation (Part 2)"
 			"author"	"Spencer Baggett"
 		}
-
-		"1.0"
-		{
-			"count"		"0"
-			"is_boss"	"1"
-			"health"	"250000"
-			"plugin"	"npc_merlton_boss"
-			"data"		"enraged"
-		}
-		"1.0"
-		{
-			"count"		"0"
-			"is_boss"	"1"
-			"health"	"400000"
-			"plugin"	"npc_merlton_boss"		// Plugin Name
-		}
 		"1.0"
 		{
 			"count"		"12"
@@ -979,6 +963,13 @@
 			"plugin"	"npc_seaborn_combine_soldier_shotgun"
 		}
 		"1.0"
+		{
+			"count"		"0"
+			"is_boss"	"1"
+			"health"	"400000"
+			"plugin"	"npc_merlton_boss"		// Plugin Name
+		}
+		"1.0"
 		{
 			"count"		"12"
 			"health"	"10000"	
@@ -997,6 +988,14 @@
 			"plugin"	"npc_seaborn_combine_soldier_elite"
 		}
 		"1.0"
+		{
+			"count"		"0"
+			"is_boss"	"1"
+			"health"	"400000"
+			"plugin"	"npc_merlton_boss"
+			"data"		"enraged"
+		}
+		"1.0"
 		{
 			"count"		"10"
 			"health"	"10000"
@@ -1198,23 +1197,14 @@
 			"name"		"Eon Trap"
 			"author"	"Kelly Bailey"
 		}
-		"5.0"
+		"0.0"
 		{
-			"count"		"1"
+			"count"		"15"
 			"health"	"200000"
-			"extra_damage"	"7.5"
+			"extra_damage"	"2.5"
 			"is_boss"	"1"
 			"plugin"	"npc_hunter"
 		}
-		"0.0"
-		{
-			"count"		"10"
-			"health"	"75000"
-			"plugin"	"npc_payback"
-			"extra_thinkspeed"	"0.5"
-   			"extra_speed"	"0.9"
-			"extra_damage"	"0.65"
-		}
 	}
 	"39"
 	{
@@ -1230,12 +1220,11 @@
 			"name"		"Escalation (Part 2)"
 			"author"	"Spencer Baggett"
 		}
-
 		"0.0"
 		{
-			"count"		"3"
+			"count"		"10"
 			"is_boss"	"1"
-			"health"	"100000"
+			"health"	"250000"
 			"data"		"enraged"
 			"plugin"	"npc_merlton_boss"
 		}

addons/sourcemod/configs/zombie_riot/maps/zr_nova/omega.cfg

@@ -402,6 +402,13 @@
 			"plugin"	"npc_xeno_combine_soldier_overlord"
 		}
 		"1.0"
+		{
+			"count"		"1"
+			"health"	"75000"	
+			"is_boss"	"1"
+			"plugin"	"npc_combine_soldier_overlord"
+		}
+		"1.0"
 		{
 			"count"		"5"
 			"health"	"2000"	
@@ -443,19 +450,12 @@
 			"health"	"2500"	
 			"plugin"	"npc_xeno_combine_soldier_ar2"
 		}
-		"1.0"
+		"0.0"
 		{
 			"count"		"2"
 			"health"	"3000"	
 			"plugin"	"npc_xeno_combine_soldier_elite"
 		}
-		"0.0"
-		{
-			"count"		"1"
-			"health"	"50000"	
-			"is_boss"	"1"
-			"plugin"	"npc_combine_soldier_overlord"
-		}
 	}
 	"16"
 	{
@@ -848,13 +848,6 @@
 			"author"	"Kelly Bailey"
 		}
 		"1.0"
-		{
-			"count"		"1"
-			"health"	"125000"	
-			"is_boss"	"1"
-			"plugin"	"npc_hunter"
-		}
-		"1.0"
 		{
 			"count"		"3"
 			"health"	"2000"	
@@ -897,6 +890,13 @@
 			"plugin"	"npc_xeno_combine_soldier_elite"
 		}
 		"1.0"
+		{
+			"count"		"1"
+			"health"	"125000"	
+			"is_boss"	"1"
+			"plugin"	"npc_hunter"
+		}
+		"1.0"
 		{
 			"count"		"10"
 			"health"	"4000"	
@@ -1316,21 +1316,6 @@
 			"author"	"Spencer Baggett"
 		}
 
-		"1.0"
-		{
-			"count"		"0"
-			"is_boss"	"1"
-			"health"	"250000"
-			"plugin"	"npc_merlton_boss"
-			"data"		"enraged"
-		}
-		"1.0"
-		{
-			"count"		"0"
-			"is_boss"	"1"
-			"health"	"400000"
-			"plugin"	"npc_merlton_boss"		// Plugin Name
-		}
 		"1.0"
 		{
 			"count"		"12"
@@ -1344,6 +1329,13 @@
 			"plugin"	"npc_seaborn_combine_soldier_shotgun"
 		}
 		"1.0"
+		{
+			"count"		"0"
+			"is_boss"	"1"
+			"health"	"400000"
+			"plugin"	"npc_merlton_boss"
+		}
+		"1.0"
 		{
 			"count"		"12"
 			"health"	"10000"	
@@ -1362,6 +1354,14 @@
 			"plugin"	"npc_seaborn_combine_soldier_elite"
 		}
 		"1.0"
+		{
+			"count"		"0"
+			"is_boss"	"1"
+			"health"	"400000"
+			"plugin"	"npc_merlton_boss"
+			"data"		"enraged"
+		}
+		"1.0"
 		{
 			"count"		"10"
 			"health"	"10000"
@@ -1665,23 +1665,14 @@
 			"name"		"Eon Trap"
 			"author"	"Kelly Bailey"
 		}
-		"5.0"
+		"0.0"
 		{
-			"count"		"1"
+			"count"		"15"
 			"health"	"200000"
-			"extra_damage"	"7.5"
+			"extra_damage"	"2.5"
 			"is_boss"	"1"
 			"plugin"	"npc_hunter"
 		}
-		"0.0"
-		{
-			"count"		"10"
-			"health"	"75000"
-			"plugin"	"npc_payback"
-			"extra_thinkspeed"	"0.5"
-   			"extra_speed"	"0.9"
-			"extra_damage"	"0.65"
-		}
 	}
 	"59"
 	{
@@ -1698,12 +1689,11 @@
 			"name"		"Escalation (Part 2)"
 			"author"	"Spencer Baggett"
 		}
-
 		"0.0"
 		{
-			"count"		"3"
+			"count"		"10"
 			"is_boss"	"1"
-			"health"	"100000"
+			"health"	"250000"
 			"data"		"enraged"
 			"plugin"	"npc_merlton_boss"
 		}

addons/sourcemod/configs/zombie_riot/waves_shitpost.cfg

@@ -164,7 +164,7 @@
 			"count"		"5"
 			"health"	"10000"
 			"plugin"	"npc_last_survivor"
-			"extra_damage"		"2.0"
+			"extra_damage"		"0.9"
 		}
 	}
 	"9"
@@ -215,7 +215,7 @@
 		{
 			"count"		"0"
 			"is_boss"	"1"
-			"health"	"100000"
+			"health"	"50000"
 			"plugin"	"npc_male07"
 		}
 	}