Merge pull request #19 from brcoding/Experiments

Added creature spawning and getting creature assets
brcoding · Jun 12, 2020 · 3f6d0ec · 3f6d0ec
2 parents b746824 + c7381f1
commit 3f6d0ec
Show file tree

Hide file tree

Showing 13 changed files with 304 additions and 40 deletions.
diff --git a/Mods/RForRotate/RForRotatePlugin/RForRotatePlugin.csproj b/Mods/RForRotate/RForRotatePlugin/RForRotatePlugin.csproj
@@ -42,6 +42,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.3rdParty.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="Bouncyrock.TaleSpire.AssetManagement, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.AssetManagement.dll</HintPath>
+    </Reference>
     <Reference Include="Bouncyrock.TaleSpire.BounceTools.Runtime">
       <HintPath>..\..\..\..\..\RemoveFogPlugin\Libs\Bouncyrock.TaleSpire.BounceTools.Runtime.dll</HintPath>
     </Reference>

diff --git a/Mods/RemoveDoFPlugin/RemoveDoFPlugin/RemoveDoFPlugin.csproj b/Mods/RemoveDoFPlugin/RemoveDoFPlugin/RemoveDoFPlugin.csproj
@@ -42,6 +42,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.3rdParty.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="Bouncyrock.TaleSpire.AssetManagement, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.AssetManagement.dll</HintPath>
+    </Reference>
     <Reference Include="Bouncyrock.TaleSpire.BounceTools.Runtime">
       <HintPath>..\..\..\..\..\RemoveFogPlugin\Libs\Bouncyrock.TaleSpire.BounceTools.Runtime.dll</HintPath>
     </Reference>

diff --git a/Mods/RemoveFogPlugin/RemoveFogPlugin/RemoveFogPlugin.csproj b/Mods/RemoveFogPlugin/RemoveFogPlugin/RemoveFogPlugin.csproj
@@ -43,6 +43,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.3rdParty.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="Bouncyrock.TaleSpire.AssetManagement, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.AssetManagement.dll</HintPath>
+    </Reference>
     <Reference Include="Bouncyrock.TaleSpire.BounceTools.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.BounceTools.Runtime.dll</HintPath>

diff --git a/Mods/SetInjectionFlag/SetInjectionFlagPlugin/SetInjectionFlagPlugin.csproj b/Mods/SetInjectionFlag/SetInjectionFlagPlugin/SetInjectionFlagPlugin.csproj
@@ -39,11 +39,18 @@
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.BouncePackage.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Bouncyrock.TaleSpire.3rdParty.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
+    <Reference Include="Bouncyrock.TaleSpire.AssetManagement, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.AssetManagement.dll</HintPath>
+    </Reference>
     <Reference Include="Bouncyrock.TaleSpire.BounceTools.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.BounceTools.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Bouncyrock.TaleSpire.DataModel.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
+    <Reference Include="Bouncyrock.TaleSpire.DataModel.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.DataModel.Runtime.dll</HintPath>
+    </Reference>
     <Reference Include="Bouncyrock.TaleSpire.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.Runtime.dll</HintPath>

diff --git a/Mods/ShowPosition/ShowPositionPlugin/ShowPosition.cs b/Mods/ShowPosition/ShowPositionPlugin/ShowPosition.cs
@@ -22,7 +22,10 @@ void Awake()
         void Update()
         {
             TextMeshProUGUI you = ModdingTales.ModdingUtils.GetUITextContainsString("YOU");
-            you.SetText(String.Format("\n\n<size=14><color=green>YOU</color></size>\n<size=22><color=#aaaaaa>{0:0.##}  {1:0.##}  {2:0.##}</color></size>", CameraController.Position.x, CameraController.CameraHeight, CameraController.Position.z));
+            if (you != null)
+            {
+                you.SetText(String.Format("\n\n<size=14><color=green>YOU</color></size>\n<size=22><color=#aaaaaa>{0:0.##}  {1:0.##}  {2:0.##}</color></size>", CameraController.Position.x, CameraController.CameraHeight, CameraController.Position.z));
+            }
         }
 
     }

diff --git a/Mods/ShowPosition/ShowPositionPlugin/ShowPositionPlugin.csproj b/Mods/ShowPosition/ShowPositionPlugin/ShowPositionPlugin.csproj
@@ -42,6 +42,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.3rdParty.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="Bouncyrock.TaleSpire.AssetManagement, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>G:\Program Files (x86)\Steam\steamapps\common\TaleSpire\TaleSpire_Data\Managed\Bouncyrock.TaleSpire.AssetManagement.dll</HintPath>
+    </Reference>
     <Reference Include="Bouncyrock.TaleSpire.BounceTools.Runtime">
       <HintPath>..\..\..\..\..\RemoveFogPlugin\Libs\Bouncyrock.TaleSpire.BounceTools.Runtime.dll</HintPath>
     </Reference>

