- Added missing point_checkpoint script include. Fixes survival mode …

…checkpoints not spawning (Thanks Enrory). - Removed mp_survival_starton and mp_survival_supported from map cfgs. - Added g_SurvivalMode.EnableMapSupport() function to the script mapinit. - Removed bundled trigger_suitcheck script and referenced vanilla scripts in place (it was a workaround for include files not working across different game folders).
R4to0 · Mar 21, 2019 · 5ff18ab · 5ff18ab
1 parent 29f7e8a
commit 5ff18ab
Show file tree

Hide file tree

Showing 34 changed files with 45 additions and 119 deletions.
diff --git a/maps/cracklife_c02_a1.cfg b/maps/cracklife_c02_a1.cfg
@@ -39,6 +39,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c02_a2
diff --git a/maps/cracklife_c02_a2.cfg b/maps/cracklife_c02_a2.cfg
@@ -40,6 +40,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c03
diff --git a/maps/cracklife_c03.cfg b/maps/cracklife_c03.cfg
@@ -40,6 +40,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c04
diff --git a/maps/cracklife_c04.cfg b/maps/cracklife_c04.cfg
@@ -42,6 +42,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c05_a1
diff --git a/maps/cracklife_c05_a1.cfg b/maps/cracklife_c05_a1.cfg
@@ -42,6 +42,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c05_a2
diff --git a/maps/cracklife_c05_a2.cfg b/maps/cracklife_c05_a2.cfg
@@ -42,6 +42,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c05_a3
diff --git a/maps/cracklife_c05_a3.cfg b/maps/cracklife_c05_a3.cfg
@@ -42,6 +42,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c06
diff --git a/maps/cracklife_c06.cfg b/maps/cracklife_c06.cfg
@@ -42,6 +42,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c07_a1
diff --git a/maps/cracklife_c07_a1.cfg b/maps/cracklife_c07_a1.cfg
@@ -43,6 +43,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c07_a2
diff --git a/maps/cracklife_c07_a2.cfg b/maps/cracklife_c07_a2.cfg
@@ -43,6 +43,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c08_a1
diff --git a/maps/cracklife_c08_a1.cfg b/maps/cracklife_c08_a1.cfg
@@ -43,6 +43,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c08_a2
diff --git a/maps/cracklife_c08_a2.cfg b/maps/cracklife_c08_a2.cfg
@@ -44,6 +44,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c09
diff --git a/maps/cracklife_c09.cfg b/maps/cracklife_c09.cfg
@@ -39,6 +39,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c10
diff --git a/maps/cracklife_c10.cfg b/maps/cracklife_c10.cfg
@@ -45,6 +45,5 @@ globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
 
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c11_a1
diff --git a/maps/cracklife_c11_a1.cfg b/maps/cracklife_c11_a1.cfg
@@ -53,6 +53,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c11_a2
diff --git a/maps/cracklife_c11_a2.cfg b/maps/cracklife_c11_a2.cfg
@@ -53,6 +53,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c11_a3
diff --git a/maps/cracklife_c11_a3.cfg b/maps/cracklife_c11_a3.cfg
@@ -54,6 +54,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife_c11_a3
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c11_a4
diff --git a/maps/cracklife_c11_a4.cfg b/maps/cracklife_c11_a4.cfg
@@ -55,6 +55,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c11_a5
diff --git a/maps/cracklife_c11_a5.cfg b/maps/cracklife_c11_a5.cfg
@@ -55,6 +55,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c12
diff --git a/maps/cracklife_c12.cfg b/maps/cracklife_c12.cfg
@@ -56,6 +56,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c13_a1
diff --git a/maps/cracklife_c13_a1.cfg b/maps/cracklife_c13_a1.cfg
@@ -56,6 +56,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c13_a2
diff --git a/maps/cracklife_c13_a2.cfg b/maps/cracklife_c13_a2.cfg
@@ -57,6 +57,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c13_a3
diff --git a/maps/cracklife_c13_a3.cfg b/maps/cracklife_c13_a3.cfg
@@ -57,6 +57,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c13_a4
diff --git a/maps/cracklife_c13_a4.cfg b/maps/cracklife_c13_a4.cfg
@@ -57,7 +57,6 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c14
 as_command rush.disabled 1
