add back other npe stuff

add new navmeshes and demeter to campain
fix playlist
2025-01-11 17:17:44 -08:00 · 2025-01-11 16:49:46 -08:00 · 2025-01-11 16:44:41 -08:00 · 2025-01-09 23:49:37 -08:00 · 2025-01-09 01:55:32 -08:00 · 2025-01-08 17:43:33 -08:00
8 changed files with 636 additions and 362 deletions
--- a/maps/graphs/mp_harmony_mines.ain
+++ b/maps/graphs/mp_harmony_mines.ain
--- a/maps/graphs/mp_o2.ain
+++ b/maps/graphs/mp_o2.ain
--- a/maps/graphs/mp_zone_18.ain
+++ b/maps/graphs/mp_zone_18.ain
--- a/playlists.txt
+++ b/playlists.txt
@ -415,6 +415,8 @@
 			"gamemode5"	"cp"
 			"map6"	"mp_airbase"
 			"gamemode6"	"at"
+			"map7"	"mp_o2"
+			"gamemode7"	"cp"
 			"map7"	"mp_corporate"
 			"gamemode7"	"cp"
 		}
--- a/scripts/vscripts/_consts.nut
+++ b/scripts/vscripts/_consts.nut
@ -466,16 +466,10 @@ enum eTrainingButtonPrompts
 	TITAN_AI_MODE,
 	TITAN_OFFHAND_OFFENSIVE,
 	TITAN_MOSH_PIT_SURVIVE,
-	// 튜토리얼용 '비상사태' 메세지 추가
-	TITAN_MOSH_PIT_EMERGENCY,
 	TITAN_SHIELDS,
 	TITAN_HEALTH,
-	TITAN_RODEO,
-	TITAN_RODEO_COMBAT,
-	TITAN_OFFENSIVE_MELEE,
 	EJECT_INIT,
 	EJECT_CONFIRM,
-	STIM,
 }

 enum eRankEnabledModes
--- a/scripts/vscripts/mp/_control_panel.nut
+++ b/scripts/vscripts/mp/_control_panel.nut
@ -294,8 +294,8 @@ function PlayerProgramsControlPanel( panel, player )
 						// we should change how this works for R2
 						local gameMode = GameRules.GetGameMode()

-						if (gameMode == TUTORIAL || gameMode == TITAN_TUTORIAL)
-						 	panel.SetUsableValue( e.panelUsableValue )
+						// if (IsTrainingLevel())
+						 	// panel.SetUsableValue( e.panelUsableValue )
 					}

 				}
--- a/scripts/vscripts/mp/mp_npe.nut
+++ b/scripts/vscripts/mp/mp_npe.nut
--- a/scripts/vscripts/ui/menu_map_select.nut
+++ b/scripts/vscripts/ui/menu_map_select.nut
@ -227,7 +227,7 @@ function MonitorDLCAvailability()
 function GetPrivateMatchMaps()
 {
 	if (GetModeNameForEnum(level.ui.privatematch_mode) == "campaign_carousel") {
-		local campaignMaps = ["mp_fracture","mp_colony","mp_relic","mp_angel_city","mp_outpost_207","mp_boneyard","mp_airbase","mp_corporate"]
+		local campaignMaps = ["mp_fracture","mp_colony","mp_relic","mp_angel_city","mp_outpost_207","mp_boneyard","mp_airbase","mp_corporate","mp_o2"]
 		return campaignMaps
 	}
 	local mapsArray = []
Author	SHA1	Message	Date
Allusive	61e730e83b	add back other npe stuff	2025-01-11 17:17:44 -08:00
Allusive	1f4dd6281e	add new navmeshes and demeter to campain	2025-01-11 16:49:46 -08:00
Allusive	e6364548ae	fix playlist	2025-01-11 16:44:41 -08:00
Allusive	09d4552b44	fix dying in final wave if doomed	2025-01-09 23:49:37 -08:00
Allusive	2aedb591e6	update check for player eject in npe	2025-01-09 01:55:32 -08:00
Allusive	b366d3f6df	fix rocket pos and angle	2025-01-08 17:43:33 -08:00
mv	dca50307a3	implement half of the dash module	2025-01-08 22:39:33 +02:00
Allusive	971c9cc87d	basic but broken vortex shield	2025-01-08 00:17:15 -08:00
Allusive	1bff6e9e93	small change	2025-01-07 23:31:38 -08:00
Allusive	e558cec24d	fix fatal script error in moshpit	2025-01-07 23:27:29 -08:00
Allusive	851cc87766	mostly working ai module	2025-01-07 23:15:43 -08:00
Allusive	d7062e6b7c	changes for ai npe	2025-01-07 20:19:58 -08:00
Allusive	53f9f7641d	basic dash setup	2025-01-07 18:47:13 -08:00
Allusive	fe5478acc7	small changes	2025-01-07 18:39:26 -08:00
Allusive	13750ef10e	fix titan moshpit	2025-01-07 18:28:45 -08:00
Allusive	b8dc05ff10	changes for eject	2025-01-07 16:40:26 -08:00
Allusive	5160654426	Merge branch 'npefix' of https://github.com/r1delta/CORE into npefix	2025-01-07 14:45:52 -08:00
Allusive	0e0117fbe9	add loading screens back	2025-01-07 14:45:50 -08:00
mv	ce51004752	correct spawn for titan moshpit	2025-01-08 00:45:35 +02:00
mv	6f36afe83b	uhmmmm titan combat	2025-01-08 00:35:33 +02:00
Allusive	3272871a80	Merge branch 'npefix' of https://github.com/r1delta/CORE into npefix	2025-01-07 14:25:21 -08:00
Allusive	b287f9687f	merge	2025-01-07 14:22:52 -08:00
mv	a7efcc291c	Revert "TRAINING_* is tfo, WE R1 IN THIS HOUSE" i accidentally the whole map This reverts commit `aee434a653`.	2025-01-08 00:20:18 +02:00
mv	aee434a653	TRAINING_* is tfo, WE R1 IN THIS HOUSE	2025-01-08 00:16:29 +02:00
mv	bdf3d72d78	pilot training scenario was missing titan introduction, this adds it	2025-01-08 00:07:39 +02:00
Allusive	1f7b54d8d6	re add invert popup	2025-01-07 14:00:01 -08:00
mv	1e75ad0c91	Merge branch 'master' into npefix	2025-01-07 22:13:42 +02:00
mv	18fcbb32e2	push initial mp_npe fixes	2025-01-07 21:43:05 +02:00