v4.111

juanosarg · Apr 1, 2023 · 41eca39 · 41eca39
1 parent 82eeb9c
commit 41eca39
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 140 deletions.
diff --git a/1.4/Assemblies/AlphaBehavioursAndEvents.dll b/1.4/Assemblies/AlphaBehavioursAndEvents.dll
diff --git a/1.4/Defs/ThingDefs_Races/Races_Aerofleet.xml b/1.4/Defs/ThingDefs_Races/Races_Aerofleet.xml
@@ -9,7 +9,7 @@
 			<ComfyTemperatureMin>-25</ComfyTemperatureMin>
 			<ComfyTemperatureMax>30</ComfyTemperatureMax>
 			<MarketValue>120</MarketValue>
-			<MeatAmount>0</MeatAmount>
+
 		</statBases>
 		<tools>
 			<li>
@@ -63,7 +63,7 @@
 			<foodType>VegetarianRoughAnimal</foodType>
 			<leatherDef>AA_Leather_Aerofleet</leatherDef>
 			<wildness>0.60</wildness>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>AA_AerofleetMeat</specificMeatDef>
 			<canBePredatorPrey>false</canBePredatorPrey>
 			<trainability>None</trainability>			
 			<lifeExpectancy>9</lifeExpectancy>
@@ -101,9 +101,7 @@
 
 			</wildBiomes>
 		</race>
-		<butcherProducts>
-			<AA_AerofleetMeat>2</AA_AerofleetMeat>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalCommon</li>
 		</tradeTags>
@@ -198,7 +196,7 @@
 			<ComfyTemperatureMin>-25</ComfyTemperatureMin>
 			<ComfyTemperatureMax>30</ComfyTemperatureMax>
 			<MarketValue>400</MarketValue>
-			<MeatAmount>0</MeatAmount>
+
 		</statBases>
 		<comps>
 			<li Class="AnimalBehaviours.CompProperties_Floating">
@@ -252,7 +250,7 @@
 			<foodType>VegetarianRoughAnimal</foodType>
 			<leatherDef>AA_Leather_Aerofleet</leatherDef>
 			<wildness>0.80</wildness>
-			<useMeatFrom>Pig</useMeatFrom>			
+			<specificMeatDef>AA_AerofleetMeat</specificMeatDef>		
 			<lifeExpectancy>110</lifeExpectancy>
 			<lifeStageAges>
 				<li>
@@ -269,9 +267,7 @@
 			<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
 
 		</race>
-		<butcherProducts>
-			<AA_AerofleetMeat>2</AA_AerofleetMeat>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 			<li>AnimalAlpha</li>

diff --git a/1.4/Defs/ThingDefs_Races/Races_Agaripawn.xml b/1.4/Defs/ThingDefs_Races/Races_Agaripawn.xml
@@ -10,7 +10,7 @@
 			<ComfyTemperatureMin>-15</ComfyTemperatureMin>
 			<MarketValue>200</MarketValue>
 			<LeatherAmount>0</LeatherAmount>
-			<MeatAmount>0</MeatAmount>
+
 			<ArmorRating_Blunt>.75</ArmorRating_Blunt>
 			<ArmorRating_Heat>-100</ArmorRating_Heat>
 			<ArmorRating_Sharp>.75</ArmorRating_Sharp>
@@ -114,7 +114,7 @@
 			<manhunterOnTameFailChance>0.018</manhunterOnTameFailChance>
 			<trainability>Intermediate</trainability>
 			<lifeExpectancy>35</lifeExpectancy>			
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>AA_AgariluxRawFungus</specificMeatDef>
 			<lifeStageAges>
 				<li>
 					<def>AnimalBaby</def>
@@ -138,9 +138,7 @@
 			<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
 
 		</race>
-		<butcherProducts>
-			<AA_AgariluxRawFungus>2</AA_AgariluxRawFungus>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 		</tradeTags>

diff --git a/1.4/Defs/ThingDefs_Races/Races_Agaripod.xml b/1.4/Defs/ThingDefs_Races/Races_Agaripod.xml
@@ -10,7 +10,7 @@
 			<ComfyTemperatureMin>-15</ComfyTemperatureMin>
 			<MarketValue>450</MarketValue>
 			<LeatherAmount>0</LeatherAmount>
-			<MeatAmount>0</MeatAmount>
+
 			<ArmorRating_Blunt>1</ArmorRating_Blunt>
 			<ArmorRating_Heat>-100</ArmorRating_Heat>
 			<ArmorRating_Sharp>2</ArmorRating_Sharp>
