Bug fix on Plasma movement

Benoit-Julien · Dec 19, 2018 · bd6a2ad · bd6a2ad
1 parent dbe6cd0
commit bd6a2ad
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/PralineNetworkSDK/MessageTypes.cs b/PralineNetworkSDK/MessageTypes.cs
@@ -56,23 +56,23 @@ public static class TCPServerToClient {
             public const short EnigmaOpened = 1012;
             public const short OpenCrate = 1013;
             public const short StartPlasma = 1014;
-            public const short Jump = 1016;
-            public const short Crouch = 1017;
-            public const short Reloading = 1018;
-            public const short TakeItem = 1019;
-            public const short DropItem = 1020;
-            public const short SwitchItem = 1021;
-            public const short SwitchKnife = 1022;
-            public const short UseItem = 1023;
-            public const short Shoot = 1024;
-            public const short HitPlayer = 1025;
-            public const short StartThrowing = 1026;
-            public const short Throwing = 1027;
-            public const short ThrowableEnd = 1028;
-            public const short RocketStart = 1029;
-            public const short RocketEnd = 2030;
-            public const short PlayerKill = 1031;
-            public const short PlayerWin = 1032;
+            public const short Jump = 1015;
+            public const short Crouch = 1016;
+            public const short Reloading = 1017;
+            public const short TakeItem = 1018;
+            public const short DropItem = 1019;
+            public const short SwitchItem = 1020;
+            public const short SwitchKnife = 1021;
+            public const short UseItem = 1022;
+            public const short Shoot = 1023;
+            public const short HitPlayer = 1024;
+            public const short StartThrowing = 1025;
+            public const short Throwing = 1026;
+            public const short ThrowableEnd = 1027;
+            public const short RocketStart = 1028;
+            public const short RocketEnd = 2029;
+            public const short PlayerKill = 1030;
+            public const short PlayerWin = 1031;
         }
 
         public static class UDPClientToServer {

diff --git a/PralineServer/Server/Room/MapEvent.cs b/PralineServer/Server/Room/MapEvent.cs
@@ -37,7 +37,7 @@ public RadiusDescription(float startRadius, float endRadius, uint duration) {
         public MyNetworkServer<Player.InGamePlayer> Server;
 
         private static readonly Dictionary<int, RadiusDescription> RadiusZone = new Dictionary<int, RadiusDescription> {
-            {1, new RadiusDescription(60, 30, 60)},//new RadiusDescription(800, 400, 60)},
+            {1, new RadiusDescription(800, 400, 60)},
             {2, new RadiusDescription(400, 100, 60)}
         };
 
@@ -141,7 +141,7 @@ private void OpenAccessZone() {
         }
 
         private void PlasmaFunction() {
-            var zone = RadiusZone[_currentZoneIndex - 1];
+            var zone = RadiusZone[_currentZoneIndex];
 
             float radiusPercent = 0;
             float sleepTimeSeconds = 1f / 100;
@@ -154,11 +154,11 @@ private void PlasmaFunction() {
                     return;
                 radiusPercent += radiusStep;
 
-                float radius = zone.StartRadius - (radiusDiff * (radiusStep / 100f));
+                _currentZoneRadius = zone.StartRadius - (radiusDiff * (radiusPercent / 100f));
 
                 var writer = new NetworkWriter(InGameProtocol.UDPServerToClient.MovingPlasma);
                 writer.Put(_currentZoneIndex);
-                writer.Put(radius);
+                writer.Put(_currentZoneRadius);
                 Server.SendAll(writer, DeliveryMethod.Unreliable);
 
                 Thread.Sleep(sleepTimeMiliseconds);