Update FD branch

.gitattributes

@@ -1 +1,4 @@
-/Northstar.Client/mod/resource/northstar_client_localisation_*.txt text diff working-tree-encoding=UTF-16LE-BOM
+/Northstar.Client/mod/resource/northstar_client_localisation_*.txt text diff working-tree-encoding=UTF-16LE-BOM
+
+# Highlight `.gnut` like `.nut` files
+*.gnut linguist-language=Squirrel

.github/nativefuncs.json

@@ -421,13 +421,7 @@
 			"helpText":"Returns whether or not a given path leads to a folder.",
 			"returnTypeString":"bool",
 			"argTypes":"string path"
-    },
-    {
-			"name":"NSPushGameStateData",
-			"helpText":"",
-			"returnTypeString":"void",
-			"argTypes":"struct gamestate"
-		}
+    }
 	],
 	"UI":[
 		{
@@ -508,6 +502,25 @@
 			"returnTypeString":"array<string>",
 			"argTypes":"string modName"
 		},
+		{
+			"name": "NSIsModDownloadable",
+			"helpText": "checks whether a mod is verified and can be auto-downloaded",
+			"returnTypeString": "bool",
+			"argTypes": "string name, string version"
+
+		},
+		{
+			"name": "NSDownloadMod",
+			"helpText": "downloads a given mod from distant API to local game profile",
+			"returnTypeString": "void",
+			"argTypes": "string name, string version"
+		},
+		{
+			"name": "NSGetModInstallState",
+			"helpText": "get status of the mod currently being installed",
+			"returnTypeString": "ModInstallState",
+			"argTypes": ""
+		},
 		{
 			"name":"NSReloadMods",
 			"helpText":"",
@@ -724,12 +737,6 @@
 			"returnTypeString":"bool",
 			"argTypes":"string path"
     },
-    {
-			"name":"NSPushUIPresence",
-			"helpText":"",
-			"returnTypeString":"void",
-			"argTypes":"struct presence"
-		},
 		{
 			"name":"NSGetMasterServerAuthResult",
 			"helpText":"",

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

@@ -4,7 +4,7 @@ on:
   issues:
     types:
       - opened
-  pull_request:
+  pull_request_target:
     types:
       - opened
 

.github/workflows/merge-conflict-auto-label.yml

@@ -0,0 +1,16 @@
+name: Merge Conflict Auto Label
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "merge conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000

Northstar.Client/mod.json

@@ -5,6 +5,10 @@
 	"LoadPriority": 0,
 	"InitScript": "cl_northstar_client_init.nut",
 	"ConVars": [
+		{
+			"Name": "allow_mod_auto_download",
+			"DefaultValue": "0"
+		},
 		{
 			"Name": "filter_hide_empty",
 			"DefaultValue": "0"
@@ -82,6 +86,10 @@
 				"After": "NSUpdateGameStateClientStart"
 			}
 		},
+		{
+			"Path": "ui/menu_ns_moddownload.nut",
+			"RunOn": "UI"
+		},
 		{
 			"Path": "ui/menu_ns_serverbrowser.nut",
 			"RunOn": "UI",

Northstar.Client/mod/resource/northstar_client_localisation_english.txt

@@ -304,6 +304,7 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"SHOW_ONLY_DISABLED" "Only Disabled"
 		"SHOW_ONLY_NOT_REQUIRED" "Only Optional Mods"
 		"SHOW_ONLY_REQUIRED" "Only Required Mods"
+		"MOD_REQUIRED_WARNING" " : This mod may get (un)loaded when joining a server"
 
 		// Maps menu
 		"HIDE_LOCKED" "Hide locked"
@@ -366,5 +367,26 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"PROGRESSION_DISABLED_BODY"		"^CCCC0000Progression has been disabled.^\n\nTitans, 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."
 
 		"PROGRESSION_ANNOUNCEMENT_BODY"	"^CCCC0000Progression can now be enabled!^\n\nNorthstar now supports vanilla progression, meaning you can choose to unlock Weapons, Skins, Titans, etc. through levelling up and completing challenges.\n\nYou can enable progression using the button at the bottom of the lobby screen.\n\nThis can be changed at any time."
+
+		// Mod downloading
+		"MISSING_MOD"						"Missing mod \"%s1\" v%s2"
+		"WRONG_MOD_VERSION"					"Server has mod \"%s1\" v%s2 while you have v%s3"
+		"MOD_NOT_VERIFIED"					"(mod is not verified, and couldn't be downloaded automatically)"
+		"MOD_DL_DISABLED"					"(automatic mod downloading is disabled)"
+		"DOWNLOADING_MOD_TITLE"				"Downloading mod"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS" 	"Downloading mod (%s1%)"
+		"DOWNLOADING_MOD_TEXT"				"Downloading %s1 v%s2..."
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"	"Downloading %s1 v%s2...\n(%s3/%s4 MB)"
+		"CHECKSUMING_TITLE"					"Checksuming mod"
+		"CHECKSUMING_TEXT"					"Verifying contents of %s1 v%s2..."
+		"EXTRACTING_MOD_TITLE"				"Extracting mod (%s1%)"
+		"EXTRACTING_MOD_TEXT"				"Extracting %s1 v%s2...\n(%s3/%s4 MB)"
+		"FAILED_DOWNLOADING"				"Failed downloading mod"
+		"FAILED_READING_ARCHIVE"			"An error occurred while reading mod archive."
+		"FAILED_WRITING_TO_DISK"			"An error occurred while extracting mod files to the filesystem."
+		"MOD_FETCHING_FAILED"				"Mod archive could not be downloaded from Thunderstore."
+		"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."
 	}
 }

Northstar.Client/mod/resource/northstar_client_localisation_french.txt

@@ -353,5 +353,9 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"TOGGLE_PROGRESSION"        "Activer la progression"
 		"Y_BUTTON_TOGGLE_PROGRESSION"        "%[Y_BUTTON|]% Activer la progression"
 		"PROGRESSION_ANNOUNCEMENT_BODY"        "^CCCC0000Le système de progression peut être activé !^\n\nNorthstar supporte désormais le système de progression du jeu original, vous permettant de choisir si vous souhaitez débloquer les armes, skins, titans etc. en gagnant des niveaux et en complétant des défis.\n\nVous pouvez activer la progression en utilisant le bouton en bas de l'écran d'accueil.\n\nCeci peut être changé à tout moment."
+		"AUTHENTICATION_FAILED_HEADER"        "Échec de l'authentification"
+		"AUTHENTICATION_FAILED_HELP"        "Aide"
+		"AUTHENTICATION_FAILED_ERROR_CODE"        "Code d'erreur : ^DB6F2C00%s1^"
+		"AUTHENTICATION_FAILED_BODY"        "L'authentification avec Atlas a échoué."
 	}
 }

