2.1 (#9)

Author: itscynxx

README.md

@@ -20,7 +20,7 @@ Patch for Northstar.Client to enable client-side mods on official servers.
 Titanfall2
   +R2Titanfall
     +packages
-      +NanohmProtogen-VanillaPlus-2.0.0
+      +NanohmProtogen-VanillaPlus-2.1.0
 ```
 
 Note that the folder in `packages` is NOT a `.zip` file

changelog.md

@@ -1,3 +1,8 @@
+2.1
+- Fix infinite connecting bug introduced in 2.0
+- Allow user to disable main menu promos (in mod settings)
+- Allow user to change Vanilla+ logo transparency (in mod settings)
+
 2.0
 - Rework/rewrite of VanillaPlus
 - Restore FD functionality

manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "VanillaPlus",
-    "version_number": "2.0.0",
+    "version_number": "2.1.0",
     "website_url": "https://github.com/Zayveeo5e/NP.VanillaPlus",
     "description": "Modified Northstar.Client to load Client-Side mods on Vanilla servers",
     "dependencies": []

mods/NP.VanillaPlus/mod.json

@@ -2,7 +2,7 @@
   "Name" : "VanillaPlus",
   "Description": "A stripped down and modified Northstar.Client mod that allows for client-side mod loading on official Respawn servers\n\nMade by Nanohm, remastered by Cyn",
   "LoadPriority": -1,
-  "Version": "2.0",
+  "Version": "2.1",
 
   "Dependencies": {
 		"HAS_CLIENT": "Northstar.Client",
@@ -35,6 +35,14 @@
     {
       "Name": "mod_remind",
       "DefaultValue": "1"
+    },
+    {
+      "Name": "menu_promos",
+      "DefaultValue": "1"
+    },
+    {
+      "Name": "vp_title_transparency",
+      "DefaultValue": "155"
     }
   ],
 

mods/NP.VanillaPlus/mod/scripts/vscripts/ui/menu_main.nut

@@ -587,7 +587,7 @@ void function UpdateTrialLabel()
 	//bool isTrialVersion
 	//bool lastIsTrialVersion = Script_IsRunningTrialVersion()
 
-	Hud_SetColor( file.trialLabel, 255, 255, 255, 255 )
+	Hud_SetColor( file.trialLabel, 255, 255, 255, GetConVarInt("vp_title_transparency"))
 	Hud_SetText( file.trialLabel, "Vanilla+" )
 	Hud_SetVisible( file.trialLabel, true )
 

mods/NP.VanillaPlus/mod/scripts/vscripts/ui/panel_mainmenu.nut

@@ -718,12 +718,12 @@ void function TrackInstallProgress()
 
 bool function IsStryderAuthenticated()
 {
-	return GetConVarInt( "mp_allowed" ) != -1
+	return true
 }
 
 bool function IsStryderAllowingMP()
 {
-	return GetConVarInt( "mp_allowed" ) == 1
+	return true
 }
 
 #if PS4_PROG
@@ -758,43 +758,13 @@ enum eMainMenuPromoDataProperty
 	smallButton2ImageIndex
 }
 
-void function UpdatePromoData()
-{
-	file.promoData = GetMainMenuPromos()
-
-	UpdateWhatsNewData()
-	UpdateSpotlightData()
-}
-
 void function UICodeCallback_MainMenuPromosUpdated()
 {
 	printt( "MainMenuPromos updated" )
 
 	UpdatePromoData()
 }
 
-void function UpdateWhatsNewData()
-{
-	// file.promoData.newInfo_ImageIndex
-	//RuiSetString( file.whatsNew, "line1Text", "`2%$rui/menu/main_menu/whats_new_bulletpoint%`0 Updated Live Fire Maps!\n`2%$rui/menu/main_menu/whats_new_bulletpoint%`0 Prime Titans`0 in the Store\n`2%$rui/menu/main_menu/whats_new_bulletpoint% DOUBLE XP`0 weekend!" )//file.promoData.newInfo_Title1 )
-	RuiSetString( file.whatsNew, "line1Text", file.promoData.newInfo_Title1 )
-	RuiSetString( file.whatsNew, "line2Text", file.promoData.newInfo_Title2 )
-	RuiSetString( file.whatsNew, "line3Text", file.promoData.newInfo_Title3 )
-
-	bool isVisible = true
-	if ( file.promoData.newInfo_Title1 == "" && file.promoData.newInfo_Title2 == "" && file.promoData.newInfo_Title3 == "" )
-		isVisible = false
-
-	RuiSetBool( file.whatsNew, "isVisible", isVisible )
-}
-
-void function UpdateSpotlightData()
-{
-	SetSpotlightButtonData( file.spotlightButtons[0], file.promoData.largeButton_Url, file.promoData.largeButton_ImageIndex, file.promoData.largeButton_Title, file.promoData.largeButton_Text )
-	SetSpotlightButtonData( file.spotlightButtons[1], file.promoData.smallButton1_Url, file.promoData.smallButton1_ImageIndex, file.promoData.smallButton1_Title )
-	SetSpotlightButtonData( file.spotlightButtons[2], file.promoData.smallButton2_Url, file.promoData.smallButton2_ImageIndex, file.promoData.smallButton2_Title )
-}
-
 void function SetSpotlightButtonData( var button, string link, int imageIndex, string title, string details = "skip" )
 {
 	var rui = Hud_GetRui( button )
@@ -853,4 +823,36 @@ void function SpotlightButton_Activate( var button )
 	{
 		LaunchExternalWebBrowser( link, WEBBROWSER_FLAG_MUTEGAME )
 	}
-}
+}
+
+// these are modified functions from vanilla
+// this is so the user can control if they want to see main menu promos
+
+void function UpdatePromoData()
+{
+	file.promoData = GetMainMenuPromos()
+
+	VP_ShouldShowPromos()
+}
+
+void function VP_ShouldShowPromos() {
+	if (GetConVarInt("menu_promos") == 1) {
+		// file.promoData.newInfo_ImageIndex
+		//RuiSetString( file.whatsNew, "line1Text", "`2%$rui/menu/main_menu/whats_new_bulletpoint%`0 Updated Live Fire Maps!\n`2%$rui/menu/main_menu/whats_new_bulletpoint%`0 Prime Titans`0 in the Store\n`2%$rui/menu/main_menu/whats_new_bulletpoint% DOUBLE XP`0 weekend!" )//file.promoData.newInfo_Title1 )
+		RuiSetString( file.whatsNew, "line1Text", file.promoData.newInfo_Title1 )
+		RuiSetString( file.whatsNew, "line2Text", file.promoData.newInfo_Title2 )
+		RuiSetString( file.whatsNew, "line3Text", file.promoData.newInfo_Title3 )
+
+		bool isVisible = true
+		if ( file.promoData.newInfo_Title1 == "" && file.promoData.newInfo_Title2 == "" && file.promoData.newInfo_Title3 == "" )
+			isVisible = false
+
+		RuiSetBool( file.whatsNew, "isVisible", isVisible )
+
+	SetSpotlightButtonData( file.spotlightButtons[0], file.promoData.largeButton_Url, file.promoData.largeButton_ImageIndex, file.promoData.largeButton_Title, file.promoData.largeButton_Text )
+	SetSpotlightButtonData( file.spotlightButtons[1], file.promoData.smallButton1_Url, file.promoData.smallButton1_ImageIndex, file.promoData.smallButton1_Title )
+	SetSpotlightButtonData( file.spotlightButtons[2], file.promoData.smallButton2_Url, file.promoData.smallButton2_ImageIndex, file.promoData.smallButton2_Title )
+	}
+	else
+		return
+}

