move devcommands to northstar.customservers (#300)

4 files changed, 77 insertions, 52 deletions

diff --git a/Northstar.Custom/mod.json b/Northstar.Custom/mod.json
index 77fc2a62f..c2b29fea3 100644
--- a/Northstar.Custom/mod.json
+++ b/Northstar.Custom/mod.json
@@ -38,13 +38,6 @@
 			}
 		},
 		{
-			"Path": "_northstar_devcommands.gnut",
-			"RunOn": "SERVER && MP",
-			"ServerCallback": {
-				"After": "NorthstarDevCommands_Init"
-			}
-		},
-		{
 			"Path": "weapons/mp_weapon_peacekraber.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP"
 		},
@@ -416,13 +409,7 @@
 			}
 		}
 	],
-	"Maps": [
-		{
-			"Name": "mp_skyway_v1",
-			"VPK": "englishclient_mp_skyway_v1",
-			"RPak": "sp_skyway_v1"
-		}
-	],
+
 	"Localisation": [
 		"resource/northstar_custom_%language%.txt"
 	]
diff --git a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut b/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut
deleted file mode 100644
index 850855a0f..000000000
--- a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut
+++ /dev/null
@@ -1,38 +0,0 @@
-untyped
-global function NorthstarDevCommands_Init
-
-void function NorthstarDevCommands_Init()
-{
-	AddClientCommandCallback( "noclip", ClientCommandCallbackToggleNoclip )
-	AddClientCommandCallback( "kill", ClientCommandCallbackKill )
-	AddClientCommandCallback( "explode", ClientCommandCallbackExplode )
-}
-
-bool function ClientCommandCallbackToggleNoclip( entity player, array<string> args )
-{
-	if ( GetConVarInt( "sv_cheats" ) != 1 )
-		return true
-
-	if ( player.IsNoclipping() )
-		player.SetPhysics( MOVETYPE_WALK )
-	else
-		player.SetPhysics( MOVETYPE_NOCLIP )
-		
-	return true
-}
-
-bool function ClientCommandCallbackKill( entity player, array<string> args )
-{
-	if ( IsAlive( player ) )
-		player.Die()
-	
-	return true
-}
-
-bool function ClientCommandCallbackExplode( entity player, array<string> args )
-{
-	if ( IsAlive( player ) )
-		player.Die( null, null, { scriptType = DF_GIB } )
-	
-	return true
-}
diff --git a/Northstar.CustomServers/mod.json b/Northstar.CustomServers/mod.json
index 4ad212c4f..89bacc36b 100644
--- a/Northstar.CustomServers/mod.json
+++ b/Northstar.CustomServers/mod.json
@@ -60,6 +60,13 @@
 			}
 		},
 		{
+			"Path": "_northstar_cheatcommands.nut",
+			"RunOn": "SERVER",
+			"ServerCallback": {
+				"After": "NorthstarCheatCommands_Init"
+			}
+		},
+		{
 			"Path": "_chat.gnut",
 			"RunOn": "SERVER"
 		},
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/_northstar_cheatcommands.nut b/Northstar.CustomServers/mod/scripts/vscripts/_northstar_cheatcommands.nut
new file mode 100644
index 000000000..619bfcafb
--- /dev/null
+++ b/Northstar.CustomServers/mod/scripts/vscripts/_northstar_cheatcommands.nut
@@ -0,0 +1,69 @@
+untyped
+global function NorthstarCheatCommands_Init
+
+void function NorthstarCheatCommands_Init()
+{
+	AddClientCommandCallback( "noclip", ClientCommandCallbackToggleNoclip )
+	AddClientCommandCallback( "notarget", ClientCommandCallbackToggleNotarget )
+	AddClientCommandCallback( "demigod", ClientCommandCallbackToggleDemigod )
+	AddClientCommandCallback( "kill", ClientCommandCallbackKill )
+	AddClientCommandCallback( "explode", ClientCommandCallbackExplode )
+}
+
+bool function ClientCommandCallbackToggleNoclip( entity player, array<string> args )
+{
+	if ( !GetConVarBool( "sv_cheats" ) )
+		return true
+	
+	print( player + " TOGGLED NOCLIP" )
+
+	if ( player.IsNoclipping() )
+		player.SetPhysics( MOVETYPE_WALK )
+	else
+		player.SetPhysics( MOVETYPE_NOCLIP )
+		
+	return true
+}
+
+bool function ClientCommandCallbackToggleNotarget( entity player, array<string> args )
+{
+	if ( !GetConVarBool( "sv_cheats" ) )
+		return true
+
+	print( player + " TOGGLED NOTARGET" )
+
+	player.SetNoTarget( !player.GetNoTarget() )
+	player.SetNoTargetSmartAmmo( player.GetNoTarget() )
+	return true
+}
+
+bool function ClientCommandCallbackToggleDemigod( entity player, array<string> args )
+{
+	if ( !GetConVarBool( "sv_cheats" ) )
+		return true
+
+	print( player + " TOGGLED DEMIGOD" )
+
+	if ( IsDemigod( player ) )
+		DisableDemigod( player )
+	else
+		EnableDemigod( player )
+		
+	return true
+}
+
+bool function ClientCommandCallbackKill( entity player, array<string> args )
+{
+	if ( IsAlive( player ) )
+		player.Die()
+	
+	return true
+}
+
+bool function ClientCommandCallbackExplode( entity player, array<string> args )
+{
+	if ( IsAlive( player ) )
+		player.Die( null, null, { scriptType = DF_GIB } )
+	
+	return true
+}