同步上游更新

fantasylidong · Jan 8, 2024 · 48ad092 · 48ad092
1 parent d80fe86
commit 48ad092
Show file tree

Hide file tree

Showing 11 changed files with 149 additions and 57 deletions.
diff --git a/cfg/cfgogl/allcharger/mapinfo.txt b/cfg/cfgogl/allcharger/mapinfo.txt
@@ -3241,11 +3241,11 @@
 			"early"
 			{
 				"min" "0"
-				"max" "38"
+				"max" "33"
 			}
 			"late"
 			{
-				"min" "66"
+				"min" "70"
 				"max" "100"
 			}
 		}
@@ -3256,14 +3256,6 @@
 	}
 	"noecho_m4"
 	{
-		"tank_ban_flow"
-		{
-			"early"
-			{
-				"min" "54"
-				"max" "100"
-			}
-		}
 		"ItemLimits"
 		{
 			"pain_pills" "5"
@@ -3325,6 +3317,32 @@
 		"start_extra_dist"	"0.000000"
 		"end_dist"			"50.000000"
 	}
+	"tripday_new_m2"
+	{
+		"tank_ban_flow"
+		{
+			"cornfield"
+			{
+				"min"		"45"
+				"max"		"64"
+			}
+		}
+	}
+	"tripday_new_m3"
+	{
+		"tank_ban_flow"
+		{
+			"near_building"
+			{
+				"min"		"72"
+				"max"		"100"
+			}
+		}
+		"ItemLimits"
+		{
+			"pain_pills"	"3"
+		}
+	}
 	"tripday_new_m4"
 	{
 		"tank_ban_flow"

diff --git a/cfg/cfgogl/allcharger/shared_settings.cfg b/cfg/cfgogl/allcharger/shared_settings.cfg
@@ -290,10 +290,6 @@ confogl_addcvar collision_tankrock_common 1
 confogl_addcvar collision_smoker_common 0
 confogl_addcvar collision_tankrock_incap 1
 
-// [l4d_stuckpunchfix]
-confogl_addcvar sm_punchstuckfix_unstucktime 0.5
-confogl_addcvar tpsf_debug_print 0
-
 // [l4d2_shotgun_ff.smx]
 confogl_addcvar l4d2_shotgun_ff_multi 0.5
 confogl_addcvar l4d2_shotgun_ff_min 1.0

diff --git a/cfg/cfgogl/alone/mapinfo.txt b/cfg/cfgogl/alone/mapinfo.txt
@@ -3241,11 +3241,11 @@
 			"early"
 			{
 				"min" "0"
-				"max" "38"
+				"max" "33"
 			}
 			"late"
 			{
-				"min" "66"
+				"min" "70"
 				"max" "100"
 			}
 		}

diff --git a/cfg/cfgogl/alone/shared_settings.cfg b/cfg/cfgogl/alone/shared_settings.cfg
@@ -349,10 +349,6 @@ confogl_addcvar collision_tankrock_common 1
 confogl_addcvar collision_smoker_common 0
 confogl_addcvar collision_tankrock_incap 1
 
-// [l4d_stuckpunchfix]
-confogl_addcvar sm_punchstuckfix_unstucktime 0.5
-confogl_addcvar tpsf_debug_print 0
-
 // [l4d2_shotgun_ff.smx]
 confogl_addcvar l4d2_shotgun_ff_multi 0.5
 confogl_addcvar l4d2_shotgun_ff_min 1.0

diff --git a/cfg/cfgogl/annehappy/mapinfo.txt b/cfg/cfgogl/annehappy/mapinfo.txt
@@ -3241,11 +3241,11 @@
 			"early"
 			{
 				"min" "0"
-				"max" "38"
+				"max" "33"
 			}
 			"late"
 			{
-				"min" "66"
+				"min" "70"
 				"max" "100"
 			}
 		}