diff --git a/Mods/SocketAPI/SDKandExamples/CSharp/SocketAPIGUI/Form1.Designer.cs b/Mods/SocketAPI/SDKandExamples/CSharp/SocketAPIGUI/Form1.Designer.cs
diff --git a/Mods/SocketAPI/SDKandExamples/CSharp/SocketAPIGUI/Form1.cs b/Mods/SocketAPI/SDKandExamples/CSharp/SocketAPIGUI/Form1.cs
@@ -34,7 +34,16 @@ public class CustomCreatureData
             public string CreatureId { get; set; }
             public string Alias { get; set; }
         }
-
+        public class CustomBoardAssetData
+        {
+            public string GUID { get; set; }
+            public string boardAssetName { get; set; }
+            public string boardAssetDesc { get; set; }
+            public string boardAssetType { get; set; }
+            public string seachString { get; set; }
+            public string boardAssetGroup { get; set; }
+        }
+        public List<CustomBoardAssetData> creatureAssets = new List<CustomBoardAssetData>();
         public List<CustomCreatureData> creatureList = new List<CustomCreatureData>();
         public string SendMessage(string command, string[] msgparams)
         {
@@ -58,24 +67,26 @@ public string SendMessage(string command, string[] msgparams)
                     Console.WriteLine("Socket connected to {0}", sender.RemoteEndPoint.ToString());
 
                     // Encode the data string into a byte array.  
-                    byte[] msg = Encoding.ASCII.GetBytes(command + " " + string.Join(",", msgparams));
+                    byte[] msg = Encoding.UTF8.GetBytes(command + " " + string.Join(",", msgparams));
 
                     // Send the data through the socket.  
                     int bytesSent = sender.Send(msg);
-
+                    Console.WriteLine("Bytes sent:" + bytesSent.ToString());
+                    Console.WriteLine("Command Sent: " + Encoding.UTF8.GetString(msg, 0, bytesSent));
                     sender.ReceiveTimeout = 3000;
                     // Receive the response from the remote device.  
                     string data = "";
                     int bytesRec = 0;
-
-                    while (sender.Available == 0)
+                    int sleeps = 0;
+                    while (sender.Available == 0 && sleeps < 3000)
                     {
                         System.Threading.Thread.Sleep(1);
+                        sleeps++;
                     }
                     while (sender.Available > 0) 
                     { 
                         bytesRec = sender.Receive(bytes);
-                        data += Encoding.ASCII.GetString(bytes, 0, bytesRec);
+                        data += Encoding.UTF8.GetString(bytes, 0, bytesRec);
                     }
                     //int bytesRec = sender.Receive(bytes, 0, sender.Available, SocketFlags.None);
                     //int bytesRec = sender.Receive(bytes);
@@ -116,6 +127,7 @@ private void button1_Click(object sender, EventArgs e)
             Console.WriteLine(data);
             dynamic json = JsonConvert.DeserializeObject(data);
             creatureList.Clear();
+
             foreach (dynamic item in json)
             {
                 creatureList.Add(new CustomCreatureData { Alias = (string)item["Alias"], CreatureId = (string)item["CreatureId"] });
@@ -325,5 +337,22 @@ private void lbStat4_Click(object sender, EventArgs e)
 
             }
         }
+
+        private void button22_Click(object sender, EventArgs e)
+        {
+            //lbCreatureAssets
+            string data = SendMessage("GetCreatureAssets", new string[0]);
+            Console.WriteLine(data);
+            dynamic json = JsonConvert.DeserializeObject(data);
+            creatureAssets.Clear();
+
+            foreach (dynamic item in json)
+            {
+                creatureAssets.Add(new CustomBoardAssetData { GUID = (string)item["GUID"], boardAssetName = (string)item["boardAssetName"] });
+            }
+            lbCreatureAssets.ValueMember = "GUID";
+            lbCreatureAssets.DisplayMember = "boardAssetName";
+            lbCreatureAssets.DataSource = creatureAssets;
+        }
     }
 }
diff --git a/Mods/SocketAPI/SDKandExamples/Python/moddingtalessdk.py b/Mods/SocketAPI/SDKandExamples/Python/moddingtalessdk.py
@@ -86,6 +86,12 @@ def CreateSlab(x, y, z, slabText):
 def GetSlabSize(slabText):
     return json.loads(ExecuteRemoteFunction('GetSlabSize {0}'.format(slabText)))
 
+def GetCreatureAssets():
+    return json.loads(ExecuteRemoteFunction('GetCreatureAssets'))
+
+def AddCreature(nguid, x, y, z, scale, alias, hpcurr, hpmax, stat1curr, stat1max,
+    stat2curr, stat2max, stat3curr, stat3max, stat4curr, stat4max, torch, hidden):
+    return json.loads(ExecuteRemoteFunction('AddCreature {0},{1},{2},{3},{4},{5},{6},{7},{8},{9},{10},{11},{12},{13},{14},{15},{16},{17}'.format(nguid, x, y, z, scale, alias, hpcurr, hpmax, stat1curr, stat1max, stat2curr, stat2max, stat3curr, stat3max, stat4curr, stat4max, torch, hidden)))
 def GetCreatureIdByAlias(alias):
     for creature in GetCreatureList():
         if creature['Alias'].lower() == alias.lower():

diff --git a/Mods/SocketAPI/SDKandExamples/Python/test.json b/Mods/SocketAPI/SDKandExamples/Python/test.json