fix player model issue on a4_finale4 - fix #56

xoxor4d · Nov 29, 2024 · 68b1ddd · 68b1ddd
1 parent ee1b38a
commit 68b1ddd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/assets/portal2-rtx/map_configs/playermodel_primaryspace_off.conf b/assets/portal2-rtx/map_configs/playermodel_primaryspace_off.conf
@@ -0,0 +1 @@
+rtx.playerModel.enableInPrimarySpace = False
diff --git a/assets/portal2-rtx/map_configs/playermodel_primaryspace_on.conf b/assets/portal2-rtx/map_configs/playermodel_primaryspace_on.conf
@@ -0,0 +1 @@
+rtx.playerModel.enableInPrimarySpace = True
diff --git a/assets/portal2-rtx/map_settings.toml b/assets/portal2-rtx/map_settings.toml
@@ -133,6 +133,11 @@
         #{ conf = "chromatic_explosion.conf", choreo = "prehub28.vcd", mode = 0, ease = 8, duration = 2.5, delay_in = 0.0, delay_out = 1.0 }
     ]}
 
+    sp_a4_finale4 = { transitions = [
+        { conf = "playermodel_primaryspace_on.conf", choreo = "button_press01.vcd", mode = 0, ease = 0, duration = 0.1, delay_in = 1.0 },
+        { conf = "playermodel_primaryspace_off.conf", choreo = "epilogue10.vcd", mode = 0, ease = 0, duration = 0.1, delay_in = 0.0 }
+    ]}
+
 
 # Spawns portals using the remix api - useful for area-connecting portals (between doors / rooms)
 # Parameters ---------------------------------------------------------------------------------------------------------------------------------

diff --git a/src/components/modules/choreo_events.cpp b/src/components/modules/choreo_events.cpp
@@ -94,18 +94,18 @@ namespace components
 				//if (!mapname.empty())
 				{
 					// fix invisible world model (arms/pgun) after expl.
-					if (map_settings::is_level.sp_a4_finale4)
-					{
-						// bw_finale04_button_press01.vcd
-						if (sname.ends_with("button_press01.vcd")) {
-							api::remix_vars::set_option(api::remix_vars::get_option("rtx.playerModel.enableInPrimarySpace"), { true });
-						}
-
-						// bw_finale04_button_press04.vcd
-						else if (sname.ends_with("epilogue10.vcd")) {
-							api::remix_vars::set_option(api::remix_vars::get_option("rtx.playerModel.enableInPrimarySpace"), { false });
-						}
-					}
+					//if (map_settings::is_level.sp_a4_finale4)
+					//{
+					//	// bw_finale04_button_press01.vcd
+					//	if (sname.ends_with("button_press01.vcd")) {
+					//		api::remix_vars::set_option(api::remix_vars::get_option("rtx.playerModel.enableInPrimarySpace"), { true });
+					//	}
+
+					//	// bw_finale04_button_press04.vcd
+					//	else if (sname.ends_with("epilogue10.vcd")) {
+					//		api::remix_vars::set_option(api::remix_vars::get_option("rtx.playerModel.enableInPrimarySpace"), { false });
+					//	}
+					//}
 
 					// ------