Merge pull request #128 from edbmods/develop

Merge to master for 0.17.1.2

EdBPrepareCarefully.csproj

@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>EdB.PrepareCarefully</RootNamespace>
     <AssemblyName>EdBPrepareCarefully</AssemblyName>
-    <ReleaseVersion>0.17.1.1</ReleaseVersion>
+    <ReleaseVersion>0.17.1.2</ReleaseVersion>
     <UseMSBuildEngine>False</UseMSBuildEngine>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>

EdBPrepareCarefully.sln

@@ -197,6 +197,6 @@ Global
 		$29.IncludeStaticEntities = True
 		$0.VersionControlPolicy = $31
 		$31.inheritsSet = Mono
-		version = 0.17.1.1
+		version = 0.17.1.2
 	EndGlobalSection
 EndGlobal

Resources/About/About.xml

@@ -8,6 +8,6 @@
 
 If you get a set of starting colonists that you like, save them as a preset so that you can start your game the same way next time.
 
-[Version 0.17.1.1]
+[Version 0.17.1.2]
 	</description>
 </ModMetaData>

Resources/CHANGELOG.txt

@@ -1,5 +1,14 @@
  _____________________________________________________________________________
 
+   Version 0.17.1.2
+ _____________________________________________________________________________
+
+ - Bug fix: No longer adding random health conditions when loading a
+   character.
+ - Bug fix: Now correctly clearing out health conditions when randomizing a
+   character.
+ _____________________________________________________________________________
+
    Version 0.17.1.1
  _____________________________________________________________________________
 

Resources/Languages/English/Keyed/EdBPrepareCarefully.xml

@@ -42,8 +42,8 @@
   <EdB.PC.Dialog.PawnPreset.Button.Save>Save</EdB.PC.Dialog.PawnPreset.Button.Save>
   <EdB.PC.Dialog.PawnPreset.DeleteTooltip>Delete this Colonist</EdB.PC.Dialog.PawnPreset.DeleteTooltip>
   <EdB.PC.Dialog.PawnPreset.ConfirmDelete>Are you sure that you want to delete this colonist?</EdB.PC.Dialog.PawnPreset.ConfirmDelete>
-  <EdB.PC.Dialog.PawnPreset.Loaded>Loaded colonist {0}</EdB.PC.Dialog.PawnPreset.Loaded>
-  <EdB.PC.Dialog.PawnPreset.Error.Failed>Failed to load colonist.  Check that all required mods are enabled.</EdB.PC.Dialog.PawnPreset.Error.Failed>
+  <EdB.PC.Dialog.PawnPreset.Loaded>Loaded character {0}</EdB.PC.Dialog.PawnPreset.Loaded>
+  <EdB.PC.Dialog.PawnPreset.Error.Failed>Failed to load character.  Check that all required mods are enabled.</EdB.PC.Dialog.PawnPreset.Error.Failed>
   <EdB.PC.Dialog.PawnPreset.Error.PreAlpha13NotSupported>Pre-alpha 13 versions of saved colonists are not supported.</EdB.PC.Dialog.PawnPreset.Error.PreAlpha13NotSupported>
 
   <EdB.PC.Dialog.Preset.Button.Load>Load Preset</EdB.PC.Dialog.Preset.Button.Load>

Source/ControllerPawns.cs

