Merge branch 'main' of https://github.com/R2Northstar/NorthstarMods

1 files changed, 48 insertions, 54 deletions

diff --git a/Northstar.Custom/mod.json b/Northstar.Custom/mod.json
index de71af58..4c933b1c 100644
--- a/Northstar.Custom/mod.json
+++ b/Northstar.Custom/mod.json
@@ -1,21 +1,31 @@
 {
-	"Name" : "Northstar.Custom",
+	"Name": "Northstar.Custom",
 	"Description": "Custom content for Northstar: extra weapons, gamemodes, etc.",
 	"Version": "1.1.0",
 	"LoadPriority": 1,
 	"RequiredOnClient": true,
-	
 	"ConVars": [
 		{
+			"Name": "ns_disallowed_tacticals",
+			"DefaultValue": ""
+		},
+		{
+			"Name": "ns_disallowed_tactical_replacement",
+			"DefaultValue": ""
+		},
+		{
 			"Name": "ns_disallowed_weapons",
 			"DefaultValue": ""
 		},
 		{
 			"Name": "ns_disallowed_weapon_primary_replacement",
 			"DefaultValue": "mp_weapon_rspn101"
+		},
+		{
+			"Name": "ns_force_melee",
+			"DefaultValue": ""
 		}
 	],
-	
 	"Scripts": [
 		{
 			"Path": "sh_northstar_custom_precache.gnut",
@@ -23,7 +33,6 @@
 			"ClientCallback": {
 				"After": "NorthstarCustomPrecache"
 			},
-			
 			"ServerCallback": {
 				"After": "NorthstarCustomPrecache"
 			}
@@ -35,19 +44,16 @@
 				"After": "NorthstarDevCommands_Init"
 			}
 		},
-		
 		{
 			"Path": "weapons/mp_weapon_peacekraber.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_chamber.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeChamber_Init"
 			},
-
 			"ServerCallback": {
 				"Before": "Sh_GamemodeChamber_Init"
 			}
@@ -66,7 +72,6 @@
 			"ClientCallback": {
 				"Before": "Sh_GamemodeHidden_Init"
 			},
-
 			"ServerCallback": {
 				"Before": "Sh_GamemodeHidden_Init"
 			}
@@ -79,14 +84,31 @@
 			"Path": "gamemodes/cl_gamemode_hidden.nut",
 			"RunOn": "CLIENT && MP"
 		},
-		
+		{
+			"Path": "gamemodes/sh_gamemode_sns.gnut",
+			"RunOn": "SERVER || CLIENT",
+			"ServerCallback": {
+				"Before": "SNSMode_Init"
+			},
+			"ClientCallback": {
+				"Before": "SNSMode_Init"
+			}
+		},
+		{
+			"Path": "gamemodes/cl_gamemode_sns.gnut",
+			"RunOn": "CLIENT"
+		},
+		{
+			"Path": "gamemodes/_gamemode_sns.gnut",
+			"RunOn": "SERVER"
+		},
+
 		{
 			"Path": "gamemodes/sh_gamemode_fw_custom.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "SHCreateGamemodeFW_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "SHCreateGamemodeFW_Init"
 			}
@@ -99,14 +121,12 @@
 			"Path": "gamemodes/cl_gamemode_fw.nut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_gg.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeGG_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "Sh_GamemodeGG_Init"
 			}
@@ -119,14 +139,12 @@
 			"Path": "gamemodes/cl_gamemode_gg.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_tt.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeTT_Init"
-			},	
-			
+			},
 			"ServerCallback": {
 				"Before": "Sh_GamemodeTT_Init"
 			}
@@ -139,14 +157,12 @@
 			"Path": "gamemodes/cl_gamemode_tt.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_inf.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeInfection_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "Sh_GamemodeInfection_Init"
 			}
@@ -159,7 +175,6 @@
 			"Path": "gamemodes/cl_gamemode_inf.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "_droppod_spawn.gnut",
 			"RunOn": "SERVER && MP",
@@ -173,7 +188,6 @@
 			"ClientCallback": {
 				"Before": "Sh_GamemodeArena_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "Sh_GamemodeArena_Init"
 			}
@@ -181,15 +195,12 @@
 		{
 			"Path": "gamemodes/sh_arena_loadouts.gnut",
 			"RunOn": "UI || MP",
-			
 			"ClientCallback": {
 				"After": "InitialiseArenaLoadouts"
 			},
-			
 			"ServerCallback": {
 				"After": "InitialiseArenaLoadouts"
 			},
-			
 			"UICallback": {
 				"After": "InitialiseArenaLoadouts"
 			}
@@ -202,14 +213,12 @@
 			"Path": "gamemodes/cl_gamemode_arena.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_kr.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeKR_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "Sh_GamemodeKR_Init"
 			}
