Leeani: custom pawn kind for crashlanded scenario. As engineered race…

…, they can't be body purists. Carbon: more balancing for 1.0 Animals Logic: pregnant tag is not necessary amymore.
quicksilverfox · Jul 2, 2018 · ae68920 · ae68920
1 parent dfffadb
commit ae68920
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 36 deletions.
diff --git a/AnimalsLogic/About/ModSync.xml b/AnimalsLogic/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>1c1a011c-a469-4887-a1e0-04c817f06db2</ID>
   <ModName>Animals Logic</ModName>
-  <Version>1.0.0.0</Version>
+  <Version>1.0.0.1</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>quicksilverfox</Owner>

diff --git a/AnimalsLogic/Assemblies/AnimalsLogic.dll b/AnimalsLogic/Assemblies/AnimalsLogic.dll
diff --git a/AnimalsLogic/Source/AnimalsLogic/AnimalsAreDifferent.cs b/AnimalsLogic/Source/AnimalsLogic/AnimalsAreDifferent.cs
@@ -73,18 +73,6 @@ public static string AnimalImportantInfo(Pawn p, bool gender = false)
                 }
             }
 
-            // [P]regnant
-            if (p.health.hediffSet.HasHediff(HediffDefOf.Pregnant))
-            {
-                Hediff_Pregnant hediff_Pregnant = (Hediff_Pregnant)p.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.Pregnant);
-                if (hediff_Pregnant.Visible)
-                {
-                    if (e.Length > 0)
-                        e += ";";
-                    e += "P" + hediff_Pregnant.GestationProgress.ToStringPercent();
-                }
-            }
-
             // [W]ool
             CompShearable wool = p.TryGetComp<CompShearable>();
             if (wool != null && wool.Fullness > 0.05)

diff --git a/AnimalsLogic/Source/AnimalsLogic/AnimalsLogic.csproj b/AnimalsLogic/Source/AnimalsLogic/AnimalsLogic.csproj
@@ -42,9 +42,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine">
       <HintPath>..\..\..\..\..\..\Games\SteamLibrary\steamapps\common\RimWorld\RimWorldWin_Data\Managed\UnityEngine.dll</HintPath>

diff --git a/Carbon/About/ModSync.xml b/Carbon/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>aa4ad3eb-22fa-42b5-a730-b417c1a2335e</ID>
   <ModName>Carbon</ModName>
-  <Version>1.0.0.0</Version>
+  <Version>1.0.0.1</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>quicksilverfox</Owner>

diff --git a/Carbon/Defs/RecipeDefs/Recipes_Production.xml b/Carbon/Defs/RecipeDefs/Recipes_Production.xml
@@ -9,7 +9,7 @@
 		<jobString>Refining chemfuel from hay.</jobString>
 		<effectWorking>Cremate</effectWorking>
 		<soundWorking>Recipe_Cremate</soundWorking>
-		<workAmount>2150</workAmount>
+		<workAmount>2000</workAmount>
 		<workSpeedStat>UnskilledLaborSpeed</workSpeedStat>
 		<ingredients>
 			<li>
@@ -38,7 +38,7 @@
 		<jobString>Making carbon weave.</jobString>
 		<effectWorking>Cremate</effectWorking>
 		<soundWorking>Recipe_Cremate</soundWorking>
-		<workAmount>3000</workAmount>
+		<workAmount>2000</workAmount>
 		<workSpeedStat>UnskilledLaborSpeed</workSpeedStat>
 		<researchPrerequisite>CarbonResearch</researchPrerequisite>
 		<ingredients>
@@ -48,7 +48,7 @@
 						<li>Chemfuel</li>
 					</thingDefs>
 				</filter>
-				<count>60</count>
+				<count>50</count>
 			</li>
 		</ingredients>
 		<fixedIngredientFilter>
@@ -68,7 +68,7 @@
 		<jobString>Making carbon composite.</jobString>
 		<effectWorking>Cremate</effectWorking>
 		<soundWorking>Recipe_Cremate</soundWorking>
-		<workAmount>3000</workAmount>
+		<workAmount>2000</workAmount>
 		<workSpeedStat>UnskilledLaborSpeed</workSpeedStat>
 		<researchPrerequisite>CarbonResearch</researchPrerequisite>
 		<ingredients>
@@ -78,7 +78,7 @@
 						<li>Chemfuel</li>
 					</thingDefs>
 				</filter>
-				<count>60</count>
+				<count>50</count>
 			</li>
 		</ingredients>
 		<fixedIngredientFilter>
@@ -98,7 +98,7 @@
 		<jobString>Making diamond.</jobString>
 		<effectWorking>Cremate</effectWorking>
 		<soundWorking>Recipe_Cremate</soundWorking>
-		<workAmount>5000</workAmount>
+		<workAmount>3500</workAmount>
 		<workSpeedStat>UnskilledLaborSpeed</workSpeedStat>
 		<researchPrerequisite>CarbonResearch</researchPrerequisite>
 		<ingredients>
@@ -108,7 +108,7 @@
 						<li>Chemfuel</li>
 					</thingDefs>
 				</filter>
-				<count>60</count>
+				<count>50</count>
 			</li>
 		</ingredients>
 		<fixedIngredientFilter>

diff --git a/Carbon/Defs/ThingDefs_Items/Items_Resource_Stuff.xml b/Carbon/Defs/ThingDefs_Items/Items_Resource_Stuff.xml
@@ -12,8 +12,8 @@
 		</graphicData>
 		<useHitPoints>true</useHitPoints>
 		<statBases>