Northstar.Client/mod/resource/northstar_client_localisation_mspanish.txt

@@ -319,5 +319,35 @@ Si estas de acuerdo con esto, presiona SI. Esta decision puede ser cambiada en e
 		"INVALID_MASTERSERVER_TOKEN"      "Token de jugador expirado o invalido"
 		"JSON_PARSE_ERROR"                "Error procesando respuesta json"
 		"UNSUPPORTED_VERSION"             "La versión que estas usando ya no esta soportada" 
+		"SHOW_ONLY_REQUIRED"             "Solo Mods requeridos" 
+		"player_force_respawn"             "Reaparición Forzada" 
+		"TOGGLE_PROGRESSION"             "Alternar Progreso" 
+		"PROGRESSION_TOGGLE_ENABLED_HEADER"             "Desactivar Progreso?" 
+		"NO_RESULTS"             "No hay resultados." 
+		"NO_MODS"             "No hay configuraciones disponibles! Instala mas mods en: ^5588FF00northstar.thunderstore.io^0." 
+		"AUTHENTICATION_FAILED_HEADER"             "Verificacion fallida" 
+		"AUTHENTICATION_FAILED_BODY"             "Autenticación fallada con Atlas!" 
+		"AUTHENTICATION_FAILED_ERROR_CODE"             "Codigo de error: ^DB6F2C00%s1^" 
+		"AUTHENTICATION_FAILED_HELP"             "Ayuda" 
+		"WILL_RESET_ALL_SETTINGS"             "Esto reiniciará TODAS las configuraciones de categoría\nEsto no es reversible" 
+		"WILL_RESET_SETTING"             "Esto revertirá %s1 a la configuracion por defecto. \n \nEsto no es revertible." 
+		"MOD_SETTINGS_SERVER"             "Servidor" 
+		"MOD_SETTINGS_RESET"             "Reiniciar" 
+		"MOD_SETTINGS_RESET_ALL"             "Reiniciar todo" 
+		"MOD_REQUIRED_WARNING"             " Este mod puede ser deshabilitado al entrar a un servidor" 
+		"MOD_SETTINGS"             "Configuracion de Mods" 
+		"NORTHSTAR_BASE_SETTINGS"             "Configuracion base de Northstar" 
+		"ONLY_HOST_MATCH_SETTINGS"             "Solo el Host puede cambiar ajustes de partida" 
+		"ONLY_HOST_CAN_START_MATCH"             "Solo el host puede iniciar la partida" 
+		"MATCH_COUNTDOWN_LENGTH"             "Cuenta Atrás de partida privada" 
+		"LOG_UNKNOWN_CLIENTCOMMANDS"             "Registro desconocido de comandos de cliente" 
+		"DISALLOWED_TACTICALS"             "Tactica Prohibida" 
+		"TACTICAL_REPLACEMENT"             "Reemplazo de Tactica" 
+		"DISALLOWED_WEAPONS"             "Arma Prohibida" 
+		"REPLACEMENT_WEAPON"             "Arma de Reemplazo" 
+		"SHOULD_RETURN_TO_LOBBY"             "Volver al lobby al finalizar partida" 
+		"ARE_YOU_SURE"             "Seguro?" 
+		"Y_BUTTON_TOGGLE_PROGRESSION"             "%[Y_BUTTON|]% Alternar Progreso" 
+		"SHOW_ONLY_NOT_REQUIRED"             "Solo Mods Opcionales" 
 	}
 }

