Merge Experimental

Northstar.Client/kb_act.lst

@@ -2,7 +2,8 @@
 "blank"					"NORTHSTAR"
 "blank"					"=========================="
 "toggleconsole"			"Toggle Developer Console"
-"pingspot"              "Ping Spotted Enemy/Location"
+"dropbattery"			"Drop Battery"
+"pingspot"				"Ping Spotted Enemy/Location"
 "vote 1"				"Vote 1"
 "vote 2"				"Vote 2"
 "vote 3"				"Vote 3"

Northstar.Client/mod/resource/northstar_client_localisation_english.txt

@@ -50,13 +50,14 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"MODE_SETTING_CATEGORY_RIFF" "Riffs"
 		"MODE_SETTING_CATEGORY_MATCH" "Match"
 
-		"classic_mp" "Classic MP"
+		"run_intro" "Dropship Intro"
 		"run_epilogue" "Run Epilogue"
 		"scorelimit" "Score Limit"
 		"roundscorelimit" "Score Limit (round-based)"
 		"timelimit" "Time Limit"
 		"roundtimelimit" "Time Limit (round-based)"
 		"respawnprotection" "Respawn Protection Time"
+		"pick_loadout_every_round" "Pick Loadout Every Round"
 
 		"pilot_health_multiplier" "Health multiplier"
 		"respawn_delay" "Respawn Delay"
@@ -79,6 +80,9 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"featured_mode_rocket_arena" "Rocket Arena"
 		"featured_mode_shotguns_snipers" "Armed and Dangerous"
 		"iron_rules" "Iron Titan Rules"
+		"riff_titan_queue" "Max Active Titans per Team"
+		"classic_executions" "Classic Executions"
+		"drop_battery_command"				"Drop Battery Command"
 
 		"cp_amped_capture_points" "Amped Hardpoints"
 		"coliseum_loadouts_enabled" "Coliseum Loadouts"
@@ -224,7 +228,6 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"custom_air_accel_pilot" "Air Acceleration"
 		"no_pilot_collision" "Inter-Pilot Collision"
 		"promode_enable" "Promode Weapons"
-		"fp_embark_enabled" "Firstperson embarks/executions"
 		"classic_rodeo" "Classic Rodeo"
 		"oob_timer_enabled" "Out of Bounds Timer"
 		"riff_instagib" "Instagib Mode"
@@ -412,5 +415,26 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"MOD_CORRUPTED"						"Downloaded archive checksum does not match verified signature."
 		"NO_DISK_SPACE_AVAILABLE"			"There is not enough space on your disk."
 		"MOD_FETCHING_FAILED_GENERAL"		"Mod extraction failed. Check logs for more details."
+
+		// Frontier defense playlistvars
+		"fd_harvester_health" "Harvester HP"
+		"fd_harvester_shield" "Harvester Shield"
+		"fd_wave_buy_time" "Wave Break Time"
+		"fd_titan_health_adjust" "Enemy Titans HP Adjust"
+		"fd_reaper_health_adjust" "Enemy Reapers HP Adjust"
+		"fd_mortar_spectre_setup_time" "Mortar Spectre Build Siege Time"
+		"fd_grunt_at_weapon_users" "Amount of Grunts with AT Weapons"
+		"fd_player_damage_scalar" "Player Damage Multiplier"
+		"fd_at_unlimited_ammo" "Unlimited Anti-Titan Ammo"
+		"fd_pro_titan_shields" "Enemies Spawns with Shields"
+		"fd_respawn_dropship" "Respawn In Dropship"
+		"fd_money_per_round"				"Money Per Round"
+		"fd_money_flyouts"					"Money Flyouts"
+		"riff_minimap_state" "Hide Minimap"
+		"fd_killcredit_grunt"				"Grunt Kill Credit"
+		"fd_killcredit_drone"				"Drone Kill Credit"
+		"fd_killcredit_spectre"				"Spectre Kill Credit"
+		"fd_killcredit_stalker"				"Stalker Kill Credit"
+		"fd_killcredit_reaper"				"Reaper Kill Credit"
 	}
