From 0e4a3a642318ee9e00875a088be2712cca92e6db Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Tue, 17 Dec 2019 20:04:12 +0100
Subject: [PATCH] fixes
---
src/events/intro/introSummary.tw | 8 ++++----
src/npc/descriptions/eyes.js | 2 +-
src/pregmod/managePersonalAffairs.tw | 16 ++++++++++------
src/pregmod/pcAppearanceIntro.tw | 5 ++---
src/uncategorized/addCustomDescriptors.tw | 8 ++++----
src/uncategorized/reFSAcquisition.tw | 2 +-
6 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 5666c08be5c..e0110d3a93c 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -748,7 +748,6 @@ __''Player Character''__
<</options>>
<br>
- <<run resetEyeColor($PC)>>
<<options>>
Your eyes are:
<<option>>
@@ -1043,7 +1042,7 @@ __''Player Character''__
//Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.//
<br>
- You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and <<print eyesColor($PC)>>. You have a $PC.faceShape face.
+ You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and <<print App.Desc.eyesColor($PC)>>. You have a $PC.faceShape face.
<br>
Your preferred refreshment is <<textbox2 "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
@@ -1395,11 +1394,12 @@ __''Mods''__
<<if $secExpEnabled > 0>>
<<set $wasToggledBefore = 1>>
<</if>>
+ <<run resetEyeColor($PC)>>
<</link>>
<<if ($economy != 100) || ($seeDicks != 25) || ($continent != "North America") || ($internationalTrade != 1) || ($internationalVariety != 1) || ($seeRace != 1) || ($seeNationality != 1) || ($seeExtreme != 0) || ($seeCircumcision != 1) || ($seeAge != 1) || ($plot != 1)>>
- | [[restore defaults|Intro Summary][$seeDicks = 25,$economy = 100,$continent = "North America",$internationalTrade = 1,$internationalVariety = 1,$seeRace = 1,$seeNationality = 1,$seeExtreme = 0,$seeCircumcision = 1,$seeAge = 1,$plot = 1]]
+ | [[restore defaults|Intro Summary][$seeDicks = 25, $economy = 100, $continent = "North America", $internationalTrade = 1, $internationalVariety = 1, $seeRace = 1, $seeNationality = 1, $seeExtreme = 0, $seeCircumcision = 1, $seeAge = 1, $plot = 1]]
<</if>>
<br><br>
-[[Cheat Start|init Nationalities][cashX(1000000, "cheating"),$PC.rules.living = "luxurious",repX(20000, "cheating"),$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.skill.trading = 100,$PC.skill.warfare = 100,$PC.skill.slaving = 100,$PC.skill.engineering = 100,$PC.skill.medicine = 100,$PC.skill.hacking = 100]] | //Intended for debugging: may have unexpected effects//
+[[Cheat Start|init Nationalities][cashX(1000000, "cheating"), $PC.rules.living = "luxurious",repX(20000, "cheating"), $dojo += 1, $cheatMode = 1, $seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion", $sortSlavesOrder = "descending", $sortSlavesMain = 0, $rulesAssistantMain = 1, $abbreviateDevotion = 1, $abbreviateRules = 1, $abbreviateClothes = 2, $abbreviateHealth = 1, $abbreviateDiet = 1, $abbreviateDrugs = 1, $abbreviateRace = 1, $abbreviateNationality = 1, $abbreviateGenitalia = 1, $abbreviatePhysicals = 1, $abbreviateSkills = 1, $abbreviateMental = 2, $PC.skill.trading = 100, $PC.skill.warfare = 100, $PC.skill.slaving = 100, $PC.skill.engineering = 100, $PC.skill.medicine = 100, $PC.skill.hacking = 100, resetEyeColor($PC)]] | //Intended for debugging: may have unexpected effects//
diff --git a/src/npc/descriptions/eyes.js b/src/npc/descriptions/eyes.js
index 159ace160d6..d9816939a2f 100644
--- a/src/npc/descriptions/eyes.js
+++ b/src/npc/descriptions/eyes.js
@@ -148,4 +148,4 @@ App.Desc.eyeVisionToString = function(type) {
default:
return "unknown eye vision: " + type;
}
-};
\ No newline at end of file
+};
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 0f424f8b002..67698479845 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -10,7 +10,7 @@
<</if>>
You pause for a moment from your busy day to day life to return to <<if $masterSuite != 0>>$masterSuiteName<<else>>your room<</if>> to consider some things about yourself.
-<br>You take yourself in a full length mirror. You are <<if $PC.race == "amerindian" || $PC.race == "asian" || $PC.race == "indo-aryan">>an<<else>>a<</if>> $PC.race <<if $PC.dick != 0 && $PC.vagina != -1>>futanari<<elseif $PC.dick != 0>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair, <<print eyesColor($PC)>> and a perfect $PC.faceShape face.
+<br>You take yourself in a full length mirror. You are <<if $PC.race == "amerindian" || $PC.race == "asian" || $PC.race == "indo-aryan">>an<<else>>a<</if>> $PC.race <<if $PC.dick != 0 && $PC.vagina != -1>>futanari<<elseif $PC.dick != 0>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair, <<print App.Desc.eyesColor($PC)>> and a perfect $PC.faceShape face.
<<if $PC.actualAge >= 65>>
You're @@.orange;$PC.actualAge@@ and definitely feeling it.<<if $PC.visualAge > $PC.actualAge>> You've taken measures to @@.lime;look an older $PC.visualAge,@@ though perhaps it might be time to undo it.<<elseif $PC.visualAge < $PC.actualAge>> You've taken measures to @@.lime;look a younger $PC.visualAge,@@ now if only your body agreed with your looks.<</if>>
<<elseif $PC.actualAge >= 50>>
@@ -39,18 +39,18 @@ You current eye color is <<print App.Desc.eyeColor($PC)>>.
<<set _n = 0>>
<<if getLeftEyeColor($PC) !== getGeneticEyeColor($PC, "left")>>
<<set _n++>>
- [[Remove left lens|Salon][resetEyeColor($PC, "left")]]
+ [[Remove left lens|Manage Personal Affairs][resetEyeColor($PC, "left")]]
<</if>>
<<if getRightEyeColor($PC) !== getGeneticEyeColor($PC, "right")>>
<<set _n++>>
<<if _n > 0>>|<</if>>
- [[Remove right lens|Salon][resetEyeColor($PC, "right")]]
+ [[Remove right lens|Manage Personal Affairs][resetEyeColor($PC, "right")]]
<</if>>
<<if _n === 2>>
- | [[Remove both lenses|Salon][resetEyeColor($PC, "both")]]
+ | [[Remove both lenses|Manage Personal Affairs][resetEyeColor($PC, "both")]]
<</if>>
-//Change what $his eyes look like://
+//Change what your eyes look like://
<br>
Side:
@@ -109,9 +109,13 @@ Sclera:
| [[Turquoise|Salon][$artificialEyeFill = "turquoise"]]
| [[Yellow|Salon][$artificialEyeFill = "yellow"]]
+<<if ndef $artificialEyeColor>>
+ <<set $artificialEyeColor = "", $artificialEyeShape = "", $artificialEyeFill = "">>
+<</if>>
+
<<if $artificialEyeSide != "" && $artificialEyeColor != "">>
<br>
- <<link "Give" "Manage Personal Affairs">>
+ <<link "Take" "Manage Personal Affairs">>
/* apply modifications */
<<run setEyeColorFull($PC, $artificialEyeColor, $artificialEyeShape, $artificialEyeFill, $artificialEyeSide)>>
<<run cashX(forceNeg($modCost), "slaveMod", $PC)>>
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index afce67a246d..72e1d46e9c0 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -244,8 +244,7 @@ You have $PC.origSkin skin.
@@.orange;What color are your eyes?@@
<br>
-<<set resetEyeColor($PC)>>
-You have <<print eyesColor($PC)>>.
+You have $PC.eye.origColor eyes.
<br><<textbox "$PC.eye.origColor" $PC.eye.origColor "PC Appearance Intro">>
<br><br>
@@ -256,4 +255,4 @@ You have $PC.hColor hair.
<br><<textbox "$PC.hColor" $PC.hColor "PC Appearance Intro">>
<br><br>
-[[Finish player character customization|PC Experience Intro]]
+[[Finish player character customization|PC Experience Intro][resetEyeColor($PC)]]
diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw
index 889f9cacec5..31cb869d385 100644
--- a/src/uncategorized/addCustomDescriptors.tw
+++ b/src/uncategorized/addCustomDescriptors.tw
@@ -127,11 +127,11 @@ Custom hair color: <<textbox "$activeSlave.hColor" $activeSlave.hColor "Add cust
<br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'black with purple highlights'//
<br><br>
-<<if getLenseCount(slave) > 0>>
- $He is wearing <<print eyesColor($activeSlave, "", eye = "lense", eyes = "lenses")>>.
+<<if getLenseCount($activeSlave) > 0>>
+ $He is wearing <<print App.Desc.eyesColor($activeSlave, "", "lense", "lenses")>>.
<<else>>
- $He has <<print eyesColor($activeSlave)>>.
-<</if>>
+ $He has <<print App.Desc.eyesColor($activeSlave)>>.
+<</if>><br>
<<if hasLeftEye($activeSlave)>>
Custom left eye color: <<textbox "$activeSlave.eye.left.iris" $activeSlave.eye.left.iris "Add custom descriptors">><br>
<</if>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 6cc532ad23d..080e2b1a6ff 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1623,7 +1623,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<case "Edo Revivalist">>
$He arrives with doubt already clouding $his eyes. It seems $he passed one of the arcology's seedier bars on $his way up to your penthouse; the sight of roaring patrons swilling cheap sake and manhandling whores in loose kimonos does not seem to have been part of $his expectations. As the enslavement process winds on, $he reflexively begins to look around for a means of escape, and slowly collapses into $himself as $he realizes there is none.
<<case "Arabian Revivalist">>
- Your estimation of $him rises through the enslavement process: $he doffs and discards $his conservative business wear without complaint, and stands nude before you, obeying instructions without fuss. There is an indecipherable glint in $his <<print eyesColor($activeSlave)>>: nerves? Excitement? Challenge, even? Perhaps $he even feels this is an adventure. And that, it will certainly be.
+ Your estimation of $him rises through the enslavement process: $he doffs and discards $his conservative business wear without complaint, and stands nude before you, obeying instructions without fuss. There is an indecipherable glint in $his <<print App.Desc.eyesColor($activeSlave)>>: nerves? Excitement? Challenge, even? Perhaps $he even feels this is an adventure. And that, it will certainly be.
<<case "Chinese Revivalist">>
$He arrives in a simple, sturdy suit, which $he obviously wore in the correct anticipation of immediately removing and never seeing again. $He cooperates with the enslavement process as best $he can, $his glance confident and watchful. $He's obviously calculating how to get ahead within this new place, and $he pays particularly close attention as the ebb and flow of business through your office brings your various slaves into $his view for the first time.
<</switch>>
--
GitLab