Merge remote-tracking branch 'upstream/master'

fantasylidong · Jul 31, 2023 · c92655b · c92655b
2 parents 9b88677 + 0dd7a35
commit c92655b
Show file tree

Hide file tree

Showing 111 changed files with 4,357 additions and 5,620 deletions.
diff --git a/addons/sourcemod/configs/matchmodes.txt b/addons/sourcemod/configs/matchmodes.txt
@@ -27,11 +27,11 @@
 	{
 		"zonemod"
 		{
-			"name" "ZoneMod 2.8.4"
+			"name" "ZoneMod 2.8.5"
 		}
 		"zoneretro"
 		{
-			"name" "ZoneMod Retro 2.8.4"
+			"name" "ZoneMod Retro 2.8.5"
 		}
 		"zm3v3"
 		{
@@ -128,7 +128,7 @@
 	{
 		"zonehunters"
 		{
-			"name" "ZoneHunters 2.8.4"
+			"name" "ZoneHunters 2.8.5"
 		}
 		"zh3v3"
 		{

diff --git a/cfg/cfgogl/acemodrv/mapinfo.txt b/cfg/cfgogl/acemodrv/mapinfo.txt
@@ -13,15 +13,20 @@
 		"max_distance"		"400"
 		"tank_ban_flow"
 		{
-			"Before elevator exit"
+			"Instant spawns"
 			{
-				"min"		"38"
+				"min"		"0"
+				"max"		"20"
+			}
+			"Before elevator top, after elevator bottom"
+			{
+				"min"		"33"
 				"max"		"79"
 			}
-			"Early spawns"
+			"After kitchen"
 			{
-				"min"		"0"
-				"max"		"24"
+				"min"		"85"
+				"max"		"100"
 			}
 		}
 	}
@@ -137,6 +142,11 @@
 		"horde_limit"		"240"
 		"tank_ban_flow"
 		{
+			"One way drop"
+			{
+				"min"		"38"
+				"max"		"41"
+			}
 			"[ACEMOD] Coaster Start"
 			{
 				"min"		"56"
@@ -211,6 +221,14 @@
 		"start_extra_dist"	"200.000000"
 		"end_dist"			"200.000000"
 		"max_distance"		"500"
+		"tank_ban_flow"
+		{
+			"Late tanks"
+			{
+				"min"		"75"
+				"max"		"100"
+			}
+		}
 	}
 	"c3m3_shantytown"
 	{
@@ -287,7 +305,7 @@
 		{
 			"Elevator"
 			{
-				"min"		"30"
+				"min"		"23"
 				"max"		"36"
 			}
 		}
@@ -514,6 +532,19 @@
 		"start_extra_dist"	"605.247620"
 		"end_point"			"2883.220703 2962.613037 -204.742737"
 		"end_dist"			"336.442200"
+		"tank_ban_flow"
+		{
+			"One way drop"
+			{
+				"min"		"31"
+				"max"		"43"
+			}
+			"Alley"
+			{
+				"min"		"59"
+				"max"		"67"
+			}
+		}
 	}
 	"c8m2_subway"
 	{
@@ -626,6 +657,14 @@
 		"start_extra_dist"	"587.266541"
 		"end_point"			"-10784.895508 -4906.771973 318.224670"
 		"end_dist"			"403.989594"
+		"tank_ban_flow"
+		{
+			"Ladders"
+			{
+				"min"		"38"
+				"max"		"42"
+			}
+		}
 		"witch_ban_flow"
 		{
 			"Ladders"
@@ -642,6 +681,14 @@
 		"start_extra_dist"	"399.942505"
 		"end_point"			"-8339.282227 -5592.915039 0.031253"
 		"end_dist"			"322.081451"
+		"tank_ban_flow"
+		{
+			"Tunnel spawn"
+			{
+				"min"		"40"
+				"max"		"51"
+			}
+		}
 	}
 	"c10m3_ranchhouse"
 	{
@@ -663,9 +710,14 @@
 		{
 			"Start of event"
 			{
-				"min"		"68"
+				"min"		"65"
 				"max"		"75"
 			}
+			"End of event"
+			{
+				"min"		"83"
+				"max"		"100"
+			}
 		}
 	}
 	"c10m5_houseboat"
@@ -771,6 +823,11 @@
 		"horde_limit"		"90"
 		"tank_ban_flow"
 		{
+			"Saferoom tank"
+			{
+				"min"		"0"
+				"max"		"28"
+			}
 			"Late spawns (bugged spawn)"
 			{
 				"min"		"81"
@@ -785,16 +842,8 @@
 		"start_extra_dist"	"264.932068"
 		"end_point"			"10398.775391 -310.353424 2.031253"
 		"end_dist"			"316.505157"
-		"max_distance"		"500"
+		"max_distance"		"400"
 		"horde_limit"		"90"
-		"tank_ban_flow"
-		{
-			"Warehouse"
-			{
-				"min"		"39"
-				"max"		"54"
-			}
-		}
 	}
 	"c12m5_cornfield"
 	{
@@ -977,6 +1026,19 @@
 		"start_extra_dist"	"566.889465"
 		"end_point"			"-2013.103882 -3279.305176 144.031250"
 		"end_dist"			"276.152161"
+		"tank_ban_flow"
+		{
+			"Valley one way drop"
+			{
+				"min"		"35"
+				"max"		"50"
+			}
+			"Late spawns"
+			{
+				"min"		"78"
+				"max"		"100"
+			}
+		}
 	}
 	"cdta_02road"
 	{
@@ -1440,6 +1502,14 @@
 		"start_extra_dist"	"357.132141"
 		"end_point"			"2948.021729 7602.731445 -604.782043"
 		"end_dist"			"142.267410"
+		"tank_ban_flow"
+		{
+			"Alarm car to one way drop"
+			{
+				"min"		"50"
+				"max"		"75"
+			}
+		}
 	}
 	"l4d_dbd2dc_the_mall"
 	{