Merge pull request #18 from martijns/master

Update for A17
Longwelwind · May 26, 2017 · 33046ca · 33046ca
2 parents c065bff + 31aa92d
commit 33046ca
Show file tree

Hide file tree

Showing 14 changed files with 1,014 additions and 32 deletions.
diff --git a/ExternPackages/Assembly-CSharp.dll b/ExternPackages/Assembly-CSharp.dll
diff --git a/ExternPackages/UnityEngine.dll b/ExternPackages/UnityEngine.dll
diff --git a/PhiClient/PhiClient.cs b/PhiClient/PhiClient.cs
@@ -219,7 +219,7 @@ private string GetServerAddress()
             }
             else
             {
-                return File.ReadAllLines(SERVER_FILE)[0];
+                return File.ReadAllLines(SERVER_FILE)[0].Trim();
             }
         }
 

diff --git a/PhiClient/PhiClient.csproj b/PhiClient/PhiClient.csproj
@@ -89,25 +89,23 @@
     <Content Include="PhiClient\About\About.xml">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="PhiClient\Defs\MainTabDefs\PhiClient.xml" />
+    <Content Include="PhiClient\Defs\MainButtonDefs\PhiClient.xml" />
     <Content Include="PhiClient\Defs\ThingDefs\PhiClient.xml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="PhiClient\Assemblies\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy /Y "$(TargetDir)PhiClient.dll" "D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\PhiClient.dll"
-copy /Y "$(TargetDir)PhiClient.dll" "D:\Documents\IGG-RimWorld.Alpha.14\Mods\PhiClient\Assemblies\PhiClient.dll"
+    <PostBuildEvent>For /F "Tokens=1,2*" %25%25A In ('Reg Query HKCU\SOFTWARE\Valve\Steam') Do ( If "%25%25A" Equ "SteamPath" Set "SPth=%25%25C" )
 
-copy /Y "$(TargetDir)websocket-sharp.dll" "D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\1-websocket-sharp.dll"
-copy /Y "$(TargetDir)websocket-sharp.dll" "D:\Documents\IGG-RimWorld.Alpha.14\Mods\PhiClient\Assemblies\1-websocket-sharp.dll"
-
-copy /Y "$(TargetDir)SocketLibrary.dll" "D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\2-SocketLibrary.dll"
-copy /Y "$(TargetDir)SocketLibrary.dll" "D:\Documents\IGG-RimWorld.Alpha.14\Mods\PhiClient\Assemblies\2-SocketLibrary.dll"
-
-copy /Y "$(TargetDir)PhiData.dll" "D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\3-PhiData.dll"
-copy /Y "$(TargetDir)PhiData.dll" "D:\Documents\IGG-RimWorld.Alpha.14\Mods\PhiClient\Assemblies\3-PhiData.dll"</PostBuildEvent>
+mkdir "%25SPth%25\steamapps\common\RimWorld\Mods\PhiClient\Assemblies"
+xcopy /Y /E "$(ProjectDir)PhiClient" "%25SPth%25\steamapps\common\RimWorld\Mods\PhiClient"
+copy /Y "$(TargetDir)PhiClient.dll" "%25SPth%25\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\PhiClient.dll"
+copy /Y "$(TargetDir)websocket-sharp.dll" "%25SPth%25\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\1-websocket-sharp.dll"
+copy /Y "$(TargetDir)SocketLibrary.dll" "%25SPth%25\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\2-SocketLibrary.dll"
+copy /Y "$(TargetDir)PhiData.dll" "%25SPth%25\steamapps\common\RimWorld\Mods\PhiClient\Assemblies\3-PhiData.dll"
+</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/PhiClient/PhiClient/About/About.xml b/PhiClient/PhiClient/About/About.xml
@@ -2,9 +2,8 @@
 <ModMetaData>
   <name>PhiClient</name>
   <author>Longwelwind</author>
-  <url></url>
-  <targetVersion>0.16.1393</targetVersion>
+  <targetVersion>0.17.1546</targetVersion>
   <description>
-    Online Multi-cities for Rimworld (v0.11)
+    Online Multi-cities for Rimworld (v0.12)
   </description>
 </ModMetaData>
diff --git a/PhiClient/PhiClient/About/preview.pdn b/PhiClient/PhiClient/About/preview.pdn
diff --git a/PhiClient/PhiClient/About/preview.png b/PhiClient/PhiClient/About/preview.png
diff --git a/PhiClient/PhiClient/Defs/MainButtonDefs/PhiClient.xml b/PhiClient/PhiClient/Defs/MainButtonDefs/PhiClient.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MainButtonDefs>
+  <MainButtonDef>
+    <defName>Server</defName>
+    <label>server</label>
+    <description>Check the status of the </description>
+    <tabWindowClass>PhiClient.ServerMainTab</tabWindowClass>
+    <order>100</order>
+    <defaultHotKey>F12</defaultHotKey>
+  </MainButtonDef>
+</MainButtonDefs>
diff --git a/PhiClient/PhiClient/Defs/MainTabDefs/PhiClient.xml b/PhiClient/PhiClient/Defs/MainTabDefs/PhiClient.xml
diff --git a/PhiClient/ServerMainMenuWindow.cs b/PhiClient/ServerMainMenuWindow.cs
@@ -151,7 +151,7 @@ public void OnConnectButtonClick()
         {
             PhiClient client = PhiClient.instance;
 
-            client.SetServerAddress(enteredAddress);
+            client.SetServerAddress(enteredAddress.Trim());
             client.TryConnect();
         }
 

diff --git a/PhiData/RealmPawn.cs b/PhiData/RealmPawn.cs
@@ -70,7 +70,7 @@ public static RealmPawn ToRealmPawn(Pawn pawn, RealmData realmData)
             }
 
             List<RealmThing> equipments = new List<RealmThing>();
-            foreach (ThingWithComps thing in pawn.equipment.AllEquipment)
+            foreach (ThingWithComps thing in pawn.equipment.AllEquipmentListForReading)
             {
                 equipments.Add(realmData.ToRealmThing(thing));
             }

diff --git a/PhiData/TransactionSystem/ColonistTransaction.cs b/PhiData/TransactionSystem/ColonistTransaction.cs
@@ -70,7 +70,7 @@ public override void OnEndReceiver(RealmData realmData)
                 Find.LetterStack.ReceiveLetter(
                     "Colonist pod",
                     "A colonist was sent to you by " + sender.name,
-                    LetterType.Good,
+                    LetterDefOf.Good,
                     new RimWorld.Planet.GlobalTargetInfo(position, Find.VisibleMap)
                 );
             }

diff --git a/PhiData/TransactionSystem/ItemTransaction.cs b/PhiData/TransactionSystem/ItemTransaction.cs
@@ -86,7 +86,7 @@ public override void OnEndReceiver(RealmData realmData)
                 Find.LetterStack.ReceiveLetter(
                     "Ship pod",
                     "A pod was sent from " + sender.name + " containing items",
-                    LetterType.Good,
+                    LetterDefOf.Good,
                     new RimWorld.Planet.GlobalTargetInfo(position, Find.VisibleMap)
                 );
             }

diff --git a/SocketLibrary/SocketLibrary.csproj b/SocketLibrary/SocketLibrary.csproj
@@ -40,13 +40,13 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\ExternPackages\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\ExternPackages\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e">
       <HintPath>..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>