From fa8a4a55320e3366c50d349d22b2927e728876a8 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 18 Dec 2019 22:12:31 +0100
Subject: [PATCH] fixes
---
src/pregmod/editGenetics.tw | 2 +-
src/pregmod/huskSlaveSwap.tw | 2 +-
src/pregmod/testGenetics.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/pregmod/editGenetics.tw b/src/pregmod/editGenetics.tw
index 0e769b45a9e..20d3c162903 100644
--- a/src/pregmod/editGenetics.tw
+++ b/src/pregmod/editGenetics.tw
@@ -51,7 +51,7 @@
<tr>
<th>Skin</th><td class="editor string-editor" data-param="origSkin"><%- s.origSkin %></td>
<th>Skin markings</th><td class="editor choice-editor" data-param="markings" data-choices="none, beauty mark, birthmark, freckles, heavily freckled"><%- s.markings %></td>
- <th>Eyes</th><td class="editor string-editor" data-param="origEye"><%- s.origEye %></td>
+ <th>Eyes</th><td class="editor string-editor" data-param="eye.origColor"><%- s.eye.origColor %></td>
<th>Hair</th><td class="editor string-editor" data-param="origHColor"><%- s.origHColor %></td>
</tr>
<tr>
diff --git a/src/pregmod/huskSlaveSwap.tw b/src/pregmod/huskSlaveSwap.tw
index 7f39b22c635..6acde5a7928 100644
--- a/src/pregmod/huskSlaveSwap.tw
+++ b/src/pregmod/huskSlaveSwap.tw
@@ -8,7 +8,7 @@
You strap $slaves[_m].slaveName, and the body to which $he will be transferred, into the remote surgery and stand back as it goes to work.
<<BodySwap $slaves[_m] $activeSlave>>
<<set _gps = $genePool.findIndex(function(s) { return s.ID == $slaves[_m].ID; })>>
-<<set $genePool[_gps].race = $slaves[_m].race, $genePool[_gps].origRace = $slaves[_m].origRace, $genePool[_gps].skin = $slaves[_m].skin, $genePool[_gps].markings = $slaves[_m].markings, $genePool[_gps].origEye = $slaves[_m].origEye, $genePool[_gps].origHColor = $slaves[_m].origHColor, $genePool[_gps].origSkin = $slaves[_m].origSkin, $genePool[_gps].face = $slaves[_m].face, $genePool[_gps].pubicHStyle = $slaves[_m].pubicHStyle, $genePool[_gps].underArmHStyle = $slaves[_m].underArmHStyle, $genePool[_gps].eyebrowHStyle = $slaves[_m].eyebrowHStyle>> /* special exception to swap genePool since the temporary body lacks an entry. Otherwise we could just call the widget using the genePool entries */
+<<set $genePool[_gps].race = $slaves[_m].race, $genePool[_gps].origRace = $slaves[_m].origRace, $genePool[_gps].skin = $slaves[_m].skin, $genePool[_gps].markings = $slaves[_m].markings, $genePool[_gps].eye.origColor = $slaves[_m].eye.origColor, $genePool[_gps].origHColor = $slaves[_m].origHColor, $genePool[_gps].origSkin = $slaves[_m].origSkin, $genePool[_gps].face = $slaves[_m].face, $genePool[_gps].pubicHStyle = $slaves[_m].pubicHStyle, $genePool[_gps].underArmHStyle = $slaves[_m].underArmHStyle, $genePool[_gps].eyebrowHStyle = $slaves[_m].eyebrowHStyle>> /* special exception to swap genePool since the temporary body lacks an entry. Otherwise we could just call the widget using the genePool entries */
<br><br>
After an honestly impressive procedure, $slaves[_m].slaveName is recovering nicely.
diff --git a/src/pregmod/testGenetics.tw b/src/pregmod/testGenetics.tw
index ab0014a094f..772a5bf2676 100644
--- a/src/pregmod/testGenetics.tw
+++ b/src/pregmod/testGenetics.tw
@@ -16,7 +16,7 @@ All slave array slaves MUST be present in genePool or else there is a malfunctio
<</for>>
</table>
-<<set _neededProperties = ['genes', 'origSkin', 'origEye', 'origHColor', 'nationality', 'origRace', 'face', 'faceShape', 'markings', 'intelligence', 'underArmHStyle', 'pubicHStyle']>>
+<<set _neededProperties = ['genes', 'origSkin', 'eye.origColor', 'origHColor', 'nationality', 'origRace', 'face', 'faceShape', 'markings', 'intelligence', 'underArmHStyle', 'pubicHStyle']>>
<table><caption style="background-color: rgba(127, 127, 127, 0.2)">slaves</caption>
<tr><th>index</th><th>name</th><th>ID</th><th>origin</th><th>assignment</th></tr>
<<for _i = 0; _i < $slaves.length; _i++>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index f0fe9104830..45130d59278 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -597,7 +597,7 @@
<</if>>
<<if $releaseID < 1059>>
- <<set $args[0].eyes = new App.Entity.EyeState()>>
+ <<set $args[0].eye = new App.Entity.EyeState()>>
<<run setGeneticEyeColor($args[0], $args[0].origEye)>>
<<if $args[0].eyes === -4>>
<<run eyeSurgery($args[0], "both", "remove")>>
@@ -610,7 +610,7 @@
<<elseif $args[0].eyes === -1>><<run eyeSurgery($args[0], "both", "blur")>>
<</if>>
<<run setEyeColorFull($args[0], $args[0].eyeColor, $args[0].pupil, $args[0].sclerae, "both")>>
- <<if typeof $args[0].slave.geneticQuirks.heterochromia === "string")>>
+ <<if typeof $args[0].geneticQuirks.heterochromia === "string">>
<<run setEyeColor($args[0].geneticQuirks.heterochromia, "left")>>
<</if>>
<</if>>
--
GitLab