Skip to content
Snippets Groups Projects
Commit ee860459 authored by Arkerthan's avatar Arkerthan
Browse files

fix incubator eyes

parent 82b3d800
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/npc/surgery/organFarm.js
+ 1
− 1
View file @ ee860459
...@@ -119,7 +119,7 @@ App.Medicine.OrganFarm.implantActions = function(slave) { ...@@ -119,7 +119,7 @@ App.Medicine.OrganFarm.implantActions = function(slave) {
r += `${App.UI.link("Discard", App.Medicine.OrganFarm.removeOrgan, [slave, organ.type], "Remote Surgery")}</div></div>`; r += `${App.UI.link("Discard", App.Medicine.OrganFarm.removeOrgan, [slave, organ.type], "Remote Surgery")}</div></div>`;
} }
return `The fabricator has completed ${slaveOrgans.length} organ(s):<div class="organContainer">${r}</div>`; return `The fabricator has completed ${slaveOrgans.length} organ(s):<div class="grid-2columns-auto">${r}</div>`;
}; };
/** /**
......
src/pregmod/incubator.tw
+ 5
− 20
View file @ ee860459
...@@ -523,49 +523,34 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu ...@@ -523,49 +523,34 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<br> <br>
<<if $tanks[$i].ovaries == 0 && $tankOrgans.ovaries != 1>> <<if $tanks[$i].ovaries == 0 && $tankOrgans.ovaries != 1>>
<<link "Prepare ovaries">> <<link "Prepare ovaries">>
<<run cashX(-10000, "incubator", $tanks[$i])>> <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "ovaries">>
<<set _newOrgan = {type: "ovaries", weeksToCompletion: "10", ID: 0}>>
<<set _newOrgan.ID = $tanks[$i].ID>>
<<set $incubatorOrgans.push(_newOrgan)>>
<<goto "Incubator">> <<goto "Incubator">>
<</link>> <</link>>
<</if>> <</if>>
<<if $tanks[$i].dick == 0 && $tankOrgans.penis != 1>> <<if $tanks[$i].dick == 0 && $tankOrgans.penis != 1>>
<<link "Prepare penis">> <<link "Prepare penis">>
<<run cashX(-5000, "incubator", $tanks[$i])>> <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "penis">>
<<set _newOrgan = {type: "penis", weeksToCompletion: "5", ID: 0}>>
<<set _newOrgan.ID = $tanks[$i].ID>>
<<set $incubatorOrgans.push(_newOrgan)>>
<<goto "Incubator">> <<goto "Incubator">>
<</link>> <</link>>
<</if>> <</if>>
<<if $tanks[$i].balls == 0 && $tankOrgans.testicles != 1>> <<if $tanks[$i].balls == 0 && $tankOrgans.testicles != 1>>
| |
<<link "Prepare testicles">> <<link "Prepare testicles">>
<<run cashX(-5000, "incubator", $tanks[$i])>> <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "testicles">>
<<set _newOrgan = {type: "testicles", weeksToCompletion: "10", ID: 0}>>
<<set _newOrgan.ID = $tanks[$i].ID>>
<<set $incubatorOrgans.push(_newOrgan)>>
<<goto "Incubator">> <<goto "Incubator">>
<</link>> <</link>>
<</if>> <</if>>
<<if getBestVision($tanks[$i]) === 0 && $tankOrgans.eyes != 1>> <<if getBestVision($tanks[$i]) === 0 && $tankOrgans.eyes != 1>>
<br>$He appears to be blind: <br>$He appears to be blind:
<<link "Prepare eyes">> <<link "Prepare eyes">>
<<run cashX(-10000, "incubator", $tanks[$i])>> <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "rightEye"), App.Medicine.OrganFarm.growOrgan($tanks[$i], "leftEye")>>
<<set _newOrgan = {type: "eyes", weeksToCompletion: "10", ID: 0}>>
<<set _newOrgan.ID = $tanks[$i].ID>>
<<set $incubatorOrgans.push(_newOrgan)>>
<<goto "Incubator">> <<goto "Incubator">>
<</link>> <</link>>
<</if>> <</if>>
<<if $tanks[$i].voice == 0 && $tankOrgans.voicebox != 1>> <<if $tanks[$i].voice == 0 && $tankOrgans.voicebox != 1>>
<br>$He appears to be mute: <br>$He appears to be mute:
<<link "Prepare vocal cords">> <<link "Prepare vocal cords">>
<<run cashX(-5000, "incubator", $tanks[$i])>> <<run App.Medicine.OrganFarm.growOrgan($tanks[$i], "voicebox">>
<<set _newOrgan = {type: "voicebox", weeksToCompletion: "5", ID: 0}>>
<<set _newOrgan.ID = $tanks[$i].ID>>
<<set $incubatorOrgans.push(_newOrgan)>>
<<goto "Incubator">> <<goto "Incubator">>
<</link>> <</link>>
<</if>> <</if>>
......
src/uncategorized/BackwardsCompatibility.tw
+ 23
− 0
View file @ ee860459
...@@ -3699,6 +3699,29 @@ Done<br> ...@@ -3699,6 +3699,29 @@ Done<br>
<<set $tooltipsEnabled = 0>> <<set $tooltipsEnabled = 0>>
<</if>> <</if>>
<<set _newOrgans = []>>
<<run $organs.forEach(o => {
if (o.type === "eyes") {
_newOrgans.push({type: "leftEye", weeksToCompletion: o.weeksToCompletion, ID: o.ID});
_newOrgans.push({type: "rightEye", weeksToCompletion: o.weeksToCompletion, ID: o.ID});
} else {
_newOrgans.push(o);
}
})>>
<<set $organs = _newOrgans>>
<<set _newOrgans = []>>
<<run $completedOrgans.forEach(o => {
if (o.type === "eyes") {
_newOrgans.push({type: "leftEye", ID: o.ID});
_newOrgans.push({type: "rightEye", ID: o.ID});
} else {
_newOrgans.push(o);
}
})>>
<<set $completedOrgans = _newOrgans>>
/* leave this at the bottom of BC */ /* leave this at the bottom of BC */
<<if $releaseID < App.Version.release>> <<if $releaseID < App.Version.release>>
<<set $releaseID = App.Version.release>> <<set $releaseID = App.Version.release>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment