diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 0171d628d8e58e8d5d612074053df6abf33d3bf8..c5e3da8cc1bf2e21df626cb7ce72831d6a8fcb18 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,12 @@ 4/09/2018 + 35 + -fixes + -background color flipper (WIP) + -more Nox/Deepmurk vector work + -stuffedanon's sugarcube tweaks + 34 -fixes to slaveSummary name flipping -fixed bad array in bellyDesc diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw index cf832ef8da80e0a6c9501c83a0dfce075d60b979..76d4295e749642bbff5c6398cc381e784908719d 100644 --- a/src/uncategorized/reFSAcquisition.tw +++ b/src/uncategorized/reFSAcquisition.tw @@ -361,6 +361,7 @@ <<set $contractCost = 1000>> <<set $activeSlaveOneTimeMaxAge = 42>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She offered herself for voluntary enslavement to get to an arcology in which implants are uncommon, since she has a fear of surgery.">> <<set $activeSlave.health = random(-20,20)>> @@ -486,6 +487,7 @@ <<set $contractCost = 1000>> <<set $activeSlaveOneTimeMaxAge = 42>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "You received her from a surgeon who botched an implant operation on her and needed to get her out of sight.">> <<set $activeSlave.boobsImplant += random(10,20)*200>> @@ -697,6 +699,7 @@ <<set $contractCost = 1000>> <<set $activeSlaveOneTimeMaxAge = 24>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She sold herself to you to escape those who condemned her lifestyle.">> <<set $activeSlave.career = "a shut-in">> @@ -805,6 +808,7 @@ <<set $contractCost = 1000>> <<set $activeSlaveOneTimeMinAge = 10>> <<set $activeSlaveOneTimeMaxAge = 18>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She thought she was important; she was not.">> <<set $activeSlave.career = "a student from a private school">> @@ -895,6 +899,7 @@ <<set $activeSlaveOneTimeMinAge = 18>> */ <<set $activeSlaveOneTimeMaxAge = 24>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She offered herself to you for enslavement because she had a disgustingly naive view of medieval Japanese culture.">> <<set $activeSlave.devotion = random(-15,-5)>> diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw index ef5758ad95294f4cd3c401060c79b6f396a02bea..37cec934e06860d04861d8a5d31e75081c9118a3 100644 --- a/src/uncategorized/reRecruit.tw +++ b/src/uncategorized/reRecruit.tw @@ -28,6 +28,7 @@ <</if>> <<set $activeSlaveOneTimeMaxAge = 19>> <<set $one_time_age_overrides_pedo_mode = 1>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She offered herself to you as a slave to escape a life of boredom.">> <<set $activeSlave.career = "a party girl">> @@ -60,6 +61,7 @@ Your head girl sends you a discreet message that she may have found a slave for <<set $activeSlaveOneTimeMinAge = 16>> <</if>> <<set $activeSlaveOneTimeMaxAge = 19>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She offered herself to you as a slave to escape a life of boredom.">> <<set $activeSlave.career = "a party girl">> @@ -87,6 +89,7 @@ Your head girl sends you a discreet message that she may have found a slave for <<if $minimumSlaveAge < 14 && $pedo_mode == 0>> <<set $activeSlaveOneTimeMinAge = random($minimumSlaveAge, 14)>> <</if>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She offered herself to you as a slave to escape the hard life of a free whore.">> <<set $activeSlave.career = "a prostitute">> @@ -124,6 +127,7 @@ Your head girl sends you a discreet message that she may have found a slave for <<case "female debtor">> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She was enslaved after she fell into debt to you.">> <<set $activeSlave.devotion = random(-45,-25)>> @@ -134,6 +138,7 @@ One of the tenants in your arcology has not paid rent in some time. In the Free <<case "male debtor">> <<set $activeSlaveOneTimeMaxAge = 30>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "You turned her into a slave girl after she fell into debt to you.">> <<set $activeSlave.devotion = random(-45,-25)>> @@ -158,6 +163,7 @@ One of the tenants in your arcology has not paid rent in some time. In the Free <<set $activeSlaveOneTimeMaxAge = 30>> <</if>> <<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/ +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy.">> <<set $activeSlave.devotion = random(0,15)>> @@ -188,6 +194,7 @@ A young woman comes to your penthouse for an interview. You accepted her request <</if>> <<set $activeSlaveOneTimeMaxAge = 22>> <<set $one_time_age_overrides_pedo_mode = 1>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She offered herself as a slave to escape the horrors a blind girl faces on the streets.">> <<set $activeSlave.devotion = random(20,30)>> @@ -216,6 +223,7 @@ A young <<if $activeSlave.physicalAge < 13>>girl<<elseif $activeSlave.physicalAg <<set $activeSlaveOneTimeMinAge = 10>> <<set $activeSlaveOneTimeMaxAge = 14>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She came to you to escape being sold to a cruel master after her producer informed her of her debt.">> <<set $activeSlave.career = "a musician">> @@ -257,6 +265,7 @@ Recently, a young musical prodigy has taken both the old world and the free citi <<set $activeSlaveOneTimeMinAge = $fertilityAge + $minimumSlaveAge>> <<set $activeSlaveOneTimeMaxAge = Math.max($activeSlaveOneTimeMinAge,$retirementAge-2)>> <<set $one_time_age_overrides_pedo_mode = 1>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She sold herself into slavery to escape life on the streets.">> <<set $activeSlave.devotion = random(0,15)>> @@ -274,6 +283,7 @@ A <<if $activeSlave.physicalAge > 50>>old woman<<elseif $activeSlave.physicalAge <<case "tg addict">> <<set $activeSlaveOneTimeMaxAge = 25>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "You tricked her into enslavement, manipulating her based on her surgical addiction.">> <<set $activeSlave.devotion = random(-75,-60)>> @@ -378,6 +388,7 @@ She hikes up her skirt and spins around slowly, displaying a petite, half-hard c <<set $activeSlaveOneTimeMinAge = random(12, 16)>> <<set $activeSlaveOneTimeMaxAge = 19>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She asked to be enslaved out of naive infatuation with you.">> <<set $activeSlave.devotion = random(25,30)>> @@ -402,6 +413,7 @@ After a short while, your assistant whispers in your earpiece, <<if $assistant = <<set $activeSlaveOneTimeMinAge = 28>> <<set $activeSlaveOneTimeMaxAge = 32>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She asked to be enslaved in the hope you'd treat a fellow woman well.">> <<set $activeSlave.devotion = random(10,15)>> @@ -431,6 +443,7 @@ After a short while, your assistant whispers in your earpiece, <<if $assistant = <<set $activeSlaveOneTimeMinAge = 13>> <<set $activeSlaveOneTimeMaxAge = 20>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She asked to be enslaved since she felt you were her only hope of becoming a prettier woman.">> <<set $activeSlave.devotion = random(10,15)>> @@ -472,6 +485,7 @@ After a short while, your assistant whispers in your earpiece, <<if $assistant = <<set $activeSlaveOneTimeMinAge = 13>> <<set $activeSlaveOneTimeMaxAge = 21>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She got into debt for damaging someone's property during a student protest and you bought out her debt.">> <<set $activeSlave.devotion = random(-25,0)>> @@ -509,6 +523,7 @@ Given the damage to an expensive classic car and the meager balance of her bank <<set $activeSlaveOneTimeMinAge = 13>> <<set $activeSlaveOneTimeMaxAge = 21>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She got into debt for damaging someone's property during a student protest and you bought out her debt.">> <<set $activeSlave.devotion = random(-30,-5)>> @@ -549,6 +564,7 @@ Given the damage to an expensive classic car and the meager balance of his bank <<set $activeSlaveOneTimeMinAge = 13>> <<set $activeSlaveOneTimeMaxAge = 27>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She got into debt for damaging someone's property during a student protest and you bought out her debt.">> <<set $activeSlave.devotion = -100>> @@ -604,6 +620,7 @@ Given the damage to an expensive classic car and the meager balance of her bank <<case "female SE">> <<set $activeSlaveOneTimeMaxAge = 21>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She enslaved herself to be with a man she loved, only to be sold to you afterward.">> <<set $activeSlave.devotion = random(-30,-5)>> @@ -641,6 +658,7 @@ The situation does yield a few business opportunities too, as not all of the guy <<case "MTF SE">> <<set $activeSlaveOneTimeMaxAge = 21>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She (formerly he) enslaved herself to be with a man she loved, only to be sold to you afterward.">> <<set $activeSlave.devotion = random(-30,-5)>> @@ -679,6 +697,7 @@ It isn't just all natural females either, as a few men also jumped on the bandwa <<case "DG SE">> <<set $activeSlaveOneTimeMaxAge = 21>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She (formerly he) enslaved herself to be with a man she loved, only to be sold to you afterward.">> <<set $activeSlave.devotion = random(-30,-5)>> @@ -1594,6 +1613,7 @@ She pauses, looking directly at you for the first time, though you get the sense <<set $activeSlaveOneTimeMinAge = 18>> <<set $activeSlaveOneTimeMaxAge = 42>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She offered herself to you for enslavement out of devotion to her artistic 'craft'.">> <<set $activeSlave.boobs = random(4,6)*50>> @@ -1660,6 +1680,7 @@ The current sale offer comes from one of the arcology's oldest college frat-hous <<case "immigrant">> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She sold herself into slavery to pay her immigration costs.">> <<set $activeSlave.devotion = random(-45,-25)>> @@ -1711,6 +1732,7 @@ As you are heading back to your penthouse from overseeing a promising new store' <<set $activeSlaveOneTimeMinAge = $fertilityAge>> <<set $activeSlaveOneTimeMaxAge = 22>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "You helped her give birth, leaving her deeply indebted to you.">> <<set $activeSlave.devotion = random(0,20)>> diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw index 0284bccdb9939044e2986a0f3e9ab5262a67a325..8f33e8f8bc44f4774bc2a5796b2e636f8f8bfa49 100644 --- a/src/uncategorized/recETS.tw +++ b/src/uncategorized/recETS.tw @@ -27,6 +27,7 @@ <<set $activeSlaveOneTimeMinAge = ($fertilityAge + $minimumSlaveAge)>> <<set $activeSlaveOneTimeMaxAge = 40>> <<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter who can be a slave. %/ +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She sold herself into slavery to escape addiction debts.">> <<set $activeSlave.devotion = random(-15,15)>> @@ -65,6 +66,7 @@ A matronly woman comes to your penthouse in tears. It seems she is a tenant of y <<set $activeSlaveOneTimeMinAge = ($fertilityAge + $minimumSlaveAge)>> <<set $activeSlaveOneTimeMaxAge = 40>> <<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter who can be a slave. %/ +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XX Slave">> <<set $activeSlave.origin = "She was enslaved after you called in her business debts.">> <<set $activeSlave.career = "a business owner">> @@ -526,6 +528,7 @@ It would cost <<print cashFormat($contractCost)>> to enslave the two of them. <<set $contractCost = 1500>> <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>> <<set $activeSlaveOneTimeMaxAge = 21>> +<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedNationality = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate XY Slave">> <<set $activeSlave.origin = "She was sold into slavery by her older sister.">> <<set $activeSlave.career = "a reluctant anal whore">> diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw index 1ec06c0fc1bd34260e566d99fa23d2cc1ff754a0..bae61a5c68c9d9343ab192e758a07d2ce0a89bae 100644 --- a/src/uncategorized/saDevotion.tw +++ b/src/uncategorized/saDevotion.tw @@ -763,6 +763,9 @@ <<if ($slaves[$i].trust > 100)>> <<if $slaves[$i].devotion < 100 && $slaves[$i].devotion >= 20>> <<set $slaves[$i].devotion += Math.trunc($slaves[$i].trust-100)>> + <<elseif $slaves[$i].devotion <= -50>> + Her blatant disregard for your rule @@.red;damages your reputation.@@ + <<set $repGain -= 30*($slaves[$i].trust-100)>> <<elseif $slaves[$i].energy <= 50>> <<set $energyPlus += Math.trunc($slaves[$i].trust-100)>> <<else>>