-}
+}

Northstar.Client/mod/resource/northstar_client_localisation_french.txt

@@ -49,7 +49,6 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"MODE_SETTING_CATEGORY_RIFF" "Riffs"
 		"MODE_SETTING_CATEGORY_MATCH" "Match"
 
-		"classic_mp" "Multijoueurs classique"
 		"run_epilogue" "Epilogue"
 		"scorelimit" "Limite de score"
 		"roundscorelimit" "Limite de score (manche)"
@@ -223,7 +222,6 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"custom_air_accel_pilot" "Accélération aérienne"
 		"no_pilot_collision" "Collisions entre pilotes"
 		"promode_enable" "Armes du mode pro"
-		"fp_embark_enabled" "Animations 1e personne"
 		"classic_rodeo" "Rodéo classique"
 		"oob_timer_enabled" "Timer hors-limites"
 		"riff_instagib" "Mode Instagib"

Northstar.Client/mod/resource/northstar_client_localisation_german.txt

@@ -49,7 +49,6 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü 
 		"MODE_SETTING_CATEGORY_RIFF" "Extras"
 		"MODE_SETTING_CATEGORY_MATCH" "Match"
 
-		"classic_mp" "Klassischer Multiplayer"
 		"run_epilogue" "Epilog"
 		"scorelimit" "Höchstpunktzahl"
 		"roundscorelimit" "Höchstpunktzahl (rundenbasiert)"
@@ -214,7 +213,6 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü 
 		"custom_air_accel_pilot" "Luftbeschleunigung"
 		"no_pilot_collision" "Inter-Pilot Kollision"
 		"promode_enable" "Pro-mode Waffen"
-		"fp_embark_enabled" "Firstperson Einstiege/Exekutionen"
 		"classic_rodeo" "Klassisches Rodeo"
 		"oob_timer_enabled" "Out of Bounds Timer"
 		"riff_instagib" "Instagib Mode"

Northstar.Client/mod/resource/northstar_client_localisation_italian.txt

@@ -47,7 +47,6 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"MODE_SETTING_CATEGORY_RIFF" "Extra"
 		"MODE_SETTING_CATEGORY_MATCH" "Partita"
 
-		"classic_mp" "Multiplayer classico"
 		"run_epilogue" "Epilogo fine partita"
 		"scorelimit" "Limite Punteggio"
 		"roundscorelimit" "Limite Punteggio (per round)"
@@ -222,7 +221,6 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"custom_air_accel_pilot" "Accelerazione Aerea"
 		"no_pilot_collision" "Collisione tra Piloti"
 		"promode_enable" "Armi Modalità Competitiva"
-		"fp_embark_enabled" "Imbarchi/esecuzioni in 1º persona"
 		"classic_rodeo" "Rodeo classico"
 		"oob_timer_enabled" "Timer Fuori dai Limiti"
 		"riff_instagib" "Modalità Instagib"

Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt

@@ -63,7 +63,6 @@
 		//要議論: "コンソールの表示/非表示"のままか、"コンソール表示のトグル"、それ以外への差し替え
 		"TOGGLE_CONSOLE" "コンソールの表示/非表示"
 
-		"classic_mp" "クラシックマルチ"
 		"run_epilogue" "エピローグの有効化"
 		"scorelimit" "スコア上限"
 		"roundscorelimit" "スコア上限 (ラウンドベース)"
@@ -249,7 +248,6 @@
 		"custom_air_accel_pilot" "空中加速度"
 		"no_pilot_collision" "パイロット同士の当たり判定"
 		"promode_enable" "Proモードの武器"
-		"fp_embark_enabled" "搭乗と処刑の一人称視点"
 		"classic_rodeo" "クラシックロデオ"
 		"oob_timer_enabled" "アウトオブバウンドタイマー"
 		"riff_instagib" "インスタギブモード"

Northstar.Client/mod/resource/northstar_client_localisation_mspanish.txt

@@ -49,7 +49,6 @@ Si estas de acuerdo con esto, presiona SI. Esta decision puede ser cambiada en e
 		"MODE_SETTING_CATEGORY_RIFF" "Riffs"
 		"MODE_SETTING_CATEGORY_MATCH" "Partida"
 
