From c586e8a98e0f82d9da3985f5e3719a70cb5eca31 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Mon, 5 Oct 2020 11:20:52 -0400 Subject: [PATCH] je Slave Dispute remove activeSlave, use param instead of globals for genslave --- src/uncategorized/jeSlaveDispute.tw | 303 +++++++++++++--------------- 1 file changed, 143 insertions(+), 160 deletions(-) diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw index 1c17bf64e4b..dfedb8a41ea 100644 --- a/src/uncategorized/jeSlaveDispute.tw +++ b/src/uncategorized/jeSlaveDispute.tw @@ -5,158 +5,141 @@ <<switch _event>> <<case "slave deal">> <<set _ContractCost = 5000>> - <<set $activeSlaveOneTimeMinAge = 24>> - <<set $activeSlaveOneTimeMaxAge = 42>> - <<set $one_time_age_overrides_pedo_mode = 1>> - <<set $oneTimeDisableDisability = 1>> - <<set $activeSlave = GenerateNewSlave("XX")>> - <<set $activeSlave.origin = "$He sold $himself into slavery to buy medical care for $his daughter.">> - <<set $activeSlave.devotion = random(25,30)>> - <<set $activeSlave.trust = $activeSlave.devotion-20>> - <<set $activeSlave.oldDevotion = $activeSlave.devotion>> - <<run setHealth($activeSlave, jsRandom(0, 20))>> - <<set $activeSlave.earPiercing = 1>> - <<set $activeSlave.vagina = random(1,2)>> - <<set $activeSlave.ovaries = 1>> - <<set $activeSlave.counter.birthsTotal = 1>> - <<set $activeSlave.shouldersTat = either("flowers", "tribal patterns")>> - <<set $activeSlave.stampTat = either("flowers", "tribal patterns")>> + <<set _slave = GenerateNewSlave("XX", {minAge: 24, maxAge: 42, ageOverridesPedoMode: 1, disableDisability: 1})>> + <<set _slave.origin = "$He sold $himself into slavery to buy medical care for $his daughter.">> + <<set _slave.devotion = random(25,30)>> + <<set _slave.trust = _slave.devotion-20>> + <<set _slave.oldDevotion = _slave.devotion>> + <<run setHealth(_slave, jsRandom(0, 20))>> + <<set _slave.earPiercing = 1>> + <<set _slave.vagina = random(1,2)>> + <<set _slave.ovaries = 1>> + <<set _slave.counter.birthsTotal = 1>> + <<set _slave.shouldersTat = either("flowers", "tribal patterns")>> + <<set _slave.stampTat = either("flowers", "tribal patterns")>> <<case "breeding deal">> <<set _ContractCost = 40000>> - <<set $activeSlaveOneTimeMinAge = $fertilityAge+3>> - <<set $activeSlaveOneTimeMaxAge = 24>> - <<set $one_time_age_overrides_pedo_mode = 1>> - <<set $oneTimeDisableDisability = 1>> - <<set $activeSlave = GenerateNewSlave("XX")>> - <<set $activeSlave.origin = "$He was raised to be a mother.">> - <<set $activeSlave.career = "a breeder">> - <<set $activeSlave.devotion = random(10,25)>> - <<set $activeSlave.trust = $activeSlave.devotion>> - <<run setHealth($activeSlave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>> - <<set $activeSlave.anus = 0>> - <<set $activeSlave.vagina = 3>> - <<set $activeSlave.skill.anal = 0>> - <<set $activeSlave.skill.oral = 0>> - <<set $activeSlave.skill.whoring = 0>> - <<set $activeSlave.skill.vaginal = 0>> - <<set $activeSlave.skill.entertainment = 0>> - <<set $activeSlave.bellySag = 10>> - <<set $activeSlave.bellySagPreg = 10>> - <<set $activeSlave.counter.birthsTotal = 3>> - <<set $activeSlave.hips = 2>> - <<set $activeSlave.boobs = random(4,6)*100>> + <<set _slave = GenerateNewSlave("XX", {minAge: $fertilityAge+3, maxAge: 42, ageOverridesPedoMode: 1, disableDisability: 1})>> + <<set _slave.origin = "$He was raised to be a mother.">> + <<set _slave.career = "a breeder">> + <<set _slave.devotion = random(10,25)>> + <<set _slave.trust = _slave.devotion>> + <<run setHealth(_slave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>> + <<set _slave.anus = 0>> + <<set _slave.vagina = 3>> + <<set _slave.skill.anal = 0>> + <<set _slave.skill.oral = 0>> + <<set _slave.skill.whoring = 0>> + <<set _slave.skill.vaginal = 0>> + <<set _slave.skill.entertainment = 0>> + <<set _slave.bellySag = 10>> + <<set _slave.bellySagPreg = 10>> + <<set _slave.counter.birthsTotal = 3>> + <<set _slave.hips = 2>> + <<set _slave.boobs = random(4,6)*100>> <<if $seePreg == 1>> - <<set $activeSlave.belly = 18000>> + <<set _slave.belly = 18000>> <</if>> <<case "slave training">> <<set _ContractCost = 10000>> - <<set $oneTimeDisableDisability = 1>> - <<set $activeSlave = GenerateNewSlave("XY")>> - <<set $activeSlave.origin = "You bought out a deal involving $him training to be an expert gelded sex slave.">> - <<set $activeSlave.devotion = random(30,40)>> - <<set $activeSlave.trust = $activeSlave.devotion>> - <<set $activeSlave.oldDevotion = $activeSlave.devotion>> - <<run setHealth($activeSlave, jsRandom(60, 80), 0, 0, 0, jsRandom(10, 30))>> - <<set $activeSlave.balls = 0>> - <<set $activeSlave.anus = 2>> - <<set $activeSlave.skill.anal = 35>> - <<set $activeSlave.skill.oral = 35>> - <<set $activeSlave.skill.whoring = 35>> - <<set $activeSlave.skill.entertainment = 35>> - <<set $activeSlave.nipplesPiercing = 1>> - <<set $activeSlave.clitPiercing = 1>> - <<set $activeSlave.dickPiercing = 1>> - <<set $activeSlave.anusPiercing = 1>> - <<set $activeSlave.lipsPiercing = 1>> - <<set $activeSlave.tonguePiercing = 1>> - <<set $activeSlave.earPiercing = 1>> - <<set $activeSlave.nosePiercing = 1>> - <<set $activeSlave.eyebrowPiercing = 1>> - <<set $activeSlave.navelPiercing = 1>> - <<set $activeSlave.boobsTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.buttTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.vaginaTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.dickTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.lipsTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.anusTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.shouldersTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.armsTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.legsTat = either("advertisements", "degradation", "rude words")>> - <<set $activeSlave.stampTat = either("advertisements", "degradation", "rude words")>> + <<set _slave = GenerateNewSlave("XY", {disableDisability: 1})>> + <<set _slave.origin = "You bought out a deal involving $him training to be an expert gelded sex slave.">> + <<set _slave.devotion = random(30,40)>> + <<set _slave.trust = _slave.devotion>> + <<set _slave.oldDevotion = _slave.devotion>> + <<run setHealth(_slave, jsRandom(60, 80), 0, 0, 0, jsRandom(10, 30))>> + <<set _slave.balls = 0>> + <<set _slave.anus = 2>> + <<set _slave.skill.anal = 35>> + <<set _slave.skill.oral = 35>> + <<set _slave.skill.whoring = 35>> + <<set _slave.skill.entertainment = 35>> + <<set _slave.nipplesPiercing = 1>> + <<set _slave.clitPiercing = 1>> + <<set _slave.dickPiercing = 1>> + <<set _slave.anusPiercing = 1>> + <<set _slave.lipsPiercing = 1>> + <<set _slave.tonguePiercing = 1>> + <<set _slave.earPiercing = 1>> + <<set _slave.nosePiercing = 1>> + <<set _slave.eyebrowPiercing = 1>> + <<set _slave.navelPiercing = 1>> + <<set _slave.boobsTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.buttTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.vaginaTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.dickTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.lipsTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.anusTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.shouldersTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.armsTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.legsTat = either("advertisements", "degradation", "rude words")>> + <<set _slave.stampTat = either("advertisements", "degradation", "rude words")>> <<case "majority deal">> <<set _ContractCost = 20000>> - <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>> - <<set $activeSlaveOneTimeMaxAge = 18>> - <<set $oneTimeDisableDisability = 1>> - <<set $activeSlave = GenerateNewSlave()>> - <<set $activeSlave.origin = "$He was raised to be a slave, since $he was mistakenly thought to be from good slave stock.">> - <<set $activeSlave.career = "a slave">> - <<set $activeSlave.devotion = random(10,15)>> - <<set $activeSlave.trust = $activeSlave.devotion>> - <<set $activeSlave.oldDevotion = $activeSlave.devotion>> - <<run setHealth($activeSlave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>> - <<if $activeSlave.dick == 0>> - <<set $activeSlave.vagina = 0>> - <<set $activeSlave.ovaries = 1>> - <<elseif $activeSlave.balls == 0>> - <<set $activeSlave.balls = 1>> + <<set _slave = GenerateNewSlave("", , {minAge: $minimumSlaveAge, maxAge: 18, disableDisability: 1})>> + <<set _slave.origin = "$He was raised to be a slave, since $he was mistakenly thought to be from good slave stock.">> + <<set _slave.career = "a slave">> + <<set _slave.devotion = random(10,15)>> + <<set _slave.trust = _slave.devotion>> + <<set _slave.oldDevotion = _slave.devotion>> + <<run setHealth(_slave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>> + <<if _slave.dick == 0>> + <<set _slave.vagina = 0>> + <<set _slave.ovaries = 1>> + <<elseif _slave.balls == 0>> + <<set _slave.balls = 1>> <</if>> - <<set $activeSlave.anus = 0>> - <<set $activeSlave.skill.anal = 0>> - <<set $activeSlave.skill.oral = 0>> - <<set $activeSlave.skill.whoring = 0>> - <<set $activeSlave.skill.vaginal = 0>> - <<set $activeSlave.skill.entertainment = 0>> + <<set _slave.anus = 0>> + <<set _slave.skill.anal = 0>> + <<set _slave.skill.oral = 0>> + <<set _slave.skill.whoring = 0>> + <<set _slave.skill.vaginal = 0>> + <<set _slave.skill.entertainment = 0>> <<case "indenture deal">> <<set _ContractCost = 7500>> - <<set $activeSlaveOneTimeMinAge = 24>> - <<set $activeSlaveOneTimeMaxAge = 42>> - <<set $oneTimeDisableDisability = 1>> - <<set $activeSlave = GenerateNewSlave()>> - <<run setHealth($activeSlave, jsRandom(-20, 20))>> - <<set $activeSlave.anus = 2>> - <<if $activeSlave.vagina > -1>> - <<set $activeSlave.vagina = 2>> + <<set _slave = GenerateNewSlave("", , {minAge: 24, maxAge: 42, disableDisability: 1})>> + <<run setHealth(_slave, jsRandom(-20, 20))>> + <<set _slave.anus = 2>> + <<if _slave.vagina > -1>> + <<set _slave.vagina = 2>> <</if>> - <<set $activeSlave.skill.vaginal = 15>> - <<set $activeSlave.skill.oral = 15>> - <<set $activeSlave.skill.anal = 15>> - <<set $activeSlave.skill.whoring = 0>> - <<set $activeSlave.skill.entertainment = 15>> - <<set $activeSlave.boobs += 600>> - <<set $activeSlave.boobsImplant = 600>> - <<set $activeSlave.boobsImplantType = "normal">> - <<set $activeSlave.butt += 1>> - <<set $activeSlave.buttImplant = 1>> - <<set $activeSlave.buttImplantType = "normal">> - <<set $activeSlave.lips += 10>> - <<set $activeSlave.lipsImplant = 10>> - <<set $activeSlave.lipsPiercing = 1>> - <<set $activeSlave.tonguePiercing = 1>> - <<set $activeSlave.earPiercing = 1>> - <<set $activeSlave.nosePiercing = 1>> - <<set $activeSlave.eyebrowPiercing = 1>> - <<set $activeSlave.navelPiercing = 1>> - <<set $activeSlave.nipplesPiercing = 1>> - <<set $activeSlave.clitPiercing = 1>> - <<set $activeSlave.stampTat = either("flowers", "tribal patterns")>> + <<set _slave.skill.vaginal = 15>> + <<set _slave.skill.oral = 15>> + <<set _slave.skill.anal = 15>> + <<set _slave.skill.whoring = 0>> + <<set _slave.skill.entertainment = 15>> + <<set _slave.boobs += 600>> + <<set _slave.boobsImplant = 600>> + <<set _slave.boobsImplantType = "normal">> + <<set _slave.butt += 1>> + <<set _slave.buttImplant = 1>> + <<set _slave.buttImplantType = "normal">> + <<set _slave.lips += 10>> + <<set _slave.lipsImplant = 10>> + <<set _slave.lipsPiercing = 1>> + <<set _slave.tonguePiercing = 1>> + <<set _slave.earPiercing = 1>> + <<set _slave.nosePiercing = 1>> + <<set _slave.eyebrowPiercing = 1>> + <<set _slave.navelPiercing = 1>> + <<set _slave.nipplesPiercing = 1>> + <<set _slave.clitPiercing = 1>> + <<set _slave.stampTat = either("flowers", "tribal patterns")>> <<default>> <<set _ContractCost = 10000>> - <<set $activeSlaveOneTimeMaxAge = 22>> - <<set $oneTimeDisableDisability = 1>> - <<set $activeSlave = GenerateNewSlave()>> - <<set $activeSlave.origin = "You bought out a deal for $his sale after the seller took $his virginity and the buyer no longer wanted $him.">> - <<set $activeSlave.counter.publicUse += 10>> - <<set $activeSlave.devotion = random(25,30)>> - <<set $activeSlave.trust = $activeSlave.devotion-20>> - <<set $activeSlave.oldDevotion = $activeSlave.devotion>> - <<run setHealth($activeSlave, jsRandom(0, 20))>> - <<set $activeSlave.anus = 2>> - <<if $activeSlave.dick == 0>> - <<set $activeSlave.vagina = 2>> - <<set $activeSlave.ovaries = 1>> - <<if isFertile($activeSlave) && $seePreg == 1>> - <<= knockMeUp($activeSlave, 100, 2, -2, 1)>> + <<set _slave = GenerateNewSlave("", {maxAge: 22, disableDisability: 1})>> + <<set _slave.origin = "You bought out a deal for $his sale after the seller took $his virginity and the buyer no longer wanted $him.">> + <<set _slave.counter.publicUse += 10>> + <<set _slave.devotion = random(25,30)>> + <<set _slave.trust = _slave.devotion-20>> + <<set _slave.oldDevotion = _slave.devotion>> + <<run setHealth(_slave, jsRandom(0, 20))>> + <<set _slave.anus = 2>> + <<if _slave.dick == 0>> + <<set _slave.vagina = 2>> + <<set _slave.ovaries = 1>> + <<if isFertile(_slave) && $seePreg == 1>> + <<= knockMeUp(_slave, 100, 2, -2, 1)>> <</if>> <</if>> <</switch>> @@ -164,14 +147,14 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt(_slave, 2, 0)>></div> <<else>> - <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt(_slave, 2, 0)>></div> <</if>> <</if>> /* 000-250-006 */ -<<run App.Utils.setLocalPronouns($activeSlave)>> +<<run App.Utils.setLocalPronouns(_slave)>> <<= capFirstChar($assistant.name)>> breaks in on your sleep with an urgent message. You push a slave off you and sit up to take it. As the owner of the arcology, you perform some functions that would traditionally be the province of a government. In this anarcho-liberal polity, it's still necessary for people making deals to have someone to appeal to when disputes arise. Part of your agreement with your tenants is that you will perform this duty on deals between two tenants. The message is about just such a disagreement; they always seem to happen in the middle of the night, and they're always urgent. @@ -186,8 +169,8 @@ A small-time slave breeder is accusing a customer of reneging on their agreement. For the last nine months, one of his best breeders has been busy growing his client's future slave and now <<if $seePreg == 1>> that $he's ready to give birth, - <<set $activeSlave.belly = 0>> - <<set $activeSlave.pregWeek = -3>> + <<set _slave.belly = 0>> + <<set _slave.pregWeek = -3>> <<else>> that it's born, <</if>> @@ -245,7 +228,7 @@ <br><br> <<set $arcologies[0].prosperity += 5>> <<run repX(2500, "event")>> - <<includeDOM App.UI.newSlaveIntro($activeSlave)>> + <<includeDOM App.UI.newSlaveIntro(_slave)>> <</replace>> <</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave// <<case "breeding deal">> @@ -281,7 +264,7 @@ <br><br> <<set $arcologies[0].prosperity += 3>> <<run repX(300, "event")>> - <<includeDOM App.UI.newSlaveIntro($activeSlave)>> + <<includeDOM App.UI.newSlaveIntro(_slave)>> <</replace>> <</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave// <<case "slave training">> @@ -313,7 +296,7 @@ <br><br> <<set $arcologies[0].prosperity += 5>> <<run repX(2500, "event")>> - <<includeDOM App.UI.newSlaveIntro($activeSlave)>> + <<includeDOM App.UI.newSlaveIntro(_slave)>> <</replace>> <</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave// <<case "majority deal">> @@ -345,7 +328,7 @@ <br><br> <<set $arcologies[0].prosperity += 3>> <<run repX(1500, "event")>> - <<includeDOM App.UI.newSlaveIntro($activeSlave)>> + <<includeDOM App.UI.newSlaveIntro(_slave)>> <</replace>> <</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave// <<case "indenture deal">> @@ -371,33 +354,33 @@ <</replace>> <</link>> <br><<link "Buy out the contract and $his indenture">> - <<set $activeSlave.devotion = random(10,15)>> - <<set $activeSlave.trust = $activeSlave.devotion+4>> - <<set $activeSlave.oldDevotion = $activeSlave.devotion>> - <<set $activeSlave.indenture = random(52,78)>> - <<set $activeSlave.indentureRestrictions = 2>> - <<set $activeSlave.origin = "You took over $his indenture after $he launched a legal complaint against an abusive master.">> + <<set _slave.devotion = random(10,15)>> + <<set _slave.trust = _slave.devotion+4>> + <<set _slave.oldDevotion = _slave.devotion>> + <<set _slave.indenture = random(52,78)>> + <<set _slave.indentureRestrictions = 2>> + <<set _slave.origin = "You took over $his indenture after $he launched a legal complaint against an abusive master.">> <<run cashX(forceNeg(_ContractCost), "slaveTransfer")>> <<replace "#result">> You offer to simply buy out the indenture contract, thereby acquiring $him, to which both parties readily agree. This decision is viewed as @@.green;incredibly generous@@ by both your arcology's romantically-minded and financially-inclined citizens. For their part, your new servant is hopeful that you will be more considerate of $his health, while the former holder is just happy to have $him off his hands. <br><br> <<set $arcologies[0].prosperity += 3>> <<run repX(1500, "event")>> - <<includeDOM App.UI.newSlaveIntro($activeSlave)>> + <<includeDOM App.UI.newSlaveIntro(_slave)>> <</replace>> <</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the servant as such// <br><<link "Buy out the contract and enslave $him">> - <<set $activeSlave.origin = "$He was enslaved after you manipulated $his deal for indentured servitude.">> - <<set $activeSlave.devotion = random(-10,-15)>> - <<set $activeSlave.trust = $activeSlave.devotion+4>> - <<set $activeSlave.oldDevotion = $activeSlave.devotion>> + <<set _slave.origin = "$He was enslaved after you manipulated $his deal for indentured servitude.">> + <<set _slave.devotion = random(-10,-15)>> + <<set _slave.trust = _slave.devotion+4>> + <<set _slave.oldDevotion = _slave.devotion>> <<run cashX(forceNeg(_ContractCost), "slaveTransfer")>> <<replace "#result">> You quietly contact the trader and suggest an alternative method of settling the dispute. He is surprised, but agrees readily, chuckling at how the "recalcitrant bitch" is going to be dealt with. To $his horror, $he finds that your near-total power over deals made in your arcology has been employed to saddle $him with additional debts that, under $his indentured servitude, $he cannot hope to repay. It is then the work of ten minutes to demand payment, and when $he cannot pay, demand $his body for enslavement. The story of your cunning @@.green;impresses@@ the slave traders, but is @@.red;booed@@ by fairer-minded citizens. <br><br> <<set $arcologies[0].prosperity += 5>> <<run repX(-100, "event")>> - <<includeDOM App.UI.newSlaveIntro($activeSlave)>> + <<includeDOM App.UI.newSlaveIntro(_slave)>> <</replace>> <</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the servant as a slave// <<default>> @@ -427,7 +410,7 @@ <<replace "#result">> You offer to simply buy out the contract, taking the slave for yourself. This lets the buyer out of buying $him, and the slaveowner gets his money; but it soon becomes apparent that what both of them were really looking for is an opportunity to put one over on the other. Neither is pleased to be denied a petty victory, but they both have the sense to keep their mouths shut. The poor slave, meanwhile, appears in the penthouse entryway, @@.hotpink;hopeful@@ that $he's been lucky enough to end up in a less abusive situation. <br><br> - <<includeDOM App.UI.newSlaveIntro($activeSlave)>> + <<includeDOM App.UI.newSlaveIntro(_slave)>> <</replace>> <</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave// <</switch>> -- GitLab