From e3fba5c413772655933d9f96427550b37d932876 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sun, 15 Dec 2019 22:46:06 +0100
Subject: [PATCH] convert .eyeColor to object
---
src/js/DefaultRules.js | 12 ++++++------
src/npc/databases/dSlavesDatabase.tw | 3 ++-
src/npc/startingGirls/moreCustomOptions.tw | 2 +-
src/uncategorized/RESS.tw | 3 ++-
src/uncategorized/addCustomDescriptors.tw | 13 +++++++++----
src/uncategorized/reFSAcquisition.tw | 4 ++--
src/uncategorized/reMalefactor.tw | 2 +-
7 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index f1afef38574..6f612bee120 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1520,17 +1520,17 @@ window.DefaultRules = (function() {
* @param {App.Entity.SlaveState} slave
* @param {App.RA.RuleSetters} rule
*/
-
+
function ProcessPit(slave,rule){
if (rule.pitRules !== undefined && rule.pitRules !== null){
if (V.pit > 0){
if (rule.pitRules === 0){
V.fighterIDs = V.fighterIDs.filter(e => e !== slave.ID);
- r += `<br>${slave.slaveName} has been removed from the pit.`;
+ r += `<br>${slave.slaveName} has been removed from the pit.`;
}else{
if (App.Entity.facilities.pit.job().checkRequirements(slave).length !== 0) {
V.fighterIDs = V.fighterIDs.filter(e => e !== slave.ID);
- r += `<br>${slave.slaveName} is not eligible to fight.`;
+ r += `<br>${slave.slaveName} is not eligible to fight.`;
} else{
if (!V.fighterIDs.includes(slave.ID)){
V.fighterIDs.push(slave.ID);
@@ -2133,10 +2133,10 @@ window.DefaultRules = (function() {
*/
function ProcessStyle(slave, rule) {
if (rule.eyeColor !== undefined && (rule.eyeColor !== null)) {
- if ((slave.eyeColor !== rule.eyeColor)) {
- slave.eyeColor = rule.eyeColor;
+ if (getLeftEyeColor(slave) !== rule.eyeColor || getRightEyeColor(slave) !== rule.eyeColor) {
+ setEyeColor(slave, rule.eyeColor);
cashX(forceNeg(V.modCost), "slaveMod", slave);
- r += `<br>${slave.slaveName} has been given ${slave.eyeColor} contact lenses.`;
+ r += `<br>${slave.slaveName} has been given ${rule.eyeColor} contact lenses.`;
}
}
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index ac5460586ae..f31cff2726b 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -326,7 +326,8 @@
/*Fixed customdesc syntax, added pierced ears, corrected hair color, added origin and arrogant -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Xendra", _HS.birthName = "Xendra", _HS.origin = "$He was a hermit until $he became a slave, and went along with it out of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 75, _HS.height = 175, _HS.race = "black", _HS.eye.origColor = "brown", _HS.override_Eye_Color = 1, _HS.override_H_Color = 1, _HS.eyeColor = "purple", _HS.origHColor = "white", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.combat = 1, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.custom.tattoo = "$He has a pair of full sleeve tattoos.", _HS.custom.desc = "$He has many scars, and is skilled with plants.", _HS.career = "a shut-in">>
+<<set _HS.slaveName = "Xendra", _HS.birthName = "Xendra", _HS.origin = "$He was a hermit until $he became a slave, and went along with it out of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 40, _HS.devotion = 75, _HS.height = 175, _HS.race = "black", _HS.eye.origColor = "brown", _HS.override_Eye_Color = 1, _HS.override_H_Color = 1, _HS.origHColor = "white", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.boobs = 500, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.skill.vaginal = 15, _HS.skill.oral = 15, _HS.skill.anal = 15, _HS.skill.combat = 1, _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "bitchy", _HS.custom.tattoo = "$He has a pair of full sleeve tattoos.", _HS.custom.desc = "$He has many scars, and is skilled with plants.", _HS.career = "a shut-in">>
+<<run setEyeColor(_HS, "purple")>>
<<set $heroSlaves.push(_HS)>>
/*toned, snuff, fighter*/
/*Increased health, added combatskill, bitchy and pierced ears, fixed tattoo and customdesc syntax, corrected skin color from 'white' to 'dark' -BoneyM*/
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index c6fe0e642d3..40e92371390 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -1,7 +1,7 @@
:: More customization options [nobr]
<<set $activeSlave.hColor = $activeSlave.origHColor>>
-<<set $activeSlave.eyeColor = $activeSlave.origEye>>
+<<run resetEyeColor($activeSlave)>>
<<set $activeSlave.origRace = $activeSlave.race>>
<<set $activeSlave.eyebrowHColor = $activeSlave.hColor>>
<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 7c890da97f1..68453c74e31 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -18003,8 +18003,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set $activeSlave.health -= 20>>
<<set $activeSlave.race = $arcologies[0].FSSubjugationistRace>>
<<set $activeSlave.skin = randomRaceSkin($arcologies[0].FSSubjugationistRace)>>
- <<set $activeSlave.eyeColor = randomRaceEye($arcologies[0].FSSubjugationistRace)>>
+ <<run setEyeColor($activeSlave, randomRaceEye($arcologies[0].FSSubjugationistRace))>>
<<set $activeSlave.hColor = randomRaceHair($arcologies[0].FSSubjugationistRace)>>
+ <<set $activeSlave.override_Skin = 1, $activeSlave.override_Eye_Color = 1, $activeSlave.override_H_Color = 1>>
<</replace>>
<</link>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take $his virginity and ignore $his chastity//<</if>>
<br><<link "No surgery today, but give $him something to think about">>
diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw
index 1f2a01de0a6..889f9cacec5 100644
--- a/src/uncategorized/addCustomDescriptors.tw
+++ b/src/uncategorized/addCustomDescriptors.tw
@@ -128,12 +128,17 @@ Custom hair color: <<textbox "$activeSlave.hColor" $activeSlave.hColor "Add cust
<br><br>
<<if getLenseCount(slave) > 0>>
- $He is wearing $activeSlave.eyeColor lenses.
+ $He is wearing <<print eyesColor($activeSlave, "", eye = "lense", eyes = "lenses")>>.
<<else>>
- $He has $activeSlave.eyeColor eyes.
+ $He has <<print eyesColor($activeSlave)>>.
<</if>>
-Custom eye color: <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "Add custom descriptors">>
-<br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'blue'//
+<<if hasLeftEye($activeSlave)>>
+ Custom left eye color: <<textbox "$activeSlave.eye.left.iris" $activeSlave.eye.left.iris "Add custom descriptors">><br>
+<</if>>
+<<if hasRightEye($activeSlave)>>
+ Custom right eye color: <<textbox "$activeSlave.eye.right.iris" $activeSlave.eye.right.iris "Add custom descriptors">><br>
+<</if>>
+ //For best results, use a short, uncapitalized and unpunctuated description; for example: 'blue'//
<br><br>
Change $his custom tattoo: <<textbox "$activeSlave.custom.tattoo" $activeSlave.custom.tattoo "Add custom descriptors">> <br> //For best results, use complete sentences; for example: '$He has blue stars tattooed along $his cheekbones.'//
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index b029be5062e..6c6a76f88d3 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 $activeSlave.eyeColor eyes: 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 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>>
@@ -1750,4 +1750,4 @@ The call comes in from an office, and you suppress the urge to check whether $as
</span>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index aac45fc372e..5889d4ccc9f 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -315,7 +315,7 @@
<</if>>
<<set $activeSlave.race = _fakeRace>>
<<set $activeSlave.skin = randomRaceSkin(_fakeRace)>>
-<<set $activeSlave.eyeColor = randomRaceEye(_fakeRace)>>
+<<run setEyeColor($activeSlave, randomRaceEye(_fakeRace))>>
<<set $activeSlave.hColor = randomRaceHair(_fakeRace)>>
<<set $activeSlave.override_Race = 1, $activeSlave.override_Skin = 1, $activeSlave.override_H_Color = 1, $activeSlave.override_Eye_Color = 1>>
--
GitLab