Changes here and there

RimWorld-CCL-Reborn · May 1, 2018 · 5be4f43 · 5be4f43
1 parent d450bad
commit 5be4f43
Show file tree

Hide file tree

Showing 23 changed files with 1,119 additions and 1,420 deletions.
diff --git a/Assemblies/0JecsTools.dll b/Assemblies/0JecsTools.dll
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
diff --git a/Assemblies/AbilityUserAI.dll b/Assemblies/AbilityUserAI.dll
diff --git a/Assemblies/CompActivatableEffect.dll b/Assemblies/CompActivatableEffect.dll
diff --git a/Assemblies/CompAnimated.dll b/Assemblies/CompAnimated.dll
diff --git a/Assemblies/CompDeflector.dll b/Assemblies/CompDeflector.dll
diff --git a/Assemblies/CompDelayedSpawner.dll b/Assemblies/CompDelayedSpawner.dll
diff --git a/Assemblies/CompExtraSounds.dll b/Assemblies/CompExtraSounds.dll
diff --git a/Assemblies/CompInstalledPart.dll b/Assemblies/CompInstalledPart.dll
diff --git a/Assemblies/CompLumbering.dll b/Assemblies/CompLumbering.dll
diff --git a/Assemblies/CompOverlays.dll b/Assemblies/CompOverlays.dll
diff --git a/Assemblies/CompOversizedWeapon.dll b/Assemblies/CompOversizedWeapon.dll
diff --git a/Assemblies/CompSlotLoadable.dll b/Assemblies/CompSlotLoadable.dll
diff --git a/Assemblies/CompToggleDef.dll b/Assemblies/CompToggleDef.dll
diff --git a/Assemblies/CompVehicle.dll b/Assemblies/CompVehicle.dll
diff --git a/Source/.idea/.idea.JecsTools/.idea/contentModel.xml b/Source/.idea/.idea.JecsTools/.idea/contentModel.xml
diff --git a/Source/.idea/.idea.JecsTools/.idea/workspace.xml b/Source/.idea/.idea.JecsTools/.idea/workspace.xml
diff --git a/Source/AllModdingComponents/CompVehicle/HarmonyCompVehicle.cs b/Source/AllModdingComponents/CompVehicle/HarmonyCompVehicle.cs
@@ -90,9 +90,9 @@ static HarmonyCompVehicle()
             ///
 
             //harmony.Patch(AccessTools.)
-            harmony.Patch(AccessTools.Method(typeof(PawnUtility), "IsTravelingInTransportPodWorldObject"), null,
-                new HarmonyMethod(typeof(HarmonyCompVehicle),
-                    nameof(PreventAssigningRandomFaction)));
+//            harmony.Patch(AccessTools.Method(typeof(PawnUtility), "IsTravelingInTransportPodWorldObject"), null,
+//                new HarmonyMethod(typeof(HarmonyCompVehicle),
+//                    nameof(PreventAssigningRandomFaction)));
             harmony.Patch(AccessTools.Method(typeof(SocialCardUtility), "Recache"), new HarmonyMethod(
                 typeof(HarmonyCompVehicle),
                 nameof(SocialTabNullHandling)), null);
@@ -703,12 +703,6 @@ public static IEnumerable<CodeInstruction> FightActionTranspiler(IEnumerable<Cod
         // J This patch allows colonists to freely join vehicles 
         //   without having their factions randomly switched around.
         // RimWorld.PawnUtility
-        public static void PreventAssigningRandomFaction(ref bool __result, Pawn pawn)
-        {
-            var prevResult = __result;
-            //Check for vehicles...
-            __result = prevResult || ThingOwnerUtility.AnyParentIs<VehicleHandlerGroup>(pawn);
-        }
 
 
         //S Bug fixes social tab issue with vehicles

diff --git a/Source/AllModdingComponents/JecsTools/ApparelExtension.cs b/Source/AllModdingComponents/JecsTools/ApparelExtension.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Verse;
+
+namespace JecsTools
+{
+    public class ApparelExtension : DefModExtension
+    {
+        public List<string> coverage = new List<string>();
+    }
+}
diff --git a/Source/AllModdingComponents/JecsTools/HarmonyPatches.cs b/Source/AllModdingComponents/JecsTools/HarmonyPatches.cs
@@ -33,19 +33,54 @@ static HarmonyPatches()
                 new HarmonyMethod(typeof(HarmonyPatches), nameof(Post_GetPostArmorDamage)));
             harmony.Patch(AccessTools.Method(typeof(PawnGenerator), "GeneratePawnInternal"), null,
                 new HarmonyMethod(typeof(HarmonyPatches), nameof(Post_GeneratePawnInternal)));
