diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 128a3b61130b0c825909cf529276e88dff998635..d2520d1e3104258cb0911777f51d970cc442bc45 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1301,17 +1301,6 @@ __''Mods''__
<br>
-<<options $cyberMod>>
- Cybernetics mod is
- <<option 0 "Disable">>
- ''disabled''.
- <<option 1 "Enable">>
- ''enabled''.
- <<comment>>
- This mod alters how prosthetics system works and adds some content.
-<</options>>
-<br>
-
<<options $secExp>>
The Security Expansion Mod is
<<option 0 "Disable">>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index d4f1ade394f28ce268693736140eaffdc6e3a31b..81b1ccf1d94c75bc5eda60f04d017cd5e27c776b 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -2114,7 +2114,8 @@ Then pick _namePool.random(), or display those names as possible choices, or do
{name: "No default setting", value: "no default setting"},
{name: "None", value: "none"},
{name: "Tail", value: "tail", rs: "buyTails"},
- {name: "Fox tail", value: "fox tail", rs: "buyTails"}, {name: "Cat tail", value: "cat tail", rs: "buyTails"}]>>
+ {name: "Fox tail", value: "fox tail", rs: "buyTails"},
+ {name: "Cat tail", value: "cat tail", rs: "buyTails"}]>>
<<set setup.facilityCareers = ["be confined in the arcade", "be confined in the cellblock", "be the Attendant", "be the DJ", "be the Farmer", "be the Madam", "be the Matron", "be the Milkmaid", "be the Nurse", "be the Schoolteacher", "be the Stewardess", "be the Wardeness", "be your Concubine", "get treatment in the clinic", "learn in the schoolroom", "live with your Head Girl", "rest in the spa", "serve in the club", "serve in the master suite", "work as a farmhand", "work as a nanny", "work as a servant", "work in the brothel", "work in the dairy"]>>
@@ -2122,6 +2123,25 @@ Then pick _namePool.random(), or display those names as possible choices, or do
<<set setup.secExCombatPrestige = ["She is well known for being a great commander.", "She is famous for being an incredible commander.", "She is known as a legendary commander all over the world."]>>
+/* 10 = 1 week at level 1*/
+<<set setup.prosthetics = [
+ {name: "Basic prosthetic interface", refit: 40, craft: 50, research: 100, level: 1, costs: 5000},
+ {name: "Advanced prosthetic interface", refit: 80, craft: 80, research: 160, level: 2, costs: 10000},
+ {name: "Basic prosthetic limbs", refit: 40, craft: 40, research: 80, level: 1, costs: 7000},
+ {name: "Advanced sex limbs", refit: 60, craft: 70, research: 140, level: 2, costs: 15000},
+ {name: "Advanced beauty limbs", refit: 60, craft: 70, research: 140, level: 2, costs: 15000},
+ {name: "Advanced combat limbs", refit: 60, craft: 70, research: 140, level: 2, costs: 15000},
+ {name: "Cybernetic limbs", refit: 80, craft: 150, research: 250, level: 3, costs: 25000},
+ {name: "Ocular implant", refit: 60, craft: 80, research: 150, level: 2, costs: 20000},
+ {name: "Cochlear implant", refit: 40, craft: 40, research: 80, level: 1, costs: 5000},
+ {name: "Electrolarynx", refit: 40, craft: 40, research: 40, level: 1, costs: 5000},
+ {name: "Prosthetic tail interface", refit: 50, craft: 60, research: 120, level: 1, costs: 5000},
+ {name: "Modular tail", refit: 40, craft: 40, research: 80, level: 1, costs: 5000},
+ {name: "Combat tail", refit: 70, craft: 70, research: 140, level: 2, costs: 15000},
+ {name: "Pleasure Tail", refit: 60, craft: 60, research: 120, level: 2, costs: 10000},
+ {name: "Erectile implant", refit: 40, craft: 50, research: 100, level: 1, costs: 7000}
+]>>
+
<<set setup.lightColorMap = {
"rgb(0, 0, 0)":"rgb(255, 255, 255)",
"rgb(255, 255, 0)":"rgb(255, 255, 0)",
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index ef2e63b5e415a4ae913c7bd37575d1642e76d77f..e5ac1c105f931327d145c08dedcd509ae41a6131 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1053,8 +1053,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $dispensaryUpgrade = 0>>
<<set $organFarmUpgrade = 0>>
<<set $completedOrgans = []>>
-<<set $limbsCompleted = 0>>
-<<set $limbs = []>>
<<set $ImplantProductionUpgrade = 0>>
<<set $permaPregImplant = 0>>
<<set $injectionUpgrade = 0>>
@@ -1084,7 +1082,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $animalOvaries = 0>> /*{pigOvaries: 0, canineOvaries: 0, horseOvaries: 0, cowOvaries: 0} currently unused*/
<<set $animalTesticles = 0>> /*{pigTestes: 0, dogTestes: 0, horseTestes: 0, cowTestes: 0} currently unused*/
<<set $animalMpreg = 0>> /*{pigMpreg: 0, dogMpreg: 0, horseMpreg: 0, cowMpreg: 0} currently unused*/
-<<set $prostheticsUpgrade = 0>>
<<set $geneticMappingUpgrade = 0>>
<<set $pregnancyMonitoringUpgrade = 0>>
<<set $cloningSystem = 0>>
@@ -1457,37 +1454,44 @@ You should have received a copy of the GNU General Public License along with thi
<<set $IsPastPrimePC = 5000>>
<</if>>
+<<set $prostheticsUpgrade = 0>>
+<<set $prostheticsCompleted = 0>>
+<<set $prosthetics = []>> /*format: {id: int, workleft: int, slaveID: int}*/
+/*task: {type: "research"/"craft", id: int, workLeft: int}*/
<<set $researchLab = {
- built: "false",
+ level: 0,
aiModule: 1,
productionTime: 0,
- research: "none",
- manufacture: "none",
+ tasks: [],
maxSpace: 0,
hired: 0,
menials: 0,
}>>
+/*when adding new prosthetics do not leave spaces between the IDs */
<<set $prostheticIDs = {
- basicPLimbInterface: 0,
- advPLimbInterface: 1,
- basicPLimb: 2,
- advSexPLimb: 3,
- advGracePLimb: 4,
- advCombatPLimb: 5,
- cyberneticPLimb: 6,
- ocularImplant: 7,
- cochlearImplant: 8,
+ interfaceP1: 0,
+ interfaceP2: 1,
+ basicL: 2,
+ sexL: 3,
+ beautyL: 4,
+ combatL: 5,
+ cyberneticL: 6,
+ ocular: 7,
+ cochlear: 8,
electrolarynx: 9,
- interfacePTail: 10,
- modPTail: 11,
- warPTail: 12,
- sexPTail: 13,
- erectileImplant: 14
+ interfaceTail: 10,
+ modT: 11,
+ combatT: 12,
+ sexT: 13,
+ erectile: 14
}>>
<<set $prosthetics = []>>
-<<for _i = 0; i < 14; i++>>
- <<run $prosthetics.push({amount: 0, schematic: 0})>>
+<<for _i = 0; _i < 15; _i++>>
+ <<set $prosthetics.push({amount: 0, research: 0})>>
<</for>>
+/*
+<<set $limbsCompleted = 0>> cybermod
+<<set $limbs = []>>*/
<<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw
index e21f7ac2e56f63ecb52319b6f9ceab71c2d5a8c8..f9584de8f78924fa2ed8be9e6de2987d9ae670ee 100644
--- a/src/interaction/researchLab.tw
+++ b/src/interaction/researchLab.tw
@@ -1,418 +1,199 @@
:: Research Lab [nobr]
-<<switch $temp>>
-
-<<case 0>>
-
- <<set $nextButton = "Back", $nextLink = "Main">>
-
- <<set $researchLab.speed = (($researchLab.hired * 3) + $researchLab.menials) * $researchLab.aiModule>>
-
- //You switch one of the screens in your office to the feed from your research facility.//
- /*<br><br>
-
- <br>[[Decommission facility|Manage Arcology][$researchLab.built = "false", $researchLab.hired = 0, $menials += $researchLab.menials, $researchLab.menials = 0,$researchLab.speed = 0, !!!TASKS!!!]] //Warning! This will cancel all projects, remove all staff and shut down this facility.//
-*/
- <br><br>
-
- [[Purchase cybernetics|Research Lab][$temp = 1]]
-
- <br><br>
- __Personnel__
- <br><br>
-
- <<if $researchLab.aiModule == 1>>
- [[Buy and install research module|Research Lab][cashX(-35000, "capEx"), $researchLab.aiModule = 2]] //This module enables your personal assistant to assist staff and direct menials assigned to your research facility, increasing efficiency. It costs <<print cashFormat(35000)>>//<br>
- <</if>>
- <<if ($researchLab.hired + $researchLab.menials) == 0>>
- //Facility is currently unstaffed.//
- <<else>>
- //You have
- <<if $researchLab.hired == 1>>
- one scientist
- <<elseif $researchLab.hired > 1>>
- $researchLab.hired scientists
- <</if>>
- <<if $researchLab.hired > 0 && $researchLab.menials > 0 >> and<</if>>
- <<if $researchLab.menials == 1>>
- one menial slave
- <<elseif $researchLab.menials > 1>>
- $researchLab.menials menials
- <</if>>
- working in your lab.
- <<setAssistantPronouns>>
- <<if $researchLab.aiModule > 1>>Occasionally you hear the voice of your assistant as _heA helps direct and organize work.<</if>>//
- <</if>>
+<<set $nextButton = "Back", $nextLink = "Main">>
+
+<<set $researchLab.speed = (($researchLab.hired * 3) + $researchLab.menials) * $researchLab.aiModule>>
+
+//You switch one of the screens in your office to the feed from your research facility.//
+
+<br><br>
+__Personnel__
+<br><br>
+
+<<if $researchLab.aiModule == 1>>
+ [[Buy and install research module|Research Lab][cashX(-35000, "capEx"), $researchLab.aiModule = 2]] //This module enables your personal assistant to assist staff and direct menials assigned to your research facility, increasing efficiency. It costs <<print cashFormat(35000)>>//<br>
+<</if>>
+<<if ($researchLab.hired + $researchLab.menials) == 0>>
+ //Facility is currently unstaffed.//
+<<else>>
+ //You have
+ <<if $researchLab.hired == 1>>
+ one scientist
+ <<elseif $researchLab.hired > 1>>
+ $researchLab.hired scientists
+ <</if>>
+ <<if $researchLab.hired > 0 && $researchLab.menials > 0 >> and<</if>>
+ <<if $researchLab.menials == 1>>
+ one menial slave
+ <<elseif $researchLab.menials > 1>>
+ $researchLab.menials menials
+ <</if>>
+ working in your lab.
+ <<setAssistantPronouns>>
+ <<if $researchLab.aiModule > 1>>Occasionally you hear the voice of your assistant as _heA helps direct and organize work.<</if>>//
+<</if>>
+<br>
+
+ Currently, this facility can employ $researchLab.maxSpace people.
+<<if $researchLab.maxSpace == 5>>
+ [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 10]]
+ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+<<elseif $researchLab.maxSpace == 10>>
+ [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 20]]
+ //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
+<<elseif $researchLab.maxSpace == 20>>
+ [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 30]]
+ //Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>>//
+<<elseif $researchLab.maxSpace == 30>>
+ [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 40]]
+ //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+<<elseif $researchLab.maxSpace == 40>>
+ [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 50]]
+ //Costs <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>//
+<<elseif $researchLab.maxSpace == 50>>
+ //Facility is fully expanded.//
+<</if>>
+<br><br>
+
+<<if ($researchLab.hired + $researchLab.menials) < $researchLab.maxSpace>>
+ Hire [[x1|Research Lab][$researchLab.hired += 1,cashX(-2000, "lab")]]
+ <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5>>
+ | [[x5|Research Lab][$researchLab.hired += 5,cashX(-10000, "lab")]]
+ <</if>>
+ <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10>>
+ | [[x10|Research Lab][$researchLab.hired += 10,cashX(-10000, "lab")]]
+ <</if>>
+ scientists.<br>
+ //Each scientist will require an initial fee of <<print cashFormat(2000)>> and incur <<print cashFormat(300)>> weekly.//
<br>
-
- Currently, this facility can employ $researchLab.maxSpace people.
- <<if $researchLab.maxSpace == 5>>
- [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 10]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
- <<elseif $researchLab.maxSpace == 10>>
- [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 20]]
- //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
- <<elseif $researchLab.maxSpace == 20>>
- [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 30]]
- //Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>>//
- <<elseif $researchLab.maxSpace == 30>>
- [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 40]]
- //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
- <<elseif $researchLab.maxSpace == 40>>
- [[Expand facility|Research Lab][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $researchLab.maxSpace = 50]]
- //Costs <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>//
- <<elseif $researchLab.maxSpace == 50>>
- //Facility is fully expanded.//
- <</if>>
- <br><br>
-
- <<if ($researchLab.hired + $researchLab.menials) < $researchLab.maxSpace>>
- Hire [[x1|Research Lab][$researchLab.hired += 1,cashX(-2000, "lab")]]
- <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5>>
- | [[x5|Research Lab][$researchLab.hired += 5,cashX(-10000, "lab")]]
- <</if>>
- <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10>>
- | [[x10|Research Lab][$researchLab.hired += 10,cashX(-10000, "lab")]]
- <</if>>
- scientists.<br>
- //Each scientist will require an initial fee of <<print cashFormat(2000)>> and incur <<print cashFormat(300)>> weekly.//
- <br>
- <<if $menials > 0>>
- Assign [[x1|Research Lab][$researchLab.menials += 1,$menials -= 1]]
- <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5 && $menials >= 5>>
- | [[x5|Research Lab][$researchLab.menials += 5,$menials -= 5]]
- <</if>>
- <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10 && $menials >= 10>>
- | [[x10|Research Lab][$researchLab.menials += 10,$menials -= 10]]
- <</if>>
- menial slaves to lab.<br>
- <<else>>You do not own any <<if $researchLab.menials != 0>>unassigned <</if>>menial slaves.<br>
- <</if>>
- //Using menial slaves is much cheaper than hiring scientists, but they are less effective. <<print cashFormat(100)>> per slave each week.//<br>
+ <<if $menials > 0>>
+ Assign [[x1|Research Lab][$researchLab.menials += 1,$menials -= 1]]
+ <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5 && $menials >= 5>>
+ | [[x5|Research Lab][$researchLab.menials += 5,$menials -= 5]]
+ <</if>>
+ <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10 && $menials >= 10>>
+ | [[x10|Research Lab][$researchLab.menials += 10,$menials -= 10]]
+ <</if>>
+ menial slaves to lab.<br>
+ <<else>>You do not own any <<if $researchLab.menials != 0>>unassigned <</if>>menial slaves.<br>
+ <</if>>
+ //Using menial slaves is much cheaper than hiring scientists, but they are less effective. <<print cashFormat(100)>> per slave each week.//<br>
+<<else>>
+ //Facility is fully staffed.//
+<</if>>
+<br>
+<<if $researchLab.hired > 0>>
+ Fire [[x1|Research Lab][$researchLab.hired -= 1]]
+ <<if $researchLab.hired >= 5>>
+ | [[x5|Research Lab][$researchLab.hired -= 5]]
+ <</if>>
+ <<if $researchLab.hired >= 10>>
+ | [[x10|Research Lab][$researchLab.hired -= 10]]
+ <</if>>
+ | [[All|Research Lab][$researchLab.hired = 0]]
+ scientists.
+<</if>>
+<<if $researchLab.menials > 0>><br>
+ Dismiss [[x1|Research Lab][$researchLab.menials -= 1,$menials += 1]]
+ <<if $researchLab.menials >= 5>>
+ | [[x5|Research Lab][$researchLab.menials -= 5,$menials += 5]]
+ <</if>>
+ <<if $researchLab.menials >= 10>>
+ | [[x10|Research Lab][$researchLab.menials -= 10,$menials += 10]]
+ <</if>>
+ | [[All|Research Lab][$menials += $researchLab.menials, $researchLab.menials = 0]]
+ menial slaves.
+<</if>>
+
+<br><br>
+
+__Tasks__
+
+<br><br>
+
+<<if $researchLab.tasks.length > 0>>
+ <<set _j = 0>>
+ <<if $researchLab.speed > 0>>
+ The following tasks are queued:
<<else>>
- //Facility is fully staffed.//
+ You have projects planned but without researchers you won't be able to work on them:
<</if>>
<br>
- <<if $researchLab.hired > 0>>
- Fire [[x1|Research Lab][$researchLab.hired -= 1]]
- <<if $researchLab.hired >= 5>>
- | [[x5|Research Lab][$researchLab.hired -= 5]]
- <</if>>
- <<if $researchLab.hired >= 10>>
- | [[x10|Research Lab][$researchLab.hired -= 10]]
- <</if>>
- | [[All|Research Lab][$researchLab.hired = 0]]
- scientists.
- <</if>>
- <<if $researchLab.menials > 0>><br>
- Dismiss [[x1|Research Lab][$researchLab.menials -= 1,$menials += 1]]
- <<if $researchLab.menials >= 5>>
- | [[x5|Research Lab][$researchLab.menials -= 5,$menials += 5]]
+ <<for _i = 0; _i < $researchLab.tasks.length; _i++>>
+ <<if $researchLab.tasks[_i].type == "research">>
+ You <<if _i == 0>>are researching<<else>> plan to research<</if>>
+ <<elseif $researchLab.tasks[_i].type == "craft">>
+ You <<if _i == 0>>are constructing<<else>> plan to construct<</if>>
+ <<else>>
+ @@.red;Error: Unkown $$researchLab.tasks[].type: $researchLab.tasks[_i].type@@
<</if>>
- <<if $researchLab.menials >= 10>>
- | [[x10|Research Lab][$researchLab.menials -= 10,$menials += 10]]
+ <<set _j += $researchLab.tasks[_i].workLeft>>
+ @@.yellow;<<print setup.prosthetics[$researchLab.tasks[_i].id].name>>@@.
+ <<if $researchLab.speed > 0>>
+ Finished in approximately <<print (Math.floor(_j / $researchLab.speed) + 1)>> week(s).
<</if>>
- | [[All|Research Lab][$menials += $researchLab.menials, $researchLab.menials = 0]]
- menial slaves.
- <</if>>
-
- <br><br>
-
- __Tasks__
-
- <br><br>
- <<if $researchLab.tasks.length > 0>>
- <<set _j = 0>>
- <<if $researchLab.speed > 0>>
- The following tasks are queued:
+ <<if $researchLab.tasks[_i].type == "research">>
+ <<set _link = "Cancel: Will not return investments.">>
<<else>>
- You have projects planned but without researchers you won't be able to work on them:
+ <<set _link = "Cancel">>
<</if>>
- <br>
- <<for _i = 0; _i < $researchLab.tasks.length; _i++>>
- <<if $researchLab.tasks[_i].type == "research">>
- You <<if _i == 0>>are researching<<else>> plan to research<</if>>
- <<elseif $researchLab.tasks[_i].type == "manufacture">>
- You <<if _i == 0>>are constructing<<else>> plan to construct<</if>>
- <<else>>
- @@.red;Error: Unkown $$researchLab.tasks[].type: $researchLab.tasks[_i].type@@
- <</if>>
- <<set _j += $researchLab.tasks[_i].workLeft>>
- @@.yellow;$researchLab.tasks[_i].product@@.
- <<if $researchLab.speed > 0>>
- Finished in approximately <<print (Math.floor(_j / $researchLab.speed) + 1)>> week(s).
- <</if>>
-
- <<if $researchLab.tasks[_i].type == "research">>
- <<set _link = "Cancel: Will not return prosthetics.">>
- <<else>>
- <<set _link = "Cancel">>
- <</if>>
- <<capture _i>>
- <<link _link "Research Lab">>
- <<if $researchLab.tasks[_i].type == "research">>
- <<switch $researchLab.tasks[_i].product>>
- <<case "Basic prosthetics interface">>
- <<set $researchLab.basicPLimbInterface = 0>>
- <<case "Advanced prosthetics interface">>
- <<set $researchLab.advPLimbInterface = 0>>
- <<case "Basic prosthetic limbs">>
- <<set $researchLab.basicPLimb = 0>>
- <<case "Advanced sex limbs">>
- <<set $researchLab.advSexPLimb = 0>>
- <<case "Advanced beauty limbs">>
- <<set $researchLab.advGracePLimb = 0>>
- <<case "Advanced combat limbs">>
- <<set $researchLab.advCombatPLimb = 0>>
- <<case "Cybernetic limbs">>
- <<set $researchLab.cyberneticPLimb = 0>>
- <<case "Ocular implants">>
- <<set $researchLab.ocularImplant = 0>>
- <<case "Cochlear implants">>
- <<set $researchLab.cochlearImplant = 0>>
- <<case "Electrolarynx">>
- <<set $researchLab.electrolarynx = 0>>
- /*<<case "Erectile implant">>
- <<set $researchLab.erectileImplant = 1>>*/
- <</switch>>
- <</if>>
- <<set $researchLab.tasks.deleteAt(_i)>>
- <</link>>
- <</capture>>
-
- <br>
- <</for>>
- <<else>>
- //Currently the research lab has no tasks planned.//
- <</if>>
-
- <br><br>
-
- __Research__
- <br><br>
-
- Available research projects:
- <<if $researchLab.basicPLimbInterface == 0 && $stockpile.basicPLimbInterface > 0>><br>
- [[Reverse engineer basic prosthetics interface|Research Lab][$stockpile.basicPLimbInterface -= 1, $researchLab.basicPLimbInterface = -1, $researchLab.tasks.push({type: "research", product: "Basic prosthetics interface", workLeft: 100})]]
- <</if>>
- <<if $researchLab.basicPLimbInterface > 0 && $researchLab.advPLimbInterface == 0 && $stockpile.advPLimbInterface > 0>><br>
- [[Reverse engineer advanced prosthetics interface|Research Lab][$stockpile.advPLimbInterface -= 1, $researchLab.advPLimbInterface = -1, $researchLab.tasks.push({type: "research", product: "Advanced prosthetics interface", workLeft: 160})]]
- <</if>>
- <<if $researchLab.basicPLimb == 0 && $stockpile.basicPLimb > 0>><br>
- [[Reverse engineer basic prosthetic limbs|Research Lab][$stockpile.basicPLimb -= 1, $researchLab.basicPLimb = -1, $researchLab.tasks.push({type: "research", product: "Basic prosthetic limbs", workLeft: 80})]]
- <</if>>
- <<if $researchLab.advSexPLimb == 0 && $stockpile.advSexPLimb > 0>><br>
- [[Reverse engineer advanced sex limbs|Research Lab][$stockpile.advSexPLimb -= 1, $researchLab.advSexPLimb = -1, $researchLab.tasks.push({type: "research", product: "Advanced sex limbs", workLeft: 140})]]
- <</if>>
- <<if $researchLab.advGracePLimb == 0 && $stockpile.advGracePLimb > 0>><br>
- [[Reverse engineer advanced beauty limbs|Research Lab][$stockpile.advGracePLimb -= 1, $researchLab.advGracePLimb = -1, $researchLab.tasks.push({type: "research", product: "Advanced beauty limbs", workLeft: 140})]]
- <</if>>
- <<if $researchLab.advCombatPLimb == 0 && $stockpile.advCombatPLimb > 0>><br>
- [[Reverse engineer advanced combat limbs|Research Lab][$stockpile.advCombatPLimb -= 1, $researchLab.advCombatPLimb = -1, $researchLab.tasks.push({type: "research", product: "Advanced combat limbs", workLeft: 140})]]
- <</if>>
- <<if $researchLab.cyberneticPLimb == 0 && $researchLab.advPLimbInterface == 1 && ($researchLab.advSexPLimb > 0 || $researchLab.advGracePLimb > 0 || $researchLab.advCombatPLimb > 0)>><br>
- [[Develop cybernetic limbs|Research Lab][$researchLab.cyberneticPLimb = -1, $researchLab.tasks.push({type: "research", product: "Cybernetic limbs", workLeft: 250})]]
- <</if>>
- <<if $researchLab.ocularImplant == 0 && $stockpile.ocularImplant > 0>><br>
- [[Reverse engineer ocular implants|Research Lab][$stockpile.ocularImplant -= 1, $researchLab.ocularImplant = -1, $researchLab.tasks.push({type: "research", product: "Ocular implants", workLeft: 150})]]
- <</if>>
- <<if $researchLab.cochlearImplant == 0 && $stockpile.cochlearImplant > 0>><br>
- [[Reverse engineer cochlear implants|Research Lab][$stockpile.cochlearImplant -= 1, $researchLab.cochlearImplant = -1, $researchLab.tasks.push({type: "research", product: "Cochlear implants", workLeft: 80})]]
- <</if>>
- <<if $researchLab.electrolarynx == 0 && $stockpile.electrolarynx > 0>><br>
- [[Reverse engineer electrolarynx|Research Lab][$stockpile.electrolarynx -= 1, $researchLab.electrolarynx = -1, $researchLab.tasks.push({type: "research", product: "Electrolarynx", workLeft: 80})]]
- <</if>>
- /*<<if $researchLab.erectileImplant == 0 && $stockpile.erectileImplant > 0>><br>
- [[Reverse engineer erectile implant|Research Lab][$stockpile.erectileImplant -= 1,$researchLab.productionTime = 100,$researchLab.research = "Erectile implant"]]
- <</if>>*/
- <br>
- //When researching a schematic one prosthetic will be destroyed while analyzing its structure.//
-
- <br><br>
- __Manufacture__
- <br><br>
- Available building projects:<br>
- <<if $researchLab.basicPLimbInterface == 1>><br>
- [[Build basic prosthetics interface|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Basic prosthetics interface", workLeft: 50})]] // Currently have: $stockpile.basicPLimbInterface//
- <</if>>
- <<if $researchLab.advPLimbInterface == 1>><br>
- [[Build advanced prosthetics interface|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Advanced prosthetics interface", workLeft: 80})]] // Currently have: $stockpile.advPLimbInterface//
- <</if>>
- <<if $researchLab.basicPLimb == 1>><br>
- [[Build basic prosthetic limbs|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Basic prosthetic limbs", workLeft: 40})]] // Currently have: $stockpile.basicPLimb//
- <</if>>
- <<if $researchLab.advSexPLimb == 1>><br>
- [[Build advanced sex limbs|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Advanced sex limbs", workLeft: 70})]] // Currently have: $stockpile.advSexPLimb//
- <</if>>
- <<if $researchLab.advGracePLimb == 1>><br>
- [[Build advanced beauty limbs|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Advanced beauty limbs", workLeft: 70})]] // Currently have: $stockpile.advGracePLimb//
- <</if>>
- <<if $researchLab.advCombatPLimb == 1>><br>
- [[Build advanced combat limbs|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Advanced combat limbs", workLeft: 70})]] // Currently have: $stockpile.advCombatPLimb//
- <</if>>
- <<if $researchLab.cyberneticPLimb == 1>><br>
- [[Build cybernetic limbs|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Cybernetic limbs", workLeft: 150})]] // Currently have: $stockpile.cyberneticPLimb//
- <</if>>
- <<if $researchLab.ocularImplant == 1>><br>
- [[Build ocular implants|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Ocular implants", workLeft: 100})]] // Currently have: $stockpile.ocularImplant//
- <</if>>
- <<if $researchLab.cochlearImplant == 1>><br>
- [[Build cochlear implants|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Cochlear implants", workLeft: 40})]] // Currently have: $stockpile.cochlearImplant//
- <</if>>
- <<if $researchLab.electrolarynx == 1>><br>
- [[Build electrolarynx|Research Lab][$researchLab.tasks.push({type: "manufacture", product: "Electrolarynx", workLeft: 40})]] // Currently have: $stockpile.electrolarynx//
- <</if>>
- /*<<if $researchLab.erectileImplant == 1>><br>
- [[Build erectile implant|Research Lab][$researchLab.productionTime = 50,$researchLab.manufacture = "Erectile implant"]] // Costs <<print cashFormat(25000)>>. Currently have: $stockpile.erectileImplant//
- <</if>>*/
+ <<capture _i>>
+ <<link _link "Research Lab">>
+ <<if $researchLab.tasks[_i].type == "research">>
+ <<set $prosthetics[$researchLab.tasks[_i].id].research = 0>>
+ <</if>>
+ <<set $researchLab.tasks.deleteAt(_i)>>
+ <</link>>
+ <</capture>>
- <br><br>
- <<= ResearchLabStockPile()>>
+ <br>
+ <</for>>
+<<else>>
+ //Currently the research lab has no tasks planned.//
+<</if>>
-<<case 1>>
- <<set $temp = 0>>
- <<set $nextLink = "Research Lab">>
- //You contact a representative of one of the larger cybernetics companies and inquire about their products.<br> This is what they have to offer://<br><br>
+<br><br>
- __Hardware__<br>
+__Research__
+<br><br>
- [[Basic prosthetics interface|Research Lab][$temp = 1, cashX(-7000, "lab"), $stockpile.basicPLimbInterface += 1]] //Costs <<print cashFormat(7000)>>. Currently have: $stockpile.basicPLimbInterface//<br>
- <<if $rep > 11000>>
- [[Advanced prosthetics interface|Research Lab][$temp = 1, cashX(-10000, "lab"), $stockpile.advPLimbInterface += 1]] //Costs <<print cashFormat(10000)>>.//
- <<else>>
- //You lack the reputation to obtain advanced prosthetics interface.//
- <</if>>
- //Currently have: $stockpile.advPLimbInterface//<br>
- [[Basic prosthetic limbs|Research Lab][$temp = 1, cashX(-7000, "lab"), $stockpile.basicPLimb += 1]] //Costs <<print cashFormat(10000)>>. Currently have: $stockpile.basicPLimb//<br>
- <<if $rep > 11000>>
- [[Advanced sex limbs|Research Lab][$temp = 1, cashX(-15000, "lab"), $stockpile.advSexPLimb += 1]] //Costs <<print cashFormat(15000)>>.//
- <<else>>
- //You lack the reputation to obtain advanced sex limbs.//
- <</if>>
- //Currently have: $stockpile.advSexPLimb//<br>
- <<if $rep > 11000>>
- [[Advanced beauty limbs|Research Lab][$temp = 1, cashX(-15000, "lab"), $stockpile.advGracePLimb += 1]] //Costs <<print cashFormat(15000)>>.//
- <<else>>
- //You lack the reputation to obtain advanced beauty limbs.//
- <</if>>
- //Currently have: $stockpile.advGracePLimb//<br>
- <<if $rep > 11000>>
- [[Advanced combat limbs|Research Lab][$temp = 1, cashX(-15000, "lab"), $stockpile.advCombatPLimb += 1]] //Costs <<print cashFormat(15000)>>.//
- <<else>>
- //You lack the reputation to obtain advanced combat limbs.//
- <</if>>
- //Currently have: $stockpile.advCombatPLimb//<br>
- <<if $rep > 9000>>
- [[Ocular implants|Research Lab][$temp = 1, cashX(-20000, "lab"), $stockpile.ocularImplant += 1]] //Costs <<print cashFormat(20000)>>.//
- <<else>>
- //You lack the reputation to obtain ocular implants.//
- <</if>>
- //Currently have: $stockpile.ocularImplant//<br>
- [[Cochlear implants|Research Lab][$temp = 1, cashX(-5000, "lab"), $stockpile.cochlearImplant += 1]] //Costs <<print cashFormat(5000)>>. Currently have: $stockpile.cochlearImplant//<br>
- [[Electrolarynx|Research Lab][$temp = 1, cashX(-5000, "lab"), $stockpile.electrolarynx += 1]] //Costs <<print cashFormat(5000)>>. Currently have: $stockpile.electrolarynx//<br>
- /*[[Erectile implant|Research Lab][$temp = 1, cashX(-25000, "lab"), $stockpile.erectileImplant += 1]] //Costs <<print cashFormat(25000)>>. Currently have: $stockpile.erectileImplant//*/
-
- <br>__Schematics__<br>
- <<if $researchLab.basicPLimbInterface == 0>>
- <<if $rep > 8000>>
- [[Basic prosthetics interface|Research Lab][$temp = 1, cashX(-85000, "lab"), $researchLab.basicPLimbInterface = 1]] //Costs <<print cashFormat(85000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for basic prosthetics interfaces.//
- <</if>>
- <br>
- <</if>>
- <<if $researchLab.advPLimbInterface == 0>>
- <<if $rep > 12000>>
- [[Advanced prosthetics interface|Research Lab][$temp = 1, cashX(-260000, "lab"), $researchLab.advPLimbInterface = 1]] //Costs <<print cashFormat(260000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for advanced prosthetics interfaces.//
- <</if>>
- <br>
- <</if>>
- <<if $researchLab.basicPLimb == 0>>
- <<if $rep > 8000>>
- [[Basic prosthetic limbs|Research Lab][$temp = 1, cashX(-60000, "lab"), $researchLab.basicPLimb = 1]] //Costs <<print cashFormat(60000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for basic prosthetics limbs.//
- <</if>>
- <br>
- <</if>>
- <<if $researchLab.advSexPLimb == 0>>
- <<if $rep > 12000>>
- [[Advanced sex limbs|Research Lab][$temp = 1, cashX(-120000, "lab"), $researchLab.advSexPLimb = 1]] //Costs <<print cashFormat(120000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for advanced sex limbs.//
- <</if>>
- <br>
- <</if>>
- <<if $researchLab.advGracePLimb == 0>>
- <<if $rep > 12000>>
- [[Advanced beauty limbs|Research Lab][$temp = 1, cashX(-120000, "lab"), $researchLab.advGracePLimb = 1]] //Costs <<print cashFormat(120000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for advanced beauty limbs.//
- <</if>>
- <br>
- <</if>>
- <<if $researchLab.advCombatPLimb == 0>>
- <<if $rep > 12000>>
- [[Advanced combat limbs|Research Lab][$temp = 1, cashX(-120000, "lab"), $researchLab.advCombatPLimb = 1]] //Costs <<print cashFormat(120000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for advanced combat limbs.//
- <</if>>
- <br>
- <</if>>
- <<if $researchLab.ocularImplant == 0>>
- <<if $rep > 10000>>
- [[Ocular implants|Research Lab][$temp = 1, cashX(-160000, "lab"), $researchLab.ocularImplant = 1]] //Costs <<print cashFormat(160000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for ocular implants.//
- <</if>>
- <br>
- <</if>>
- <<if $researchLab.cochlearImplant == 0>>
- <<if $rep > 8000>>
- [[Cochlear implants|Research Lab][$temp = 1, cashX(-125000, "lab"), $researchLab.cochlearImplant = 1]] //Costs <<print cashFormat(125000)>>.//
+Available research projects:<br>
+<<for _i = 0; _i < $prosthetics.length; _i++>>
+ <<if $prosthetics[_i].research == 0>>
+ <<if _i != $prostheticIDs.erectile>> /*excludes erectile*/
+ <<if $researchLab.level >= setup.prosthetics[_i].level>>
+ <<capture _i>>
+ <<link "Reverse engineer <<print setup.prosthetics[_i].name>>" "Research Lab">>
+ <<set cashX(forceNeg(setup.prosthetics[_i].costs), "lab"), $prosthetics[_i].research = -1, $researchLab.tasks.push({type: "research", id: _i, workLeft: setup.prosthetics[_i].research})>>
+ <</link>>
+ <</capture>>
+ //Costs <<print cashFormat(setup.prosthetics[_i].costs)>> of initial investment.//
<<else>>
- //You lack the reputation to obtain schematics for cochlear implants.//
+ //You need to upgrade the research lab before you can research advanced technologies.//
<</if>>
<br>
- <</if>>
- <<if $researchLab.electrolarynx == 0>>
- <<if $rep > 8000>>
- [[Electrolarynx|Research Lab][$temp = 1, cashX(-125000, "lab"), $researchLab.electrolarynx = 1]] //Costs <<print cashFormat(200000)>>.//
- <<else>>
- //You lack the reputation to obtain schematics for electrolarynx.//
<</if>>
- <br>
<</if>>
- /*<<if $researchLab.erectileImplant != 1 && $researchLab.research != "Erectile implant">>
- [[Erectile implant|Research Lab][$temp = 1, cashX(-95000, "lab"), $researchLab.erectileImplant = 1]] //Costs <<print cashFormat(95000)>>.//
- <</if>>*/
+<</for>>
- <br><br>
+<br><br>
+__Manufacture__
+<br><br>
- //You contact a representative of one of the most popular Japanese cybernetics companies and inquire about their products.<br>
- This is what they have to offer://
-
- <br><br>
-
- __Hardware__<br>
- [[Neural Tail Interface|Research Lab][$temp = 1, cashX(-10000, "lab"), $stockpile.interfacePTail += 1]] //Costs <<print cashFormat(10000)>>. Currently have: $stockpile.interfacePTail//<br>
- [[Modular Tail|Research Lab][$temp = 1, cashX(-3000, "lab"), $stockpile.modPTail += 1]] //Costs <<print cashFormat(5000)>>. Currently have: $stockpile.modPTail//<br>
- <<if $rep > 11000>>
- [[Combat Tail|Research Lab][$temp = 1, cashX(-15000, "lab"), $stockpile.warPTail += 1]] //Costs <<print cashFormat(15000)>>.//
- <<else>>
- //You lack the reputation to obtain combat tails.//
- <</if>>
- //Currently have: $stockpile.warPTail//<br>
- <<if $rep > 10000>>
- [[Pleasure Tail|Research Lab][$temp = 1, cashX(-10000, "lab"), $stockpile.sexPTail += 1]] //Costs <<print cashFormat(10000)>>.//
- <<else>>
- //You lack the reputation to obtain pleasure tails.//
+Available building projects:<br>
+<<for _i = 0; _i < $prosthetics.length; _i++>>
+ <<if $prosthetics[_i].research == 1>>
+ <<if _i != $prostheticIDs.erectile>> /*excludes erectile*/
+ <<capture _i>>
+ <<link "Build <<print setup.prosthetics[_i].name>>" "Research Lab">>
+ <<set $researchLab.tasks.push({type: "craft", id: _i, workLeft: setup.prosthetics[_i].craft})>>
+ <</link>>
+ <</capture>>
+ <br>
+ <</if>>
<</if>>
- //Currently have: $stockpile.sexPTail//<br>
+<</for>>
- <br>__Schematics__<br>
- They do not currently offer schematics for sale.
-<</switch>>
+<br><br>
+ <<= ResearchLabStockPile()>>
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index da99a03fbfe304830b04f914684c85d17c432743..1c20b7f4f299255c961b30111470ff4bc8ddc0d4 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -444,11 +444,7 @@ window.getPolicyCosts = function() {
};
window.getCyberModCosts = function() {
- let costs = 0;
- if (State.variables.cyberMod !== 0 && State.variables.researchLab.built === 'true') {
- costs += ((100 * State.variables.researchLab.maxSpace) + (300 * State.variables.researchLab.hired) + (100 * State.variables.researchLab.hired));
- }
- return costs;
+ return ((100 * State.variables.researchLab.maxSpace) + (300 * State.variables.researchLab.hired) + (100 * State.variables.researchLab.hired));
};
diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw
index d6aa1f3198d38d72e9f0465d39189155605bc4fe..7bbecbd60d6ac127159ee5cd1a2dfeb64569b56c 100644
--- a/src/pregmod/huskSlaveSwapWorkaround.tw
+++ b/src/pregmod/huskSlaveSwapWorkaround.tw
@@ -4,7 +4,7 @@
"This operation is neither simple nor is it perfected. There are extreme health risks involved and no guarantee of success. Strap a slave into your remote surgery to consent to the operation. Indentured servants<<if ($incubator > 0) || ($nurseryBabies)>> and slaves with reserved children<</if>> are not eligible."
<br>
-//Select the slave whose mind will be transferred into the waiting husk.<<if $cyberMod == 1>> Amputated slaves must not be wearing prosthetics.<</if>> This operation will cost <<print cashFormat(10000)>>.//
+//Select the slave whose mind will be transferred into the waiting husk. Amputated slaves must not be wearing prosthetics. This operation will cost <<print cashFormat(10000)>>.//
<br><br>
__Select an eligible slave:__
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index fd0c90f7b4dfac231dae944c46d9819f9f9d6b17..5e4959dd0b8279a72a32e797f821094c111e9924 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3710,5 +3710,46 @@ Done!
<<set $JobIDArray = resetJobIDArray()>>
+<<if def $limbs>>
+ <<set $prosthetics = $limbs>>
+ <<unset $limbs>>
+<</if>>
+<<if def $limbsCompleted>>
+ <<set $prostheticsCompleted = $limbsCompleted>>
+ <<unset $limbsCompleted>>
+<</if>>
+<<if def $researchLab.built>>
+ <<if $researchLab.built == "true">>
+ <<set $researchLab.level = 1>>
+ <<else>>
+ <<set $researchLab.level = 0>>
+ <</if>>
+ <<unset $researchLab.built>>
+<</if>>
+<<if undef $prostheticIDs>>
+ <<set $prostheticIDs = {
+ interfaceP1: 0,
+ interfaceP2: 1,
+ basicL: 2,
+ sexL: 3,
+ beautyL: 4,
+ combatL: 5,
+ cyberneticL: 6,
+ ocular: 7,
+ cochlear: 8,
+ electrolarynx: 9,
+ interfaceTail: 10,
+ modT: 11,
+ combatT: 12,
+ sexT: 13,
+ erectile: 14
+ }>>
+<</if>>
+<<if undef $prosthetics>>
+ <<set $prosthetics = [{amount: $stockpile.basicPLimbInterface, research: $researchLab.basicPLimbInterface}, {amount: $stockpile.advPLimbInterface, research: $researchLab.advPLimbInterface}, {amount: $stockpile.basicPLimb, research: $researchLab.basicPLimb}, {amount: $stockpile.advSexPLimb, research: $researchLab.advSexPLimb}, {amount: $stockpile.advGracePLimb, research: $researchLab.advGracePLimb}, {amount: $stockpile.advCombatPLimb, research: $researchLab.advCombatPLimb}, {amount: $stockpile.cyberneticPLimb, research: $researchLab.cyberneticPLimb}, {amount: $stockpile.ocularImplant, research: $researchLab.ocularImplant}, {amount: $stockpile.cochlearImplant, research: $researchLab.cochlearImplant}, {amount: $stockpile.electrolarynx, research: $researchLab.electrolarynx}, {amount: $stockpile.interfacePTail, research: 0}, {amount: $stockpile.modPTail, research: 0}, {amount: $stockpile.warPTail, research: 0}, {amount: $stockpile.sexPTail, research: 0}, {amount: $stockpile.erectileImplant, research: $researchLab.erectileImplant}]>>
+ <<unset $stockpile, $researchLab.basicPLimbInterface, $researchLab.advPLimbInterface, researchLab.basicPLimb, $researchLab.advSexPLimb, $researchLab.advGracePLimb, $researchLab.advCombatPLimb, $researchLab.cyberneticPLimb, $researchLab.ocularImplant, $researchLab.cochlearImplant, $researchLab.electrolarynx, $researchLab.erectileImplant}]>>
+<</if>>
+
+
/* reset NaNArray after BC is run */
<<set $NaNArray = findNaN()>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index ecb0befa454d505274d8be20c30e3b8fcc2dc41b..70e63f1484bd6a32097d9b47c55557597fefd469 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -137,7 +137,7 @@ if(!Macro.has('sectorblock')) {
<td colspan="3"></td>
<td id="Penthouse" colspan="4">
<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
- <<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$nursery||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.built=="true">>
+ <<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$nursery||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.level > 0>>
<br>
<<if $masterSuite>> <<print MasterSuiteUIName()>> ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
<<if $HGSuite>> <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>><</if>>
@@ -149,7 +149,7 @@ if(!Macro.has('sectorblock')) {
<<if $schoolroom>> <<print SchoolRoomUIName()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
<<if $cellblock>> <<print CellblockUIName()>> ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
<<if $incubator>> <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>>
- <<if $researchLab.built == "true">>[[Research Lab][$temp = 0]]<</if>>
+ <<if $researchLab.level > 0>>[[Research Lab][$temp = 0]]<</if>>
<</if>>
</td>
<td colspan="3"></td>
diff --git a/src/uncategorized/labReport.tw b/src/uncategorized/labReport.tw
index acf533dc3f07be5e05a8c7b25bc9af4c63880391..cc36d454f4ea4056fe47fb9ba29175d8617ba266 100644
--- a/src/uncategorized/labReport.tw
+++ b/src/uncategorized/labReport.tw
@@ -13,61 +13,15 @@
<<for _work > 0>>
<<if _work < _task.workLeft>>
<<set _task.workLeft -= _work, _work = 0>>
- The lab continues <<if _task.type == "research">>research<<else>>working<</if>> on @@.yellow;_task.product.@@ It will take approximately <<print (Math.floor($researchLab.productionTime / $researchLab.speed) + 1)>> week(s) to complete.
+ The lab continues <<if _task.type == "research">>research<<else>>working<</if>> on @@.yellow;setup.prosthetics[_task.id].name.@@ It will take approximately <<print (Math.floor(_task.workLeft / $researchLab.speed) + 1)>> week(s) to complete.
<<else>>
<<set _work -= _task.workLeft>>
<<if _task.type == "research">>
- Your lab staff have @@.green;completed@@ their _task.product research project.
- <<switch _task.product>>
- <<case "Basic prosthetics interface">>
- <<set $researchLab.basicPLimbInterface = 1>>
- <<case "Advanced prosthetics interface">>
- <<set $researchLab.advPLimbInterface = 1>>
- <<case "Basic prosthetic limbs">>
- <<set $researchLab.basicPLimb = 1>>
- <<case "Advanced sex limbs">>
- <<set $researchLab.advSexPLimb = 1>>
- <<case "Advanced beauty limbs">>
- <<set $researchLab.advGracePLimb = 1>>
- <<case "Advanced combat limbs">>
- <<set $researchLab.advCombatPLimb = 1>>
- <<case "Cybernetic limbs">>
- <<set $researchLab.cyberneticPLimb = 1>>
- <<case "Ocular implants">>
- <<set $researchLab.ocularImplant = 1>>
- <<case "Cochlear implants">>
- <<set $researchLab.cochlearImplant = 1>>
- <<case "Electrolarynx">>
- <<set $researchLab.electrolarynx = 1>>
- /*<<case "Erectile implant">>
- <<set $researchLab.erectileImplant = 1>>*/
- <</switch>>
+ Your lab staff have @@.green;completed@@ their setup.prosthetics[_task.id].name research project.
+ <<set $prosthetics[_task.id].research = 1>>
<<else>>
- Your lab staff have @@.green;completed@@ their _task.product construction project.
- <<switch _task.product>>
- <<case "Basic prosthetics interface">>
- <<set $stockpile.basicPLimbInterface += 1>>
- <<case "Advanced prosthetics interface">>
- <<set $stockpile.advPLimbInterface += 1>>
- <<case "Basic prosthetic limbs">>
- <<set $stockpile.basicPLimb += 1>>
- <<case "Advanced sex limbs">>
- <<set $stockpile.advSexPLimb += 1>>
- <<case "Advanced beauty limbs">>
- <<set $stockpile.advGracePLimb += 1>>
- <<case "Advanced combat limbs">>
- <<set $stockpile.advCombatPLimb += 1>>
- <<case "Cybernetic limbs">>
- <<set $stockpile.cyberneticPLimb += 1>>
- <<case "Ocular implants">>
- <<set $stockpile.ocularImplant += 1>>
- <<case "Cochlear implants">>
- <<set $stockpile.cochlearImplant += 1>>
- <<case "Electrolarynx">>
- <<set $stockpile.electrolarynx += 1>>
- /*<<case "Erectile implant">>
- <<set $stockpile.erectileImplant += 1, $researchLab.productionTime = 50>>*/
- <</switch>>
+ Your lab staff have @@.green;completed@@ their setup.prosthetics[_task.id].name construction project.
+ <<set $prosthetics[_task.id].amount += 1>>
<</if>>
<<set $researchLab.tasks.shift(), _task = $researchLab.tasks[0]>>
<<if ndef _task>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index 5bf7437470c1b40c0fb97ba99b9032fdbdf2bdb7..52f70c64cb75127d84ebabb43ee984f4abd3c563 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -132,15 +132,13 @@ __Penthouse Facilities__
There is a small but handsome suite next to yours reserved for the Head Girl.
<</if>>
-<<if $cyberMod == 1>>
<br>
- <<if $researchLab.built == "true">>
+ <<if $researchLab.level > 0>>
Your penthouse is now equipped with a research lab.
<<else>>
- [[Clear out one of the floors and install research equipment|Manage Penthouse][cashX(forceNeg(Math.trunc(15000*$upgradeMultiplierArcology)), "capEx"), $researchLab.built = "true", $researchLab.maxSpace = 5, $PC.engineering += 1]]
+ [[Clear out one of the floors and install research equipment|Manage Penthouse][cashX(forceNeg(Math.trunc(15000*$upgradeMultiplierArcology)), "capEx"), $researchLab.level = 1, $researchLab.maxSpace = 5, $PC.engineering += 1]]
//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>>//
<</if>>
-<</if>>
<br><br>
@@ -349,7 +347,6 @@ __Penthouse Upgrades__
<br>
-<<if $cyberMod == 0>>
<<switch $prostheticsUpgrade>>
<<case 1>>
There is a facility to construct mechanical prosthetic limbs for amputated slaves.
@@ -377,7 +374,6 @@ __Penthouse Upgrades__
//You lack the reputation to construct a prosthetics facility.//
<</if>>
<</switch>>
-<</if>>
<br>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 246adc0f87e96a3f2dc60b02dbce0fbfb01b8773..826dfcdf6972bc1b028972e32ec8569123c53fb4 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -501,14 +501,6 @@ Assignment performance vignettes on the end week report are
<br>
-<<if ($cyberMod == 0)>>
- Cybernetics Mod is currently @@.red;DISABLED.@@ [[Enable|Options][$cyberMod = 1]]
-<<else>>
- Cybernetics Mod is currently @@.cyan;ENABLED.@@ [[Disable|Options][$cyberMod = 0]]
-<</if>>
-
-<br>
-
<<if $secExp == 0>>
The Security Expansion mod is @@.red;DISABLED.@@
<<link "Enable">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 9e49429cede9eca0c5923e1be1d17deedaafaafe..acfc4c79af6228dc5eb7af28cb7ac00e2cf6b6db 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -144,7 +144,7 @@ $His $activeSlave.faceShape face is
| [[Remove eyes|Surgery Degradation][$activeSlave.eyes = -4, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "remove eyes"]]
<<if ($activeSlave.eyes > -2)>>//This will greatly restrict $him//<</if>>
<</if>>
- <<if ($cyberMod == 1) && ($stockpile.ocularImplant > 0)>>
+ <<if $stockpile.ocularImplant > 0>>
| [["Give " + $him + " ocular implants"|Surgery Degradation][$activeSlave.eyesImplant = 1, $stockpile.ocularImplant--,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index e04a0be42dcf86ba97e99b737460bcea72001e5d..bb2c7f439cef87e8524b9bd2e7bce89cd9c54024 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -771,6 +771,6 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
<<unset _ii>>
/** /Accordion */
-<<if ($researchLab.built == "true")>>
+<<if ($researchLab.level > 0)>>
<<include "Lab Report">><br><br>
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 1c071768a4c2f4ef646e4bb6bd7b845beb53cd04..d1eec0d4089a6bf0ac12ab079f79aff513fd8c9f 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -613,8 +613,8 @@
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
<</if>>
- <<if $cyberMod != 0 && $researchLab.built == "true">>
- <br>[[Manage Research Lab|Research Lab][$temp = 0]]
+ <<if $researchLab.level > 0>>
+ <br>[[Manage Research Lab|Research Lab][]]
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
@@ -655,8 +655,8 @@
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
<</if>>
- <<if $cyberMod != 0 && $researchLab.built == "true">>
- <br>[[Manage Research Lab|Research Lab][$temp = 0]]
+ <<if $researchLab.level > 0>>
+ <br>[[Manage Research Lab|Research Lab][]]
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
@@ -707,8 +707,8 @@
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
<</if>>
- <<if $cyberMod != 0 && $researchLab.built == "true">>
- <br>[[Manage Research Lab|Research Lab][$temp = 0]]
+ <<if $researchLab.level > 0>>
+ <br>[[Manage Research Lab|Research Lab][]]
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@