diff --git a/About/About.xml b/About/About.xml
index 7d54a96..090dc53 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -1,14 +1,14 @@
- Medical Dissection
+ [DEV]Medical Dissection
Heremeus
- 0.18.0
+ 1.0.0
Adds a dissection table to the game.
Human corpses can be dissected at the table to improve the medical knowledge of your doctors.
Available languages: English, German (in progress)
-(v1.1.3)
+(v1.2.0)
\ No newline at end of file
diff --git a/About/Version.xml b/About/Version.xml
index b7947aa..c1e45d0 100644
--- a/About/Version.xml
+++ b/About/Version.xml
@@ -7,7 +7,7 @@
- 4.1.0
+ 6.1.0
UnlimitedHugs/RimworldHugsLibChecker
\ No newline at end of file
diff --git a/Assemblies/$HugsLibChecker.dll b/Assemblies/$HugsLibChecker.dll
index f5d1d8c..603578a 100644
Binary files a/Assemblies/$HugsLibChecker.dll and b/Assemblies/$HugsLibChecker.dll differ
diff --git a/Assemblies/HMDissection.dll b/Assemblies/HMDissection.dll
index b74a534..6c0e956 100644
Binary files a/Assemblies/HMDissection.dll and b/Assemblies/HMDissection.dll differ
diff --git a/Defs/Recipes/Recipes_DissectCorpse.xml b/Defs/Recipes/Recipes_DissectCorpse.xml
index c408b9c..2d339be 100644
--- a/Defs/Recipes/Recipes_DissectCorpse.xml
+++ b/Defs/Recipes/Recipes_DissectCorpse.xml
@@ -30,17 +30,17 @@
Corpses
-
+
CorpsesMechanoid
CorpsesAnimal
-
+
AllowRotten
- Human_Corpse
+ Corpse_Human
AllowCorpsesColonist
@@ -82,10 +82,10 @@
Corpses
-
- Human_Corpse
+
+ CorpsesHumanlike
CorpsesMechanoid
-
+
AllowRotten
diff --git a/Defs/ThingDefs_Buildings/Buildings_Production.xml b/Defs/ThingDefs_Buildings/Buildings_Production.xml
index cdbd154..563ba4e 100644
--- a/Defs/ThingDefs_Buildings/Buildings_Production.xml
+++ b/Defs/ThingDefs_Buildings/Buildings_Production.xml
@@ -107,13 +107,12 @@
Building
Building
- BulletImpactMetal
true
MapMeshAndRealTime
Light
Repair
true
- BuildingRubble
+ Filth_RubbleBuilding
0.70
diff --git a/Source/HMDissection/CompDissectionHandler.cs b/Source/HMDissection/CompDissectionHandler.cs
index 77ee146..ed5dad7 100644
--- a/Source/HMDissection/CompDissectionHandler.cs
+++ b/Source/HMDissection/CompDissectionHandler.cs
@@ -112,7 +112,7 @@ public override void CompTick()
float bodyPartsLeftPercent;
if (PawnOrCorpseStatUtility.TryGetPawnOrCorpseStat(StatRequest.For(corpse), (Pawn x) => x.health.hediffSet.GetCoverageOfNotMissingNaturalParts(x.RaceProps.body.corePart), (ThingDef x) => 1f, out bodyPartsLeftPercent))
{
- float workLeftPercent = bodyPartsLeftPercent - (currentDissectedPart.coverageAbs - currentDissectedPart.coverageAbs * (leftoverNutritionToDissect / FoodUtility.GetBodyPartNutrition(corpse.InnerPawn, currentDissectedPart)));
+ float workLeftPercent = bodyPartsLeftPercent - (currentDissectedPart.coverageAbs - currentDissectedPart.coverageAbs * (leftoverNutritionToDissect / FoodUtility.GetBodyPartNutrition(corpse, currentDissectedPart)));
jobDriver_DoBill.workLeft = Mathf.Max(10f, workLeftPercent * RECIPE_WORK_AMOUNT);
}
else
@@ -196,7 +196,7 @@ private void DissectedCalculateAmounts(Corpse corpse, Pawn dissector, out float
}));
dissectedPart = corpse.InnerPawn.RaceProps.body.corePart;
}
- float bodyPartNutrition = FoodUtility.GetBodyPartNutrition(corpse.InnerPawn, dissectedPart);
+ float bodyPartNutrition = FoodUtility.GetBodyPartNutrition(corpse, dissectedPart);
nutritionDissected = bodyPartNutrition;
}
@@ -209,17 +209,17 @@ private void DissectedCalculateAmounts(Corpse corpse, Pawn dissector, out float
private BodyPartRecord GetNextBodyPartToDissect(Corpse corpse, Pawn dissector)
{
IEnumerable source = from x in corpse.InnerPawn.health.hediffSet.GetNotMissingParts(BodyPartHeight.Undefined, BodyPartDepth.Undefined)
- where x.depth == BodyPartDepth.Outside && FoodUtility.GetBodyPartNutrition(corpse.InnerPawn, x) > 0.00001f
+ where x.depth == BodyPartDepth.Outside && FoodUtility.GetBodyPartNutrition(corpse, x) > 0.00001f
select x;
if (!source.Any())
{
return null;
}
- BodyPartRecord bodyPart = source.RandomElementByWeight(part => 1f / FoodUtility.GetBodyPartNutrition(corpse.InnerPawn, part));
+ BodyPartRecord bodyPart = source.RandomElementByWeight(part => 1f / FoodUtility.GetBodyPartNutrition(corpse, part));
var notMissingChildParts = bodyPart.GetDirectChildParts().Where(part => !corpse.InnerPawn.health.hediffSet.PartIsMissing(part));
while (notMissingChildParts.Any())
{
- bodyPart = notMissingChildParts.RandomElementByWeight(part => 1f / FoodUtility.GetBodyPartNutrition(corpse.InnerPawn, part));
+ bodyPart = notMissingChildParts.RandomElementByWeight(part => 1f / FoodUtility.GetBodyPartNutrition(corpse, part));
notMissingChildParts = bodyPart.GetDirectChildParts().Where(part => !corpse.InnerPawn.health.hediffSet.PartIsMissing(part));
}
return bodyPart;
diff --git a/Source/HMDissection/HMDissection.csproj b/Source/HMDissection/HMDissection.csproj
index d363490..81df12f 100644
--- a/Source/HMDissection/HMDissection.csproj
+++ b/Source/HMDissection/HMDissection.csproj
@@ -40,11 +40,11 @@
False
- ..\..\..\..\RimWorldWin_Data\Managed\Assembly-CSharp.dll
+ ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
False
- ..\..\..\HugsLib\Assemblies\HugsLib.dll
+ ..\..\..\HugsLib.dll
False
@@ -54,7 +54,7 @@
- ..\..\..\..\RimWorldWin_Data\Managed\UnityEngine.dll
+ ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll
False