Merge remote-tracking branch 'upstream/main' into gamemode_fd

R2Northstar · Dec 8, 2024 · a4a27fe · a4a27fe
2 parents 228aefe + 037760a
commit a4a27fe
Show file tree

Hide file tree

Showing 45 changed files with 6,513 additions and 809 deletions.
diff --git a/.github/nativefuncs.json b/.github/nativefuncs.json
@@ -7,59 +7,17 @@
 			"argTypes":""
 		},
 		{
-			"name":"NSIsModEnabled",
+			"name":"NSGetModsInformation",
 			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
+			"returnTypeString":"array<ModInfo>",
+			"argTypes":""
 		},
 		{
 			"name":"NSSetModEnabled",
 			"helpText":"",
 			"returnTypeString":"void",
 			"argTypes":"string modName, bool enabled"
 		},
-		{
-			"name":"NSIsModRemote",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDownloadLinkByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModLoadPriority",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSIsModRequiredOnClient",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModConvarsByModName",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"DecodeJSON",
 			"helpText":"converts a json string to a squirrel table",
@@ -260,60 +218,12 @@
 			"returnTypeString":"array<string>",
 			"argTypes":""
 		},
-		{
-			"name":"NSIsModEnabled",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"NSSetModEnabled",
 			"helpText":"",
 			"returnTypeString":"void",
 			"argTypes":"string modName, bool enabled"
 		},
-		{
-			"name":"NSIsModRemote",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDownloadLinkByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModLoadPriority",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSIsModRequiredOnClient",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModConvarsByModName",
-			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
-		},
 		{
 			"name":"DecodeJSON",
 			"helpText":"converts a json string to a squirrel table",
@@ -467,58 +377,22 @@
 			"argTypes":""
 		},
 		{
-			"name":"NSIsModEnabled",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSSetModEnabled",
+			"name":"NSGetModsInformation",
 			"helpText":"",
-			"returnTypeString":"void",
-			"argTypes":"string modName, bool enabled"
-		},
-		{
-			"name":"NSIsModRemote",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDescriptionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModVersionByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModDownloadLinkByModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"string modName"
-		},
-		{
-			"name":"NSGetModLoadPriority",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"string modName"
+			"returnTypeString":"array<ModInfo>",
+			"argTypes":""
 		},
 		{
-			"name":"NSIsModRequiredOnClient",
+			"name":"NSGetModInformation",
 			"helpText":"",
-			"returnTypeString":"bool",
+			"returnTypeString":"array<ModInfo>",
 			"argTypes":"string modName"
 		},
 		{
-			"name":"NSGetModConvarsByModName",
+			"name":"NSSetModEnabled",
 			"helpText":"",
-			"returnTypeString":"array<string>",
-			"argTypes":"string modName"
+			"returnTypeString":"void",
+			"argTypes":"string modName, bool enabled"
 		},
 		{
 			"name": "NSFetchVerifiedModsManifesto",
@@ -540,6 +414,12 @@
 			"returnTypeString": "void",
 			"argTypes": "string name, string version"
 		},