Northstar.Client/mod/resource/ui/menus/modlist.menu

@@ -488,8 +488,8 @@ resource/ui/menus/modlist.menu
 		{
 			ControlName	Label
 
-			labelText	" : This mod gets (un)loaded automatically"
-			wide 500
+			labelText	"#MOD_REQUIRED_WARNING"
+			auto_wide_tocontents 1
 			tall 50
 			visible 0
 

Northstar.Client/mod/scripts/vscripts/cl_northstar_client_init.nut

@@ -1,3 +1,11 @@
+global enum eDiscordGameState
+{
+    LOADING = 0
+    MAINMENU
+    LOBBY
+    INGAME
+}
+
 global struct GameStateStruct {
 
     string map
@@ -15,10 +23,7 @@ global struct GameStateStruct {
 }
 
 global struct UIPresenceStruct {
-	bool isLoading
-	bool isLobby
-	string loadingLevel
-	string loadedLevel
+    int gameState
 }
 
 global struct RequiredModInfo
@@ -48,3 +53,11 @@ global struct MasterServerAuthResult
     string errorCode
     string errorMessage
 }
+
+global struct ModInstallState
+{
+    int status
+    int progress
+    int total
+    float ratio
+}

Northstar.Client/mod/scripts/vscripts/presence/cl_presence.nut

@@ -1,10 +1,8 @@
 untyped
 globalize_all_functions
 
-void function NorthstarCodeCallback_GenerateGameState() {
-
-    GameStateStruct gs
-
+GameStateStruct function DiscordRPC_GenerateGameState( GameStateStruct gs )
+{
     int highestScore = 0
     int secondHighest = 0
 
@@ -40,6 +38,5 @@ void function NorthstarCodeCallback_GenerateGameState() {
 		gs.timeEnd = expect float(level.nv.roundEndTime - Time())
 	else
 		gs.timeEnd = expect float(level.nv.gameEndTime - Time())
-
-    NSPushGameStateData(gs)
-}
+    return gs
+}

Northstar.Client/mod/scripts/vscripts/presence/ui_presence.nut

@@ -1,12 +1,16 @@
 untyped
 globalize_all_functions
 
-void function NorthstarCodeCallback_GenerateUIPresence() {
-	UIPresenceStruct uis
+UIPresenceStruct function DiscordRPC_GenerateUIPresence( UIPresenceStruct uis )
+{
+	if ( uiGlobal.isLoading )
+		uis.gameState = eDiscordGameState.LOADING;
+	else if ( uiGlobal.loadedLevel == "" )
+		uis.gameState = eDiscordGameState.MAINMENU;
+	else if ( IsLobby() || uiGlobal.loadedLevel == "mp_lobby" )
+		uis.gameState = eDiscordGameState.LOBBY;
+	else
+		uis.gameState = eDiscordGameState.INGAME;
 
-	uis.isLoading = uiGlobal.isLoading
-	uis.isLobby = IsLobby()
-	uis.loadingLevel = uiGlobal.loadingLevel
-	uis.loadedLevel = uiGlobal.loadedLevel
-	NSPushUIPresence(uis)
-}
+	return uis
+}