From b2ed2297f85d3e2271db5c2641ddf58314453215 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Mon, 9 Dec 2019 11:18:17 +0100
Subject: [PATCH] revert unneeded .orig* changes
---
src/js/generateGenetics.js | 24 +++++-----
src/pregmod/analyzePlayerPregnancy.tw | 6 +--
src/pregmod/analyzePregnancy.tw | 6 +--
src/pregmod/incubator.tw | 4 +-
src/pregmod/sePlayerBirth.tw | 16 +++----
src/uncategorized/customSlave.tw | 54 +++++++++++-----------
src/uncategorized/seCustomSlaveDelivery.tw | 4 +-
7 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 1f0bf0170af..986ab6d2edf 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -28,9 +28,9 @@ window.generateGenetics = (function() {
intelligence: 0,
face: 0,
faceShape: "cute",
- origEye: "brown",
- origHColor: "black",
- origSkin: "light",
+ eyeColor: "brown",
+ hColor: "black",
+ skin: "light",
markings: "none",
behavioralFlaw: "none",
sexualFlaw: "none",
@@ -92,16 +92,16 @@ window.generateGenetics = (function() {
genes.fatherName = setFatherName(father, activeFather, actor2);
genes.nationality = setNationality(father, mother);
genes.geneticQuirks = setGeneticQuirks(activeFather, activeMother, genes.gender);
- genes.origSkin = setSkin(father, mother, actor2);
+ genes.skin = setSkin(father, mother, actor2);
genes.race = setRace(father, mother, actor2);
genes.intelligence = setIntelligence(father, mother, activeMother, actor2);
genes.face = setFace(father, mother, activeMother, actor2, genes.geneticQuirks);
genes.faceShape = setFaceShape(father, mother, genes.geneticQuirks);
- genes.origEye = setEyeColor(father, mother, actor2);
+ genes.eyeColor = setEyeColor(father, mother, actor2);
if (genes.geneticQuirks.heterochromia === 2) {
genes.geneticQuirks.heterochromia = setHeterochromaticEyeColor(father, mother, actor2);
}
- genes.origHColor = setHColor(father, mother, actor2);
+ genes.hColor = setHColor(father, mother, actor2);
genes.underArmHStyle = setUnderArmHStyle(father, mother);
genes.pubicHStyle = setPubicHStyle(father, mother);
genes.markings = setMarkings(father, mother);
@@ -1294,9 +1294,9 @@ window.generateChild = function(mother, ova, destination) {
child.albinismOverride.skin = "pure white";
}
}
- child.origSkin = genes.origSkin;
- child.origEye = genes.origEye;
- child.origHColor = genes.origHColor;
+ child.origSkin = genes.skin;
+ child.origEye = genes.eyeColor;
+ child.origHColor = genes.hColor;
child.skin = getGeneticSkinColor(child);
child.eyeColor = getGeneticEyeColor(child);
child.hColor = getGeneticHairColor(child);
@@ -1557,9 +1557,9 @@ window.generateChild = function(mother, ova, destination) {
child.albinismOverride.skin = "pure white";
}
}
- child.origSkin = genes.origSkin;
- child.origEye = genes.origEye;
- child.origHColor = genes.origHColor;
+ child.origSkin = genes.skin;
+ child.origEye = genes.eyeColor;
+ child.origHColor = genes.hColor;
child.skin = getGeneticSkinColor(child);
child.eyeColor = getGeneticEyeColor(child);
child.hColor = getGeneticHairColor(child);
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index 7cac45e4ab6..5fe11783980 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -91,15 +91,15 @@
<br>
Race: $PC.womb[_ap].genetics.race
<br>
- Skin tone: $PC.womb[_ap].genetics.origSkin
+ Skin tone: $PC.womb[_ap].genetics.skin
<br>
Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100
<br>
Face index: $PC.womb[_ap].genetics.face out of 100
<br>
- Eye Color: $PC.womb[_ap].genetics.origEye
+ Eye Color: $PC.womb[_ap].genetics.eyeColor
<br>
- Hair Color: $PC.womb[_ap].genetics.origHColor
+ Hair Color: $PC.womb[_ap].genetics.hColor
<<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
<br>
Body hair: none
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 537fcad11cb..133b7ad07bf 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -103,15 +103,15 @@
<br>
Race: $activeSlave.womb[_ap].genetics.race
<br>
- Skin tone: $activeSlave.womb[_ap].genetics.origSkin
+ Skin tone: $activeSlave.womb[_ap].genetics.skin
<br>
Intelligence index: $activeSlave.womb[_ap].genetics.intelligence out of 100
<br>
Face index: $activeSlave.womb[_ap].genetics.face out of 100
<br>
- Eye Color: $activeSlave.womb[_ap].genetics.origEye
+ Eye Color: $activeSlave.womb[_ap].genetics.eyeColor
<br>
- Hair Color: $activeSlave.womb[_ap].genetics.origHColor
+ Hair Color: $activeSlave.womb[_ap].genetics.hColor
<<if $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless" && $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
<br>
Body hair: none
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 06a76837c0e..1734d874610 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -338,9 +338,9 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<setLocalPronouns $tanks[$i]>>
<br><br>@@.pink;$tanks[$i].slaveName@@ occupies this tank.
<<if $geneticMappingUpgrade >= 1>>
- $He is a <<if $tanks[$i].genes == "XX">>female<<else>>male<</if>> of $tanks[$i].race descent with $tanks[$i].origEye eyes, $tanks[$i].origHColor hair and $tanks[$i].origSkin skin. Given $his parentage, $he is considered $tanks[$i].nationality.
+ $He is a <<if $tanks[$i].genes == "XX">>female<<else>>male<</if>> of $tanks[$i].race descent with $tanks[$i].eyeColor eyes, $tanks[$i].hColor hair and $tanks[$i].skin skin. Given $his parentage, $he is considered $tanks[$i].nationality.
<<else>>
- $He appears to be <<if $tanks[$i].genes == "XX">>a natural girl<<else>>a natural boy<</if>>, with $tanks[$i].origHColor hair<<if $tanks[$i].eyes != -2>> and $tanks[$i].origEye eyes.<<else>>. $He most likely will be blind.<</if>>
+ $He appears to be <<if $tanks[$i].genes == "XX">>a natural girl<<else>>a natural boy<</if>>, with $tanks[$i].hColor hair<<if $tanks[$i].eyes != -2>> and $tanks[$i].eyeColor eyes.<<else>>. $He most likely will be blind.<</if>>
<</if>>
Statistical projections indicates that once released $he will be around <<= heightToEitherUnit($tanks[$i].height + random(-5,5))>> tall. Most likely $he will be
<<if $tanks[$i].weight <= 30 && $tanks[$i].weight >= -30>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 303a3241825..93589f69f18 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -353,13 +353,13 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if $PC.curBabies[_p].genetics.race == $PC.origRace>>
<<set _PCDegree++>>
<</if>>
- <<if $PC.curBabies[_p].genetics.origHColor == $PC.origHColor>>
+ <<if $PC.curBabies[_p].genetics.hColor == $PC.hColor>>
<<set _PCDegree++>>
<</if>>
- <<if $PC.curBabies[_p].genetics.origSkin == $PC.origSkin>>
+ <<if $PC.curBabies[_p].genetics.skin == $PC.skin>>
<<set _PCDegree++>>
<</if>>
- <<if $PC.curBabies[_p].genetics.origEye == $PC.eye.origColor>>
+ <<if $PC.curBabies[_p].genetics.eyeColor == $PC.eye.origColor>>
<<set _PCDegree++>>
<</if>>
@@ -368,7 +368,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
looks exactly like you, in fact, the resemblance seems uncanny. Since <<if _gender == "XX">>she<<else>>he<</if>> has the exact same genetics as you, <<if _gender == "XX">>she<<else>>he<</if>>'ll likely look almost identical to you when <<if _gender == "XX">>she<<else>>he<</if>>'s your age.
<<elseif _PCDegree == 4>>
looks just like you; <<if _gender == "XX">>she<<else>>he<</if>> will likely grow up to closely resemble yourself.
- <<elseif $PC.curBabies[_p].genetics.origEye == $PC.eye.origColor>>
+ <<elseif $PC.curBabies[_p].genetics.eyeColor == $PC.eye.origColor>>
has your lovely $PC.eye.origColor eyes.
<<elseif _PCDegree > 0>>
looks a little like you, enough that <<if _gender == "XX">>she<<else>>he<</if>>'ll be recognizable as yours.
@@ -395,13 +395,13 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if $PC.curBabies[0].genetics.race == $PC.origRace>>
<<set _PCDegree++>>
<</if>>
- <<if $PC.curBabies[_p].genetics.origHColor == $PC.origHColor>>
+ <<if $PC.curBabies[_p].genetics.hColor == $PC.hColor>>
<<set _PCDegree++>>
<</if>>
- <<if $PC.curBabies[_p].genetics.origSkin == $PC.origSkin>>
+ <<if $PC.curBabies[_p].genetics.skin == $PC.skin>>
<<set _PCDegree++>>
<</if>>
- <<if $PC.curBabies[_p].genetics.origEye == $PC.eye.origColor>>
+ <<if $PC.curBabies[_p].genetics.eyeColor == $PC.eye.origColor>>
<<set _PCDegree++>>
<</if>>
@@ -412,7 +412,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
looks exactly like you<<if _p == 0>>, in fact, the resemblance seems uncanny. Since <<if $PC.curBabies[_p].genetics.gender == "XX">>she<<else>>he<</if>> has the exact same genetics as you, <<if $PC.curBabies[_p].genetics.gender == "XX">>she<<else>>he<</if>>'ll likely look almost identical to you when <<if $PC.curBabies[_p].genetics.gender == "XX">>she<<else>>he<</if>>'s your age<</if>>. Every one of your children look this way; it's kind of hard to tell them apart.
<<elseif _PCDegree == 4>>
looks just like you; <<if $PC.curBabies[_p].genetics.gender == "XX">>she<<else>>he<</if>> will likely grow up to closely resemble yourself.
- <<elseif $PC.curBabies[_p].genetics.origEye == $PC.eye.origColor>>
+ <<elseif $PC.curBabies[_p].genetics.eyeColor == $PC.eye.origColor>>
has your lovely $PC.eye.origColor eyes.
<<elseif _PCDegree > 0>>
looks a little like you, enough that <<if $PC.curBabies[_p].genetics.gender == "XX">>she<<else>>he<</if>>'ll be recognizable as yours.
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index 5c0b91296ff..5cc040be217 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -613,135 +613,135 @@ Ethnicity: <span id = "ethnicity">
<br>
Skin tone: <span id = "skin">
-<<textbox "$customSlave.origSkin" $customSlave.origSkin "Custom Slave">>
+<<textbox "$customSlave.skin" $customSlave.skin "Custom Slave">>
</span>
<<link "Pure White">>
- <<set $customSlave.origSkin = "pure white">>
+ <<set $customSlave.skin = "pure white">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Ivory">>
- <<set $customSlave.origSkin = "ivory">>
+ <<set $customSlave.skin = "ivory">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "White">>
- <<set $customSlave.origSkin = "white">>
+ <<set $customSlave.skin = "white">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Extremely Pale">>
- <<set $customSlave.origSkin = "extremely pale">>
+ <<set $customSlave.skin = "extremely pale">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Very Pale">>
- <<set $customSlave.origSkin = "very pale">>
+ <<set $customSlave.skin = "very pale">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Pale">>
- <<set $customSlave.origSkin = "pale">>
+ <<set $customSlave.skin = "pale">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Extremely Fair">>
- <<set $customSlave.origSkin = "extremely fair">>
+ <<set $customSlave.skin = "extremely fair">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Very Fair">>
- <<set $customSlave.origSkin = "very fair">>
+ <<set $customSlave.skin = "very fair">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Fair">>
- <<set $customSlave.origSkin = "fair">>
+ <<set $customSlave.skin = "fair">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Light">>
- <<set $customSlave.origSkin = "light">>
+ <<set $customSlave.skin = "light">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Light Olive">>
- <<set $customSlave.origSkin = "light olive">>
+ <<set $customSlave.skin = "light olive">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Tan">>
- <<set $customSlave.origSkin = "tan">>
+ <<set $customSlave.skin = "tan">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Olive">>
- <<set $customSlave.origSkin = "olive">>
+ <<set $customSlave.skin = "olive">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Bronze">>
- <<set $customSlave.origSkin = "bronze">>
+ <<set $customSlave.skin = "bronze">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Dark Olive">>
- <<set $customSlave.origSkin = "dark olive">>
+ <<set $customSlave.skin = "dark olive">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Dark">>
- <<set $customSlave.origSkin = "dark">>
+ <<set $customSlave.skin = "dark">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Light Beige">>
- <<set $customSlave.origSkin = "light beige">>
+ <<set $customSlave.skin = "light beige">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Beige">>
- <<set $customSlave.origSkin = "beige">>
+ <<set $customSlave.skin = "beige">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Dark Beige">>
- <<set $customSlave.origSkin = "dark beige">>
+ <<set $customSlave.skin = "dark beige">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Light Brown">>
- <<set $customSlave.origSkin = "light brown">>
+ <<set $customSlave.skin = "light brown">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Brown">>
- <<set $customSlave.origSkin = "brown">>
+ <<set $customSlave.skin = "brown">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Dark Brown">>
- <<set $customSlave.origSkin = "dark brown">>
+ <<set $customSlave.skin = "dark brown">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Black">>
- <<set $customSlave.origSkin = "black">>
+ <<set $customSlave.skin = "black">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Ebony">>
- <<set $customSlave.origSkin = "ebony">>
+ <<set $customSlave.skin = "ebony">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Pure Black">>
- <<set $customSlave.origSkin = "pure black">>
+ <<set $customSlave.skin = "pure black">>
<<CustomSlaveSkin>>
<</link>>
|
<<link "Left natural">>
- <<set $customSlave.origSkin = "left natural">>
+ <<set $customSlave.skin = "left natural">>
<<CustomSlaveSkin>>
<</link>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 8194871818b..3d61716ff90 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -181,8 +181,8 @@
<<set $activeSlave.weight = $customSlave.weight>>
<<set $activeSlave.face = $customSlave.face>>
<<set $activeSlave.lips = $customSlave.lips>>
-<<if $customSlave.origSkin != "left natural">>
- <<set $activeSlave.origSkin = $customSlave.origSkin>>
+<<if $customSlave.skin != "left natural">>
+ <<set $activeSlave.origSkin = $customSlave.skin>>
<<set $activeSlave.skin = getGeneticSkin($activeSlave)>>
<</if>>
<<set $activeSlave.boobs = $customSlave.boobs>>
--
GitLab