Restructured the settings menu to make it less confusing

emipa606 · May 29, 2021 · ba305c0 · ba305c0
1 parent 283b152
commit ba305c0
Show file tree

Hide file tree

Showing 50 changed files with 1,768 additions and 1,261 deletions.
diff --git a/1.2/Assemblies/RoadsOfTheRim.dll b/1.2/Assemblies/RoadsOfTheRim.dll
diff --git a/About/About.xml b/About/About.xml
@@ -25,6 +25,7 @@ Update of Loconekos mod
 https://steamcommunity.com/sharedfiles/filedetails/?id=1613783924
 
 - Can be added to save-games
+- Russian translation added, thanks Festival!
 
 [img]https://i.imgur.com/7Gzt3Rg.png[/img]
 
@@ -203,6 +204,6 @@ It will save a lot of your time (and a little bit of mine ;-) )
 [*] Do not report errors by making a discussion-thread, I get no notification of that.
 [*] If you have the solution for a problem, please post it to the GitHub repository.
 [/list]
+
 </description>
 </ModMetaData>
-
diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,5 +1,8 @@
 # Changelog for RoadsOfTheRim
 
+1.0.6.0 - Restructured the settings menu to make it less confusing
+
+
 1.0.5.0 - Russian translation added, thanks Festival!
 
 

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>RoadsOfTheRim</identifier>
-  <version>1.0.5.0</version>
+  <version>1.0.6.0</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>1a0c92d0-3054-4626-a0d1-2ed267af412e</ID>
   <ModName>Roads of the Rim (Continued)</ModName>
-  <Version>1.0.5.0</Version>
+  <Version>1.0.6.0</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>emipa606</Owner>

diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ Update of Loconekos mod
 https://steamcommunity.com/sharedfiles/filedetails/?id=1613783924
 
 - Can be added to save-games
+- Russian translation added, thanks Festival!
 
 ![Image](https://i.imgur.com/7Gzt3Rg.png)
 
@@ -203,3 +204,4 @@ It will save a lot of your time (and a little bit of mine ;-) )
 
 
 
+

diff --git a/Source/RoadsOfTheRim.csproj.oldversioncscproj b/Source/RoadsOfTheRim.csproj.oldversioncscproj
@@ -0,0 +1,69 @@
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{32C59479-1ECF-4609-BD0D-BB12658BF92B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoStandardLibraries>false</NoStandardLibraries>
+    <AssemblyName>RoadsOfTheRim</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\1.2\Assemblies\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\1.2\Assemblies\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RootNamespace>RoadsOfTheRim</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Krafs.Rimworld.Ref">
+      <Version>1.2.2753</Version>
+      <ExcludeAssets>runtime</ExcludeAssets>
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Lib.Harmony">
+      <Version>2.0.2</Version>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Bridges.cs" />
+    <Compile Include="CaravanArrivalAction_StartWorkingOnRoad.cs" />
+    <Compile Include="OldDefsCleanup.cs" />
+    <Compile Include="WorldLayer_RoadsOnWater.cs" />
+    <Compile Include="ConstructionMenu.cs" />
+    <Compile Include="DefModExtension_RotR_RoadDef.cs" />
+    <Compile Include="GenStep_CleanBuiltRoads.cs" />
+    <Compile Include="HarmonyPatches.cs" />
+    <Compile Include="ModMain.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RoadConstructionLeg.cs" />
+    <Compile Include="RoadConstructionSite.cs" />
+    <Compile Include="WITab_Caravan_Build.cs" />
+    <Compile Include="WorldComponent_FactionHelpConstruction.cs" />
+    <Compile Include="WorldComponent_RoadBuildingState.cs" />
+    <Compile Include="WorldObjectComp_Caravan.cs" />
+    <Compile Include="WorldObjectComp_ConstructionSite.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSHARP.Targets" />
+  <ProjectExtensions>
+    <VisualStudio AllowExistingFolder="true" />
+  </ProjectExtensions>
+</Project>
diff --git a/Source/RoadsOfTheRim/Bridges.cs b/Source/RoadsOfTheRim/Bridges.cs
diff --git a/Source/RoadsOfTheRim/CaravanArrivalAction_StartWorkingOnRoad.cs b/Source/RoadsOfTheRim/CaravanArrivalAction_StartWorkingOnRoad.cs
@@ -6,18 +6,15 @@ namespace RoadsOfTheRim
 {
     public class CaravanArrivalAction_StartWorkingOnRoad : CaravanArrivalAction
     {
-        public CaravanArrivalAction_StartWorkingOnRoad()
-        {
-        }
         public override string Label => "Start working, you lazy bastards";
 
         public override string ReportString => "Work for your rich masters";
 
-        public override void Arrived (Caravan caravan)
+        public override void Arrived(Caravan caravan)
         {
             try
             {
-                WorldObjectComp_Caravan CaravanComp = caravan.GetComponent<WorldObjectComp_Caravan>();
+                var CaravanComp = caravan.GetComponent<WorldObjectComp_Caravan>();
                 CaravanComp.StartWorking();
             }
             catch (Exception e)
@@ -26,4 +23,4 @@ public override void Arrived (Caravan caravan)
             }
         }
     }
-}
+}
diff --git a/Source/RoadsOfTheRim/CaravanState.cs b/Source/RoadsOfTheRim/CaravanState.cs
@@ -0,0 +1,12 @@
+namespace RoadsOfTheRim
+{
+    public enum CaravanState : byte
+    {
+        Moving,
+        NightResting,
+        AllOwnersHaveMentalBreak,
+        AllOwnersDowned,
+        ImmobilizedByMass,
+        ReadyToWork
+    }
+}
diff --git a/Source/RoadsOfTheRim/CompProperties_RoadsOfTheRimConstructionSite.cs b/Source/RoadsOfTheRim/CompProperties_RoadsOfTheRimConstructionSite.cs
@@ -0,0 +1,12 @@
+using RimWorld;
+
+namespace RoadsOfTheRim
+{
+    public class CompProperties_RoadsOfTheRimConstructionSite : WorldObjectCompProperties
+    {
+        public CompProperties_RoadsOfTheRimConstructionSite()
+        {
+            compClass = typeof(WorldObjectComp_ConstructionSite);
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ Update of Loconekos mod @@
     https://steamcommunity.com/sharedfiles/filedetails/?id=1613783924
     - Can be added to save-games
+    - Russian translation added, thanks Festival!
     ![Image](https://i.imgur.com/7Gzt3Rg.png)
@@ Expand Down Expand Up @@
@@ Expand Down @@