From c2d46125cae2877a668aa09b5bd228d89ef645eb Mon Sep 17 00:00:00 2001
From: Anony <solosenpai@protonmail.com>
Date: Fri, 17 Jan 2020 12:42:57 -0800
Subject: [PATCH] Fix code for incubator organs
---
src/npc/surgery/organFarm.js | 8 ++++++++
src/pregmod/incubator.tw | 10 +++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/npc/surgery/organFarm.js b/src/npc/surgery/organFarm.js
index fa1791e5ae7..7c4f2ae79df 100644
--- a/src/npc/surgery/organFarm.js
+++ b/src/npc/surgery/organFarm.js
@@ -75,6 +75,14 @@ App.Medicine.OrganFarm.growOrgan = function(slave, organType) {
cashX(-organ.cost, "slaveSurgery", slave);
};
+App.Medicine.OrganFarm.growIncubatorOrgan = function(slave, organType) {
+ const organ = App.Medicine.OrganFarm.Organs[organType];
+
+ V.incubatorOrgans.push({type: organType, weeksToCompletion: organ.time, ID: slave.ID});
+
+ cashX(-organ.cost, "slaveSurgery", slave);
+};
+
/**
* @param {App.Entity.SlaveState} slave
* @returns {string}
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 4759cbeb4f1..774b41d0e01 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -523,34 +523,34 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<br>
<<if $tanks[$i].ovaries == 0 && $tankOrgans.ovaries != 1>>
<<link "Prepare ovaries">>
- <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "ovaries">>
+ <<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "ovaries")>>
<<goto "Incubator">>
<</link>>
<</if>>
<<if $tanks[$i].dick == 0 && $tankOrgans.penis != 1>>
<<link "Prepare penis">>
- <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "penis">>
+ <<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "penis")>>
<<goto "Incubator">>
<</link>>
<</if>>
<<if $tanks[$i].balls == 0 && $tankOrgans.testicles != 1>>
|
<<link "Prepare testicles">>
- <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "testicles">>
+ <<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "testicles")>>
<<goto "Incubator">>
<</link>>
<</if>>
<<if getBestVision($tanks[$i]) === 0 && $tankOrgans.eyes != 1>>
<br>$He appears to be blind:
<<link "Prepare eyes">>
- <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "rightEye"), App.Medicine.OrganFarm.growOrgan($tanks[$i], "leftEye")>>
+ <<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "rightEye"), App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "leftEye")>>
<<goto "Incubator">>
<</link>>
<</if>>
<<if $tanks[$i].voice == 0 && $tankOrgans.voicebox != 1>>
<br>$He appears to be mute:
<<link "Prepare vocal cords">>
- <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "voicebox">>
+ <<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "voicebox")>>
<<goto "Incubator">>
<</link>>
<</if>>
--
GitLab