@@ -222,14 +231,12 @@
 			"Path": "gamemodes/cl_gamemode_kr.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_fastball.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeFastball_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "Sh_GamemodeFastball_Init"
 			}
@@ -246,14 +253,12 @@
 			"Path": "gamemodes/cl_gamemode_fastball.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_hs.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeHideAndSeek_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "Sh_GamemodeHideAndSeek_Init"
 			}
@@ -266,41 +271,34 @@
 			"Path": "gamemodes/cl_gamemode_hs.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "gamemodes/sh_gamemode_ctf_comp.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "ShGamemodeCTFComp_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "ShGamemodeCTFComp_Init"
 			}
 		},
-
 		{
 			"Path": "gamemodes/sh_gamemode_tffa.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"Before": "Sh_GamemodeTFFA_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "Sh_GamemodeTFFA_Init"
 			}
 		},
-
 		{
 			"Path": "gamemodes/_gamemode_tffa.gnut",
 			"RunOn": "SERVER && MP"
 		},
-		
 		{
 			"Path": "gamemodes/cl_gamemode_tffa.gnut",
 			"RunOn": "CLIENT && MP"
 		},
-		
 		{
 			"Path": "sh_3psequence_to_1p_hacks.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -308,49 +306,41 @@
 				"Before": "FirstPersonSequenceForce1P_Init",
 				"After": "FirstPersonSequenceForce1P_InitPlaylistVars"
 			},
-			
 			"ServerCallback": {
 				"Before": "FirstPersonSequenceForce1P_Init",
 				"After": "FirstPersonSequenceForce1P_InitPlaylistVars"
 			}
 		},
-		
 		{
 			"Path": "gamemodes/sh_riff_instagib.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"After": "RiffInstagib_Init"
 			},
-			
 			"ServerCallback": {
 				"After": "RiffInstagib_Init"
 			}
 		},
-		
 		{
 			"Path": "sh_custom_air_accel.gnut",
 			"RunOn": "CLIENT || SERVER",
 			"ClientCallback": {
 				"After": "CustomAirAccelVars_Init"
 			},
-			
 			"ServerCallback": {
 				"After": "CustomAirAccelVars_Init"
 			}
 		},
-		
 		{
 			"Path": "sh_promode.gnut",
 			"RunOn": "MP",
 			"ClientCallback": {
 				"After": "Promode_Init"
 			},
-			
 			"ServerCallback": {
 				"After": "Promode_Init"
 			}
 		},
-		
 		{
 			"Path": "sh_bleedout_damage.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -358,37 +348,31 @@
 				"Before": "BleedoutDamage_PreInit",
 				"After": "BleedoutDamage_Init"
 			},
-			
 			"ServerCallback": {
 				"Before": "BleedoutDamage_PreInit",
 				"After": "BleedoutDamage_Init"
 			}
 		},
-		
 		{
 			"Path": "sh_custom_oob_timer.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"After": "CustomOOBTimer_Init"
 			},
-			
 			"ServerCallback": {
 				"After": "CustomOOBTimer_Init"
 			}
 		},
-		
 		{
 			"Path": "rodeo/sh_classic_rodeo.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"After": "ClassicRodeo_InitPlaylistVars"
 			},
-			
 			"ServerCallback": {
 				"After": "ClassicRodeo_InitPlaylistVars"
 			}
 		},
-		
 		{
 			"Path": "_disallowed_weapons.gnut",
 			"RunOn": "SERVER && MP",
@@ -396,20 +380,31 @@
 				"After": "DisallowedWeapons_Init"
 			}
 		},
-		
+		{
+			"Path": "_disallowed_tacticals.gnut",
+			"RunOn": "SERVER && MP",
+			"ServerCallback": {
+				"After": "DisallowedTacticals_Init"
+			}
+		},
+		{
+			"Path": "_force_melee.gnut",
+			"RunOn": "SERVER && MP",
+			"ServerCallback": {
+				"After": "ForceMelee_Init"
+			}
+		},
 		{
 			"Path": "sh_custom_pilot_collision.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
 				"After": "CustomPilotCollision_InitPlaylistVars"
 			},
-			
 			"ServerCallback": {
 				"After": "CustomPilotCollision_InitPlaylistVars"
 			}
 		}
 	],
-	
 	"Maps": [
 		{
 			"Name": "mp_skyway_v1",
@@ -417,8 +412,7 @@
 			"RPak": "sp_skyway_v1"
 		}
 	],
-	
 	"Localisation": [
 		"resource/northstar_custom_%language%.txt"
 	]
-}
+}
\ No newline at end of file