diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 1f4a35638a7e51398bea38c42c216111bc713f10..259dcf0f9834e019ecfadebe3b937860c2ffa726 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -760,7 +760,7 @@ accepts string "braided" "dreadlocks" "permed" -"curls" +"curled" "luxurious" "bald" diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index 4c96031141b376667ad764bf92e37932377d3e2c..3ea5aabf553162b6130ca6af5c13e8f0682c042d 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -184,9 +184,9 @@ <<set setup.DJCareers = ["a dancer", "a musician", "a classical dancer", "a classical musician", "a house DJ", "an aspiring pop star"]>> -<<set setup.bodyguardCareers = ["a soldier", "an assassin", "a transporter", "an MS pilot", "a bodyguard", "a law enforcement officer", "a child soldier", "in a militia", "a revolutionary", "a military brat", "captain of the kendo club", "an assassin"]>> +<<set setup.bodyguardCareers = ["a soldier", "an assassin", "a transporter", "an MS pilot", "a bodyguard", "a law enforcement officer", "a child soldier", "in a militia", "a revolutionary", "a military brat", "captain of the kendo club"]>> -<<set setup.wardenessCareers = ["a security guard", "a mercenary", "an enforcer", "a private detective", "a bouncer", "a prison guard", "an enforcer", "a street thug", "a gang member"]>> +<<set setup.wardenessCareers = ["a security guard", "a mercenary", "an enforcer", "a private detective", "a bouncer", "a prison guard", "a street thug", "a gang member"]>> <<set setup.nurseCareers = ["a nurse", "a doctor", "a medic", "a paramedic", "a medical student"]>> diff --git a/src/pregmod/fillUpButt.tw b/src/pregmod/fillUpButt.tw index 15c4cc8dbc6951b06138b0e82e1854eabb2884e0..84f5532acf06a2feab81fb79d40d8548b9c83fea 100644 --- a/src/pregmod/fillUpButt.tw +++ b/src/pregmod/fillUpButt.tw @@ -298,7 +298,7 @@ before calling her over so you can play with her inhuman <<elseif $activeSlave.butt <= 20>> couch-like - <</if>> buttocks. You start rubbing along her cheeks, feeling the shape of her <<if $seeRace == 1>>$activeSlave.race <</if>>ass with your fingers and squeezing gently. As you rub your fingers around her anus, she sighs audibly. She moans as you continue to move around her posterior gently reaching to touch your fingertips against her sphincter while rubbing her ass at the same time. She quivers while you circle around her anus with your fingers. You look at her face and is <<if canSee($activeSlave)>>looking<<else>>gazing<</if>> back at you longingly, getting aroused by your continued touch on her butt. You keep squeezing her buttocks tenderly - first one, then the other and then finally both and she can't help but let out a moan while in your grasp. + <</if>> buttocks. You start rubbing along her cheeks, feeling the shape of her <<if $seeRace == 1>>$activeSlave.race <</if>>ass with your fingers and squeezing gently. As you rub your fingers around her anus, she sighs audibly. She moans as you continue to move around her posterior gently reaching to touch your fingertips against her sphincter while rubbing her ass at the same time. She quivers while you circle around her anus with your fingers. You look at her face and she is <<if canSee($activeSlave)>>looking<<else>>gazing<</if>> back at you longingly, getting aroused by your continued touch on her butt. You keep squeezing her buttocks tenderly - first one, then the other and then finally both and she can't help but let out a moan while in your grasp. <<if ($activeSlave.amp != 1)>> You pull her body closer towards you by her buttocks, turn her around and bend her over your lap, <<if $activeSlave.inflation == 2>>her soft and jiggly <<print $activeSlave.inflationType>>-filled belly spilling over your legs<<elseif $activeSlave.inflation == 1>>her <<print $activeSlave.inflationType>> distended belly resting on your legs<<else>>her belly resting on your legs<</if>>. <<else>> diff --git a/src/uncategorized/fondleButt.tw b/src/uncategorized/fondleButt.tw index e1a3f5867a9856e282ffd4a0adfe275331cd68df..b2d451299c2c84f3369d4508074ec281872c1157 100644 --- a/src/uncategorized/fondleButt.tw +++ b/src/uncategorized/fondleButt.tw @@ -460,7 +460,7 @@ You call her over so you can fondle her inhuman <<elseif $activeSlave.butt <= 20>> couch-like - <</if>> buttocks. You start rubbing along her cheeks, feeling the shape of her<<if $seeRace == 1>> $activeSlave.race<</if>> ass with your fingers and squeezing gently. As you rub your fingers around her anus, she starts to relax. She quivers as you continue to move around her posterior gently reaching to touch your fingertips against her sphincter while rubbing her ass at the same time. She purses her lips while you circle around her anus with your fingers. You look at her face and is looking back at you doe-eyed, trying but failing not to get aroused by your soft touch on her butt. You keep squeezing her buttocks tenderly - first one, then the other and then finally both and she can't help but let out a moan while in your grasp. + <</if>> buttocks. You start rubbing along her cheeks, feeling the shape of her<<if $seeRace == 1>> $activeSlave.race<</if>> ass with your fingers and squeezing gently. As you rub your fingers around her anus, she starts to relax. She quivers as you continue to move around her posterior gently reaching to touch your fingertips against her sphincter while rubbing her ass at the same time. She purses her lips while you circle around her anus with your fingers. You look at her face and she is looking back at you doe-eyed, trying but failing not to get aroused by your soft touch on her butt. You keep squeezing her buttocks tenderly - first one, then the other and then finally both and she can't help but let out a moan while in your grasp. <<if ($activeSlave.amp != 1)>> You pull her body closer towards you by her buttocks, turn her around and push her down, bending her over your desk. <<else>> @@ -502,7 +502,7 @@ You call her over so you can fondle her inhuman <<elseif $activeSlave.butt <= 20>> couch-like - <</if>> buttocks. You start rubbing along her cheeks, feeling the shape of her<<if $seeRace == 1>> $activeSlave.race<</if>> ass with your fingers and squeezing gently. As you rub your fingers around her anus, she sighs audibly. She moans as you continue to move around her posterior gently reaching to touch your fingertips against her sphincter while rubbing her ass at the same time. She quivers while you circle around her anus with your fingers. You look at her face and is looking back at you longingly, getting aroused by your continued touch on her butt. You keep squeezing her buttocks tenderly - first one, then the other and then finally both and she can't help but let out a moan while in your grasp. + <</if>> buttocks. You start rubbing along her cheeks, feeling the shape of her<<if $seeRace == 1>> $activeSlave.race<</if>> ass with your fingers and squeezing gently. As you rub your fingers around her anus, she sighs audibly. She moans as you continue to move around her posterior gently reaching to touch your fingertips against her sphincter while rubbing her ass at the same time. She quivers while you circle around her anus with your fingers. You look at her face and she is looking back at you longingly, getting aroused by your continued touch on her butt. You keep squeezing her buttocks tenderly - first one, then the other and then finally both and she can't help but let out a moan while in your grasp. <<if ($activeSlave.amp != 1)>> You pull her body closer towards you by her buttocks, turn her around and push her down, bending her over your desk. <<else>> diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw index 93b2e684cc7be4980178bef5f0b2bf97bf7bafee..9ee1997dc6aa02e253a4e22da4679b00fa6c74ab 100644 --- a/src/uncategorized/slaveMarkets.tw +++ b/src/uncategorized/slaveMarkets.tw @@ -11,65 +11,20 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex <<if $slaveMarket == "heap">> -You're in the corner of the slave market occupied by "The Flesh Heap", a dumping ground, of sorts, for broken slaves. Be it braindeath, drug overdose, coma or anything else, this market is willing to buy and sell them. Most of the worthwhile slaves have already been picked clean by pharmaceutical companies for drug testing, and the rest are practically nothing more than vegetables, but a handful remain just conscious enough to be profitable with effort as slaves. One should go in expecting only the worst quality possible, though if anything catches your eye, it will be rather cheap to purchase. - -<<set $seed to random(1,4)>> -<<if $seed == 1>> - "Looking for a warm body to use as furniture? Perhaps as a decorative, living sculpture? We got what you want!" -<<elseif $seed == 2>> - "I guarantee they are all alive, maybe not healthy but alive. Well, except that one, just ignore that one." -<<elseif $seed == 3>> - "We ask that you don't use this merchandise for organ harvesting, we have plenty of nonfuctional ones for that." -<<else>> - "If you are looking for a body to do unmentionable things to, you came to the right place! Though these in particular just barely fall under slave laws." -<</if>> - -<<include "Generate New Slave">> -<<set $activeSlave.origin = "You bought her from a body dump, completely broken.">> -<<set $activeSlave.devotion = 0>> -<<set $activeSlave.trust = 0>> -<<set $activeSlave.career = "a slave">> -<<set $activeSlave.intelligence = either(-3, -3, -2, -2, -2, -1, -1, -1, -1, 0)>> -<<set $activeSlave.intelligenceImplant = 0>> -<<set $activeSlave.health = random(-99,0)>> -<<set $activeSlave.weight = random(-100,0)>> -<<set $activeSlave.eyes = either(-2, -1, -1, -1, -1, 1, 1, 1)>> -<<set $activeSlave.amp = either(0, 0, 0, 0, 0, 0, 1, 1, 1)>> -<<if $activeSlave.amp != 1>> - <<set $activeSlave.heels = either(0, 0, 0, 0, 0, 1, 1)>> -<</if>> -<<set $activeSlave.voice = random(0,2)>> -<<set $activeSlave.face = random(-3,1)>> -<<if $activeSlave.vagina > -1>> - <<set $activeSlave.vagina = either(1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 10)>> - <<set $activeSlave.preg = random(-3,-1)>> - <<set $activeSlave.vaginalCount += random(0,300)>> -<</if>> -<<set $activeSlave.anus = either(1, 2, 2, 3, 3, 3, 3, 4, 4, 4)>> -<<if $activeSlave.balls > 1>> - <<if random(1,100) > 50>> - <<set $activeSlave.balls = 0>> + You're in the corner of the slave market occupied by "The Flesh Heap", a dumping ground, of sorts, for broken slaves. Be it braindeath, drug overdose, coma or anything else, this market is willing to buy and sell them. Most of the worthwhile slaves have already been picked clean by pharmaceutical companies for drug testing, and the rest are practically nothing more than vegetables, but a handful remain just conscious enough to be profitable with effort as slaves. One should go in expecting only the worst quality possible, though if anything catches your eye, it will be rather cheap to purchase. + + <<set $seed to random(1,4)>> + <<if $seed == 1>> + "Looking for a warm body to use as furniture? Perhaps as a decorative, living sculpture? We got what you want!" + <<elseif $seed == 2>> + "I guarantee they are all alive, maybe not healthy but alive. Well, except that one, just ignore that one." + <<elseif $seed == 3>> + "We ask that you don't use this merchandise for organ harvesting, we have plenty of nonfuctional ones for that." + <<else>> + "If you are looking for a body to do unmentionable things to, you came to the right place! Though these in particular just barely fall under slave laws." <</if>> -<</if>> -<<set $activeSlave.oralCount += random(0,300)>> -<<set $activeSlave.analCount += random(0,300)>> -<<if $activeSlave.boobs > 500>> - <<set $activeSlave.mammaryCount += random(0,300)>> -<</if>> -<<set $activeSlave.vaginalSkill = 0>> -<<set $activeSlave.oralSkill = 0>> -<<set $activeSlave.analSkill = 0>> -<<set $activeSlave.whoreSkill = 0>> -<<set $activeSlave.entertainSkill = 0>> -<<set $activeSlave.combatSkill = 0>> -<<set $activeSlave.addict = either(0, 0, 0, 10, 10, 20, 30)>> -<<set $activeSlave.chem = random(0,1000)>> -<<set $activeSlave.behavioralFlaw = "none">> -<<set $activeSlave.behavioralQuirk = "none">> -<<set $activeSlave.sexualFlaw = "none">> -<<set $activeSlave.sexualQuirk = "none">> -<<set $activeSlave.fetish = "mindbroken">> -<<set $activeSlave.fetishStrength = 0>> + <<GenerateMarketSlave "heap">> + <<elseif $slaveMarket == "kidnappers">> You're in the area of the slave market populated by slave kidnappers, though of course they prefer more polite titles. The slaves here are cheap, and they look it. They're almost all recent catches from bad parts of the old world, and most of them have seen considerable abuse between the moment of their capture and entering your arcology. diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 37ffeb061e239f236dd858295f544cea6b6fdf30..b32cd601f216c69a9f51daf1b491ced9ad862219 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -2528,6 +2528,53 @@ <</if>> <</if>> +<<case "heap">> + <<include "Generate New Slave">> + <<set $activeSlave.origin = "You bought her from a body dump, completely broken.">> + <<set $activeSlave.devotion = 0>> + <<set $activeSlave.trust = 0>> + <<set $activeSlave.career = "a slave">> + <<set $activeSlave.intelligence = either(-3, -3, -2, -2, -2, -1, -1, -1, -1, 0)>> + <<set $activeSlave.intelligenceImplant = 0>> + <<set $activeSlave.health = random(-99,0)>> + <<set $activeSlave.weight = random(-100,0)>> + <<set $activeSlave.eyes = either(-2, -1, -1, -1, -1, 1, 1, 1)>> + <<set $activeSlave.amp = either(0, 0, 0, 0, 0, 0, 1, 1, 1)>> + <<if $activeSlave.amp != 1>> + <<set $activeSlave.heels = either(0, 0, 0, 0, 0, 1, 1)>> + <</if>> + <<set $activeSlave.voice = random(0,2)>> + <<set $activeSlave.face = random(-3,1)>> + <<if $activeSlave.vagina > -1>> + <<set $activeSlave.vagina = either(1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 10)>> + <<set $activeSlave.preg = random(-3,-1)>> + <<set $activeSlave.vaginalCount += random(0,300)>> + <</if>> + <<set $activeSlave.anus = either(1, 2, 2, 3, 3, 3, 3, 4, 4, 4)>> + <<if $activeSlave.balls > 1>> + <<if random(1,100) > 50>> + <<set $activeSlave.balls = 0>> + <</if>> + <</if>> + <<set $activeSlave.oralCount += random(0,300)>> + <<set $activeSlave.analCount += random(0,300)>> + <<if $activeSlave.boobs > 500>> + <<set $activeSlave.mammaryCount += random(0,300)>> + <</if>> + <<set $activeSlave.vaginalSkill = 0>> + <<set $activeSlave.oralSkill = 0>> + <<set $activeSlave.analSkill = 0>> + <<set $activeSlave.whoreSkill = 0>> + <<set $activeSlave.entertainSkill = 0>> + <<set $activeSlave.combatSkill = 0>> + <<set $activeSlave.addict = either(0, 0, 0, 10, 10, 20, 30)>> + <<set $activeSlave.chem = random(0,1000)>> + <<set $activeSlave.behavioralFlaw = "none">> + <<set $activeSlave.behavioralQuirk = "none">> + <<set $activeSlave.sexualFlaw = "none">> + <<set $activeSlave.sexualQuirk = "none">> + <<set $activeSlave.fetish = "mindbroken">> + <<set $activeSlave.fetishStrength = 0>> <<case "kidnappers">> <<include "Generate New Slave">> @@ -3170,6 +3217,8 @@ the Raiders' Market <<case "underage raiders">> the Raiders' Black Market +<<case "heap">> + the Flesh Heap as alive as when you purchased them. <<case "trainers">> the Trainers' Market <<case "TSS">> @@ -3221,6 +3270,8 @@ the Raiders' Market. <<case "underage raiders">> the Raiders' Black Market. +<<case "heap">> + the Flesh Heap, alive and not dead. <<case "trainers">> the Trainers' Market. <<case "TSS">>