Merge pull request #1 from Blaxsmith/Davkas.Inc

Update mod with Blaxsmith's Fixes

Author: leetfin

Source Code/Insulated Joint Plate/InsulatedPlate.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>InsulatedJointPlate</RootNamespace>
     <AssemblyName>InsulatedJointPlate</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />

Source Code/Insulated Joint Plate/InsulatedPlates.cs

@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using static STRINGS.UI;
 using Database;
 using System.Collections.Generic;
@@ -83,23 +83,12 @@ public static void bridgeBuildMenu(string door, string menu, string pred)
             }
         }
 
-        public static void bridgeTechTree(string door, string group)
+        public static void bridgeTechTree(string id, string researchGroup)
         {
-            if (group == "none") return;
-#if VANILLA
-            Techs.TECH_GROUPING[group] = new List<string>((IEnumerable<string>)Techs.TECH_GROUPING[group])
-            {
-                door
-            }.ToArray();
-#endif
-
-#if SPACED_OUT
-            var tech = Db.Get().Techs.TryGet(group);
-		    if (tech != null)
-		    {
-			    tech.unlockedItemIDs.Add(door);
-		    }
-#endif
+            if (researchGroup == "none") return;
+            
+            Tech tech = Db.Get().Techs.TryGet(researchGroup);
+            tech?.AddUnlockedItemIDs(id);
         }
     }
 

Source Code/Insulated Joint Plate/InsulatedWireBridgeHighWattage/InsulatedWireBridgeHighWattageConfig.cs

@@ -61,7 +61,7 @@ public override void ConfigureBuildingTemplate(GameObject go, Tag prefab_tag)
         GeneratedBuildings.MakeBuildingAlwaysOperational(go);
         SimCellOccupier simCellOccupier = go.AddOrGet<SimCellOccupier>();
         simCellOccupier.doReplaceElement = true;
-        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT.PENALTY_3;
+        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT_MODIFIERS.PENALTY_3;
         go.AddOrGet<BuildingHP>().destroyOnDamaged = true;
         go.AddOrGet<Insulator>();
         go.AddOrGet<TileTemperature>();

Source Code/Insulated Joint Plate/InsulatedWireRefinedBridgeHighWattage/InsulatedWireRefinedBridgeHighWattageConfig.cs

@@ -61,7 +61,7 @@ public override void ConfigureBuildingTemplate(GameObject go, Tag prefab_tag)
         GeneratedBuildings.MakeBuildingAlwaysOperational(go);
         SimCellOccupier simCellOccupier = go.AddOrGet<SimCellOccupier>();
         simCellOccupier.doReplaceElement = true;
-        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT.PENALTY_3;
+        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT_MODIFIERS.PENALTY_3;
         go.AddOrGet<BuildingHP>().destroyOnDamaged = true;
         go.AddOrGet<Insulator>();
         go.AddOrGet<TileTemperature>();

Source Code/Insulated Joint Plate/Localization/loc.cs

@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using System;
 using System.IO;
 using System.Reflection;

Source Code/Insulated Joint Plate/LongInsulatedWireBridgeHighWattage/LongInsulatedWireBridgeHighWattageConfig.cs

@@ -60,7 +60,7 @@ public override void ConfigureBuildingTemplate(GameObject go, Tag prefab_tag)
         GeneratedBuildings.MakeBuildingAlwaysOperational(go);
         SimCellOccupier simCellOccupier = go.AddOrGet<SimCellOccupier>();
         simCellOccupier.doReplaceElement = true;
-        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT.PENALTY_3;
+        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT_MODIFIERS.PENALTY_3;
         go.AddOrGet<BuildingHP>().destroyOnDamaged = true;
         go.AddOrGet<Insulator>();
         go.AddOrGet<TileTemperature>();

Source Code/Insulated Joint Plate/LongInsulatedWireRefinedBridgeHighWattage/LongInsulatedRefinedWireBridgeHighWattageConfig.cs

@@ -60,7 +60,7 @@ public override void ConfigureBuildingTemplate(GameObject go, Tag prefab_tag)
         GeneratedBuildings.MakeBuildingAlwaysOperational(go);
         SimCellOccupier simCellOccupier = go.AddOrGet<SimCellOccupier>();
         simCellOccupier.doReplaceElement = true;
-        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT.PENALTY_3;
+        simCellOccupier.movementSpeedMultiplier = DUPLICANTSTATS.MOVEMENT_MODIFIERS.PENALTY_3;
         go.AddOrGet<BuildingHP>().destroyOnDamaged = true;
         go.AddOrGet<Insulator>();
         go.AddOrGet<TileTemperature>();

Source Code/Insulated Joint Plate/Steam/InsulatedJointPlate.dll

@@ -1,2 +1,5 @@
 supportedContent: VANILLA_ID
-lastWorkingBuild: 447596
+minimumSupportedBuild: 641974
+
+version: 1.1.0
+APIVersion: 2