Merge branch 'main' into progression

R2Northstar · Jul 19, 2023 · 5842d1f · 5842d1f
2 parents 352f2a6 + b951cae
commit 5842d1f
Show file tree

Hide file tree

Showing 23 changed files with 2,063 additions and 23 deletions.
diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
@@ -1,7 +1,7 @@
 {
 	"Name": "Northstar.Client",
 	"Description": "Various ui and client changes to fix bugs and add better support for mods",
-	"Version": "1.14.0",
+	"Version": "1.16.0",
 	"LoadPriority": 0,
 	"InitScript": "cl_northstar_client_init.nut",
 	"ConVars": [

diff --git a/Northstar.Custom/mod.json b/Northstar.Custom/mod.json
@@ -1,7 +1,7 @@
 {
 	"Name": "Northstar.Custom",
 	"Description": "Custom content for Northstar: extra weapons, gamemodes, etc.",
-	"Version": "1.14.0",
+	"Version": "1.16.0",
 	"LoadPriority": 1,
 	"RequiredOnClient": true,
 	"ConVars": [
@@ -38,6 +38,10 @@
 			"Path": "weapons/mp_weapon_peacekraber.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP"
 		},
+		{
+			"Path": "weapons/mp_titanweapon_arc_cannon.nut",
+			"RunOn": "( CLIENT || SERVER ) && MP"
+		},
 		{
 			"Path": "gamemodes/sh_gamemode_chamber.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP",

diff --git a/Northstar.Custom/mod/models/weapons/shotgun_doublebarrel/ptpov_shotgun_doublebarrel.mdl b/Northstar.Custom/mod/models/weapons/shotgun_doublebarrel/ptpov_shotgun_doublebarrel.mdl
diff --git a/Northstar.Custom/mod/models/weapons/shotgun_doublebarrel/w_shotgun_doublebarrel.mdl b/Northstar.Custom/mod/models/weapons/shotgun_doublebarrel/w_shotgun_doublebarrel.mdl
diff --git a/Northstar.Custom/mod/models/weapons/titan_arc_rifle/atpov_titan_arc_rifle.mdl b/Northstar.Custom/mod/models/weapons/titan_arc_rifle/atpov_titan_arc_rifle.mdl
diff --git a/Northstar.Custom/mod/models/weapons/titan_arc_rifle/w_titan_arc_rifle.mdl b/Northstar.Custom/mod/models/weapons/titan_arc_rifle/w_titan_arc_rifle.mdl
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut
@@ -69,6 +69,7 @@ void function CreateGamemodeFW()
 		GameMode_AddClientInit( FORT_WAR, CLGamemodeFW_Init )
 	#endif
 	#if !UI
+		GameMode_SetScoreCompareFunc( FORT_WAR, CompareAssaultScore )
 		GameMode_AddSharedInit( FORT_WAR, SHGamemodeFW_Init )
 	#endif
 }

diff --git a/Northstar.Custom/mod/scripts/vscripts/sh_northstar_custom_precache.gnut b/Northstar.Custom/mod/scripts/vscripts/sh_northstar_custom_precache.gnut
@@ -4,6 +4,7 @@ void function NorthstarCustomPrecache()
 {
 	PrecacheWeapon( "mp_weapon_peacekraber" )
 	PrecacheWeapon( "mp_titanweapon_triplethreat" )
+	PrecacheWeapon( "mp_titanweapon_arc_cannon" )
 	PrecacheWeapon( "melee_pilot_kunai" )
 
 	RegisterWeaponDamageSources(