diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index cf6567723a2df392602120b80d607a877bfda2e2..63a7e2ea96fb851632b6418369c3f174fe82b2d7 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -4179,6 +4179,27 @@ window.induceLactation = function induceLactation(slave) { return r; } +window.ResearchLabStockPile = function() { + return `__Stockpile__ + Prosthetics interfaces: <<print commaNum($stockpile.basicPLimbInterface+ + $stockpile.advPLimbInterface)>> + Basic : $stockpile.basicPLimbInterface + Advanced: $stockpile.advPLimbInterface + Limbs: <<print commaNum($stockpile.basicPLimb+$stockpile.advSexPLimb+ + $stockpile.advGracePLimb+$stockpile.advCombatPLimb+$stockpile.cyberneticPLimb)>> + Basic: $stockpile.basicPLimb + Sex: $stockpile.advSexPLimb + Beauty: $stockpile.advGracePLimb + Combat: $stockpile.advCombatPLimb + Cybernetic: $stockpile.cyberneticPLimb + Implants: <<print commaNum($stockpile.ocularImplant+$stockpile.cochlearImplant + +$stockpile.erectileImplant)>> + Ocular: $stockpile.ocularImplant + Cochlear: $stockpile.cochlearImplant + // Erectile: $stockpile.erectileImplant + Electrolarynx: $stockpile.electrolarynx` +} + /*:: Span Macro JS [script]*/ /* diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw index 09a5cc2f0c7f4cdfdf9cbd2d8e2ce8138e19980a..af980ed1a51b094abdfbed1d61f381da1c0fc37f 100644 --- a/src/interaction/researchLab.tw +++ b/src/interaction/researchLab.tw @@ -150,9 +150,9 @@ <<if $researchLab.electrolarynx == 0 && $stockpile.electrolarynx > 0>><br> [[Reverse engineer electrolarynx|Research Lab][$stockpile.electrolarynx -= 1,$researchLab.productionTime = 80,$researchLab.research = "Electrolarynx"]] <</if>> - <<if $researchLab.erectileImplant == 0 && $stockpile.erectileImplant > 0>><br> + /*<<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>> + <</if>>*/ <</if>> <br><br> @@ -195,11 +195,15 @@ <<if $researchLab.electrolarynx == 1>><br> [[Build electrolarynx|Research Lab][$researchLab.productionTime = 60,$researchLab.manufacture = "Electrolarynx"]] // Currently have: $stockpile.electrolarynx// <</if>> - <<if $researchLab.erectileImplant == 1>><br> + /*<<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>> + <</if>>*/ <</if>> +<<if $researchLab.manufacture != "none"||$researchLab.research != "none">> + <br><br> <<= ResearchLabStockPile()>> +<</if>> + <<case 1>> <<set $temp = 0>> <<set $nextLink = "Research Lab">> diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw index 2c05fc54bb5f4ac126c650b6ec628c29c2f912b8..59655e0c63c72be8a6088be6b47f752ad7007acd 100644 --- a/src/js/utilJS.tw +++ b/src/js/utilJS.tw @@ -1054,4 +1054,25 @@ window.induceLactation = function induceLactation(slave) { } } return r; +} + +window.ResearchLabStockPile = function() { + return `__Stockpile__ + Prosthetics interfaces: <<print commaNum($stockpile.basicPLimbInterface+ + $stockpile.advPLimbInterface)>> + Basic : $stockpile.basicPLimbInterface + Advanced: $stockpile.advPLimbInterface + Limbs: <<print commaNum($stockpile.basicPLimb+$stockpile.advSexPLimb+ + $stockpile.advGracePLimb+$stockpile.advCombatPLimb+$stockpile.cyberneticPLimb)>> + Basic: $stockpile.basicPLimb + Sex: $stockpile.advSexPLimb + Beauty: $stockpile.advGracePLimb + Combat: $stockpile.advCombatPLimb + Cybernetic: $stockpile.cyberneticPLimb + Implants: <<print commaNum($stockpile.ocularImplant+$stockpile.cochlearImplant + +$stockpile.erectileImplant)>> + Ocular: $stockpile.ocularImplant + Cochlear: $stockpile.cochlearImplant + // Erectile: $stockpile.erectileImplant + Electrolarynx: $stockpile.electrolarynx` } \ No newline at end of file diff --git a/src/uncategorized/labReport.tw b/src/uncategorized/labReport.tw index 07e4898fd099c5b4d069b9478a12bf94e8409469..c5c1f6b5ce2daeb767c012c8bfc12964a667d613 100644 --- a/src/uncategorized/labReport.tw +++ b/src/uncategorized/labReport.tw @@ -9,7 +9,7 @@ <<elseif $researchLab.research != "none">> <<set $researchLab.productionTime -= (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>> <<if $researchLab.productionTime <= 0>> - Your lab staff have @@.green;completed@@ their research project, and + Your lab staff have @@.green;completed@@ their $researchLab.research research project, and <<switch $researchLab.research>> <<case "Basic prosthetics interface">> <<set $researchLab.basicPLimbInterface = 1>> @@ -31,18 +31,19 @@ <<set $researchLab.cochlearImplant = 1>> <<case "Electrolarynx">> <<set $researchLab.electrolarynx = 1>> - <<case "Erectile implant">> - <<set $researchLab.erectileImplant = 1>> + /*<<case "Erectile implant">> + <<set $researchLab.erectileImplant = 1>>*/ <</switch>> they are awaiting your next instruction. <<set $researchLab.productionTime = 0, $researchLab.research = "none">> <<else>> Your lab staff are currently researching @@.yellow;$researchLab.research@@. <</if>> + <br><br> <<= ResearchLabStockPile()>> <<elseif $researchLab.manufacture != "none">> <<set $researchLab.productionTime -= (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>> <<if $researchLab.productionTime <= 0>> - Your lab staff have @@.green;completed@@ their project, and + Your lab staff have @@.green;completed@@ their $researchLab.manufacture project, and <<switch $researchLab.manufacture>> <<case "Basic prosthetics interface">> <<set $stockpile.basicPLimbInterface += 1, $researchLab.productionTime = 50>> @@ -64,8 +65,8 @@ <<set $stockpile.cochlearImplant += 1, $researchLab.productionTime = 60>> <<case "Electrolarynx">> <<set $stockpile.electrolarynx += 1, $researchLab.productionTime = 100>> - <<case "Erectile implant">> - <<set $stockpile.erectileImplant += 1, $researchLab.productionTime = 50>> + /*<<case "Erectile implant">> + <<set $stockpile.erectileImplant += 1, $researchLab.productionTime = 50>>*/ <</switch>> <span id="haltproduction"> they are starting work on another unit. @@ -79,5 +80,6 @@ <<else>> Your lab staff are currently working on @@.yellow;$researchLab.manufacture@@. <</if>> + <br><br> <<= ResearchLabStockPile()>> <</if>> <</if>>