@@ -8,7 +8,9 @@
 namespace EdB.PrepareCarefully {
     public class ControllerPawns {
         public delegate void PawnAddedHandler(CustomPawn pawn);
+        public delegate void PawnReplacedHandler(CustomPawn pawn);
         public event PawnAddedHandler PawnAdded;
+        public event PawnReplacedHandler PawnReplaced;
 
         private State state;
         private Randomizer randomizer = new Randomizer();
@@ -20,7 +22,10 @@ public ControllerPawns(State state) {
         }
 
         public void RandomizeAll() {
-            randomizer.RandomizeAll(state.CurrentPawn);
+            Pawn pawn = randomizer.GenerateSameKindOfColonist(state.CurrentPawn);
+            state.CurrentPawn.InitializeWithPawn(pawn);
+            state.CurrentPawn.Id = Guid.NewGuid().ToString();
+            PawnReplaced(state.CurrentPawn);
         }
 
         // Name-related actions.

Source/ControllerRelationships.cs

@@ -22,6 +22,10 @@ public void DeleteAllPawnRelationships(CustomPawn pawn) {
         public void AddPawn(CustomPawn pawn) {
             PrepareCarefully.Instance.RelationshipManager.AddVisibleParentChildPawn(pawn);
         }
+        public void ReplacePawn(CustomPawn pawn) {
+            PrepareCarefully.Instance.RelationshipManager.DeletePawn(pawn);
+            PrepareCarefully.Instance.RelationshipManager.AddVisibleParentChildPawn(pawn);
+        }
         public void AddParentToParentChildGroup(CustomParentChildGroup group, CustomParentChildPawn pawn) {
             if (!group.Parents.Contains(pawn) && !group.Children.Contains(pawn)) {
                 group.Parents.Add(pawn);

Source/CustomPawn.cs

@@ -94,9 +94,7 @@ public List<CustomBodyPart> BodyParts {
         }
 
         // We use a dirty flag for the portrait to avoid calling ClearCachedPortrait() every frame.
-        // TODO: Instead of calling this, why don't we just call ClearCachedPortrait() directly?  Are
-        // we trying to avoid calling it more than once per frame?
-        public void CheckPortraitCache() {
+        protected void CheckPortraitCache() {
             if (portraitDirty) {
                 portraitDirty = false;
                 pawn.ClearCachedPortraits();
@@ -107,8 +105,11 @@ protected void MarkPortraitAsDirty() {
             portraitDirty = true;
         }
 
-        public RenderTexture GetPortrait(Vector2 size) {
+        public void UpdatePortrait() {
             CheckPortraitCache();
+        }
+
+        public RenderTexture GetPortrait(Vector2 size) {
             return PortraitsCache.Get(Pawn, size, new Vector3(0, 0, 0), 1.0f);
         }
 
@@ -219,6 +220,11 @@ protected void InitializePawnHediffs(Pawn pawn) {
         }
 
         public void InitializeSkillLevelsAndPassions() {
+
+            if (pawn.skills == null) {
+                Log.Warning("Prepare Carefully could not initialize skills for the pawn.  No pawn skill tracker for " + pawn.def.defName + ", " + pawn.kindDef.defName);
+            }
+
             // Save the original passions and set the current values to the same.
             foreach (SkillRecord record in pawn.skills.skills) {
                 originalPassions[record.def] = record.passion;
@@ -1210,6 +1216,7 @@ public void AddInjury(Injury injury) {
         public void SetInjuriesAndImplants(IEnumerable<Injury> injuries, IEnumerable<Implant> implants) {
             this.injuries.Clear();
             this.implants.Clear();
+            this.bodyParts.Clear();
             foreach (var injury in injuries) {
                 this.injuries.Add(injury);
                 this.bodyParts.Add(injury);
@@ -1257,7 +1264,6 @@ public void RemoveCustomBodyParts(BodyPartRecord part) {
 
         public void AddImplant(Implant implant) {
             if (implant != null && implant.BodyPartRecord != null) {
-                Log.Message("Added implant to CustomPawn: " + implant.recipe.defName + ", " + implant.BodyPartRecord.def.defName);
                 RemoveCustomBodyParts(implant.BodyPartRecord);
                 implants.Add(implant);
                 bodyParts.Add(implant);

Source/ExtensionsPawn.cs

@@ -57,7 +57,6 @@ public static void ClearCaches(this Pawn pawn) {
             pawn.ClearCachedLifeStage();
             pawn.ClearCachedDisabledWorkTypes();
             pawn.ClearCachedDisabledSkillRecords();
-            pawn.ClearCachedPortraits();
         }
 
         public static void ClearCachedDisabledWorkTypes(this Pawn pawn) {

Source/Page_PrepareCarefully.cs

@@ -241,6 +241,7 @@ protected void InstrumentPanels() {
             tabViewPawns.PanelPawnList.PawnDeleted += (CustomPawn pawn) => { controller.CheckPawnCapabilities(); };
             pawns.PawnAdded += (CustomPawn pawn) => { tabViewPawns.PanelPawnList.ScrollToBottom(); tabViewPawns.PanelPawnList.SelectPawn(pawn); };
             pawns.PawnAdded += (CustomPawn pawn) => { controller.CheckPawnCapabilities(); };
+            pawns.PawnReplaced += (CustomPawn pawn) => { controller.CheckPawnCapabilities(); };
 
             tabViewPawns.PanelHealth.InjuryAdded += pawns.AddInjury;
             tabViewPawns.PanelHealth.InjuryAdded += (Injury i) => { tabViewPawns.PanelHealth.ScrollToBottom(); };
@@ -292,6 +293,7 @@ protected void InstrumentPanels() {
             tabViewRelationships.PanelRelationshipsParentChild.GroupAdded += relationships.AddParentChildGroup;
             tabViewPawns.PanelPawnList.PawnDeleted += relationships.DeleteAllPawnRelationships;
             pawns.PawnAdded += relationships.AddPawn;
+            pawns.PawnReplaced += relationships.ReplacePawn;
         }
     }
 }

Source/PanelAppearance.cs

@@ -292,6 +292,7 @@ protected override void DrawPanelContent(State state) {
             }
             GUI.DrawTexture(RectPortrait, Textures.TexturePortraitBackground);
 
+            customPawn.UpdatePortrait();
             DrawPawn(customPawn, RectPortrait);
 
             GUI.color = ColorPortraitBorder;

Source/PanelPawnList.cs

@@ -215,8 +215,8 @@ public void SelectPawn(CustomPawn pawn) {
         }
 
         protected void OpenAddPawnDialog() {
-            FactionDef selectedFaction = previousFaction != null ? previousFaction : providerFactions.Factions.First();
-            var dialog = new Dialog_Options<FactionDef>(providerFactions.Factions) {
+            FactionDef selectedFaction = previousFaction != null ? previousFaction : providerFactions.NonPlayerHumanlikeFactionDefs.First();
+            var dialog = new Dialog_Options<FactionDef>(providerFactions.NonPlayerHumanlikeFactionDefs) {
                 ConfirmButtonLabel = "EdB.PC.Common.Add".Translate(),
                 CancelButtonLabel = "EdB.PC.Common.Cancel".Translate(),
                 HeaderLabel = "EdB.PC.Panel.PawnList.SelectFaction".Translate(),

Source/PawnLayers.cs

@@ -60,25 +60,31 @@ public static int ToPawnLayerIndex(ApparelLayer layer) {
 
         public static int ToPawnLayerIndex(ApparelProperties apparelProperties) {
             ApparelLayer layer = apparelProperties.LastLayer;
-            if (layer == ApparelLayer.OnSkin && apparelProperties.bodyPartGroups.Count == 1 && apparelProperties.bodyPartGroups[0].Equals(BodyPartGroupDefOf.Legs)) {
-                return Pants;
+            if (layer == ApparelLayer.OnSkin && apparelProperties.bodyPartGroups.Count == 1) {
+                if (apparelProperties.bodyPartGroups[0].Equals(BodyPartGroupDefOf.Legs)) {
+                    return Pants;
+                }
+                else if (apparelProperties.bodyPartGroups[0].defName == "Hands") {
+                    return -1;
+                }
+                else if (apparelProperties.bodyPartGroups[0].defName == "Feet") {
+                    return -1;
+                }
             }
-            else {
-                switch (layer) {
-                    case ApparelLayer.OnSkin:
-                        return BottomClothingLayer;
-                    case ApparelLayer.Middle:
-                        return MiddleClothingLayer;
-                    case ApparelLayer.Shell:
-                        return TopClothingLayer;
-                    case ApparelLayer.Belt:
-                        return Accessory;
-                    case ApparelLayer.Overhead:
-                        return Hat;
-                    default: {
-                            Log.Warning("Cannot find matching layer for apparel.  Last layer: " + apparelProperties.LastLayer);
-                            return -1;
-                        }
+            switch (layer) {
+                case ApparelLayer.OnSkin:
+                    return BottomClothingLayer;
+                case ApparelLayer.Middle:
+                    return MiddleClothingLayer;
+                case ApparelLayer.Shell:
+                    return TopClothingLayer;
+                case ApparelLayer.Belt:
+                    return Accessory;
+                case ApparelLayer.Overhead:
+                    return Hat;
+                default: {
+                    Log.Warning("Cannot find matching layer for apparel.  Last layer: " + apparelProperties.LastLayer);
+                    return -1;
                 }
             }
         }

Source/ProviderFactions.cs

@@ -5,7 +5,7 @@
 using Verse;
 namespace EdB.PrepareCarefully {
     public class ProviderFactions {
-        private List<FactionDef> factions = new List<FactionDef>();
+        private List<FactionDef> nonPlayerHumanlikeFactionDefs = new List<FactionDef>();
         public ProviderFactions() {
             HashSet<string> labels = new HashSet<string>();
             foreach (var def in DefDatabase<FactionDef>.AllDefs) {
@@ -17,16 +17,16 @@ public ProviderFactions() {
                 }
                 if (!labels.Contains(def.label)) {
                     labels.Add(def.label);
-                    factions.Add(def);
+                    nonPlayerHumanlikeFactionDefs.Add(def);
                 }
             }
-            factions.Sort((FactionDef a, FactionDef b) => {
+            nonPlayerHumanlikeFactionDefs.Sort((FactionDef a, FactionDef b) => {
                 return a.defName.CompareTo(b.defName);
             });
         }
-        public List<FactionDef> Factions {
+        public List<FactionDef> NonPlayerHumanlikeFactionDefs {
             get {
-                return factions;
+                return nonPlayerHumanlikeFactionDefs;
             }
         }
     }

Source/RelationshipManager.cs

@@ -466,6 +466,11 @@ public void DeletePawn(CustomPawn pawn) {
                 relationships.Remove(r);
             }
 
+            this.parentChildPawns.RemoveAll((CustomParentChildPawn p) => {
+                return (p.Pawn == pawn);
+            });
+            this.parentChildCustomPawnLookup.Remove(pawn);
+
             dirty = true;
         }
 

Source/Version3/PresetLoaderVersion3.cs

@@ -256,6 +256,7 @@ public CustomPawn LoadPawn(SaveRecordPawnV3 record) {
             else {
                 source = new Randomizer().GenerateColonist();
             }
+            source.health.Reset();
 
             CustomPawn pawn = new CustomPawn(source);
             pawn.Id = record.id;