+		{
+			"name": "NSCancelModDownload",
+			"helpText": "prevents installation of the mod currently being installed",
+			"returnTypeString": "void",
+			"argTypes": ""
+		},
 		{
 			"name": "NSGetModInstallState",
 			"helpText": "get status of the mod currently being installed",

diff --git a/.github/workflows/compile-check.yml b/.github/workflows/compile-check.yml
@@ -17,6 +17,14 @@ jobs:
         with:
           mods-directory: "${{ github.workspace }}/mods"
           native-json: "${{ github.workspace }}/mods/.github/nativefuncs.json"
+          vanilla: false
+
+      - name: Compile Scripts (Vanilla)
+        uses: ASpoonPlaysGames/squirrel-re-compiler@v3
+        with:
+          mods-directory: "${{ github.workspace }}/mods"
+          native-json: "${{ github.workspace }}/mods/.github/nativefuncs.json"
+          vanilla: true
 
       # It's important that scripts compile when Northstar.Custom isn't enabled/installed, so run again without it
       - name: Remove Northstar.Custom
@@ -28,3 +36,11 @@ jobs:
         with:
           mods-directory: "${{ github.workspace }}/mods"
           native-json: "${{ github.workspace }}/mods/.github/nativefuncs.json"
+          vanilla: false
+
+      - name: Compile Scripts (Vanilla, No Northstar.Custom)
+        uses: ASpoonPlaysGames/squirrel-re-compiler@v3
+        with:
+          mods-directory: "${{ github.workspace }}/mods"
+          native-json: "${{ github.workspace }}/mods/.github/nativefuncs.json"
+          vanilla: true
diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
@@ -46,6 +46,10 @@
 			"Name": "modlist_reverse",
 			"DefaultValue": "0",
 			"Flags": "ARCHIVE_PLAYERPROFILE"
+		},
+		{
+			"Name": "modemenu_mode_filter",
+			"DefaultValue": "-1"
 		}
 	],
 	"Scripts": [

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
@@ -312,6 +312,12 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		// In-game chat
 		"HUD_CHAT_WHISPER_PREFIX" "[WHISPER]"
 		"HUD_CHAT_SERVER_PREFIX" "[SERVER]"
+
+		// Team Switching
+		"TEAMSWITCH_GAMEMODE"			"Gamemode does not allow Team Switching"
+		"TEAMSWITCH_BUFFER"				"Team Switching is on Cooldown"
+		"TEAMSWITCH_GAMEPLAY"			"Team change not allowed outside playing phase"
+		"TEAMSWITCH_DISABLED"			"Current gamemode doesn't support team change"
 
 		"NO_GAMESERVER_RESPONSE" 		"Couldn't reach game server"
 		"BAD_GAMESERVER_RESPONSE" 		"Game server gave an invalid response"
@@ -324,6 +330,18 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"JSON_PARSE_ERROR" 				"Error parsing json response"
 		"UNSUPPORTED_VERSION" 			"The version you are using is no longer supported"
 
+		// Mode menu
+		"MODE_MENU_PVPVE"		"PvPvE"
+		"MODE_MENU_PVE"			"PvE"
+		"MODE_MENU_PVP"			"PvP"
+		"MODE_MENU_FFA"			"FFA"
+		"MODE_MENU_TITAN_ONLY"	"Titan Only"
+		"MODE_MENU_OTHER"		"Other"
+		"MODE_MENU_CUSTOM"		"Custom"
+		"MODE_MENU_ALL"			"All"
+		"MODE_MENU_UNKNOWN"		"Unknown"
+		"MODE_MENU_SWITCH"		"Filter"
+
 		"AUTHENTICATION_FAILED_HEADER"		"Authentication Failed"
 		"AUTHENTICATION_FAILED_BODY"		"Failed to authenticate with Atlas!"
 		"AUTHENTICATION_FAILED_ERROR_CODE"	"Error code: ^DB6F2C00%s1^"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_french.txt b/Northstar.Client/mod/resource/northstar_client_localisation_french.txt
@@ -367,7 +367,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"DOWNLOADING_MOD_TEXT"        "Téléchargement de %s1 v%s2..."
 		"WRONG_MOD_VERSION"        "Le serveur requiert la version v%s2 du mod \"%s1\" (vous avez la version v%s3)"
 		"DOWNLOADING_MOD_TEXT_W_PROGRESS"        "Téléchargement de %s1 v%s2...\n(%s3/%s4 Mo)"
-		"CHECKSUMING_TITLE"        "Vérification de la somme de contrôle du mod"
+		"CHECKSUMING_TITLE"        "Vérification de l'intégrité du mod"
 		"CHECKSUMING_TEXT"        "Vérification du contenu de %s1 v%s2..."
 		"EXTRACTING_MOD_TEXT"        "Extraction de %s1 v%s2...\n(%s3/%s4 Mo)"
 		"FAILED_DOWNLOADING"        "Echec du téléchargement du mod"
@@ -379,5 +379,15 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"MOD_FETCHING_FAILED_GENERAL"        "L'extraction du mod a échoué. Consultez le journal pour plus d'informations."
 		"MANIFESTO_FETCHING_TITLE"        "Préparation du téléchargement du mod"
 		"MANIFESTO_FETCHING_TEXT"        "Récupération de la liste des mods vérifiés..."
+		"MODE_MENU_PVPVE"        "JcJcE"
+		"MODE_MENU_PVE"        "JcE"
+		"MODE_MENU_PVP"        "JcJ"
+		"MODE_MENU_FFA"        "Mêlée générale"
+		"MODE_MENU_OTHER"        "Autre"
+		"MODE_MENU_CUSTOM"        "Personnalisé"
+		"MODE_MENU_ALL"        "Tout"
+		"MODE_MENU_UNKNOWN"        "Inconnu"
+		"MODE_MENU_SWITCH"        "Filtre"
+		"MODE_MENU_TITAN_ONLY"        "Titan Uniquement"
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt b/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt
@@ -20,7 +20,7 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"DIALOG_AUTHENTICATING_MASTERSERVER", "Autenticazione Sul Master Server in corso"
 		"AUTHENTICATIONAGREEMENT_NO", "Hai Scelto di non autenticarti con Northstar. Puoi vedere l'Accordo nel Menu delle Mods"
 
-		"MENU_TITLE_SERVER_BROWSER" "Server Browser"
+		"MENU_TITLE_SERVER_BROWSER" "Lista dei Server"
 		"NS_SERVERBROWSER_NOSERVERS" "Nessun server trovato"
 		"NS_SERVERBROWSER_UNKNOWNMODE", "Modalità Sconosciuta"
 		"NS_SERVERBROWSER_WAITINGFORSERVERS" "In attesa dei server..."

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt
@@ -404,6 +404,7 @@
 		"PROGRESSION_ANNOUNCEMENT_BODY" 			"^CCCC0000進行システムが開放されました！^\n\nNorthstarはバニラの進行システム、つまり武器、スキン、タイタン等をレベルアップやチャレンジ達成で解除する機能をサポートしています。\n\nこの進行システムは、ロビー画面下のボタンから有効にできます。\n\nこの設定はいつでも変更可能です。"
 		"MOD_NOT_VERIFIED" 			"(Modが検証されていないため、自動ダウンロードできませんでした)"
 		"WRONG_MOD_VERSION" 			"サーバーはMod\"%s1\"v%s2 を要求していますが、あなたのModバージョンは%s3です"
+		"MODE_MENU_PVPVE" 			"PvPvE"
 
 		// Translation done by Zetryox and CYakigasi
 	}

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt
@@ -304,8 +304,8 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		"HIDE_LOCKED" "Esconder desativados"
 
 		// In-game chat
