Construction skill should now take genes into account

emipa606 · Apr 29, 2023 · 5c0e315 · 5c0e315
1 parent fdc1009
commit 5c0e315
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 34 deletions.
diff --git a/1.4/Assemblies/RoadsOfTheRim.dll b/1.4/Assemblies/RoadsOfTheRim.dll
diff --git a/About/About.xml b/About/About.xml
@@ -22,8 +22,7 @@
   <loadAfter>
     <li>brrainz.harmony</li>
   </loadAfter>
-  <description>
-[img]https://i.imgur.com/buuPQel.png[/img]
+  <description>[img]https://i.imgur.com/buuPQel.png[/img]
 Update of Loconekos mod
 https://steamcommunity.com/sharedfiles/filedetails/?id=1613783924
 
@@ -35,7 +34,7 @@ https://steamcommunity.com/sharedfiles/filedetails/?id=1613783924
 
 [table]
     [tr]
-        [td][url=https://invite.gg/Mlie][img]https://i.imgur.com/zdzzBrc.png[/img][/url][/td]
+        [td][url=https://dsc.gg/mlie][img]https://i.imgur.com/zdzzBrc.png[/img][/url][/td]
         [td][url=https://github.com/emipa606/RoadsOfTheRim][img]https://i.imgur.com/kTkpTOE.png[/img][/url][/td]
     [/tr]
     [tr]
@@ -190,12 +189,6 @@ See the summary below to see what percentage of a specific terrain feature is ca
   [/tr]
 [/table]
 
-[h1]Following the project and reporting bugs[/h1] 
-
-Feedback welcome on Steam and in the [url=https://ludeon.com/forums/index.php?topic=47205.0]Forum thread[/url]
-
-You can check the code on [url=https://github.com/LocoNeko/RoadsOfTheRim]GitHub[/url], as well as the [url=https://github.com/LocoNeko/RoadsOfTheRim/issues]roadmap and current bugs and issues[/url]
-
 [b]Quick fix for Construction sites stuck after an update : https://github.com/LocoNeko/RoadsOfTheRim/wiki/How-to-remove-construction-sites-stuck-after-mod-upgrade[/b]
 
 [b]IMPORTANT NOTE BEFORE REPORTING A BUG[/b]
@@ -212,6 +205,5 @@ 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]
-
-[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2280318231]Last updated 2022-11-30[/url]</description>
+[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2280318231]Last updated 2023-04-29[/url]</description>
 </ModMetaData>
diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,5 +1,8 @@
 # Changelog for RoadsOfTheRim
 
+1.4.3 - Construction skill should now take genes into account
+
+
 1.4.2 - Some minor fixes, thanks bc-lee.
 Used DeepL to update translations for French, German
 

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.4.2</version>
+  <version>1.4.3</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.4.2</Version>
+  <Version>1.4.3</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>emipa606</Owner>

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # RoadsOfTheRim
 
-
 ![Image](https://i.imgur.com/buuPQel.png)
 
 Update of Loconekos mod
@@ -170,13 +169,6 @@ See the summary below to see what percentage of a specific terrain feature is ca
   [/tr]
 [/table]
 
-# Following the project and reporting bugs
-
-       
-Feedback welcome on Steam and in the https://ludeon.com/forums/index.php?topic=47205.0]Forum thread
-
-You can check the code on https://github.com/LocoNeko/RoadsOfTheRim]GitHub, as well as the https://github.com/LocoNeko/RoadsOfTheRim/issues]roadmap and current bugs and issues
-
 **Quick fix for Construction sites stuck after an update : https://github.com/LocoNeko/RoadsOfTheRim/wiki/How-to-remove-construction-sites-stuck-after-mod-upgrade**
 
 **IMPORTANT NOTE BEFORE REPORTING A BUG**
@@ -196,5 +188,4 @@ It will save a lot of your time (and a little bit of mine ;-) )
 -  If you have the solution for a problem, please post it to the GitHub repository.
 
 
-
-https://steamcommunity.com/sharedfiles/filedetails/changelog/2280318231]Last updated 2022-11-30
+https://steamcommunity.com/sharedfiles/filedetails/changelog/2280318231]Last updated 2023-04-29

diff --git a/Source/RoadsOfTheRim/Patch_CaravanUIUtility_CreateCaravanTransferableWidgets.cs b/Source/RoadsOfTheRim/Patch_CaravanUIUtility_CreateCaravanTransferableWidgets.cs
@@ -13,10 +13,10 @@ namespace RoadsOfTheRim;
 public static class Patch_CaravanUIUtility_CreateCaravanTransferableWidgets
 {
     [HarmonyPostfix]
-    public static void Postfix(List<TransferableOneWay> transferables, ref TransferableOneWayWidget pawnsTransfer,
+    public static void Postfix(List<TransferableOneWay> transferables,
         ref TransferableOneWayWidget itemsTransfer, string thingCountTip,
         IgnorePawnsInventoryMode ignorePawnInventoryMass, Func<float> availableMassGetter,
-        bool ignoreSpawnedCorpsesGearAndInventoryMass, int tile, bool playerPawnsReadOnly)
+        bool ignoreSpawnedCorpsesGearAndInventoryMass, int tile)
     {
         var modifiedTransferables = transferables.Where(x => x.ThingDef.category != ThingCategory.Pawn).ToList();
         modifiedTransferables = modifiedTransferables

diff --git a/Source/RoadsOfTheRim/Patch_GenConstruct_CanPlaceBlueprintAt.cs b/Source/RoadsOfTheRim/Patch_GenConstruct_CanPlaceBlueprintAt.cs
@@ -8,8 +8,7 @@ namespace RoadsOfTheRim;
 public static class Patch_GenConstruct_CanPlaceBlueprintAt
 {
     [HarmonyPostfix]
-    public static void Postfix(ref AcceptanceReport __result, BuildableDef entDef, IntVec3 center, Rot4 rot,
-        Map map, bool godMode = false, Thing thingToIgnore = null, Thing thing = null, ThingDef stuffDef = null)
+    public static void Postfix(ref AcceptanceReport __result, BuildableDef entDef, IntVec3 center, Map map)
     {
         if (entDef != TerrainDefOf.ConcreteBridge || !map.terrainGrid.TerrainAt(center).affordances
                 .Contains(TerrainAffordanceDefOf.Bridgeable)) // ConcreteBridge on normal water (bridgeable)

diff --git a/Source/RoadsOfTheRim/Patch_RoadDefGenStep_Place_Place.cs b/Source/RoadsOfTheRim/Patch_RoadDefGenStep_Place_Place.cs
@@ -13,8 +13,7 @@ public static bool IsGoodTerrain(TerrainDef terrain)
     }
 
     [HarmonyPostfix]
-    public static void Postfix(ref RoadDefGenStep_Place __instance, Map map, IntVec3 position, TerrainDef rockDef,
-        IntVec3 origin, GenStep_Roads.DistanceElement[,] distance)
+    public static void Postfix(ref RoadDefGenStep_Place __instance, Map map, IntVec3 position)
     {
         if (__instance.place == TerrainDefOf.ConcreteBridge && position.GetTerrain(map).IsWater)
         {

diff --git a/Source/RoadsOfTheRim/Patch_WorldPathGrid_CalculatedMovementDifficultyAt.cs b/Source/RoadsOfTheRim/Patch_WorldPathGrid_CalculatedMovementDifficultyAt.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using HarmonyLib;
 using RimWorld;
 using RimWorld.Planet;
@@ -11,8 +10,7 @@ namespace RoadsOfTheRim;
 internal static class Patch_WorldPathGrid_CalculatedMovementDifficultyAt
 {
     [HarmonyPostfix]
-    public static void PostFix(ref float __result, int tile, bool perceivedStatic, int? ticksAbs,
-        StringBuilder explanation)
+    public static void PostFix(ref float __result, int tile)
     {
         if (__result <= 999f || !Find.WorldGrid.InBounds(tile))
         {

diff --git a/Source/RoadsOfTheRim/PawnBuildingUtility.cs b/Source/RoadsOfTheRim/PawnBuildingUtility.cs
@@ -22,7 +22,7 @@ public static float ConstructionValue(Pawn p)
 
     public static int ConstructionLevel(Pawn p)
     {
-        return p.skills.GetSkill(SkillDefOf.Construction).levelInt;
+        return p.skills.GetSkill(SkillDefOf.Construction).Level;
     }
 
     public static string ShowConstructionValue(Pawn p)

diff --git a/Source/RoadsOfTheRim/RoadsOfTheRim.csproj b/Source/RoadsOfTheRim/RoadsOfTheRim.csproj
@@ -6,7 +6,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <DebugType>None</DebugType>
     <LangVersion>latest</LangVersion>
-    <FileVersion>1.4.2</FileVersion>
+    <FileVersion>1.4.3</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Krafs.Rimworld.Ref">