mods/NP.VanillaPlus/mod/scripts/vscripts/vanillaplus_ui_init.gnut

@@ -4,10 +4,28 @@
 
 global function VanillaPlusUI_Init
 
-// Note: A majority of this is taken from Northstar.Client
 void function VanillaPlusUI_Init()
 {
+    // this is here because if the user hasnt used northstar before
+    // they'll get infinite matchmaking in vanilla
+    // this is baked into northstar.dll, so it can't easily be removed
+
+    // we check that it's 0, because 2 is disabled so Northstar won't use the token
+    // if it's 1, they've agreed before, and we shouldn't override that (and it'll still work)
+
+    // shoutout to Spoon for bringing this up to me
+    if (GetConVarInt("ns_has_agreed_to_send_token") == 0) {
+        ClientCommand("ns_has_agreed_to_send_token 2")
+        ClientCommand("uiscript_reset")
+        printt("Disabling Northstar token sending!")
+    }
+    
     AddModTitle("Vanilla Plus Framework")
+
+    AddModCategory("General settings")
+    AddConVarSettingEnum("menu_promos", "Display promos on the main menu (requires mod reloading)", ["No", "Yes"])
+    ModSettings_AddSetting("vp_title_transparency", "Transparency of the Vanilla+ logo on the menu(requires mod reloading)", "int")
+
     AddModCategory("Demo Settings")
     AddConVarSettingEnum("demo_autoRecord", "Record Demos", ["No", "Yes"])
     AddConVarSettingEnum("demo_playbackexactframes", "Playback Exact Frames", ["No", "Yes"])