Fix Experimental

.github/workflows/add-to-project.yml

@@ -13,7 +13,7 @@ jobs:
     name: Add to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - uses: actions/add-to-project@v2.0.0
         with:
           project-url: "https://github.com/orgs/R2Northstar/projects/3"
           github-token: "${{ secrets.ADD_TO_PROJECT_PAT }}"

.github/workflows/auto-label-pr.yml

@@ -11,4 +11,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6

.github/workflows/compile-check.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: "mods"
 

.github/workflows/encoding.yml

@@ -3,10 +3,10 @@ on: [push, pull_request]
 
 jobs:
   check-loc-encoding:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Check Northstar.Client localization files encoding
         run: |
           files=$(ls Northstar.Client/mod/resource/northstar_client_localisation_*.txt)
@@ -16,10 +16,10 @@ jobs:
           files=$(ls Northstar.Custom/mod/resource/northstar_custom_*.txt)
           IFS=$'\n'; files=($files); unset IFS; ! file --mime "${files[@]}" | grep -v "charset=utf-16le"
   check-missing-translations:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Look out for missing translations
         run: node .github/build/find-missing-translations.js
         continue-on-error: true

.github/workflows/formatting-check.yml

@@ -6,10 +6,10 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Download sqformat
         run: |
           curl -sSL https://github.com/Bobbyperson/sqformat/releases/download/v1.2.1/sqformat-linux-x86_64 -o sqformat
           chmod +x sqformat
       - name: Check formatting
-        run: ./sqformat -dr .
+        run: ./sqformat -dr .

Northstar.Client/mod.json

@@ -7,53 +7,65 @@
 	"ConVars": [
 		{
 			"Name": "allow_mod_auto_download",
-			"DefaultValue": "1"
+			"DefaultValue": "1",
+			"HelpString": "Whether verified mods should be automatically downloaded on connect"
 		},
 		{
 			"Name": "filter_hide_empty",
-			"DefaultValue": "0"
+			"DefaultValue": "0",
+			"HelpString": "Whether empty servers should be hidden"
 		},
 		{
 			"Name": "filter_hide_full",
-			"DefaultValue": "0"
+			"DefaultValue": "0",
+			"HelpString": "Whether full servers should be hidden"
 		},
 		{
 			"Name": "filter_hide_protected",
-			"DefaultValue": "0"
+			"DefaultValue": "0",
+			"HelpString": "Whether password protected servers should be hidden"
 		},
 		{
 			"Name": "filter_map",
-			"DefaultValue": "0"
+			"DefaultValue": "0",
+			"HelpString": "Filter servers by map"
 		},
 		{
 			"Name": "filter_gamemode",
-			"DefaultValue": "0"
+			"DefaultValue": "0",
+			"HelpString": "Filter servers by gamemode"
 		},
 		{
 			"Name": "filter_mods",
-			"DefaultValue": "0"
+			"DefaultValue": "0",
+			"HelpString": "Filter mods in mods"
 		},
 		{
 			"Name": "filter_map_hide_locked",
-			"DefaultValue": "0"
+			"DefaultValue": "0",
+			"HelpString": "Whether locked maps should be hidden"
 		},
 		{
 			"Name": "modlist_show_convars",
 			"DefaultValue": "0",
+			"HelpString": "Whether mod list should show mod convars",
 			"Flags": "ARCHIVE_PLAYERPROFILE"
 		},
 		{
 			"Name": "modlist_reverse",
 			"DefaultValue": "0",
+			"HelpString": "Whether mod list should be in reverse order",
 			"Flags": "ARCHIVE_PLAYERPROFILE"
 		},
 		{
 			"Name": "modemenu_mode_filter",
-			"DefaultValue": "-1"
+			"DefaultValue": "-1",
+			"HelpString": "Mode menu filter"
 		},
 		{
 			"Name": "serverlist_remove_colors",
 			"DefaultValue": "0",
+			"HelpString": "Whether server can have colors in server browser",
 			"Flags": "ARCHIVE_PLAYERPROFILE"
 		}
 	],
