Fix #4290: Make SP exit-restart behaviour consistent across styles

BEEmod · Apr 5, 2024 · a14d771 · a14d771
1 parent 6a4cb7c
commit a14d771
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 165 deletions.
diff --git a/packages/styles/oldAp/items/mandatory/50s/exit_door/vbsp_config.cfg b/packages/styles/oldAp/items/mandatory/50s/exit_door/vbsp_config.cfg
@@ -21,10 +21,8 @@
 				"StyleVar" "RestartOnExit"
 				"Result"
 					{
-					"addOverlay"	
-						{
-						"File"	"instances/BEE2/clean/elevator_sp/exit_preview.vmf"
-						}
+					// Trigger restart when @map_won is triggered.
+					"addoverlay" "instances/BEE2/logic/exit_preview.vmf"
 					}
 				}
 			}

diff --git a/packages/styles/oldAp/items/mandatory/60s/exit_door/vbsp_config.cfg b/packages/styles/oldAp/items/mandatory/60s/exit_door/vbsp_config.cfg
@@ -21,10 +21,8 @@
 				"StyleVar" "RestartOnExit"
 				"Result"
 					{
-					"addOverlay"	
-						{
-						"File"	"instances/BEE2/clean/elevator_sp/exit_preview.vmf"
-						}
+					// Trigger restart when @map_won is triggered.
+					"addoverlay" "instances/BEE2/logic/exit_preview.vmf"
 					}
 				}
 			}

diff --git a/packages/styles/oldAp/items/mandatory/70s/exit_door/vbsp_config.cfg b/packages/styles/oldAp/items/mandatory/70s/exit_door/vbsp_config.cfg
@@ -60,7 +60,8 @@
 			"StyleVar" "RestartOnExit"
 			"Result"
 				{
-				"addOverlay" "instances/BEE2/clean/elevator_sp/exit_door_preview.vmf"
+				// Trigger restart when @map_won is triggered.
+				"addoverlay" "instances/BEE2/logic/exit_preview.vmf"
 				}
 			}
 		}

diff --git a/packages/styles/oldAp/items/mandatory/80s/exit_door/vbsp_config.cfg b/packages/styles/oldAp/items/mandatory/80s/exit_door/vbsp_config.cfg
@@ -21,10 +21,8 @@
 				"StyleVar" "RestartOnExit"
 				"Result"
 					{
-					"addOverlay"	
-						{
-						"File"	"instances/BEE2/clean/elevator_sp/exit_preview.vmf"
-						}
+					// Trigger restart when @map_won is triggered.
+					"addoverlay" "instances/BEE2/logic/exit_preview.vmf"
 					}
 				}
 			}

diff --git a/packages/styles/overgrown/items/mandatory/exit_door/vbsp_config.cfg b/packages/styles/overgrown/items/mandatory/exit_door/vbsp_config.cfg
@@ -47,6 +47,16 @@
 				"TemplateBrush" "BEE2_DOOR_FRAME_OVER"
 				}
 			}
+		"Condition"
+			{
+			"IfPreview"	"1"
+			"StyleVar" "RestartOnExit"
+			"Result"
+				{
+				// Trigger restart when @map_won is triggered.
+				"addoverlay" "instances/BEE2/logic/exit_preview.vmf"
+				}
+			}
 		}		
 	// We need to decide if we want to have gel / gel fizzler, or need autoportals for here.
 	// Aperture Tag never uses autoportals in the entrance.

diff --git a/packages/styles/p1_style/items/exit_door/vbsp_config.cfg b/packages/styles/p1_style/items/exit_door/vbsp_config.cfg
@@ -84,12 +84,8 @@
 			"StyleVar" "RestartOnExit"
 			"Result"
 				{
-				"addOverlay"	
-					{
-					"File"	"instances/BEE2/clean/elevator_sp/exit_door_preview.vmf"
-					// TODO: remove this rotation once the clean corridors have also been reoriented
-					"rotation" "270 180 0"
-					}
+				// Trigger restart when @map_won is triggered.
+				"addoverlay" "instances/BEE2/logic/exit_preview.vmf"
 				}
 			}
 		}

diff --git a/packages/valve/clean_style/items/exit_door/vbsp_config.cfg b/packages/valve/clean_style/items/exit_door/vbsp_config.cfg
@@ -39,15 +39,6 @@
 		"Condition"
 			{
 			"InstVar" "$exit_folder != " // Only run if defined.
-			"Condition"
-				{
-				"IfPreview" "1"
-				"StyleVar" "RestartOnExit"
-				"Result"
-					{
-					"addoverlay" "$exit_folderpreview.vmf"
-					}
-				}
 			"Condition"
 				{
 				"Game" "Aperture Tag"
@@ -99,5 +90,15 @@
 					}
 				}
 			}
+		"Condition"
+			{
+			"IfPreview" "1"
+			"StyleVar" "RestartOnExit"
+			"Result"
+				{
+				// Trigger restart when @map_won is triggered.
+				"addoverlay" "instances/BEE2/logic/exit_preview.vmf"
+				}
+			}
 		}
 	}
diff --git a/packages/valve/clean_style/resources/instances/clean/elevator_sp/exit_door_preview.vmf b/packages/valve/clean_style/resources/instances/clean/elevator_sp/exit_door_preview.vmf
diff --git a/...tances/clean/elevator_sp/exit_preview.vmf → ...esources/instances/logic/exit_preview.vmf b/...tances/clean/elevator_sp/exit_preview.vmf → ...esources/instances/logic/exit_preview.vmf