Actions fixes

Author: blazej-smorawski

Assets/Art/Fonts/dogica SDF.asset

@@ -35047,7 +35047,7 @@ MonoBehaviour:
   m_text: "{ \"base_class_name\" : \"Object\", \"class_name\" : \"Bear\", \"properties\"
     : {\"id\": -1, \"position\": \"(2,1)\"} }\n{ \"base_class_name\" : \"Action\",
     \"class_name\" : \"Move\", \"properties\" : {\"object_id\": -1, \"direction\":
-    \"DOWN\"} } \u200B"
+    \"SOUTH\"} } \u200B"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: c399690e56859744287b7d0dab7e59da, type: 2}
   m_sharedMaterial: {fileID: -2209677979897307283, guid: c399690e56859744287b7d0dab7e59da, type: 2}
@@ -46448,7 +46448,7 @@ MonoBehaviour:
     {"id": -1, "position": "(2,1)"} }
 
     { "base_class_name" : "Action", "class_name"
-    : "Move", "properties" : {"object_id": -1, "direction": "DOWN"} } '
+    : "Move", "properties" : {"object_id": -1, "direction": "SOUTH"} } '
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
@@ -62254,7 +62254,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   username: testuser2
-  sendCodeUrl: https://server.blazej-smorawski.com
+  sendCodeUrl: http://localhost:9000
   prefabs:
   - {fileID: 4821601493024767675, guid: 34f88d0fe2837ec45a120a43da02a9b3, type: 3}
   - {fileID: 5771171370426418569, guid: d47ac087dc8fe97418c9a331bec75e04, type: 3}

Assets/Scenes/SampleScene.unity

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+
+public class DealDmg : Action
+{
+    public DealDmg(string properties) { }
+
+    public override Task Execute(World world)
+    {
+        return Task.CompletedTask;
+    }
+}

Assets/Scripts/DealDmg.cs

@@ -16,9 +16,21 @@ static public Action GetAction(string json)
 
         ActionProperties properties = JsonUtility.FromJson<ActionProperties>(json);
 
-        Type type = Type.GetType(properties.class_name.ToString());
-        Action action = (Action)Activator.CreateInstance(type, propertiesJson);
+        Action action = null;
+
+        try
+        {
+            Type type = Type.GetType(properties.class_name.ToString());
+            Debug.Log(properties.class_name.ToString());
+            action = (Action)Activator.CreateInstance(type, propertiesJson);
+        }
+        catch (Exception e)
+        {
+            Debug.LogException(e);
+        }
+
         return action;
+
     }
 
     static public Object GetObject(string json, List<GameObject> prefabs)

Assets/Scripts/DealDmg.cs.meta

@@ -27,19 +27,19 @@ public override async Task Execute(World world)
 
         switch(properties.direction)
         {
-            case "UP":
+            case "NORTH":
                 dx = 0;
                 dz = 1;
                 break;
-            case "RIGHT":
+            case "EAST":
                 dx = 1;
                 dz = 0;
                 break;
-            case "DOWN":
+            case "SOUTH":
                 dx = 0;
                 dz= -1;
                 break;
-            case "LEFT":
+            case "WEST":
                 dx = -1;
                 dz = 0;
                 break;
@@ -49,6 +49,8 @@ public override async Task Execute(World world)
                 break;
         }
 
+        // Object.transform.position already
+        // accounts for Objects size
         Vector3 destination = new Vector3(
             agent.transform.position.x + dx,
             agent.transform.position.y,

Assets/Scripts/Deserializer.cs

@@ -3,18 +3,18 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-public class PrepareProperties
+public class PrepareToSlamProperties
 {
     public int object_id;
 }
 
-public class Prepare : Action
+public class PrepareToSlam : Action
 {
-    private PrepareProperties properties;
+    private PrepareToSlamProperties properties;
 
-    public Prepare(string propertiesJson) : base()
+    public PrepareToSlam(string propertiesJson) : base()
     {
-        properties = JsonUtility.FromJson<PrepareProperties>(propertiesJson);
+        properties = JsonUtility.FromJson<PrepareToSlamProperties>(propertiesJson);
     }
 
     public override async Task Execute(World world)

Assets/Scripts/Move.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+
+public class WaitForCode : Action
+{
+    public WaitForCode(string properties)
+    {
+
+    }
+
+    public override Task Execute(World world)
+    {
+        return Task.CompletedTask;
+    }
+}

Assets/Scripts/Prepare.cs Assets/Scripts/PrepareToSlam.cs

@@ -107,7 +107,8 @@ public async Task RunRequest(string request, string route)
             if (log.Contains("Action"))
             {
                 Action action = Deserializer.GetAction(log);
-                await action.Execute(this);
+                if (action != null)
+                    await action.Execute(this);
             }
             else if (log.Contains("Object"))
             {

Assets/Scripts/Prepare.cs.meta Assets/Scripts/PrepareToSlam.cs.meta

@@ -45,7 +45,7 @@ PlayerSettings:
   defaultScreenWidth: 1024
   defaultScreenHeight: 768
   defaultScreenWidthWeb: 960
-  defaultScreenHeightWeb: 600
+  defaultScreenHeightWeb: 640
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
@@ -591,7 +591,7 @@ PlayerSettings:
   webGLDebugSymbols: 0
   webGLEmscriptenArgs: 
   webGLModulesDirectory: 
-  webGLTemplate: APPLICATION:Minimal
+  webGLTemplate: APPLICATION:Default
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
   webGLCompressionFormat: 1