Plugins v3

.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":[
 		{
@@ -723,12 +717,6 @@
 			"helpText":"Returns whether or not a given path leads to a folder.",
 			"returnTypeString":"bool",
 			"argTypes":"string path"
-    },
-    {
-			"name":"NSPushUIPresence",
-			"helpText":"",
-			"returnTypeString":"void",
-			"argTypes":"struct presence"
-		}
+    }
 	]
 }

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 game_state
 }
 
 global struct RequiredModInfo

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

@@ -1,10 +1,7 @@
 untyped
 globalize_all_functions
 
-void function NorthstarCodeCallback_GenerateGameState() {
-
-    GameStateStruct gs
-
+GameStateStruct function NorthstarCodeCallback_GenerateGameState( GameStateStruct gs ) {
     int highestScore = 0
     int secondHighest = 0
 
@@ -40,6 +37,6 @@ 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,15 @@
 untyped
 globalize_all_functions
 
-void function NorthstarCodeCallback_GenerateUIPresence() {
-	UIPresenceStruct uis
+UIPresenceStruct function NorthstarCodeCallback_GenerateUIPresence( UIPresenceStruct uis ) {
+	if (uiGlobal.isLoading)
+		uis.game_state = eDiscordGameState.LOADING;
+	else if (uiGlobal.loadedLevel == "")
+		uis.game_state = eDiscordGameState.MAINMENU;
+	else if (IsLobby() || uiGlobal.loadedLevel == "mp_lobby")
+		uis.game_state = eDiscordGameState.LOBBY;
+	else
+		uis.game_state = eDiscordGameState.INGAME;
 
-	uis.isLoading = uiGlobal.isLoading
-	uis.isLobby = IsLobby()
-	uis.loadingLevel = uiGlobal.loadingLevel
-	uis.loadedLevel = uiGlobal.loadedLevel
-	NSPushUIPresence(uis)
+	return uis
 }