diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 933f65597ee956b1e0cb12ec668d0cd0bc791802..a6edd4b699d151f220285ab2c717fabc7ed688ec 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,9 @@ 1/29/18 + 311 + -anon's labReport fix + 310 -crimeanon's fixes -anon's continued tweaking diff --git a/src/uncategorized/labReport.tw b/src/uncategorized/labReport.tw index f3de21406ee832de69649adfcb143bac224e08df..eb5e3599f4ecf23de4fea9ba00f0df21c86d2adf 100644 --- a/src/uncategorized/labReport.tw +++ b/src/uncategorized/labReport.tw @@ -10,25 +10,28 @@ <<set $researchLab.productionTime -= (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>> <<if $researchLab.productionTime <= 0>> Your lab staff have @@.green;completed@@ their research project, and - <<if $researchLab.research == "Basic prosthetics interface">> + <<switch $researchLab.research>> + <<case "Basic prosthetics interface">> <<set $researchLab.basicPLimbInterface = 1>> - <<elseif $researchLab.research == "Advanced prosthetics interface">> + <<case "Advanced prosthetics interface">> <<set $researchLab.advPLimbInterface = 1>> - <<elseif $researchLab.research == "Basic prosthetic limbs">> + <<case "Basic prosthetic limbs">> <<set $researchLab.basicPLimb = 1>> - <<elseif $researchLab.research == "Advanced sex limbs">> + <<case "Advanced sex limbs">> <<set $researchLab.advSexPLimb = 1>> - <<elseif $researchLab.research == "Advanced beauty limbs">> + <<case "Advanced beauty limbs">> <<set $researchLab.advGracePLimb = 1>> - <<elseif $researchLab.research == "Advanced combat limbs">> + <<case "Advanced combat limbs">> <<set $researchLab.advCombatPLimb = 1>> - <<elseif $researchLab.research == "Cybernetic limbs">> + <<case "Cybernetic limbs">> <<set $researchLab.cyberneticPLimb = 1>> - <<elseif $researchLab.research == "Ocular implants">> + <<case "Ocular implants">> <<set $researchLab.ocularImplant = 1>> - <</if>> + <<case "Erectile implant">> + <<set $researchLab.erectileImplant = 1>> + <</switch>> they are awaiting your next instruction. - <<set $researchLab.productionTime to 0, $researchLab.research to "none">> + <<set $researchLab.productionTime = 0, $researchLab.research = "none">> <<else>> Your lab staff are currently researching @@.yellow;$researchLab.research@@. <</if>> @@ -36,28 +39,30 @@ <<set $researchLab.productionTime -= (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>> <<if $researchLab.productionTime <= 0>> Your lab staff have @@.green;completed@@ their project, and - <<if $researchLab.manufacture == "Basic prosthetics interface">> - <<set $stockpile.basicPLimbInterface += 1>> - <<elseif $researchLab.manufacture == "Advanced prosthetics interface">> - <<set $stockpile.advPLimbInterface += 1>> - <<elseif $researchLab.manufacture == "Basic prosthetic limbs">> - <<set $stockpile.basicPLimb += 1>> - <<elseif $researchLab.manufacture == "Advanced sex limbs">> - <<set $stockpile.advSexPLimb += 1>> - <<elseif $researchLab.manufacture == "Advanced beauty limbs">> - <<set $stockpile.advGracePLimb += 1>> - <<elseif $researchLab.manufacture == "Advanced combat limbs">> - <<set $stockpile.advCombatPLimb += 1>> - <<elseif $researchLab.manufacture == "Cybernetic limbs">> - <<set $stockpile.cyberneticPLimb += 1>> - <<elseif $researchLab.manufacture == "Ocular implants">> - <<set $stockpile.ocularImplant += 1>> - <</if>> - <<set $researchLab.productionTime = 0>> + <<switch $researchLab.manufacture>> + <<case "Basic prosthetics interface">> + <<set $stockpile.basicPLimbInterface += 1, $researchLab.productionTime = 50>> + <<case "Advanced prosthetics interface">> + <<set $stockpile.advPLimbInterface += 1, $researchLab.productionTime = 80>> + <<case "Basic prosthetic limbs">> + <<set $stockpile.basicPLimb += 1, $researchLab.productionTime = 20>> + <<case "Advanced sex limbs">> + <<set $stockpile.advSexPLimb += 1, $researchLab.productionTime = 100>> + <<case "Advanced beauty limbs">> + <<set $stockpile.advGracePLimb += 1, $researchLab.productionTime = 100>> + <<case "Advanced combat limbs">> + <<set $stockpile.advCombatPLimb += 1, $researchLab.productionTime = 100>> + <<case "Cybernetic limbs">> + <<set $stockpile.cyberneticPLimb += 1, $researchLab.productionTime = 150>> + <<case "Ocular implants">> + <<set $stockpile.ocularImplant += 1, $researchLab.productionTime = 80>> + <<case "Erectile implant">> + <<set $stockpile.erectileImplant += 1, $researchLab.productionTime = 50>> + <</switch>> <span id="haltproduction"> they are starting work on another unit. <<link "Halt production">> - <<set $researchLab.manufacture = "none">> + <<set $researchLab.productionTime = 0, $researchLab.research = "none">> <<replace "#haltproduction">> they are awaiting your next instruction. <</replace>>