v0.2-beta

LDami · Aug 10, 2022 · 89a4f36 · 89a4f36
2 parents fc078eb + a6b9d8c
commit 89a4f36
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/SampSharpGameMode1/Commands/DerbyCommands.cs b/SampSharpGameMode1/Commands/DerbyCommands.cs
@@ -81,7 +81,7 @@ class DerbyCommandsClass
             [Command("create")]
             private static void CreateDerby(Player player)
             {
-                if (player.pEvent != null)
+                if (player.pEvent != null || player.mapCreator != null)
                     return;
                 if (!(player.eventCreator is DerbyCreator))
                 {
@@ -93,7 +93,7 @@ private static void CreateDerby(Player player)
             [Command("loadc")]
             public static void LoadDerbyCreator(Player player, int id)
             {
-                if (player.pEvent != null)
+                if (player.pEvent != null || player.mapCreator != null)
                     return;
                 if (!(player.eventCreator is DerbyCreator))
                 {

diff --git a/SampSharpGameMode1/Commands/MappingCommands.cs b/SampSharpGameMode1/Commands/MappingCommands.cs
@@ -91,7 +91,8 @@ private static void HelpCommand(Player player)
                     $"{ColorPalette.Primary.Main}/mapping dupl [objectid] {ColorPalette.Primary.Darken}Duplicate the object" + "\n" +
                     $"{ColorPalette.Primary.Main}/mapping marker [1-2] {ColorPalette.Primary.Darken}Edit the marker position to get distance" + "\n" +
                     $"{ColorPalette.Primary.Main}/mapping dist {ColorPalette.Primary.Darken}Displays the distance between the markers" + "\n" +
-                    $"{ColorPalette.Primary.Main}/mapping edit [objectid] {ColorPalette.Primary.Darken}Edit position/rotation of object";
+                    $"{ColorPalette.Primary.Main}/mapping edit [objectid] {ColorPalette.Primary.Darken}Edit position/rotation of object" + "\n" +
+                    $"{ColorPalette.Primary.Main}/mapping magnet {ColorPalette.Primary.Darken}Toggle magnet on objects during edition";
                     ;
                 MessageDialog dialog = new MessageDialog("Command list", list, "Close");
                 dialog.Show(player);
@@ -275,6 +276,14 @@ private static void EditCommand(Player player, int objectid)
                 else
                     player.SendClientMessage(Color.Red, $"Map creator is not initialized, create or load a map first");
             }
+            [Command("magnet")]
+            private static void MagnetCommand(Player player)
+            {
+                if (!(player.mapCreator is null))
+                    player.mapCreator.Magnet = !player.mapCreator.Magnet;
+                else
+                    player.SendClientMessage(Color.Red, $"Map creator is not initialized, create or load a map first");
+            }
 
             [Command("info")]
             public static void GetInfo(Player player, int id)

diff --git a/SampSharpGameMode1/Commands/RaceCommands.cs b/SampSharpGameMode1/Commands/RaceCommands.cs
@@ -108,7 +108,7 @@ private static void HelpRace(Player player)
             [Command("create")]
             private static void CreateRace(Player player)
             {
-                if (player.pEvent != null)
+                if (player.pEvent != null || player.mapCreator != null)
                     return;
                 if (!(player.eventCreator is RaceCreator))
                 {
@@ -121,7 +121,7 @@ private static void CreateRace(Player player)
             [Command("loadc")]
             public static void LoadRaceCreator(Player player, int id)
             {
-                if (player.pEvent != null)
+                if (player.pEvent != null || player.mapCreator != null)
                     return;
                 if (!(player.eventCreator is RaceCreator))
 				{

diff --git a/SampSharpGameMode1/Events/Races/RaceCreator.cs b/SampSharpGameMode1/Events/Races/RaceCreator.cs
@@ -127,7 +127,6 @@ private void LoadingRace_Loaded(object sender, RaceLoadedEventArgs e)
                     checkpointIndex = 0;
                     editingRace = e.race;
                     spawnVehicles = new BaseVehicle[Race.MAX_PLAYERS_IN_RACE];
-                    UpdatePlayerCheckpoint();
 
                     if (map != null)
                         map.Unload();
@@ -154,9 +153,6 @@ private void SetPlayerInEditor()
         {
             player.VirtualWorld = (int)VirtualWord.EventCreators + player.Id;
             player.EnablePlayerCameraTarget(true);
-            player.KeyStateChanged += Player_KeyStateChanged;
-            player.EnterCheckpoint += Player_EnterCheckpoint;
-            player.EnterRaceCheckpoint += Player_EnterRaceCheckpoint;
 
             Vector3 pos;
             float rot = 0;
@@ -193,6 +189,10 @@ private void SetPlayerInEditor()
             player.SendClientMessage("    keypad 6:                                Go to next checkpoint");
             player.SendClientMessage("    submission key (2/é):                    Open Race menu");
             player.SendClientMessage("    /race help                               Show the controls list");
+            player.KeyStateChanged += Player_KeyStateChanged;
+            player.EnterCheckpoint += Player_EnterCheckpoint;
+            player.EnterRaceCheckpoint += Player_EnterRaceCheckpoint;
+            UpdatePlayerCheckpoint();
         }
 
         public void Unload()
@@ -956,7 +956,7 @@ public void UpdatePlayerCheckpoint()
                 Vector3 nextPos = (nextCp != null) ? nextCp.Position : Vector3.Zero;
 
                 if (shownCheckpoint == null || shownCheckpoint.IsDisposed)
-                    shownCheckpoint = new DynamicRaceCheckpoint(cp.Type, cp.Position, nextPos, cp.Size, player.VirtualWorld);
+                    shownCheckpoint = new DynamicRaceCheckpoint(cp.Type, cp.Position, nextPos, cp.Size, player.VirtualWorld, streamdistance: 500);
                 else
                 {
                     shownCheckpoint.Position = cp.Position;

diff --git a/SampSharpGameMode1/MapCreator.cs b/SampSharpGameMode1/MapCreator.cs
@@ -114,6 +114,7 @@ private void SetPlayerInEditor()
 			Magnet = true;
 			player.SendClientMessage("Here are the controls:");
 			player.SendClientMessage("    Y/N:                    Unfreeze/Freeze (usefull in Jetpack !)");
+			player.SendClientMessage("    Z/LShift:              Move camera during object edition");
 		}
 
         private void Player_Disconnected(object sender, DisconnectEventArgs e)
@@ -260,7 +261,7 @@ public int AddObject(int modelid, Vector3? position = null, Vector3? rotation =
 			{
 				Vector3 newPosition = e.Position;
 				Vector3 newRotation = e.Rotation;
-				if(magnet)
+				if(Magnet)
 				{
 					if (newPosition.X != lastObjectPos.X)
 						editedAxis = Axis.X;
@@ -291,8 +292,6 @@ public int AddObject(int modelid, Vector3? position = null, Vector3? rotation =
 					}
 					if(nearestObjectDistance < 3.0f)
 					{
-						Console.WriteLine("Nearest object detected: " + nearestObject.Id + " " + nearestObjectDistance);
-						Console.WriteLine("edited axis: " + editedAxis.ToString());
 						if (Math.Abs(nearestObject.Position.X - mapObject.Position.X) < 3.0f && editedAxis == Axis.X)
 							newPosition = new Vector3(nearestObject.Position.X, newPosition.Y, newPosition.Z);
 						if (Math.Abs(nearestObject.Position.Y - mapObject.Position.Y) < 3.0f && editedAxis == Axis.Y)