diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index fed370bd12d76da72b6b51fe1103888d8c30b870..a91ccd914ba27167096a8773aceab38be01fde46 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -5,10 +5,6 @@ <<set $PC.actualAge = variableAsNumber($PC.actualAge, 35, 14, 80)>> <<set $PC.birthWeek = variableAsNumber($PC.birthWeek, 0, 0, 51)>> -<<silently>> -FertilityAge($fertilityAge) -<</silently>> - You may review your settings before clicking "Continue" to begin. <br><br> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 6eb3a298934fd44cead2d973c435cadff8715bff..43832bae36694fc63c7c9eb17eb96405496fb541 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -372,9 +372,6 @@ You should have received a copy of the GNU General Public License along with thi <<set $pedo_mode = 0>> <<set $minimumSlaveAge = 18>> <<set $fertilityAge = 13>> - <<silently>> - FertilityAge($fertilityAge) - <</silently>> <<set $potencyAge = 13>> <<set $AgePenalty = 1>> <<set $precociousPuberty = 0>> diff --git a/src/js/storyJS.js b/src/js/storyJS.js index 6be585c2aac75263a070bdefe2656b562b30bc4c..2bb7350e8bde02102ea6a93d8bac0d63013aabc6 100644 --- a/src/js/storyJS.js +++ b/src/js/storyJS.js @@ -93,21 +93,6 @@ window.filterInPlace = function(arr, callback, thisArg) { return arr; }; -if (typeof FertilityAge === "undefined") { - var FertilityAge = { - setAge: function (age) { - age = Number(age); - if (age !== age) { - return 13; - } else { - return age; - } - } - }; - // Raise namespace scope to Global. - window.FertilityAge = FertilityAge; -} - window.canGetPregnant = /** @param {App.Entity.SlaveState} slave */ function (slave) { if (!slave) { return null; diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 569c9f86d6458733d29c536ef2f8adb8f466bb72..d1c9351cbb0c738e19c76c154f057b494a1b1ffc 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -60,18 +60,79 @@ <<else>> <<set $activeSlave.clothes = "spats and a tank top">> <</if>> +<<case "mean girls">> + <</switch>> -<span id="artFrame"> -/* 000-250-006 */ -<<if $seeImages == 1>> - <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> - <<else>> - <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> +<<if $RESSevent == "mean girls">> + + <<set _newSlaves = []>> + <<for _ress = 0; _ress < 3; _ress++>> + <<set $oneTimeDisableDisability = 1>> + <<if $arcologies[0].FSSupremacistLawME == 1>> + <<set $fixedRace = $arcologies[0].FSSupremacistRace>> + <<elseif $arcologies[0].FSSubjugationistLawME == 1>> + <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>> + <<set $fixedRace = _races.random()>> + <</if>> + <<set $fixedNationality = "American">> + <<set _meanGirl = GenerateNewSlave("XX")>> + <<set _meanGirl.origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while " + $he + " was serving the public.">> + <<set _meanGirl.career = "a student">> + <<set _meanGirl.markings = "none", _meanGirl.weight = -20>> + <<set _meanGirl.devotion = random(-80,-60)>> + <<set _meanGirl.trust = random(-20,-10)>> + <<set _meanGirl.muscles = random(0,15)>> + <<set _meanGirl.boobsImplant = 200*random(0,3)>> + <<set _meanGirl.boobs += _meanGirl.boobsImplant>> + <<set _meanGirl.buttImplant = random(0,2)>> + <<set _meanGirl.butt += _meanGirl.buttImplant>> + <<set _meanGirl.butt += 1>> + <<set _meanGirl.vagina = random(1,2)>> + <<set _meanGirl.anus = 1>> + <<set _meanGirl.face = random(20,60)>> + <<set _meanGirl.actualAge = random(18,19)>> + <<set _meanGirl.visualAge = _meanGirl.actualAge>> + <<set _meanGirl.physicalAge = _meanGirl.actualAge>> + <<set _meanGirl.ovaryAge = _meanGirl.actualAge>> + <<set _meanGirl.health = random(30,50)>> + <<set _meanGirl.attrXY = random(60,90)>> + <<set _meanGirl.attrXX = random(10,20)>> + <<set _meanGirl.behavioralFlaw = either("arrogant", "bitchy")>> + <<set _meanGirl.clothes = either("conservative clothing", "a mini dress", "sport shorts and a t-shirt", "a t-shirt and jeans")>> + <<set _newSlaves.push(_meanGirl)>> + <</for>> + + <span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt _newSlaves[2] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt _newSlaves[1] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt _newSlaves[0] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $activeSlave 2 0>> + </div> + <</if>> + /* 000-250-006 */ + </span> +<<else>> + <span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> <</if>> + /* 000-250-006 */ + </span> <</if>> -/* 000-250-006 */ -</span> <<set $activeSlave.clothes = _clothesTemp>> <<set $desc = SlaveTitle($activeSlave)>> @@ -3122,41 +3183,6 @@ $He doesn't phrase it quite like that, of course. <<case "mean girls">> -<<set _newSlaves = []>> -<<for _ress = 0; _ress < 3; _ress++>> - <<set $oneTimeDisableDisability = 1>> - <<if $arcologies[0].FSSupremacistLawME == 1>> - <<set $fixedRace = $arcologies[0].FSSupremacistRace>> - <<elseif $arcologies[0].FSSubjugationistLawME == 1>> - <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>> - <<set $fixedRace = _races.random()>> - <</if>> - <<set $fixedNationality = "American">> - <<set _meanGirl = GenerateNewSlave("XX")>> - <<set _meanGirl.origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while " + $he + " was serving the public.">> - <<set _meanGirl.career = "a student">> - <<set _meanGirl.markings = "none", _meanGirl.weight = -20>> - <<set _meanGirl.devotion = random(-80,-60)>> - <<set _meanGirl.trust = random(-20,-10)>> - <<set _meanGirl.muscles = random(0,15)>> - <<set _meanGirl.boobsImplant = 200*random(0,3)>> - <<set _meanGirl.boobs += _meanGirl.boobsImplant>> - <<set _meanGirl.buttImplant = random(0,2)>> - <<set _meanGirl.butt += _meanGirl.buttImplant>> - <<set _meanGirl.butt += 1>> - <<set _meanGirl.vagina = random(1,2)>> - <<set _meanGirl.anus = 1>> - <<set _meanGirl.face = random(20,60)>> - <<set _meanGirl.actualAge = random(18,19)>> - <<set _meanGirl.visualAge = _meanGirl.actualAge>> - <<set _meanGirl.physicalAge = _meanGirl.actualAge>> - <<set _meanGirl.ovaryAge = _meanGirl.actualAge>> - <<set _meanGirl.health = random(30,50)>> - <<set _meanGirl.attrXY = random(60,90)>> - <<set _meanGirl.attrXX = random(10,20)>> - <<set _meanGirl.behavioralFlaw = either("arrogant", "bitchy")>> - <<set _newSlaves.push(_meanGirl)>> -<</for>> <<setLocalPronouns _newSlaves[0] 2>> <<setLocalPronouns _newSlaves[1] 3>> @@ -17360,6 +17386,28 @@ You tell $him kindly that you understand, and that $he'll be trained to address <<run newSlave(_newSlaves[_ress])>> /* skip New Slave Intro */ <<run cashX(-8333, "slaveTransfer", _newSlaves[_ress])>> <</for>> + <<set _newSlaves[0].clothes = "no clothing">> + <<set _newSlaves[1].clothes = "no clothing">> + <<set _newSlaves[2].clothes = "no clothing">> + <<replace "#artFrame">> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt _newSlaves[2] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt _newSlaves[1] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt _newSlaves[0] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $activeSlave 2 0>> + </div> + <</if>> + /* 000-250-006 */ + <</replace>> + You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of _his2 friends pokes _him2 in the side and whispers something in _his2 ear and _he2 goes silent, staring at you with wide eyes. <<if $PC.title != 1>>_He2 then winces, visibly realizing that you're likely aware that _he2 called $activeSlave.slaveName's owner $his Master. Somehow, the mistake seems important to _him2 now that you're standing here, effortlessly dominating the space for all your femininity.<</if>> <br><br>