@@ -70,8 +82,7 @@
 			"Path": "ui/menu_ns_modmenu.nut",
 			"RunOn": "UI",
 			"UICallback": {
-				"Before": "AddNorthstarModMenu",
-				"After": "AddNorthstarModMenu_MainMenuFooter"
+				"Before": "AddNorthstarModMenu"
 			}
 		},
 		{
@@ -145,7 +156,7 @@
 		{
 			"Path": "ui/menu_mod_settings.nut",
 			"RunOn": "UI",
-			"UICallback":{
+			"UICallback": {
 				"Before": "AddModSettingsMenu"
 			}
 		},
@@ -163,7 +174,7 @@
 		{
 			"Path": "ui/ns_client_mod_settings.gnut",
 			"RunOn": "UI",
-			"UICallback":{
+			"UICallback": {
 				"Before": "NSClientModSettings"
 			}
 		}

Northstar.Client/mod/resource/northstar_client_localisation_english.txt

@@ -21,7 +21,6 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 
 		"DIALOG_AUTHENTICATING_MASTERSERVER" "Authenticating to master server."
 		"AUTHENTICATIONAGREEMENT_NO" "You have chosen not to authenticate with Northstar. You can view the agreement in the Mods menu."
-		"HAS_NON_VANILLA_MODS" "You currently have mods enabled (marked with a \"!\") that break vanilla compatibility. You can disable them in the Mods menu."
 
 		"MENU_TITLE_SERVER_BROWSER" "Server Browser"
 		"NS_SERVERBROWSER_NOSERVERS" "No servers found"
@@ -50,7 +49,6 @@ 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"
 
-		"run_intro" "Run Intro"
 		"run_epilogue" "Run Epilogue"
 		"scorelimit" "Score Limit"
 		"roundscorelimit" "Score Limit (round-based)"
@@ -64,6 +62,7 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"boosts_enabled" "Boosts"
 		"earn_meter_pilot_overdrive" "Boost meter overdrive"
 		"earn_meter_pilot_multiplier" "Pilot boost meter multiplier"
+		"custom_pilot_loadout" "Custom pilot loadout"
 
 		"earn_meter_titan_multiplier" "Titan boost meter multiplier"
 		"aegis_upgrades" "Aegis Upgrades"
@@ -82,13 +81,13 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"iron_rules" "Iron Titan Rules"
 		"riff_titan_queue" "Max Active Titans per Team"
 		"classic_executions" "Classic Executions"
-		"drop_battery_command"				"Drop Battery Command"
+		"pingspot_enabled" "Ping Spot Command"
+		"riff_minimap_state" "Hide Minimap"
+
+		"capture_point_amping" "Amped Hardpoints"
 
-		"cp_amped_capture_points" "Amped Hardpoints"
-		"coliseum_loadouts_enabled" "Coliseum Loadouts"
-
 		"aitdm_archer_grunts" "Archer Grunts"
-    
+
 		// northstar.custom localisation is just deciding not to work, so putting it here for now
 		"PL_sbox" "Sandbox"
 		"PL_sbox_lobby" "Sandbox Lobby"
@@ -226,12 +225,11 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"MODE_SETTING_CATEGORY_BLEEDOUT" "Pilot Bleedout"
 
 		"custom_air_accel_pilot" "Air Acceleration"
-		"no_pilot_collision" "Inter-Pilot Collision"
+		"pilot_collision" "Inter-Pilot Collision"
 		"promode_enable" "Promode Weapons"
 		"classic_rodeo" "Classic Rodeo"
 		"oob_timer_enabled" "Out of Bounds Timer"
 		"riff_instagib" "Instagib Mode"
-		"player_force_respawn" "Forced Respawn"
 
 		"riff_player_bleedout" "Pilot Bleedout"
 		"player_bleedout_forceHolster" "Holster weapons when downed"
@@ -377,8 +375,6 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"TOGGLE_PROGRESSION"			"Toggle Progression"
 		"Y_BUTTON_TOGGLE_PROGRESSION"	"%[Y_BUTTON|]% Toggle Progression"
 
-		"PROGRESSION_TOGGLE_VANILLA" "Progression cannot be disabled on vanilla servers."
-
 		"PROGRESSION_TOGGLE_ENABLED_HEADER" "Disable Progression?"
 		"PROGRESSION_TOGGLE_ENABLED_BODY" "Titans, Weapons, Factions, Skins, etc. will all be unlocked and usable at any time.\n\nThis can be changed at any time in the multiplayer lobby."
 
@@ -416,25 +412,23 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"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"
+		// 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"			"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_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

@@ -78,8 +78,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"featured_mode_shotguns_snipers" "Armé et dangereux"
 		"iron_rules" "Titans de fer"
 
-		"cp_amped_capture_points" "Points de capture améliorés"
-		"coliseum_loadouts_enabled" "Equipements du Colisée"
+		"capture_point_amping" "Points de capture améliorés"
 
 		"aitdm_archer_grunts" "Soldats (Archer)"
 
@@ -220,7 +219,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"MODE_SETTING_CATEGORY_BLEEDOUT" "Pilote à terre quand abattu"
 
 		"custom_air_accel_pilot" "Accélération aérienne"
-		"no_pilot_collision" "Collisions entre pilotes"
+		"pilot_collision" "Collisions entre pilotes"
 		"promode_enable" "Armes du mode pro"
 		"classic_rodeo" "Rodéo classique"
 		"oob_timer_enabled" "Timer hors-limites"
@@ -340,7 +339,6 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"SHOW_ONLY_NOT_REQUIRED"        "Uniquement les mods optionnels"
 		"NO_RESULTS"        "Aucun résultat."
 		"NO_MODS"        "Aucun paramètre trouvé ! Installez d'autres mods depuis ^5588FF00northstar.thunderstore.io^0."
-		"player_force_respawn"        "Réapparition forcée"
 		"PROGRESSION_TOGGLE_ENABLED_HEADER"        "Désactiver la progression ?"
 		"PROGRESSION_TOGGLE_ENABLED_BODY"        "Les Titans, Armes, Factions, Skins, et autres seront débloqués et utilisables en tout temps.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs."
 		"PROGRESSION_TOGGLE_DISABLED_HEADER"        "Activer la progression ?"

Northstar.Client/mod/resource/northstar_client_localisation_german.txt

@@ -77,8 +77,7 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü 
 		"featured_mode_shotguns_snipers" "Bewaffnet und gefährlich"
 		"iron_rules" "Iron Titan Regeln"
 
-		"cp_amped_capture_points" "Verstärkte Hardpoints"
-		"coliseum_loadouts_enabled" "Coliseum Loadouts"
+		"capture_point_amping" "Verstärkte Hardpoints"
 
 		"aitdm_archer_grunts" "Archer Frontsoldaten"
 
@@ -211,7 +210,7 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü 
 		"MODE_SETTING_CATEGORY_BLEEDOUT" "Pilot Bleedout"
 
 		"custom_air_accel_pilot" "Luftbeschleunigung"
-		"no_pilot_collision" "Inter-Pilot Kollision"
+		"pilot_collision" "Inter-Pilot Kollision"
 		"promode_enable" "Pro-mode Waffen"
 		"classic_rodeo" "Klassisches Rodeo"
 		"oob_timer_enabled" "Out of Bounds Timer"
@@ -314,7 +313,6 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü 
 		"SNS_BANKRUPT"             "Bankrott!"
 		"SNS_LEADER_BANKRUPT"             "Punktzahlführer Bankrott!"
 		"sns_reset_pulse_blade_cooldown_on_pulse_blade_kill"             "Kill Cooldown Zurücksetzungen"
-		"player_force_respawn"             "Erzwungener Respawn"
 		"SHOW_ONLY_NOT_REQUIRED"             "Nur optionale Mods"
 		"SHOW_ONLY_REQUIRED"             "Nur notwendige Mods"
 		"PROGRESSION_TOGGLE_DISABLED_HEADER"             "Fortschritt aktivieren?"

Northstar.Client/mod/resource/northstar_client_localisation_italian.txt

@@ -76,8 +76,7 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"featured_mode_shotguns_snipers" "Armato e Pericoloso"
 		"iron_rules" "Titani di Ferro"
 
-		"cp_amped_capture_points" "Hardpoints Amplificati"
-		"coliseum_loadouts_enabled" "Equipaggiamento Colosseo"
+		"capture_point_amping" "Hardpoints Amplificati"
 
 		"aitdm_archer_grunts", "Scagnozzi Archer"
 
@@ -219,7 +218,7 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"MODE_SETTING_CATEGORY_BLEEDOUT" "Sanguinamento pilota"
 
 		"custom_air_accel_pilot" "Accelerazione Aerea"
-		"no_pilot_collision" "Collisione tra Piloti"
+		"pilot_collision" "Collisione tra Piloti"
 		"promode_enable" "Armi Modalità Competitiva"
 		"classic_rodeo" "Rodeo classico"
 		"oob_timer_enabled" "Timer Fuori dai Limiti"
@@ -378,7 +377,6 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"sns_wme_kill_value"		"Valore per uccisione Wingman d'Elite"
 		"sns_reset_kill_value"		"Valore per uccisione Lama Impulsi/Esecuzione"
 		"PL_tffa_desc"		"Ogni pilota per sè, distruggi tutti i titan nemici."
-		"player_force_respawn"		"Respawn Forzato"
 		"PROGRESSION_TOGGLE_DISABLED_HEADER"		"Attivare Progressione?"
 		"TOGGLE_PROGRESSION"		"Attiva/Disattiva Progressione"
 		"Y_BUTTON_TOGGLE_PROGRESSION"		"%[Y_BUTTON|]% Attiva/Disattiva Progressione"

Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt

@@ -96,8 +96,7 @@
 		"featured_mode_shotguns_snipers" "危険武装"
 		"iron_rules" "アイロンルール"
 
-		"cp_amped_capture_points" "拠点増幅"
-		"coliseum_loadouts_enabled" "コロシアムロードアウト"
+		"capture_point_amping" "拠点増幅"
 
 		// そのまま「グラント」よりも、Respawn翻訳で使われている
 		//「ミニオン」のほうが伝わりやすいかもしれないのでこっちにする
@@ -246,7 +245,7 @@
 		"MODE_SETTING_CATEGORY_BLEEDOUT" "パイロットのダウン"
 
 		"custom_air_accel_pilot" "空中加速度"
-		"no_pilot_collision" "パイロット同士の当たり判定"
+		"pilot_collision" "パイロット同士の当たり判定"
 		"promode_enable" "Proモードの武器"
 		"classic_rodeo" "クラシックロデオ"
 		"oob_timer_enabled" "アウトオブバウンドタイマー"
@@ -345,7 +344,6 @@
 		"INVALID_MASTERSERVER_TOKEN" 	"マスターサーバーのトークンが不明か期限切れです。EAアプリの再起動をお試しください。\n(Invalid or expired masterserver token, try restarting EA App.)"
 		"JSON_PARSE_ERROR" 				"JSONレスポンスの処理に失敗しました\n(Error parsing json response)"
 		"UNSUPPORTED_VERSION" 			"現在使用しているバージョンはサポートされていません\n(The version you are using is no longer supported)"
-		"player_force_respawn" 			"強制リスポーン"
 		"SHOW_ONLY_REQUIRED" 			"必須のModのみ"
 		"Y_BUTTON_TOGGLE_PROGRESSION" 			"%[Y_BUTTON|]% 進行システム切り替え"
 		"TOGGLE_PROGRESSION" 			"進行システム切り替え"