diff --git a/maps/cracklife_c14.cfg b/maps/cracklife_c14.cfg
@@ -59,6 +59,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c15
diff --git a/maps/cracklife_c15.cfg b/maps/cracklife_c15.cfg
@@ -58,6 +58,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c16_a1
diff --git a/maps/cracklife_c16_a1.cfg b/maps/cracklife_c16_a1.cfg
@@ -58,6 +58,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c16_a2
diff --git a/maps/cracklife_c16_a2.cfg b/maps/cracklife_c16_a2.cfg
@@ -58,6 +58,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c16_a3
diff --git a/maps/cracklife_c16_a3.cfg b/maps/cracklife_c16_a3.cfg
@@ -58,6 +58,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c16_a4
diff --git a/maps/cracklife_c16_a4.cfg b/maps/cracklife_c16_a4.cfg
@@ -58,6 +58,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c17
diff --git a/maps/cracklife_c17.cfg b/maps/cracklife_c17.cfg
@@ -58,6 +58,5 @@ globalmodellist ../cracklife/cracklifeglobal.gmr
 globalsoundlist ../cracklife/cracklifeglobal.gsr
 sentence_file sound/cracklife/cl1sentences.txt
 map_script cracklife/cracklife
-mp_survival_supported 1
-mp_survival_starton 0
+
 mp_survival_nextmap cracklife_c18
diff --git a/scripts/maps/cracklife/cracklife.as b/scripts/maps/cracklife/cracklife.as
@@ -5,12 +5,14 @@
 #include "logo"
 
 // HLSP Stuff
-#include "hlsp/trigger_suitcheck"
+#include "../hlsp/trigger_suitcheck"
+#include "../point_checkpoint"
 
 void MapInit()
 {
 	// HLSP Stuff
 	RegisterTriggerSuitcheckEntity();
+	RegisterPointCheckPointEntity();
 	g_EngineFuncs.CVarSetFloat( "mp_hevsuit_voice", 1 );
 
 	//Crack-Life
@@ -19,4 +21,8 @@ void MapInit()
 	// Initialize classic mode (item mapping only)
 	g_ClassicMode.SetItemMappings( @g_ItemMappings );
 	g_ClassicMode.ForceItemRemap( true );
+
+	// Map support is enabled here by default.
+	// So you don't have to add "mp_survival_supported 1" to the map config
+	g_SurvivalMode.EnableMapSupport();
 }
diff --git a/scripts/maps/cracklife/cracklife_c11_a3.as b/scripts/maps/cracklife/cracklife_c11_a3.as
@@ -5,6 +5,8 @@
 *  -w00tguy
 */
 
+#include "../point_checkpoint"
+
 // Crack-Life Stuff
 #include "weapons/weapons"
 #include "weapons/mappings"
@@ -24,13 +26,18 @@ void MapEnded( CBaseEntity@ pActivator, CBaseEntity@ pCaller, USE_TYPE useType,
 void MapInit()
 {
 	g_EngineFuncs.CVarSetFloat( "mp_hevsuit_voice", 1 );
+	RegisterPointCheckPointEntity();
 
 	//Crack-Life
 	RegisterCrackLifeWeapons();
 
 	// Initialize classic mode (item mapping only)
 	g_ClassicMode.SetItemMappings( @g_ItemMappings );
 	g_ClassicMode.ForceItemRemap( true );
+
+	// Map support is enabled here by default.
+	// So you don't have to add "mp_survival_supported 1" to the map config
+	g_SurvivalMode.EnableMapSupport();
 }
 
 

diff --git a/scripts/maps/cracklife/hlsp/trigger_suitcheck.as b/scripts/maps/cracklife/hlsp/trigger_suitcheck.as