+            harmony.Patch(AccessTools.Method(typeof(ApparelUtility), "CanWearTogether"), null,
+                new HarmonyMethod(typeof(HarmonyPatches), nameof(Post_CanWearTogether)));
 
-
-/*            harmony.Patch(
-                AccessTools.Method(typeof(DamageWorker_AddInjury), "FinalizeAndAddInjury",
-                    new[]
-                    {
-                        typeof(Pawn), typeof(Hediff_Injury), typeof(DamageInfo),
-                        AccessTools.TypeByName("DamageResult").MakeByRefType()
-                    }),
-                new HarmonyMethod(typeof(HarmonyPatches),
-                    nameof(ApplyProperDamage)), null);*/
         }
 
+        /// <summary>
+        /// Using the new ApparelExtension, we can have a string based apparel check.
+        /// </summary>
+        /// <param name="A"></param>
+        /// <param name="B"></param>
+        /// <param name="body"></param>
+        /// <param name="__result"></param>
+        public static void Post_CanWearTogether(ThingDef A, ThingDef B, BodyDef body, ref bool __result)
+        {
+            var aHasExt = A.HasModExtension<ApparelExtension>();
+            var bHasExt = B.HasModExtension<ApparelExtension>();
+            if (aHasExt && bHasExt)
+            {
+                var aExt = A.GetModExtension<ApparelExtension>();
+                var bExt = B.GetModExtension<ApparelExtension>();
+                var check = new Dictionary<string, int>();
+                for (int i = 0; i < aExt.coverage.Count; i++)
+                {
+                    if (!check.ContainsKey(aExt.coverage[i]))
+                        check.Add(aExt.coverage[i].ToLowerInvariant(), 1);
+                    else
+                    {
+                        Log.Warning("JecsTools :: ApparelExtension :: Warning:: " + A.label + " has multiple of the same tags.");
+                        return;
+                    }
+                }
+                for (int j = 0; j < bExt.coverage.Count; j++)
+                {
+                    if (!check.ContainsKey(bExt.coverage[j]))
+                        check.Add(bExt.coverage[j].ToLowerInvariant(), 1);
+                    else
+                    {
+                        __result = false;
+                        break;
+                    }
+                }
+            }
+            else if ((aHasExt && !bHasExt) || (!aHasExt && bHasExt))
+            {
+                __result = true;
+            }
+        }
+
         public static void Post_GeneratePawnInternal(PawnGenerationRequest request, ref Pawn __result)
         {
             var hediffGiverSet = __result?.def?.race?.hediffGiverSets?.FirstOrDefault(

diff --git a/Source/AllModdingComponents/JecsTools/HediffExpandedDef.cs b/Source/AllModdingComponents/JecsTools/HediffExpandedDef.cs
@@ -16,12 +16,12 @@ public class HediffExpandedDef : HediffDef
         //public string description;
 
         /// <summary>
-        /// Text that appears before the list of modifiers.
+        /// Text key that appears before the list of modifiers.
         /// </summary>
         public string preListText;
 
         /// <summary>
-        /// Text that appears after the list of modifiers.
+        /// Text key that appears after the list of modifiers.
         /// </summary>
         public string postListText;
 

diff --git a/Source/AllModdingComponents/JecsTools/HediffWithComps_Expanded.cs b/Source/AllModdingComponents/JecsTools/HediffWithComps_Expanded.cs
@@ -18,9 +18,9 @@ public override string TipStringExtra
                 {
                     s.AppendLine(def.description);
                 }
-                if (!string.IsNullOrEmpty(Def.preListText)) s.AppendLine(Def.preListText);
+                if (!string.IsNullOrEmpty(Def.preListText)) s.AppendLine(Def.preListText.Translate());
                 s.AppendLine(base.TipStringExtra);
-                if (!string.IsNullOrEmpty(Def.postListText)) s.AppendLine(Def.postListText);
+                if (!string.IsNullOrEmpty(Def.postListText)) s.AppendLine(Def.postListText.Translate());
                 return s.ToString();
             }
         }

diff --git a/Source/AllModdingComponents/JecsTools/JecsTools.csproj b/Source/AllModdingComponents/JecsTools/JecsTools.csproj
@@ -55,6 +55,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApparelExtension.cs" />
     <Compile Include="CaravanJobs\CaravanJob.cs" />
     <Compile Include="CaravanJobs\CaravanJobDef.cs" />
     <Compile Include="CaravanJobs\CaravanJobDriver.cs" />