Mirror of 1.4.18 from Lovers Lab

source/SizedApparel/Patch-Animation.cs

@@ -40,6 +40,8 @@ namespace SizedApparel
             {
                 //comp.ForceUpdateTickAnimation = true;
                 var actorcomp = actor.GetComp<ApparelRecorderComp>();
+                if (actorcomp == null)
+                    continue;
                 //actorcomp.SetBreastJiggle(true);
                 actorcomp.ForceUpdateTickAnimation = true;
 

source/SizedApparel/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 
+// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
+// 이러한 특성 값을 변경하세요.
+[assembly: AssemblyTitle("SizedApparelforRJW")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SizedApparelforRJW")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 
+// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면
+// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요.
+[assembly: ComVisible(false)]
+
+// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다.
+[assembly: Guid("b06471b4-4c6c-478b-b94d-71cc53abd24d")]
+
+// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다.
+//
+//      주 버전
+//      부 버전 
+//      빌드 번호
+//      수정 버전
+//
+// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
+// 기본값으로 할 수 있습니다.
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

source/SizedApparel/SizedApparelComp.cs

@@ -1016,7 +1016,9 @@ namespace SizedApparel
 
                 if (SizedApparelSettings.drawBelly)
                 {
-                    List<Hediff> pregnancies = pawn.health?.hediffSet?.hediffs?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("pregnan"));//pregnancy and pregnant. has some issue with "pregnancy mood"
+                    //EggImplement as Pregnant
+                    //need to Optimize... TODO...
+                    List<Hediff> pregnancies = pawn.health?.hediffSet?.hediffs?.FindAll((Hediff h) => SizedApparelUtility.isPragnencyHediff(h) || SizedApparelUtility.isRJWEggHediff(h));//pregnancy and pregnant. has some issue with "pregnancy mood"
                     if (!pregnancies.NullOrEmpty())
                     {
                         foreach (Hediff h in pregnancies)
@@ -1033,6 +1035,8 @@ namespace SizedApparel
                         bellySeverity += cumflation != null ? cumflation.Severity : 0;
                         bellySeverity += cumstuffed != null ? cumstuffed.Severity : 0;
                     }
+
+
                 }
 
 

source/SizedApparel/SizedApparelMain.cs

@@ -62,6 +62,8 @@ namespace SizedApparel
         public static void Postfix(Pawn ___pawn)
         {
             var comp = ___pawn.GetComp<ApparelRecorderComp>();
+            if (comp == null)
+                return;
             comp.SetDirty(false,false,false,true,true);//Apparel and Hediff will be changed with other reason. just set skeleton dirty.
         }
     }
@@ -942,6 +944,8 @@ namespace SizedApparel
         public static void Postfix(PawnRenderer __instance, Pawn ___pawn, Vector3 shellLoc, Rot4 facing, Quaternion quat, PawnRenderFlags flags)
         {
             var comp = ___pawn.GetComp<ApparelRecorderComp>();
+            if (comp == null)
+                return;
             float angle;
             Vector3 v;
             //angle = Quaternion.Angle(quat, Quaternion.AngleAxis(0, Vector3.up));
@@ -981,6 +985,8 @@ namespace SizedApparel
             if (__result == null)
                 return;
             var comp = __instance.pawn.GetComp<ApparelRecorderComp>();
+            if (comp == null)
+                return;
             Material sizedApparelBaseBodyMat = null;
 
             if (comp.graphicbaseBodyFurCovered != null)

source/SizedApparel/SizedApparelStyleStationPatch.cs

@@ -285,6 +285,8 @@ namespace SizedApparel
         public static void Postfix(Pawn pawn)
         {
             var comp = pawn.GetComp<ApparelRecorderComp>();
+            if (comp == null)
+                return;
             comp.initialPubicHairDef = comp.pubicHairDef;
         }
     }

source/SizedApparel/SizedApparelUtility.cs

@@ -400,13 +400,25 @@ namespace SizedApparel
         public static bool isPragnencyHediff(Hediff h)
         {
             //TODO. remove contain pregnancy side effect hediffs
-            return h.def.defName.ToLower().Contains("pregnancy") || h.def.defName.ToLower().Contains("pregnant");
+            if (h.def == HediffDefOf.PregnantHuman || h.def == HediffDefOf.Pregnant)
+                return true;
+
+            return h.def.defName.ToLower().Contains("rjw_pregnancy") || h.def.defName.ToLower().EndsWith("pregnant"); // h.def.defName.ToLower().Contains("pregnancy");
+        }
+        public static bool isRJWEggHediff(Hediff h)
+        {
+            var e = h as rjw.Hediff_InsectEgg;
+            if (e == null)
+                return false;
+            return true;
         }
 
         public static bool isBellyBulgeHediff(Hediff h)
         {
             if (isPragnencyHediff(h))
                 return true;
+            if (isRJWEggHediff(h))
+                return true;
             if (SizedApparelPatch.LicentiaActive)
             {
                 if (h.def.defName.ToLower().Contains("cumflation"))
@@ -415,6 +427,8 @@ namespace SizedApparel
                     return true;
             }
             return false;
+
+
         }
 
         public static bool isRJWParts(Hediff h)