@@ -100,7 +100,7 @@
 			<baseBodySize>4.0</baseBodySize>
 			<baseHealthScale>3.6</baseHealthScale>
 			<baseHungerRate>0.33</baseHungerRate>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>AA_AgariluxRawFungus</specificMeatDef>
 			<foodType>VegetarianRoughAnimal</foodType>
 			<hasGenders>false</hasGenders>
 			<wildness>0.9</wildness>
@@ -130,9 +130,7 @@
 			<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
 
 		</race>
-		<butcherProducts>
-			<AA_AgariluxRawFungus>2</AA_AgariluxRawFungus>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 		</tradeTags>

diff --git a/1.4/Defs/ThingDefs_Races/Races_Cactipine.xml b/1.4/Defs/ThingDefs_Races/Races_Cactipine.xml
@@ -12,8 +12,7 @@
 			<ComfyTemperatureMin>-5</ComfyTemperatureMin>
 			<ComfyTemperatureMax>70</ComfyTemperatureMax>
 			<MarketValue>100</MarketValue>
-			<MeatAmount>0</MeatAmount>
-
+
 		</statBases>
 		<tools>
 			<li>
@@ -85,7 +84,7 @@
 			<leatherDef>Leather_Cactus</leatherDef>
 			<foodType>OmnivoreAnimal, OvivoreAnimal</foodType>
 			<wildness>0.75</wildness>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>AA_CactusMeat</specificMeatDef>	
 			<manhunterOnDamageChance>1.0</manhunterOnDamageChance>
 			<manhunterOnTameFailChance>0.2</manhunterOnTameFailChance>
 			<trainability>Intermediate</trainability>
@@ -122,9 +121,7 @@
 			<soundMeleeHitBuilding>Pawn_Melee_SmallScratch_HitBuilding</soundMeleeHitBuilding>
 			<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
 		</race>
-		<butcherProducts>
-			<AA_CactusMeat>2</AA_CactusMeat>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalCommon</li>
 		</tradeTags>

diff --git a/1.4/Defs/ThingDefs_Races/Races_Mantrap.xml b/1.4/Defs/ThingDefs_Races/Races_Mantrap.xml
@@ -13,8 +13,7 @@
 			<ComfyTemperatureMax>70</ComfyTemperatureMax>
 			<MarketValue>450</MarketValue>
 			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-			<MeatAmount>0</MeatAmount>
-
+
 		</statBases>
 
 		<tools>
@@ -97,7 +96,7 @@
 			<foodType>CarnivoreAnimal, OvivoreAnimal</foodType>			
 			<leatherDef>Leather_Cactus</leatherDef>
 			<wildness>0.8</wildness>
-			<useMeatFrom>Rat</useMeatFrom>
+			<specificMeatDef>AA_CactusMeat</specificMeatDef>
 			<trainability>Intermediate</trainability>
 			<gestationPeriodDays>10</gestationPeriodDays>
 			<litterSizeCurve>
@@ -129,9 +128,7 @@
 			<soundMeleeHitBuilding>Pawn_Melee_BigBash_HitBuilding</soundMeleeHitBuilding>
 			<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
 		</race>
-		<butcherProducts>
-			<AA_CactusMeat>2</AA_CactusMeat>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalUncommon</li>
 			<li>AnimalFighter</li>

diff --git a/1.4/Defs/ThingDefs_Races/Races_MycoidColossus.xml b/1.4/Defs/ThingDefs_Races/Races_MycoidColossus.xml
@@ -11,7 +11,7 @@
 			<MoveSpeed>2.00</MoveSpeed>
 			<ComfyTemperatureMin>-30</ComfyTemperatureMin>
 			<MarketValue>550</MarketValue>
-			<MeatAmount>0</MeatAmount>
+
 			<LeatherAmount>0</LeatherAmount>
 			<FilthRate>16</FilthRate>
 
@@ -72,8 +72,9 @@
 			<hasGenders>false</hasGenders>
 			<trainability>Intermediate</trainability>
 			<manhunterOnDamageChance>.75</manhunterOnDamageChance>
-			<useMeatFrom>AA_OvergrownColossus</useMeatFrom>
+
 			<lifeExpectancy>570</lifeExpectancy>
+			<specificMeatDef>AA_AgariluxRawFungus</specificMeatDef>
 			<lifeStageAges>
 				<li>
 					<def>AnimalBaby</def>
