last fixes + added proper south sprite for mechanoid workshop

rheirman · Sep 7, 2018 · 95f3359 · 95f3359
1 parent 80d7e98
commit 95f3359
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/Assemblies/WhatTheHack.dll b/Assemblies/WhatTheHack.dll
diff --git a/Defs/RecipeDefs/Recipes_Mechanoids.xml b/Defs/RecipeDefs/Recipes_Mechanoids.xml
@@ -7,7 +7,7 @@
 		<workSpeedStat>WTH_HackingMaintenanceSpeed</workSpeedStat>
 		<effectWorking>Repair</effectWorking>
 		<soundWorking>Recipe_Machining</soundWorking>
-		<workAmount>2000</workAmount>
+		<workAmount>1500</workAmount>
 		<unfinishedThingDef>UnfinishedComponent</unfinishedThingDef>
 		<ingredients>
 		  <li>

diff --git a/Source/WhatTheHack/Buildings/Building_HackingTable.cs b/Source/WhatTheHack/Buildings/Building_HackingTable.cs
@@ -35,8 +35,11 @@ public bool TryAddPawnForModification(Pawn pawn, RecipeDef recipeDef)
                 {
                     return false;
                 }
-                pawn.health.surgeryBills.AddBill(bill);
-                bill.Part = bodyparts.First();
+                if(pawn.health.surgeryBills.FirstShouldDoNow == null || pawn.health.surgeryBills.FirstShouldDoNow.recipe != WTH_DefOf.WTH_HackMechanoid)
+                {
+                    pawn.health.surgeryBills.AddBill(bill);
+                    bill.Part = bodyparts.First();
+                }
             }
             Need_Power powerNeed = pawn.needs.TryGetNeed<Need_Power>();
             if (powerNeed != null)

diff --git a/Source/WhatTheHack/Jobs/JobDriver_CarryToHackingTable.cs b/Source/WhatTheHack/Jobs/JobDriver_CarryToHackingTable.cs
@@ -47,6 +47,7 @@ protected override IEnumerable<Toil> MakeNewToils()
                 {
                     this.pawn.carryTracker.TryDropCarriedThing(HackingTable.GetSleepingSlotPos(Building_HackingTable.SLOTINDEX), ThingPlaceMode.Direct, out Thing thing, null);
                     this.pawn.ClearAllReservations();
+                    HackingTable.TryAddPawnForModification(Takee, WTH_DefOf.WTH_HackMechanoid);
                     Takee.Position = HackingTable.GetSleepingSlotPos(Building_HackingTable.SLOTINDEX);
                 },
                 defaultCompleteMode = ToilCompleteMode.Instant

diff --git a/Textures/Things/MechanoidWorkshop_south.png b/Textures/Things/MechanoidWorkshop_south.png