-		"classic_mp" "Multijugador Clásico"
 		"run_epilogue" "Habilitar Epílogo"
 		"scorelimit" "Limite de puntos"
 		"roundscorelimit" "Limite de puntos (basado en rondas)"
@@ -223,7 +222,6 @@ Si estas de acuerdo con esto, presiona SI. Esta decision puede ser cambiada en e
 		"custom_air_accel_pilot" "Aceleración aerea"
 		"no_pilot_collision" "Colisión de piloto"
 		"promode_enable" "Armas de modo pro"
-		"fp_embark_enabled" "Embarques/Ejecucciones en primera persona"
 		"classic_rodeo" "Rodeo Clásico"
 		"oob_timer_enabled" "Temporizador de limite de mapa"
 		"riff_instagib" "Modo Instagib"

Northstar.Client/mod/resource/northstar_client_localisation_polish.txt

@@ -49,7 +49,6 @@ Naciśnij Tak jeżeli wyrażasz zgodę. Wybór może zostać zmieniony w menu Mo
 		"MODE_SETTING_CATEGORY_RIFF" "Modyfikatory rozgrywki"
 		"MODE_SETTING_CATEGORY_MATCH" "Mecz"
 
-		"classic_mp" "Klasyczny tryb wieloosobowy"
 		"run_epilogue" "Epilog"
 		"scorelimit" "Limit wyniku"
 		"roundscorelimit" "Limit wyniku (na rundę)"
@@ -223,7 +222,6 @@ Naciśnij Tak jeżeli wyrażasz zgodę. Wybór może zostać zmieniony w menu Mo
 		"custom_air_accel_pilot" "Air Acceleration"
 		"no_pilot_collision" "Kolidowanie Pilotów"
 		"promode_enable" "Bronie trybu pro"
-		"fp_embark_enabled" "Pierwszoosobowe wsiadanie/egzekucje"
 		"classic_rodeo" "Klasyczne Rodeo"
 		"oob_timer_enabled" "Licznik czasu poza granicami mapy"
 		"riff_instagib" "Instagib Mode"

Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt

@@ -49,7 +49,6 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		"MODE_SETTING_CATEGORY_RIFF" "Riffs"
 		"MODE_SETTING_CATEGORY_MATCH" "Partida"
 
-		"classic_mp" "MP Clássico"
 		"run_epilogue" "Executar epílogo"
 		"scorelimit" "Limite de pontos"
 		"roundscorelimit" "Limite de pontos (por rodada)"
@@ -221,7 +220,6 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		"custom_air_accel_pilot" "Aceleração aérea"
 		"no_pilot_collision" "Colisão entre pilotos"
 		"promode_enable" "Armas de Modo PRO"
-		"fp_embark_enabled" "Execuções/embarque em 1a pessoa"
 		"classic_rodeo" "Rodeio clássico"
 		"oob_timer_enabled" "Temporizador fora do mapa"
 		"riff_instagib" "Modo Instagib"

Northstar.Client/mod/resource/northstar_client_localisation_russian.txt

@@ -40,7 +40,6 @@
 		"MODE_SETTING_CATEGORY_RIFF" "Рифф"
 		"MODE_SETTING_CATEGORY_MATCH" "Матч"
 
-		"classic_mp" "Классический мультиплеер"
 		"run_epilogue" "Запустить эпилог"
 		"scorelimit" "Лимит очков"
 		"roundscorelimit" "Лимит очков (по раундам)"
@@ -166,7 +165,6 @@
 
 		"custom_air_accel_pilot" "Ускорение в воздухе"
 		"promode_enable" "Оружие из режима про"
-		"fp_embark_enabled" "Казни/посадки в титана от первого лица"
 		"classic_rodeo" "Классическое родео"
 		"oob_timer_enabled" "Таймер уничтожения за пределами карты"
 		"riff_instagib" "Моментальная смерть при попадании"

Northstar.Client/mod/resource/northstar_client_localisation_spanish.txt