-			<StuffPower_Armor_Sharp>1.5</StuffPower_Armor_Sharp>
-			<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Sharp>1.4</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.35</StuffPower_Armor_Blunt>
 			<StuffPower_Armor_Heat>3.0</StuffPower_Armor_Heat>
 			<StuffPower_Insulation_Cold>22</StuffPower_Insulation_Cold>
 			<StuffPower_Insulation_Heat>22</StuffPower_Insulation_Heat>

diff --git a/Leeani/About/ModSync.xml b/Leeani/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>e22c4149-b736-418c-84b1-1dd4b9155cd9</ID>
   <ModName>Leeani Playable Race</ModName>
-  <Version>1.0.0.0</Version>
+  <Version>1.0.0.1</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>quicksilverfox</Owner>

diff --git a/Leeani/Defs/PawnKindDefs_Humanlikes/PawnKinds_Player_Leeani.xml b/Leeani/Defs/PawnKindDefs_Humanlikes/PawnKinds_Player_Leeani.xml
@@ -3,13 +3,14 @@
 
 	<PawnKindDef Abstract="True" Name="BaseLeeaniPawnKind">
 		<race>Alien_Leeani</race>
-		<combatPower>20</combatPower>
+		<combatPower>30</combatPower>
 		<baseRecruitDifficulty>0.50</baseRecruitDifficulty>
 		<isFighter>false</isFighter>
 		<apparelIgnoreSeasons>true</apparelIgnoreSeasons>
 		<forceNormalGearQuality>true</forceNormalGearQuality>
 	</PawnKindDef>
 
+	<!-- For Leeani Loords scenario -->
 	<PawnKindDef ParentName="BaseLeeaniPawnKind">
 		<defName>Leeani</defName>
 		<label>colonist</label>
@@ -29,4 +30,32 @@
 		</weaponMoney>
 	</PawnKindDef>
 
+	<!-- For Crashlanded scenario -->
+	<PawnKindDef ParentName="BaseLeeaniPawnKind">
+		<defName>LeeaniColonist</defName>
+		<label>colonist</label>
+		<defaultFactionType>PlayerColony</defaultFactionType>
+		<backstoryCategory>Civil</backstoryCategory>
+		<chemicalAddictionChance>0.06</chemicalAddictionChance>
+		<apparelTags>
+			<li>IndustrialBasic</li>
+			<li>LeeaniPlayer</li>
+		</apparelTags>
+		<apparelAllowHeadgearChance>0</apparelAllowHeadgearChance>
+		<apparelMoney>
+			<min>350</min>
+			<max>600</max>
+		</apparelMoney>
+		<backstoryCryptosleepCommonality>1</backstoryCryptosleepCommonality>
+		<techHediffsChance>0.03</techHediffsChance>
+		<techHediffsMoney>
+			<min>50</min>
+			<max>800</max>
+		</techHediffsMoney>
+		<techHediffsTags>
+			<li>Poor</li>
+			<li>Simple</li>
+		</techHediffsTags>
+	</PawnKindDef>
+
 </Defs>
diff --git a/Leeani/Defs/ThingDefs_Items/Leeani_Bodyparts.xml b/Leeani/Defs/ThingDefs_Items/Leeani_Bodyparts.xml
@@ -23,7 +23,7 @@
 		<techLevel>Spacer</techLevel>
 		<costList>
 			<Plasteel>5</Plasteel>
-			<ComponentSpacer>4</ComponentSpacer>
+			<ComponentSpacer>3</ComponentSpacer>
 		</costList>
 		<statBases>
 			<WorkToMake>12000</WorkToMake>

diff --git a/Leeani/Defs/ThingDefs_Races/Race_Leeani.xml b/Leeani/Defs/ThingDefs_Races/Race_Leeani.xml
@@ -28,7 +28,16 @@
 						<defName>LeeaniPacifist</defName>
 						<chance>70</chance>
 					</li>
+					<li>
+						<!-- being poorly engineered race, they tend to like the idea of improving their bodies -->
+						<defName>Transhumanist</defName>
+						<chance>10</chance>
+					</li>
 				</forcedRaceTraitEntries>
+				<disallowedTraits>
+					<!-- being engineered race, they aren't exactly natural to begin with -->
+					<li>BodyPurist</li>
+				</disallowedTraits>
 				<alienPartGenerator>
 					<alienbodytypes>
 						<li>Thin</li>
@@ -107,15 +116,9 @@
 						<pawnKindEntries>
 							<li>
 								<kindDefs>
-									<li>LeeaniSpaceRefugee</li>
-									<li>LeeaniScout</li>
-									<li>LeeaniSoldier</li>
-									<li>LeeaniTradie</li>
-									<li>LeeaniPeasant</li>
-									<li>LeeaniArkhaevest</li>
-									<li>LeeaniMercenary</li>
+									<li>LeeaniColonist</li>
 								</kindDefs>
-								<chance>10.0</chance>
+								<chance>25.0</chance>
 							</li>
 						</pawnKindEntries>
 						<factionDefs>
@@ -130,6 +133,7 @@
 							<li>
 								<kindDefs>
 									<li>LeeaniSpaceRefugee</li>
+									<li>LeeaniColonist</li>
 									<li>LeeaniScout</li>
 									<li>LeeaniSoldier</li>
 									<li>LeeaniNoble</li>
@@ -163,7 +167,10 @@
 					<li>AteRawFood</li>
 					<li>SleptOnGround</li>
 					<li>SleptOutside</li>
+					<!-- foxes are semi-nocturnal animals who rely more on nose and ears, so they are okay with being in darkness -->
 					<li>EnvironmentDark</li>
+					<!-- being somewhat poorly engineered race, they won't mind improving their bodies -->
+					<li>NonProsthophileHasAddedBodyParts</li>
 				</cannotReceiveThoughts>
 			</thoughtSettings>
 			<raceRestriction>