@@ -96,9 +97,7 @@
 			<soundMeleeHitBuilding>Pawn_Melee_SmallScratch_HitBuilding</soundMeleeHitBuilding>
 			<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
 		</race>
-		<butcherProducts>
-			<AA_AgariluxRawFungus>2</AA_AgariluxRawFungus>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalUncommon</li>
 			<li>AnimalFighter</li>

diff --git a/1.4/Defs/ThingDefs_Races/Races_NeedlePost.xml b/1.4/Defs/ThingDefs_Races/Races_NeedlePost.xml
@@ -13,8 +13,7 @@
 			<ComfyTemperatureMax>70</ComfyTemperatureMax>
 			<MarketValue>630</MarketValue>
 			<ArmorRating_Blunt>0.3</ArmorRating_Blunt>
-			<MeatAmount>0</MeatAmount>
-
+
 		</statBases>
 		<tickerType>Normal</tickerType>
 
@@ -91,7 +90,7 @@
 			<foodType>VegetarianRoughAnimal</foodType>
 			<leatherDef>Leather_Cactus</leatherDef>
 			<wildness>0.6</wildness>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>AA_CactusMeat</specificMeatDef>	
 			<trainability>Intermediate</trainability>
 			<gestationPeriodDays>10</gestationPeriodDays>
 			<litterSizeCurve>
@@ -124,9 +123,7 @@
 			<soundMeleeHitBuilding>Pawn_Melee_BigBash_HitBuilding</soundMeleeHitBuilding>
 			<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
 		</race>
-		<butcherProducts>
-			<AA_CactusMeat>2</AA_CactusMeat>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 		</tradeTags>

diff --git a/1.4/Defs/ThingDefs_Races/Races_NeedleRoll.xml b/1.4/Defs/ThingDefs_Races/Races_NeedleRoll.xml
@@ -13,8 +13,7 @@
 			<ComfyTemperatureMax>100</ComfyTemperatureMax>
 			<MarketValue>250</MarketValue>
 			<ArmorRating_Blunt>0.15</ArmorRating_Blunt>
-			<MeatAmount>0</MeatAmount>
-
+
 		</statBases>
 		<tickerType>Normal</tickerType>
 
@@ -88,7 +87,7 @@
 			<foodType>VegetarianRoughAnimal</foodType>
 			<leatherDef>Leather_Cactus</leatherDef>
 			<wildness>0.6</wildness>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>AA_CactusMeat</specificMeatDef>
 			<trainability>None</trainability>
 			<gestationPeriodDays>6.66</gestationPeriodDays>
 			<litterSizeCurve>
@@ -122,9 +121,7 @@
 			<soundMeleeHitBuilding>Pawn_Melee_SmallScratch_HitBuilding</soundMeleeHitBuilding>
 			<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
 		</race>
-		<butcherProducts>
-			<AA_CactusMeat>2</AA_CactusMeat>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 		</tradeTags>

diff --git a/1.4/Defs/ThingDefs_Races/Races_OcularJelly.xml b/1.4/Defs/ThingDefs_Races/Races_OcularJelly.xml
@@ -10,7 +10,7 @@
 			<ComfyTemperatureMin>-35</ComfyTemperatureMin>
 			<ComfyTemperatureMax>40</ComfyTemperatureMax>
 			<MarketValue>250</MarketValue>
-			<MeatAmount>0</MeatAmount>
+
 		</statBases>
 		<tools>
 			<li>
@@ -90,7 +90,7 @@
 			<leatherDef>Leather_Light</leatherDef>
 			<wildness>0.8</wildness>
 			<trainability>Intermediate</trainability>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>AA_OcularJellyMeat</specificMeatDef>
 
 			<lifeExpectancy>4</lifeExpectancy>
 			<lifeStageAges>
@@ -124,9 +124,7 @@
 
 			</wildBiomes>
 		</race>
-		<butcherProducts>
-			<AA_OcularJellyMeat>2</AA_OcularJellyMeat>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 		</tradeTags>

diff --git a/1.4/Defs/ThingDefs_Races/Races_Wildpawn.xml b/1.4/Defs/ThingDefs_Races/Races_Wildpawn.xml
@@ -10,7 +10,7 @@
 			<ComfyTemperatureMin>-15</ComfyTemperatureMin>
 			<MarketValue>200</MarketValue>
 			<LeatherAmount>0</LeatherAmount>