@@ -49,7 +49,6 @@ Presiona Sí al estar de acuerdo. Esta opcion se puede cambiar en el menú de mo
 		"MODE_SETTING_CATEGORY_RIFF" "Fragmento"
 		"MODE_SETTING_CATEGORY_MATCH" "Partida"
 
-		"classic_mp" "Multijugador Clasico"
 		"run_epilogue" "Habilitar Epílogo"
 		"scorelimit" "Limite de puntuación"
 		"roundscorelimit" "Límite de punataje (rondas)"
@@ -223,7 +222,6 @@ Presiona Sí al estar de acuerdo. Esta opcion se puede cambiar en el menú de mo
 		"custom_air_accel_pilot" "Aceleración aerea"
 		"no_pilot_collision" "Colisión de piloto"
 		"promode_enable" "Armas del Modo Pro"
-		"fp_embark_enabled" "Embarques/Ejecucciones en Primera Persona"
 		"classic_rodeo" "Abordaje Clasico"
 		"oob_timer_enabled" "Temporizador del limite de mapa"
 		"riff_instagib" "Modo Instagib"

Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt

@@ -49,7 +49,6 @@
 		"MODE_SETTING_CATEGORY_RIFF" "規則"
 		"MODE_SETTING_CATEGORY_MATCH" "比賽"
 
-		"classic_mp" "經典多人"
 		"run_epilogue" "最終作戰"
 		"scorelimit" "分數限制"
 		"roundscorelimit" "分數限制（回合制）"
@@ -223,7 +222,6 @@
 		"custom_air_accel_pilot" "空中加速"
 		"no_pilot_collision" "取消鐵馭間碰撞"
 		"promode_enable" "進階平衡武器"
-		"fp_embark_enabled" "第一人稱登機/處決"
 		"classic_rodeo" "經典馴牛術"
 		"oob_timer_enabled" "超出戰場計時"
 		"riff_instagib" "瞬殺模式"

Northstar.Client/mod/scripts/vscripts/client/cl_minimap.gnut

@@ -449,8 +449,15 @@ void function Minimap_Ping( vector origin, float radius, float duration, vector
 	RuiSetGameTime( rui, "endTime", Time() + duration )
 
 	RuiSetBool( rui, "reverse", reverse )
+
+	thread Minimap_DestroyPing_Threaded( duration, rui )
 }
 
+void function Minimap_DestroyPing_Threaded( float duration, var rui )
+{
+	wait duration
+	RuiDestroy( rui )
+}
 
 
 var function Minimap_AddLayer( asset layerImage, bool isFriendly )

Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut

@@ -1677,4 +1677,4 @@ void function Lobby_SetFDModeBasedOnSearching( string playlistToSearch )
 	}
 
 	Lobby_SetFDMode( isFDMode )
-}
+}

Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut

@@ -17,18 +17,7 @@ global enum eModeMenuModeCategory
 }
 
 // List of blocked modes due to them being unfinished
-#if VANILLA
 const array<string> blockedModes = []
-#else
-const array<string> blockedModes =
-[
-	"fd_easy",
-	"fd_normal",
-	"fd_hard",
-	"fd_master",
-	"fd_insane"
-]
-#endif
 
 struct ListEntry_t {
 	string mode

Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut

@@ -7,6 +7,8 @@ global function OnServerSelected_Threaded
 global function AddConnectToServerCallback
 global function RemoveConnectToServerCallback
 
+global function IsCoreMod
+
 // Stop peeking
 
 const int BUTTONS_PER_PAGE = 15 // Number of servers we show

Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut

@@ -585,7 +585,11 @@ function UpdatePrivateMatchButtons()
 		#endif
 
 		string modeName = PrivateMatch_GetSelectedMode()
-		bool settingsLocked = IsFDMode( modeName )
+		bool settingsLocked = false
+
+		#if VANILLA
+			settingsLocked = IsFDMode( modeName )
+		#endif
 
 		if ( settingsLocked && uiGlobal.activeMenu == GetMenu( "MatchSettingsMenu" ) )
 			CloseActiveMenu()