@@ -3256,14 +3256,6 @@
 	}
 	"noecho_m4"
 	{
-		"tank_ban_flow"
-		{
-			"early"
-			{
-				"min" "54"
-				"max" "100"
-			}
-		}
 		"ItemLimits"
 		{
 			"pain_pills" "5"
@@ -3325,6 +3317,58 @@
 		"start_extra_dist"	"0.000000"
 		"end_dist"			"50.000000"
 	}
+	"tripday_new_m2"
+	{
+		"tank_ban_flow"
+		{
+			"cornfield"
+			{
+				"min"		"45"
+				"max"		"64"
+			}
+		}
+	}
+	"tripday_new_m2"
+	{
+		"tank_ban_flow"
+		{
+			"cornfield"
+			{
+				"min"		"45"
+				"max"		"64"
+			}
+		}
+	}
+	"tripday_new_m3"
+	{
+		"tank_ban_flow"
+		{
+			"near_building"
+			{
+				"min"		"72"
+				"max"		"100"
+			}
+		}
+		"ItemLimits"
+		{
+			"pain_pills"	"1"
+		}
+	}
+	"tripday_new_m3"
+	{
+		"tank_ban_flow"
+		{
+			"near_building"
+			{
+				"min"		"72"
+				"max"		"100"
+			}
+		}
+		"ItemLimits"
+		{
+			"pain_pills"	"3"
+		}
+	}
 	"tripday_new_m4"
 	{
 		"tank_ban_flow"

diff --git a/cfg/cfgogl/annehappy/shared_settings.cfg b/cfg/cfgogl/annehappy/shared_settings.cfg
@@ -370,10 +370,6 @@ confogl_addcvar collision_tankrock_common 1
 confogl_addcvar collision_smoker_common 0
 confogl_addcvar collision_tankrock_incap 1
 
-// [l4d_stuckpunchfix]
-confogl_addcvar sm_punchstuckfix_unstucktime 0.5
-confogl_addcvar tpsf_debug_print 0
-
 // [l4d2_shotgun_ff.smx]
 confogl_addcvar l4d2_shotgun_ff_multi 0.5
 confogl_addcvar l4d2_shotgun_ff_min 1.0

diff --git a/cfg/cfgogl/hunters/mapinfo.txt b/cfg/cfgogl/hunters/mapinfo.txt
@@ -3241,11 +3241,11 @@
 			"early"
 			{
 				"min" "0"
-				"max" "38"
+				"max" "33"
 			}
 			"late"
 			{
-				"min" "66"
+				"min" "70"
 				"max" "100"
 			}
 		}

diff --git a/cfg/cfgogl/hunters/shared_settings.cfg b/cfg/cfgogl/hunters/shared_settings.cfg
@@ -274,9 +274,6 @@ confogl_addcvar collision_tankrock_common 1
 confogl_addcvar collision_smoker_common 0
 confogl_addcvar collision_tankrock_incap 1
 
-// [l4d_stuckpunchfix]
-confogl_addcvar sm_punchstuckfix_unstucktime 0.5
-confogl_addcvar tpsf_debug_print 0
 
 // [l4d2_shotgun_ff.smx]
 confogl_addcvar l4d2_shotgun_ff_multi 0.5

diff --git a/cfg/cfgogl/witchparty/mapinfo.txt b/cfg/cfgogl/witchparty/mapinfo.txt
@@ -3241,11 +3241,11 @@
 			"early"
 			{
 				"min" "0"
-				"max" "38"
+				"max" "33"
 			}
 			"late"
 			{
-				"min" "66"
+				"min" "70"
 				"max" "100"
 			}
 		}
@@ -3256,14 +3256,6 @@
 	}
 	"noecho_m4"
 	{
-		"tank_ban_flow"
-		{
-			"early"
-			{
-				"min" "54"
-				"max" "100"
-			}
-		}
 		"ItemLimits"
 		{
 			"pain_pills" "5"
@@ -3325,6 +3317,32 @@
 		"start_extra_dist"	"0.000000"
 		"end_dist"			"50.000000"
 	}
+	"tripday_new_m2"
+	{
+		"tank_ban_flow"
+		{
+			"cornfield"
+			{
+				"min"		"45"
+				"max"		"64"
+			}
+		}
+	}
+	"tripday_new_m3"
+	{
+		"tank_ban_flow"
+		{
+			"near_building"
+			{
+				"min"		"72"
+				"max"		"100"
+			}
+		}
+		"ItemLimits"
+		{
+			"pain_pills"	"3"
+		}
+	}
 	"tripday_new_m4"
 	{
 		"tank_ban_flow"

diff --git a/cfg/cfgogl/witchparty/shared_settings.cfg b/cfg/cfgogl/witchparty/shared_settings.cfg
@@ -290,10 +290,6 @@ confogl_addcvar collision_tankrock_common 1
 confogl_addcvar collision_smoker_common 0
 confogl_addcvar collision_tankrock_incap 1
 
-// [l4d_stuckpunchfix]
-confogl_addcvar sm_punchstuckfix_unstucktime 0.5
-confogl_addcvar tpsf_debug_print 0
-
 // [l4d2_shotgun_ff.smx]
 confogl_addcvar l4d2_shotgun_ff_multi 0.5
 confogl_addcvar l4d2_shotgun_ff_min 1.0

diff --git a/cfg/stripper/zonemod_anne/maps/cwm3_drain.cfg b/cfg/stripper/zonemod_anne/maps/cwm3_drain.cfg
@@ -43,7 +43,31 @@ add:
 }
 
 
-; --- RBTV Fixes
+; --- Block survivors getting to an unreachable platform in the sewers
+{
+	"classname" "env_physics_blocker"
+	"origin" "-1160 -2240 -312"
+	"mins" "-248 -1 -184"
+	"maxs" "248 1 184"
+	"initialstate" "1"
+	"BlockType" "1"
+}
+{
+	"classname" "env_physics_blocker"
+	"origin" "-1344 -1860 -256"
+	"mins" "-32 -628 -128"
+	"maxs" "32 628 128"
+	"initialstate" "1"
+	"BlockType" "1"
+}
+{
+	"classname" "env_physics_blocker"
+	"origin" "-1290 -1710 -256"
+	"mins" "-22 -41 -128"
+	"maxs" "22 41 128"
+	"initialstate" "1"
+	"BlockType" "1"
+}
 ; --- Block jumping out of bounds on dirt platforms in sewers
 {
 	"classname" "env_physics_blocker"
@@ -81,7 +105,6 @@ add:
 	"initialstate" "1"
 	"BlockType" "1"
 }
-
 ; --- Block various skips / props around the bridge event
 ; --- Pipes
 {
@@ -168,7 +191,15 @@ add:
 	"spawnflags" "1"
 	"OnTrigger" "caralarm_car1,SurvivorStandingOnCar,,0,-1"
 }
-
+; --- Block jumping on swing set to skip the alarm car
+{
+	"classname" "env_physics_blocker"
+	"origin" "2192 -575 888"
+	"mins" "-29 -77 -520"
+	"maxs" "29 77 520"
+	"initialstate" "1"
+	"BlockType" "1"
+}
 
 
 ; #############  LADDER CHANGES AND FIXES  ############
@@ -314,4 +345,4 @@ add:
 	"normal.y" "0"
 	"normal.z" "0"
 	"team" "2"
-}
+}