-		"HUD_CHAT_WHISPER_PREFIX" "[WHISPER]"
-		"HUD_CHAT_SERVER_PREFIX" "[SERVER]"
+		"HUD_CHAT_WHISPER_PREFIX" "[SUSSURRO]"
+		"HUD_CHAT_SERVER_PREFIX" "[SERVIDOR]"
 		"ONLY_HOST_MATCH_SETTINGS" "Somente o Host pode mudar as configurações da Partida Privada"
 		"ONLY_HOST_CAN_START_MATCH" "Somente o Host pode Iniciar a Partida"
 		"LOG_UNKNOWN_CLIENTCOMMANDS" "Registrar Comandos desconhecidos de Clientes"
@@ -355,8 +355,8 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		"MOD_DL_DISABLED" "(download automático de mod está desabilitado)"
 		"DOWNLOADING_MOD_TITLE" "Baixando mod"
 		"DOWNLOADING_MOD_TEXT_W_PROGRESS" "Baixando %s1 v%s2...\n(%s3/%s4 MB)"
-		"CHECKSUMING_TITLE" "Verificando o mod"
-		"CHECKSUMING_TEXT" "Verificando conteúdo de %s1 v%s2..."
+		"CHECKSUMING_TITLE" "Verificando a integridade do mod"
+		"CHECKSUMING_TEXT" "Validando arquivos de %s1 v%s2..."
 		"EXTRACTING_MOD_TITLE" "Extraíndo mod (%s1%)"
 		"MOD_REQUIRED_WARNING" " Este mod pode ser desativado quando entrar em um servidor"
 		"AUTHENTICATION_FAILED_HEADER" "Autenticação Falhou"
@@ -376,5 +376,15 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		"MOD_FETCHING_FAILED_GENERAL" "Extração do mod falhou. Verifique os logs para mais detalhes."
 		"MANIFESTO_FETCHING_TEXT" "Retornando a lista de mods verificados..."
 		"MANIFESTO_FETCHING_TITLE" "Preparando o download do mod"
+		"MODE_MENU_PVPVE" "JcJcA"
+		"MODE_MENU_PVE" "JcA"
+		"MODE_MENU_PVP" "JcJ"
+		"MODE_MENU_FFA" "TcT"
+		"MODE_MENU_OTHER" "Outros"
+		"MODE_MENU_CUSTOM" "Personalizado"
+		"MODE_MENU_ALL" "Todos"
+		"MODE_MENU_UNKNOWN" "Desconhecido"
+		"MODE_MENU_SWITCH" "Filtrar"
+		"MODE_MENU_TITAN_ONLY" "Somente Titãs"
 	}
 }