Add files via upload

Syrchalis · Oct 21, 2018 · cb1042b · cb1042b
1 parent d0042d8
commit cb1042b
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 9 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,7 @@
 <ModMetaData>
     <name>[SYR] Individuality</name>
     <author>Syrchalis</author>
-    <targetVersion>0.19.2009</targetVersion>
+    <targetVersion>1.0.2059</targetVersion>
 	<url>https://ludeon.com/forums/index.php?topic=43449</url>
     <description>Adds new traits, rebalances vanilla traits and allows pawns to have randomized stats. 
 

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>49aabcd6-be2a-4475-aeb7-1814db779576</ID>
   <ModName>[SYR] Individuality</ModName>
-  <Version>1.1.2</Version>
+  <Version>1.1.4</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>Syrchalis</Owner>

diff --git a/Assemblies/SyrTraits.dll b/Assemblies/SyrTraits.dll
diff --git a/Languages/English/Keyed/settings.xml b/Languages/English/Keyed/settings.xml
@@ -4,7 +4,7 @@
   <IndividualityTooltip>View natural variations</IndividualityTooltip>
   <SyrTraitsSettingsCategory>Individuality</SyrTraitsSettingsCategory>
 
-  <SyrTraitsTraitCount>Amount of traits pawns spawn with (default: 2-3)</SyrTraitsTraitCount>
+  <SyrTraitsTraitCount>Amount of traits pawns spawn with</SyrTraitsTraitCount>
   <SyrTraitsTraitCountWarning>Warning: Only 5 traits can be displayed, enable "tiny trait font" to view up to 8</SyrTraitsTraitCountWarning>
   <SyrTraitsTraitsTinyFont>Tiny trait font</SyrTraitsTraitsTinyFont>
   <SyrTraitsTraitsTinyFontTooltip>This allows up to 8 traits to be displayed in the character window</SyrTraitsTraitsTinyFontTooltip>

diff --git a/Source/SyrTraits/CompIndividuality.cs b/Source/SyrTraits/CompIndividuality.cs
@@ -67,7 +67,7 @@ public override void PostSpawnSetup(bool respawningAfterLoad)
                     else if (pawn.story.bodyType == BodyTypeDefOf.Thin)
                         BodyWeight = GenMath.RoundTo(Rand.Range(-30, -10), 5);
                     else if (pawn.story.bodyType == BodyTypeDefOf.Female)
-                        BodyWeight = GenMath.RoundTo(Rand.Range(-10, 0), 5);
+                        BodyWeight = GenMath.RoundTo(Rand.Range(-15, 5), 5);
                     BodyWeight = Mathf.Clamp(BodyWeight, -30, 50);
                 }
                 if (BodyWeight == -39)

diff --git a/Source/SyrTraits/IndividualityCardUtility.cs b/Source/SyrTraits/IndividualityCardUtility.cs
@@ -46,7 +46,7 @@ public static void DrawIndividualityCard(Rect rect, Pawn pawn)
                     num += rect3.height + 2f;
                 }
                 Rect rect4 = new Rect(20f, num, rect.width - 20f, 24f);
-                Widgets.Label(rect4, "BodyWeight".Translate() + ": " + (comp.BodyWeight + 70) + " kg (" + pawn.story.bodyType + ")");
+                Widgets.Label(rect4, "BodyWeight".Translate() + ": " + ((comp.BodyWeight + 70) * pawn.BodySize) + " kg (" + pawn.story.bodyType + ")");
                 TipSignal BodyWeightTooltip = "BodyWeightTooltip".Translate();
                 TooltipHandler.TipRegion(rect4, BodyWeightTooltip);
                 if (Mouse.IsOver(rect4))

diff --git a/Source/SyrTraits/InteractionWorker_RomanceAttemptPatch.cs b/Source/SyrTraits/InteractionWorker_RomanceAttemptPatch.cs
@@ -14,7 +14,7 @@ namespace SyrTraits
     [HarmonyPatch(typeof(InteractionWorker_RomanceAttempt), "RandomSelectionWeight")]
     public static class InteractionWorker_RomanceAttemptPatch
     {
-        [HarmonyPriority(Priority.Last)]
+        [HarmonyPriority(Priority.VeryLow)]
         [HarmonyPostfix]
         public static void RandomSelectionWeight_Postfix(ref float __result, Pawn initiator, Pawn recipient)
         {

diff --git a/Source/SyrTraits/ThoughtWorker_DisfiguredPatch.cs b/Source/SyrTraits/ThoughtWorker_DisfiguredPatch.cs
@@ -16,10 +16,13 @@ public static class ThoughtWorker_DisfiguredPatch
         [HarmonyPostfix]
         public static void ThoughtWorker_Disfigured_Postfix(ref ThoughtState __result, Pawn pawn, Pawn other)
         {
-        int num = other.story.traits.DegreeOfTrait(TraitDefOf.Beauty);
-        if (num == -1 || num == -2)
+            if (other?.story?.traits != null && other.story.traits.HasTrait(TraitDefOf.Beauty))
             {
-            __result = false;
+                int num = other.story.traits.DegreeOfTrait(TraitDefOf.Beauty);
+                if (num == -1 || num == -2)
+                {
+                    __result = false;
+                }
             }
         }
     }

diff --git a/Source/SyrTraits/obj/Release/SyrIndividuality.csprojAssemblyReference.cache b/Source/SyrTraits/obj/Release/SyrIndividuality.csprojAssemblyReference.cache
diff --git a/Source/SyrTraits/obj/Release/SyrTraits.dll b/Source/SyrTraits/obj/Release/SyrTraits.dll