-			<MeatAmount>0</MeatAmount>
+
 			<ArmorRating_Blunt>.75</ArmorRating_Blunt>
 			<ArmorRating_Heat>-100</ArmorRating_Heat>
 			<ArmorRating_Sharp>.75</ArmorRating_Sharp>
@@ -106,7 +106,7 @@
 			<manhunterOnTameFailChance>0.018</manhunterOnTameFailChance>
 			<trainability>Intermediate</trainability>
 			<lifeExpectancy>35</lifeExpectancy>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>RawFungus</specificMeatDef>
 
 			<lifeStageAges>
 				<li>
@@ -136,9 +136,7 @@
 				<AridShrubland>0.05</AridShrubland>
 			</wildBiomes>
 		</race>
-		<butcherProducts>
-			<RawFungus>2</RawFungus>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 		</tradeTags>

diff --git a/1.4/Defs/ThingDefs_Races/Races_Wildpod.xml b/1.4/Defs/ThingDefs_Races/Races_Wildpod.xml
@@ -10,7 +10,7 @@
 			<ComfyTemperatureMin>-15</ComfyTemperatureMin>
 			<MarketValue>400</MarketValue>
 			<LeatherAmount>0</LeatherAmount>
-			<MeatAmount>0</MeatAmount>
+
 			<ArmorRating_Blunt>1</ArmorRating_Blunt>
 			<ArmorRating_Heat>-100</ArmorRating_Heat>
 			<ArmorRating_Sharp>2</ArmorRating_Sharp>
@@ -107,7 +107,7 @@
 			<manhunterOnTameFailChance>0.018</manhunterOnTameFailChance>
 			<trainability>Intermediate</trainability>
 			<lifeExpectancy>70</lifeExpectancy>
-			<useMeatFrom>Pig</useMeatFrom>
+			<specificMeatDef>RawFungus</specificMeatDef>
 
 			<lifeStageAges>
 				<li>
@@ -140,9 +140,7 @@
 				<AridShrubland>0.05</AridShrubland>
 			</wildBiomes>
 		</race>
-		<butcherProducts>
-			<RawFungus>2</RawFungus>
-		</butcherProducts>
+
 		<tradeTags>
 			<li>AnimalExotic</li>
 		</tradeTags>

diff --git a/...83cfa0e-cbe3-450d-b16b-20fc9b6c092e.vsidx → ...969ea17-914a-40d9-8d43-92dfb5559199.vsidx b/...83cfa0e-cbe3-450d-b16b-20fc9b6c092e.vsidx → ...969ea17-914a-40d9-8d43-92dfb5559199.vsidx
diff --git a/.../.vs/AlphaBehavioursAndEvents/FileContentIndex/3fbddb52-6065-498b-b529-d04f654198f9.vsidx b/.../.vs/AlphaBehavioursAndEvents/FileContentIndex/3fbddb52-6065-498b-b529-d04f654198f9.vsidx
diff --git a/.../.vs/AlphaBehavioursAndEvents/FileContentIndex/f6c16109-f8ed-42d0-9376-55523dfcddaf.vsidx b/.../.vs/AlphaBehavioursAndEvents/FileContentIndex/f6c16109-f8ed-42d0-9376-55523dfcddaf.vsidx
diff --git a/1.4/Source/AlphaBehavioursAndEvents/.vs/AlphaBehavioursAndEvents/v17/.suo b/1.4/Source/AlphaBehavioursAndEvents/.vs/AlphaBehavioursAndEvents/v17/.suo
diff --git a/1.4/Source/AlphaBehavioursAndEvents/AlphaBehavioursAndEvents/AlphaBehavioursAndEvents.csproj b/1.4/Source/AlphaBehavioursAndEvents/AlphaBehavioursAndEvents/AlphaBehavioursAndEvents.csproj
@@ -349,7 +349,6 @@
     <Compile Include="Harmony\PawnUtility_IsFighting.cs" />
     <Compile Include="Harmony\QuestManager_Notify_ThingsProduced_Patch.cs" />
     <Compile Include="Harmony\RoomStatWorker_Beauty_GetScore_Patch.cs" />
-    <Compile Include="Harmony\Thing_ButcherProducts.cs" />
     <Compile Include="Harmony\JobDriver_Ingest_MakeNewToils.cs" />
     <Compile Include="Harmony\MapTemperature_SeasonAcceptableFor_Patch.cs" />
     <Compile Include="Hediffs\HediffCompProperties\HediffCompProperties_RemoveFromMechs.cs" />