From 7d1d0e3cc738c8369ca70847707b38f82786d3f0 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 24 Aug 2018 17:04:47 -0400
Subject: [PATCH] fixes and overrides
---
devNotes/twine JS.txt | 27 ++++++++++++++++++++++-----
src/js/assayJS.tw | 21 ++++++++++++++++-----
src/npc/databases/dSlavesDatabase.tw | 2 +-
src/pregmod/seFCTVshows.tw | 2 ++
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/reRecruit.tw | 4 ++++
src/uncategorized/salon.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 3 ++-
8 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index e639053791b..622ea25b63c 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -6918,11 +6918,28 @@ window.newSlave = function newSlave(slave) {
slave.origEye = slave.eyeColor;
break;
}
- slave.origRace = slave.race;
- slave.origHColor = slave.hColor;
- slave.underArmHColor = slave.hColor;
- slave.pubicHColor = slave.hColor;
- slave.origSkin = slave.skin;
+
+ if (V.override_Race != 1) {
+ slave.origRace = slave.race;
+ }
+ if (V.override_H_Color != 1) {
+ slave.origHColor = slave.hColor;
+ }
+ if (V.override_Arm_H_Color != 1) {
+ slave.underArmHColor = slave.hColor;
+ }
+ if (V.override_Pubic_H_Color != 1) {
+ slave.pubicHColor = slave.hColor;
+ }
+ if (V.override_Skin != 1) {
+ slave.origSkin = slave.skin;
+ }
+
+ V.override_Race = 0;
+ V.override_H_Color = 0;
+ V.override_Arm_H_Color = 0;
+ V.override_Pubic_H_Color = 0;
+ V.override_Skin = 0;
if (V.surnamesForbidden === 1) {
slave.slaveSurname = 0;
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index 978032cbc20..d48bdc9db00 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -251,11 +251,22 @@ window.newSlave = function newSlave(slave) {
slave.origEye = slave.eyeColor;
break;
}
- slave.origRace = slave.race;
- slave.origHColor = slave.hColor;
- slave.underArmHColor = slave.hColor;
- slave.pubicHColor = slave.hColor;
- slave.origSkin = slave.skin;
+
+ if (slave.override_Race != 1) {
+ slave.origRace = slave.race;
+ }
+ if (slave.override_H_Color != 1) {
+ slave.origHColor = slave.hColor;
+ }
+ if (slave.override_Arm_H_Color != 1) {
+ slave.underArmHColor = slave.hColor;
+ }
+ if (slave.override_Pubic_H_Color != 1) {
+ slave.pubicHColor = slave.hColor;
+ }
+ if (slave.override_Skin != 1) {
+ slave.origSkin = slave.skin;
+ }
if (V.surnamesForbidden === 1) {
slave.slaveSurname = 0;
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 45644528405..ba6a9a0835b 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -532,7 +532,7 @@
<<if $seePreg != 0>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.births = 2, _HS.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -2, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.births = 2, _HS.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -2, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
<</if>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index cc2df0cb088..3ba9da09896 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -1045,8 +1045,10 @@ The offered price is <<print cashFormat($slaveCost)>>.
<<set $lastShow = 15, $showFifteen++>>
<<if $showFifteen == 3>><<set $showFifteen = 1>><</if>>
<<if $showFifteen == 1>>
+ /*
You awaken one morning, just before the break of dawn, and find yourself unable to go back to sleep. Giving up on the idea of returning to slumber, you idly flip through the channels on your TV, finding mostly static or early morning infomercials, until you finally land on a channel broadcasting so early in the morning.
<br><br>
+ */
You're greeted by a man with an eyepatch, a bushy black beard, and a crimson bandanna around his head. He's sitting behind a crude looking bamboo desk. Behind him is the backdrop of a sun rising over the ocean and two slaves in tight revealing sailor outfits swabbing the deck. The whole set looks like some sort of tropical pirate theme and you almost change the channel mistaking the show for a kids show when it catches up to you what the pirate is talking about.
<br><br>
"-An that be concludin' our special report on the dangers o' dealin' with old world customs agencies an how to find a scallywag'll right proper let you sneak a bound wench through fer the right bribe. If'n you missed it or be needin' a refresher, catch our rebroadcast in 12 bells time. Now afore the turn of the hourglass we go to our weatherwench Lusty Pearl who's been keepin' a weather eye on the horizon. Lusty?"
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 63fa87f0c06..a4a490858d4 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -949,7 +949,7 @@ As $he enjoys $himself, $his loose sphincter relaxes still further until it's ba
<<set $activeSlave.devotion += 4>>
<<EventNameLink $activeSlave>> is in solitary. $He's let out whenever required for a slave task, but unless $he's serving, $he spends $his days in a featureless cell. It's clean and dry, but designed to totally deny any mental stimulation. Careful monitoring is necessary to prevent mental damage.
<br><br>
-As you pass by $his cell on other business, there is a faint stirring within. <<if canHear($activeSlave)>>$He must have heard the dim sound of your footsteps through the door.<<elseif canSee($activeSlave)>>$He must have been ooking for you through a small opening in $his cell door.<<else>>$He must have placed $himself against the door just in case you stopped by.<</if>> There's a small port for meals to be inserted into the cell, and $he shouts at it, clearly with $his mouth right against it, "Plea<<s>>e don't go! I'll do anything if you ju<<s>>t <<s>>tay a bit, whoever you are! I ju<<s>>t need <<s>>ome time with <<s>>omeone! Plea<<s>>e!"
+As you pass by $his cell on other business, there is a faint stirring within. <<if canHear($activeSlave)>>$He must have heard the dim sound of your footsteps through the door.<<elseif canSee($activeSlave)>>$He must have been looking for you through a small opening in $his cell door.<<else>>$He must have placed $himself against the door just in case you stopped by.<</if>> There's a small port for meals to be inserted into the cell, and $he shouts at it, clearly with $his mouth right against it, "Plea<<s>>e don't go! I'll do anything if you ju<<s>>t <<s>>tay a bit, whoever you are! I ju<<s>>t need <<s>>ome time with <<s>>omeone! Plea<<s>>e!"
<<case "scrubbing">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index d270dcd8f0d..969ad8bf195 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -622,6 +622,10 @@ Given the damage to an expensive classic car and the meager balance of his bank
<<set $activeSlave.vaginaPiercing = 1>>
<<set $activeSlave.eyebrowPiercing = 1>>
<<set $activeSlave.navelPiercing = 1>>
+<<set $activeSlave.override_H_Color = 1>>
+<<set $activeSlave.override_Arm_H_Color = 1>>
+<<set $activeSlave.override_Pubic_H_Color = 1>>
+<<set $activeSlave.hColor = either("purple", "blue", "green")>>
Your desk flags a report of the arcology security service for your immediate attention. As it turns out, a number of rather liberal students from the <<if $activeSlave.actualAge >= 18>>college<<elseif $activeSlave.actualAge >= 14>>high school<<elseif $activeSlave.actualAge >= 11>>junior high school<<else>>elementary school<</if>> in your arcology led a protest earlier today in the financial district several levels up from their institution. Seems to have been against slavery, for environmentalism, or some other nonsense that you skip over reading. The really interesting thing is what happened during the protest anyways. Things became a bit unruly between protesters and some counter-protesters - and at some point rocks started to fly... all of which would barely be worth a mention, if the vintage sports car of a prominent resident hadn't been parked on the same street.
<br><br>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index eb48da27845..ad4b39426d6 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -272,7 +272,7 @@
<<if $primaryHairColor != 0>>
<br>
- [["Dye " + $his + " hair|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),$cash -= $modCost, $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
+ [["Dye " + $his + " hair"|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),$cash -= $modCost, $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
<</if>>
<br><br>$His $activeSlave.hStyle hair is <<= lengthToEitherUnit($activeSlave.hLength)>> long. //General hairstyles will conform to hair length and clothing choices.//
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index bb52e7193f1..6d8405b5934 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -3101,6 +3101,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
+ <<set $fixedRace = "white">>
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "You bought her from St. Claver Preparatory after she served as a plastic surgeon's passing final exam.">>
<<set $activeSlave.chem = 20>>
@@ -3160,8 +3161,8 @@
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.hColor = "blonde">>
<<set $activeSlave.pubicHColor = "blonde">>
+ <<set $activeSlave.override_Skin = 1>>
<<set $activeSlave.underArmHColor = "blonde">>
- <<set $activeSlave.race = "white">>
<<set $activeSlave.skin = "tanned">>
<<set $activeSlave.customTat = "She has the coat of arms of St. Claver Preparatory tattooed on her left cheek.">>
--
GitLab