diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt index fd738724ae3fe01aadbdc3fb6d073cca9e350d8f..d74d8091844a600ac3b2f9152b4222fbe378e327 100644 --- a/player variables documentation - Pregmod.txt +++ b/player variables documentation - Pregmod.txt @@ -317,7 +317,7 @@ eyeColor: your eye color accepts string -origEyeColor: +origEye: your original eye color accepts string diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 0b58e40ef60bcda4760ab88caa5fa7f137e7ead9..5f3f2023049dd34bb83986ba9b3b25e17e931737 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -3088,7 +3088,7 @@ custom: Encapsulates various custom properties, set by users -custom.tatto: +custom.tattoo: adds a custom tattoo accepts string diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js index 1929e3b90510eae0046b88b25fd1488d45ccd93e..3c26b059cc366df9d1089f3c7b3865324fbfaeee 100644 --- a/src/js/eventSelectionJS.js +++ b/src/js/eventSelectionJS.js @@ -484,7 +484,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) { if (eventSlave.devotion > 50) { if (eventSlave.speechRules !== "restrictive") { if (eventSlave.birthWeek >= 51) { - /* lets give this a much higher chance of appearing */ + /* let's give this a much higher chance of appearing */ State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); @@ -2072,7 +2072,7 @@ window.generateRandomEventPoolServant = function(eventSlave) { if (eventSlave.devotion > 50) { if (eventSlave.speechRules !== "restrictive") { if (eventSlave.birthWeek >= 51) { - /* lets give this a much higher chance of appearing */ + /* let's give this a much higher chance of appearing */ State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw index 664a695c2100f55f62a555abf23af6aa0c1815b3..ce424d0603d2452268e7a7cd9b7be2a65e125569 100644 --- a/src/npc/startingGirls/moreCustomOptions.tw +++ b/src/npc/startingGirls/moreCustomOptions.tw @@ -1,5 +1,6 @@ :: More customization options [nobr] +<<set $activeSlave.eyebrowHColor = $activeSlave.hColor>> <<set $activeSlave.pubicHColor = $activeSlave.hColor>> <<set $activeSlave.underArmHColor = $activeSlave.hColor>> <<set $activeSlave.origHColor = $activeSlave.hColor>> @@ -20,7 +21,7 @@ <br>''Career:'' <<textbox "$activeSlave.career" $activeSlave.career "More customization options">> <br>''Nationality:'' <<textbox "$activeSlave.nationality" $activeSlave.nationality "More customization options">> //This will not alter name or race.// <br>''Ethnicity:'' <<textbox "$activeSlave.race" $activeSlave.race "More customization options">> //This will not apply phenotypes.// -<br>''Hair color:'' <<textbox "$activeSlave.hColor" $activeSlave.hColor "More customization options">> //This will also set pubic and underarm hair color.// +<br>''Hair color:'' <<textbox "$activeSlave.hColor" $activeSlave.hColor "More customization options">> //This will also set eyebrow, pubic, and underarm hair color.// <br>''Eye color:'' <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "More customization options">> <br>''Pupil shape:'' <<textbox "$activeSlave.pupil" $activeSlave.pupil "More customization options">> <br>''Sclera color:'' <<textbox "$activeSlave.sclerae" $activeSlave.sclerae "More customization options">> @@ -40,6 +41,31 @@ <br><br> +''Eyebrow hair style:'' $activeSlave.eyebrowHStyle. +[[Natural|More customization options][$activeSlave.eyebrowHStyle = "natural"]] +| [[Curved|More customization options][$activeSlave.eyebrowHStyle = "curved"]] +| [[Elongated|More customization options][$activeSlave.eyebrowHStyle = "elongated"]] +| [[High-Arched|More customization options][$activeSlave.eyebrowHStyle = "high-arched"]] +| [[Rounded|More customization options][$activeSlave.eyebrowHStyle = "rounded"]] +| [[Shaved|More customization options][$activeSlave.eyebrowHStyle = "shaved"]] +| [[Shortened|More customization options][$activeSlave.eyebrowHStyle = "shortened"]] +| [[Slanted Inwards|More customization options][$activeSlave.eyebrowHStyle = "slanted inwards"]] +| [[Slanted Outwards|More customization options][$activeSlave.eyebrowHStyle = "slanted outwards"]] +| [[Straight|More customization options][$activeSlave.eyebrowHStyle = "straight"]] + +<br> + +''Eyebrow hair maintenance:'' $activeSlave.eyebrowFullness +[[Natural|More customization options][$activeSlave.eyebrowFullness = "natural"]] +| [[Bushy|More customization options][$activeSlave.eyebrowFullness = "bushy"]] +| [[Thick|More customization options][$activeSlave.eyebrowFullness = "thick"]] +| [[Tapered|More customization options][$activeSlave.eyebrowFullness = "tapered"]] +| [[Threaded|More customization options][$activeSlave.eyebrowFullness = "threaded"]] +| [[Thin|More customization options][$activeSlave.eyebrowFullness = "thin"]] +| [[Pencil-Thin|More customization options][$activeSlave.eyebrowFullness = "pencil-thin"]] + +<br><br> + ''Pubic hair maintenance:'' $activeSlave.pubicHStyle. [[Waxed|More customization options][$activeSlave.pubicHStyle = "waxed"]] | [[Naturally hairless|More customization options][$activeSlave.pubicHStyle = "hairless"]] diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw index b5f53d89ff269f368893f3ece823ee775aa4f8bc..2e8309e14bf7761829001b0198896785a2d9b2d5 100644 --- a/src/npc/uploadSlave.tw +++ b/src/npc/uploadSlave.tw @@ -200,7 +200,7 @@ analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, -custom.tatto: "$activeSlave.custom.tattoo", +custom.tattoo: "$activeSlave.custom.tattoo", custom.label: "", custom.desc: "$activeSlave.custom.desc", custom.image.filename: "", diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw index 22479d1700397cc9399121192dd42589698bbcfb..926f80e11d3b1b71409a66ebf82d4b0a6058546f 100644 --- a/src/pregmod/breederProposal.tw +++ b/src/pregmod/breederProposal.tw @@ -13,7 +13,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le <<InitStandards>> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ <<elseif $PC.pregSource == -1 || $PC.pregSource == -6>> - "Since you are doing your part and carrying an elite child, we will gladly reward you by granting your proposal. We shall decide upon the standards for breeding stock and notify you shortly." + "Since you are doing your part and carrying an Elite child, we will gladly reward you by granting your proposal. We shall decide upon the standards for breeding stock and notify you shortly." <<set $propOutcome = 1>> <<InitStandards>> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw index 50c736eaf62f9ec7368b152a1f79f8729f71d05c..08691a989213acc88ec8616b63148a7ba090bbc7 100644 --- a/src/pregmod/criminalMarkets.tw +++ b/src/pregmod/criminalMarkets.tw @@ -11,7 +11,7 @@ You board the transport to <<switch $weeklyMarket>> <<case "low tier criminals">> /* mixed prisoners */ - a small prison on the edge of the city spanning from the foot of your arcology with the appearance of an old world police station. You arrive inside and are met by a cute receptionist, asking why one such as yourself would visit such a place. With formalities out of the way, the head of the station is called and arrives shortly. "Well now, didn't expect to see you here. Came to pick up a criminal and give them a chance at not being a menial?" You are then led further into the station and into the prisoners quarters; most of them downcast and dismal, but some look up to see what the commotion is about. "You! Come here! This <<if $PC.title == 1>>fine lady<<else>>gentleman<</if>> wants to take a look so be on your best behavior!" the head calls out, bringing one of the criminals close enough to be inspected. + a small prison on the edge of the city spanning from the foot of your arcology with the appearance of an old world police station. You arrive inside and are met by a cute receptionist, asking why one such as yourself would visit such a place. With formalities out of the way, the head of the station is called and arrives shortly. "Well now, didn't expect to see you here. Came to pick up a criminal and give them a chance at not being a menial?" You are then led further into the station and into the prisoners' quarters; most of them appear downcast and dismal, but some look up to see what the commotion is about. "You! Come here! This fine <<if $PC.title == 1>>lady<<else>>gentleman<</if>> wants to take a look, so be on your best behavior!" the head calls out, bringing one of the criminals close enough to be inspected. <<case "gangs and smugglers">> /* males only */ @@ -19,17 +19,17 @@ You board the transport to <br><br> Your destination at the end of the road is a garage, where upon your disembarking, no less than 4 heavily armored guards with electric batons at their sides come to greet you. You could almost mistake them for unmanned drones had they not start speaking. "We've been expecting you; please follow us. We house some dangerous individuals in our establishment and we need to keep you safe." You accept their advice and enter the premises. <br><br> - You are met with a dimly lit concrete hallway as you enter, only for it to open up to a multi-floor prison that had placed its prisoners underground for the most part<<if $PC.title == 0 || $PC.boobsBonus > 1 || $PC.butt > 1>>, where you are met with a hailstorm of whistles, cheers and other catcalls<</if>>. You come to a bridge and look down to see its inhabitants, hard criminals that are coming together for a meal. You watch a fight break out at one point and an armored guard quickly stepped in and applying his baton to the offenders, coupled with a loud zap that silences the entire area. Around your level, you see the better stock; the attractive prisoners one would show to an interested customer. + You are met with a dimly lit concrete hallway as you enter, only for it to open up to a multi-floor prison that had placed its prisoners underground for the most part<<if $PC.title == 0 || $PC.boobsBonus > 1 || $PC.butt > 1>>, where you are met with a hailstorm of whistles, cheers and other catcalls<</if>>. You come to a bridge and look down to see its inhabitants, hard criminals that are coming together for a meal. You watch a fight break out at one point and an armored guard quickly step in and apply his baton to the offenders, coupled with a loud zap that silences the entire area. Around your level, you see the better stock: the attractive prisoners one would show to an interested customer. <br><br> - You finally reach the warden's office, "Welcome <<if $PC.title == 1>>Mister<<else>>Miss<</if>> <<= PlayerName()>>, I never thought my prison could have turned to a trade such as this, but times are hard." He beckons you to the seat opposite him, "but I'm not one to complain when an opportunity such as this comes my way." He motions to his guards to bring in a select stock for your perusal, "We house some tough nuts in this establishment, but if you believe you can capitalize on these criminals, we'll be happy to have you take them off our hands." The guard returns with a convict ready to be sold. + You finally reach the warden's office, "Welcome <<if $PC.title == 1>>Mister<<else>>Miss<</if>> <<= PlayerName()>>, I never thought my prison could have turned to a trade such as this, but times are hard." He beckons you to the seat opposite him, "but I'm not one to complain when an opportunity such as this comes my way." He motions to his guards to bring in a select stock for your perusal. "We house some tough nuts in this establishment, but if you believe you can capitalize on these criminals, we'll be happy to have you take them off our hands." The guard returns with a convict ready to be sold. <<case "white collar">> /* mixed prisoners */ what looks more like an oversized vacation home rather than something one goes to for committing crimes. You enter the premises into a small chamber with a booth to the side and are immediately met with a cheerful "Ah! We've been waiting for you. Please go in. We'll call someone to guide you immediately." <br><br> - You nod at the prompt and enter further into the luxurious building to find a formally dressed guide and what appears to be the holding area of the prison. The cells, if you can call them that, are large and cozy, each with their own computer and television. The air is also conditioned for their comfort and old world classical music is playing to provide further ambiance. Walking through, you see the prisoners themselves, lazing about in their beds, sitting at their computers or just talking to each other. If there was ever a prison you'd rather end up in, this would be it. + You nod at the prompt and enter further into the luxurious building to find a formally dressed guide and what appears to be the holding area of the prison. The cells, if you can call them that, are large and cozy, each with their own computer and television. The air is also conditioned for their comfort and old world classical music is playing to provide further ambiance. Walking through, you see the prisoners themselves, lazing about in their beds, sitting at their computers, or just talking to each other. If there was ever a prison you'd rather end up in, this would be it. <br><br> - You enter the warden's office and are greeted with all due formalities, "Glad to see you at our establishment. When I heard that someone as renowned as yourself was coming over, I made the appropriate preparations." You are served a cup of tea as she brings in the chosen stock for you to observe at your leisure. + You enter the warden's office and are greeted with all due formalities. "Glad to see you at our establishment. When I heard that someone as renowned as yourself was coming over, I made the appropriate preparations." You are served a cup of tea as she brings in the chosen stock for you to observe at your leisure. <<case "military prison">> @@ -37,7 +37,7 @@ You board the transport to <br><br> Once you arrive at the prison, the door opens to a garage and another door, brightly lit to welcome you to the premises. Through the door, you find the prisoner's quarters, each of them enclosed by electrified fences to ensure your safety as you see the stock. A guard enters, asking you to follow him as he leads you across the chamber to meet with the warden. <br><br> - Entering the warden's quarters, you take a seat across from the warden as he takes the initiative, "Ah, fancy meeting one such as yourself here. Though we house some of the hardiest criminals you can find, I'm sure one such as yourself could find great use for them." He smirks. "... or perhaps great entertainment through the pits", he says as he beckons to his staff as they bring in the selected stock. + Entering the warden's quarters, you take a seat across from him as he takes the initiative. "Ah, fancy meeting one such as yourself here. Though we house some of the hardiest criminals you can find, I'm sure one such as yourself could find great use for them." He smirks. "... or perhaps great entertainment through the pits," he says as he beckons to his staff as they bring in the selected stock. <</switch>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index f6c890e62d3ac0f89b8e86ed76ba76f404c0805f..e44d5bdbf2a916d96b333f50e1157449d9289bc6 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -39,7 +39,7 @@ <<set $args[0].tailColor = "none">> <</if>> <<if ndef $args[0].missingEyes>> - <<if $args[0].eyes == -3>> + <<if $args[0].eyes == -4>> <<set $args[0].missingEyes = 3>> <<else>> <<set $args[0].missingEyes = 0>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 88fbc7338e0f46bdb346156fb7cc7b1e34d7cead..92383d0cf792a2140e767e5d64d5b9b75d3c8472 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1472,7 +1472,7 @@ Deal with $his hair: $He is no longer capable of growing hair on $his head. <</if>> <br> -<<if ($activeSlave.eyebrowStyle != "bald" && $activeSlave.eyebrowStyle != "hairless")>> +<<if ($activeSlave.eyebrowStyle != "bald")>> $He has $activeSlave.origHColor eyebrows. [["Surgically remove " + $his + " ability to grow eyebrows"|Surgery Degradation][cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$surgeryType = "eyebrow removal"]] <<else>> diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index 99641825de8b6877b490f20c1347e220ffdf10d7..c036f531ea2b3a73fac9cce99a5b3be3b55ddd2d 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -783,7 +783,7 @@ Dye or paint: <<if $activeSlave.eyebrowHStyle != "bald">> - <br><br>$His <<if $activeSlave.eyebrowFullness != "natural" && $activeSlave.eyebrowHStyle != "natural">>$activeSlave.eyebrowFullness, $activeSlave.eyebrowHStyle<</if>> eyebrows + <br><br>$His <<if $activeSlave.eyebrowFullness != "natural">>$activeSlave.eyebrowFullness<<if $activeSlave.eyebrowHStyle != "natural">>,<</if>> <</if>><<if $activeSlave.eyebrowHStyle != "natural">>$activeSlave.eyebrowHStyle <</if>> eyebrows <<if $activeSlave.eyebrowHStyle == "shaved">> would be $activeSlave.eyebrowHColor if present. <<else>> diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw index ee2541e649f1977bd1bb5418db9b930e6db3e82b..38b87be0742ce96977a9fd5cfbd687b918ff1a81 100644 --- a/src/uncategorized/slaveStats.tw +++ b/src/uncategorized/slaveStats.tw @@ -293,9 +293,9 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden <br>penetrativeCount: $activeSlave.counter.penetrative <br>publicCount: $activeSlave.counter.publicUse <br>pitKills: $activeSlave.counter.pitKills -<br>custom.tatto: $activeSlave.custom.tattoo +<br>custom.tattoo: $activeSlave.custom.tattoo <br>custom.label: $activeSlave.custom.label -<br>custom.ddesc: $activeSlave.custom.desc +<br>custom.desc: $activeSlave.custom.desc <br>custom.title: $activeSlave.custom.title <br>custom.titleLisp: $activeSlave.custom.titleLisp <br>rudeTitle: $activeSlave.rudeTitle diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index f16a9c82f10305d3c3b57551ee187439f66ae139..60bb37a600c85ef3a103a178988e03d7d0289510 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -2493,7 +2493,7 @@ As the remote surgery's long recovery cycle completes, <<case "body hair removal">> <<if $activeSlave.underArmHStyle != "hairless">><<set $activeSlave.underArmHStyle = "bald">><</if>> <<if $activeSlave.pubicHStyle != "hairless">><<set $activeSlave.pubicHStyle = "bald">><</if>> - When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he feels the breeze on $his skin and realizes that <<if $activeSlave.origHColor != "bald">>all hair below $his neck is missing<<else>>$he is now completely hairless<</if>>. + When $he <<if $activeSlave.amp == 1>>is carried<<elseif canWalk($activeSlave)>>walks<<else>>is escorted<</if>> out of the surgery $he feels the breeze on $his skin and realizes that <<if $activeSlave.hStyle != "bald" && $activeSlave.eyebrowHStyle != "bald">>all hair below $his neck is missing<<else>>$he is now completely hairless<</if>>. <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <br> <<if $activeSlave.devotion > 50>> @@ -2507,11 +2507,11 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> <</if>> - <br><br>As this was a non-invasive procedure $his health was not affected. + <br><br>As this was a non-invasive procedure, $his health was not affected. <<case "eyebrow removal">> <<set $activeSlave.eyebrowHStyle = "bald">> - When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he feels the breeze on $his face and realizes that $his eyebrows are gone, permanantly. + When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he feels the breeze on $his face and realizes that $his eyebrows are gone, permanently. <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <br> <<if $activeSlave.devotion > 50>> @@ -2525,11 +2525,11 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> <</if>> - <br><br>As this was a non-invasive procedure $his health was not affected. + <br><br>As this was a non-invasive procedure, $his health was not affected. <<case "hair removal">> <<set $activeSlave.hStyle = "bald">> - <<set $activeSlave.eyebrowHStyle = "hairless">> + <<set $activeSlave.eyebrowHStyle = "bald">> When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he immediately notices the chill on $his head and realizes that $he is bald. <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <br> @@ -2554,7 +2554,7 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> <</if>> - <br><br>As this was a non-invasive procedure $his health was not affected. + <br><br>As this was a non-invasive procedure, $his health was not affected. <<case "womb">> It's not immediately apparent to $him what kind of surgery $he received, since all $he's left with is a terrible nonspecific ache in $his lower belly. As with all invasive surgery @@.red;$his health has been greatly affected.@@ diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 1b2819d556b0d308bcf4bf16906d53c8233bcc7e..b2c68ffb18d7ea48459162022b7b10ddafd1d735 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -912,11 +912,11 @@ $His <<case "bald">> hair no longer grows. If it did, it would be $activeSlave.origHColor. - <<case "shaved bald">> + <<case "shaved" "shaved bald">> hair has been shaved. If $his hair were visible, it would be $activeSlave.hColor. <<case "buzzcut">> - $activeSlave.hColor hair is a short buzzcut. + $activeSlave.hColor hair is in a short buzzcut. <<case "trimmed">> $activeSlave.hColor hair is trimmed short. @@ -972,7 +972,7 @@ $His <</if>> bun. - <<case "neat" "strip" "tails" "up" "ponytail" "braided" "dreadlocks" "permed" "curled" "luxurious">> + <<case "braided" "curled" "dreadlocks" "luxurious" "neat" "permed" "ponytail" "strip" "tails" "up">> <<set _hairLength = $activeSlave.hLength/$activeSlave.height>> <<if _hairLength > 0.9>> floor-length, @@ -1002,7 +1002,7 @@ $His <<if $activeSlave.eyebrowHStyle == "bald">> brows do not grow hair. $His eyebrows would be $activeSlave.eyebrowHColor in color if they did. <<elseif $activeSlave.eyebrowHStyle == "shaved">> - eyebrows have been shaved off. If they were visible, they would be $activeSlave.eyebrowHColor in color. + eyebrows have <<if $activeSlave.hStyle == "shaved" || $activeSlave.hStyle == "shaved bald">>also <</if>>been shaved off. If they were visible, they would be $activeSlave.eyebrowHColor in color. <<else>> $activeSlave.eyebrowHColor eyebrows <<switch $activeSlave.eyebrowHStyle>> @@ -1039,7 +1039,7 @@ $His kept to a natural level of fullness. <<case "tapered">> styled to be thicker in the center but otherwise normal. - <<case "thin">> + <<case "thick">> considerably thicker than what would be considered average. <<case "bushy">> incredibly and unnaturally full and bushy.