From c587f8b3da1395d01e55b7c7a5e7b507901ccac7 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 21 Apr 2017 19:38:16 -0400 Subject: [PATCH] Birthday rework, skills changes, and some oversight fixes. --- src/uncategorized/RESS.tw | 26 +++++++++++++++++--------- src/uncategorized/ptWorkaround.tw | 20 +++++++++++--------- src/uncategorized/saRelationships.tw | 24 ++++++++++++++++++++---- src/uncategorized/saTakeClasses.tw | 17 +++++++++++++---- src/uncategorized/schoolroom.tw | 2 +- src/uncategorized/schoolroomReport.tw | 4 ++-- 6 files changed, 64 insertions(+), 29 deletions(-) diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 758810c1a68..5deaf295ff3 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -548,7 +548,7 @@ As the Free Cities grow and evolve, slave culture does too. It seems this is a n <<case "birthday">> -You come across <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> in the kitchen. She has a normal slave meal on a plate in front of her, but also has a pack of hotwax candles from your sex gear. Oddly, she has a candle upright in the food and is trying to light it. You ask what she's doing, and she explains <<if ($activeSlave.lips > 70)>>meekly through her massive dick-sucking lips, "I unno, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>. Ah been a slave so long. Ah jus <<if canSee($activeSlave)>>saw<<else>>heard<</if>> th date tday an... seem lak de righ thing to do. Ahm sorry."<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>meekly through her inconvenient oral piercings, "I unno, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>. Ah been a slave so long. Ah jus <<if canSee($activeSlave)>>saw<<else>>heard<</if>> th date tday an... seem lak de righ thing to do. Ahm sorry."<<else>>meekly, "I don't know, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. I've been a slave so long. I just <<if canSee($activeSlave)>>saw<<else>>heard<</if>> the date today and this seemed like the right thing to do. I'm sorry."<</if>> It's probably her birthday. Apparently she's losing her grasp on the concept. +You come across <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> in the kitchen. She has a normal slave meal on a plate in front of her, but also has a pack of hotwax candles from your sex gear. Oddly, she has a candle upright in the food and is trying to light it. You ask what she's doing, and she explains meekly, "I don't know, <<Master>>. I've been a <<s>>lave <<s>>o long. I ju<<s>>t <<if canSee($activeSlave)>><<s>>aw<<else>>heard<</if>> the date today and thi<<s>> <<s>>eemed like the right thing to do. I'm <<s>>orry." It's probably her birthday. Apparently she's losing her grasp on the concept. <<case "inconvenient labia">> @@ -4810,17 +4810,25 @@ You tell her kindly that you understand, and that she'll be trained to address t <<link "Bake her a cake">> <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> - You bake a simple cake while patiently explaining birthdays. She slowly remembers, and <<if canSee($activeSlave)>>looks repeatedly at the date display<<else>>focuses intently on the date as she repeats it to herself<</if>> to ingrain her birthday back in her mind. When the cake is done, you quickly dust it with confectionary sugar, stand a hotwax candle in the middle of it, and invite her to think of a wish and blow it out. She sits on your lap and the two of you take turns feeding each other warm cake. When the cake is gone she gets up to do the dishes and you turn to go. As you go, she asks <<if ($activeSlave.lips > 70)>>through her massive dick-sucking lips, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, may Ah tell yeh wha mah wish was?"<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>through her inconvenient oral piercings, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, may Ah tell yeh wha mah wish was?"<<else>>"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, may I tell you what my wish was?"<</if>> You nod, and she kneels on the kitchen chair with her eyes closed, her hands spreading her buttocks, and her mouth open. <<if ($activeSlave.lips > 70)>>"Buttsex, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>."<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>"Buttsex, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>."<<else>>"Buttsex, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>."<</if>> @@color:hotpink;Her devotion has increased.@@ - <<set $activeSlave.devotion += 4>> - <<if ($activeSlave.vagina > -1)>> - <<set $activeSlave.vaginalCount += 1>> - <<set $vaginalTotal += 1>> + You bake a simple cake while patiently explaining birthdays. She slowly remembers, and <<if canSee($activeSlave)>>looks repeatedly at the date display<<else>>focuses intently on the date as she repeats it to herself<</if>> to ingrain her birthday back in her mind. When the cake is done, you quickly dust it with confectionary sugar, stand a hotwax candle in the middle of it, and invite her to think of a wish and blow it out. She sits on your lap and the two of you take turns feeding each other warm cake. When the cake is gone she gets up to do the dishes and you turn to go. As you go, she asks <<if ($activeSlave.lips > 70)>>through her massive dick-sucking lips, <<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>through her inconvenient oral piercings, <</if>>"<<Master>>, may I tell you what my wi<<s>>h wa<<s>>?"<</if>> You nod, and she kneels on the kitchen chair with her eyes closed, + <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>> + her hands spreading her buttocks; her pussy moist and inviting and her anus begging for penetration. "Take me, <<Master>>." + <<BothVCheck>> + <<elseif canDoVaginal($activeSlave)>> + her hands spreading her buttocks; her pussy moist and inviting. "Take me, <<Master>>." + <<VaginalVCheck>> + <<elseif canDoAnal($activeSlave)>> + her hands spreading her buttocks, and her mouth open. "Butt<<s>>ex, <<Master>>." + <<AnalVCheck>> <<else>> - <<set $activeSlave.analCount += 1>> - <<set $analTotal += 1>> + hands to her breasts, and mouth wide open. "To ta<<s>>te you, <<Master>>." + <<set $activeSlave.oralCount += 1>> + <<set $oralTotal += 1>> <</if>> + She feels so much @@color:hotpink;closer to you@@ than before. + <<set $activeSlave.devotion += 4>> <</replace>> -<</link>> +<</link>> //This option will take virginity if applicable, favoring vaginal before anal.//<</if>> <br><<link "Teach her a new meaning of birthdays">> <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw index 00d430feb85..1f928698cb6 100644 --- a/src/uncategorized/ptWorkaround.tw +++ b/src/uncategorized/ptWorkaround.tw @@ -255,28 +255,28 @@ <<if $activeSlave.oralSkill <= 10>> Since she's orally unskilled, you start with her mouth. She <<if $PC.dick == 1>>sucks your dick<<else>>eats you out<</if>>, of course, but her training is more creative than just that. You give her delicious hard candies to suck and feed her phallic fruits and vegetables that she must deepthroat before she can eat. As her skill improves, she wears a gag with an inward-facing dildo, which is swapped out for a bigger size every so often. You only let her orgasm when she's sucking, and before long she's associating giving someone oral pleasure with experiencing pleasure herself. Her oral skills have improved. <<OralSkillIncrease $activeSlave>> - <<elseif ($activeSlave.vaginalSkill <= 10) && ($activeSlave.vagina > 0) && ($activeSlave.vaginalAccessory != "chastity belt")>> + <<elseif ($activeSlave.vaginalSkill <= 10) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>> Since she's vaginally unskilled, and not a virgin, you start with her pussy. Her vaginal skills have improved. <<VaginalSkillIncrease $activeSlave>> - <<elseif ($activeSlave.analSkill <= 10) && ($activeSlave.anus > 0)>> + <<elseif ($activeSlave.analSkill <= 10) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>> Since she's anally unskilled, and not an anal virgin, you start with her ass. Her anal skills have improved. <<AnalSkillIncrease $activeSlave>> <<elseif $activeSlave.oralSkill <= 30>> Since she's sexually experienced, you work with her on the finer points of oral sex. Her oral skills have improved. <<OralSkillIncrease $activeSlave>> - <<elseif ($activeSlave.vaginalSkill <= 30) && ($activeSlave.vagina > 0) && ($activeSlave.vaginalAccessory != "chastity belt")>> + <<elseif ($activeSlave.vaginalSkill <= 30) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>> Since she's sexually experienced, you work with her on the finer points of penetrative sex. She can already fuck pretty well, but her muscular control could be improved. She works her kegel muscles all week, using fingers, dildos, and your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> as training tools. She becomes expert enough that she is able to make you cum without any thrusting at all by you or any riding by her; she just flexes her muscles enough to <<if $PC.dick == 0>>grind the fake phallus back against your cunt<<else>>stimulate you<</if>>. Her vaginal skills have improved. <<VaginalSkillIncrease $activeSlave>> - <<elseif ($activeSlave.analSkill <= 30) && ($activeSlave.anus > 0)>> + <<elseif ($activeSlave.analSkill <= 30) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>> Since she's anally experienced, you work with her on the finer points of penetrative sex. She can already take it up her ass, but her muscular control could be improved. She works her kegel muscles and anal sphincter all week, using fingers, dildos, and your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> as training tools. She becomes expert enough that she is able to make you cum without any thrusting at all by you or any riding by her; she just flexes her muscles enough to <<if $PC.dick == 0>>squeeze the fake phallus<<else>>stimulate you<</if>>. Her anal skills have improved. <<AnalSkillIncrease $activeSlave>> <<elseif $activeSlave.oralSkill < 100>> She is already a skilled oral whore, but her skills can be polished further. You train her in the basics of urine play, massage, pet play, needle play, and many other niche skills. You also expand her oral endurance, enabling her to deepthroat for extended periods. Her oral skills have improved. <<OralSkillIncrease $activeSlave>> - <<elseif ($activeSlave.vaginalSkill < 100) && ($activeSlave.vagina > 0) && ($activeSlave.vaginalAccessory != "chastity belt")>> + <<elseif ($activeSlave.vaginalSkill < 100) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>> She is already a skilled pussy slut, but her skills can be polished further. You train her in the basics of urine play, massage, pet play, needle play, and many other niche skills. You also work with her to develop a personal regimen of vaginal muscle exercises. This will enable her to squeeze and massage dicks with her practiced vaginal walls. Her vaginal skills have improved. <<VaginalSkillIncrease $activeSlave>> - <<elseif ($activeSlave.analSkill < 100) && ($activeSlave.anus > 0)>> + <<elseif ($activeSlave.analSkill < 100) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>> She is already a skilled anal bitch, but her skills can be polished further. You train her in the basics of urine play, massage, pet play, needle play, and many other niche skills. You also expand her knowledge of sexual positions. She learns to balance herself on tiptoe for the challenge of standing anal sex without support. Her sexual skills have improved. <<AnalSkillIncrease $activeSlave>> <<elseif $activeSlave.whoreSkill <= 10>> @@ -405,7 +405,7 @@ @@color:gold;encourages her fear@@ of you. <<set $activeSlave.trust -= 10>> <</if>> - <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>> + <<if ($PC.slaving >= 100)>> Your @@color:springgreen;slave-breaking experience@@ allows you to apply @@color:gold;exquisite agony@@ without any increase in damage. <<set $activeSlave.trust -= 5>> <</if>> @@ -572,7 +572,7 @@ <</if>> <</switch>> <<set $activeSlave.training += 120-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>> - <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>> + <<if ($PC.slaving >= 100)>> <<set $activeSlave.training += 20>> <</if>> <<if $activeSlave.training < 100>> @@ -736,7 +736,7 @@ She gets through it, but she doesn't seem to enjoy seeing her audience on the screen. <</if>> <<else>> - <br> You already know she + <br> You already know that she <<switch $activeSlave.fetish>> <<case "submissive" "cumslut" "buttslut" "sadist" "masochist" "dom">> is a @@color:coral;$activeSlave.fetish@@, @@ -744,6 +744,8 @@ is @@color:red;mindbroken@@, <<case "boobs" "humiliation" "pregnancy">> loves @@color:coral;$activeSlave.fetish@@, + <<default>> + lacks a fetish, <</switch>> so your investigation is complete. <</if>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 446866a8dc7..479e033189c 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -423,9 +423,17 @@ <<if _PCrelative == 1>> <<set _PCrelative = "twin">> <<elseif _PCrelative == 2>> - <<set _PCrelative = "sister">> + <<if $PC.title == 1>> + <<set _PCrelative = "brother">> + <<else>> + <<set _PCrelative = "sister">> + <</if>> <<elseif _PCrelative == 3>> - <<set _PCrelative = "half-sister">> + <<if $PC.title == 1>> + <<set _PCrelative = "half-brother">> + <<else>> + <<set _PCrelative = "half-sister">> + <</if>> <</if>> She <<if _SlaveI.sexualQuirk is "perverted">> @@ -680,9 +688,17 @@ <<if _PCrelative == 1>> <<set _PCrelative = "twin">> <<elseif _PCrelative == 2>> - <<set _PCrelative = "sister">> + <<if $PC.title == 1>> + <<set _PCrelative = "brother">> + <<else>> + <<set _PCrelative = "sister">> + <</if>> <<elseif _PCrelative == 3>> - <<set _PCrelative = "half-sister">> + <<if $PC.title == 1>> + <<set _PCrelative = "half-brother">> + <<else>> + <<set _PCrelative = "half-sister">> + <</if>> <</if>> She <<if _SlaveI.sexualQuirk is "perverted">> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index f9a87641a58..2a299a09628 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -107,12 +107,15 @@ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedi <<elseif ($slaves[$i].oralSkill <= 10)>> Since she is orally incompetent, she is taught basic gag reflex suppression exercises and other simple oral things. <<OralSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina > 0) && ($slaves[$i].vaginalAccessory != "chastity belt")>> + <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina >= 0)>> Since she is unskilled at using her pussy, she is taught kegel exercises and other simple vaginal skills. <<VaginalSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus > 0)>> + <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus > 0) && canDoAnal($slaves[$i])>> Since she is a novice at taking it up her butt, she is taught relaxation exercises and other simple anal basics. <<AnalSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus >= 0)>> + Since she is a novice at taking it up her butt and not permitted to learn through practice, she is taught relaxation exercises and other simple anal basics. + <<AnalSkillIncrease $slaves[$i]>> <<elseif ($slaves[$i].whoreSkill <= 10)>> Since she has little idea what's involved in selling her body, she is taught basic safety practices and other simple prostitution skills. <<WhoreSkillIncrease $slaves[$i]>> @@ -129,6 +132,12 @@ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedi <<elseif ($slaves[$i].entertainSkill <= 30)>> Having completed the basic sex slave curriculum, she studies courtesanship, including social dynamics and flirtation more subtle than straightforward begging for sex. <<EntertainSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].vaginalSkill <= 30) && ($slaves[$i].vagina >= 0)>> + Having completed the basic sex slave curriculum, she studies more advanced techniques and exotic positions to make use of her <<if $slaves[$i].vagina == 0>>virgin pussy for use in her first time<<else>>pussy<</if>>. + <<VaginalSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].analSkill <= 30)>> + Having completed the basic sex slave curriculum, she studies more advanced techniques and exotic positions to make use of her <<if $slaves[$i].vagina == 0>>virgin ass for use in her first time<<else>>ass<</if>>. + <<AnalSkillIncrease $slaves[$i]>> <</if>> <</if>> <</for>> @@ -177,8 +186,8 @@ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedi <<if ($slaves[$i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].oralSkill > 10))>> <<if ($slaves[$i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].whoreSkill > 10))>> <<if ($slaves[$i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].entertainSkill > 10))>> -<<if ($slaves[$i].analSkill > 10) || ($slaves[$i].anus < 1)>> -<<if ($slaves[$i].vaginalSkill > 10) || ($slaves[$i].vagina < 1)>> +<<if ($slaves[_i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].analSkill > 10))>> +<<if ($slaves[_i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].vaginalSkill > 10)) || ($slaves[_i].vagina < 0)>> She can learn little from further classes, so @@color:yellow;her assignment has defaulted to rest.@@ <<set $slaves[$i].assignment = "rest", $slaves[$i].assignmentVisible = 1>> <</if>> diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw index 0391e3290ce..72b6499d3ef 100644 --- a/src/uncategorized/schoolroom.tw +++ b/src/uncategorized/schoolroom.tw @@ -73,7 +73,7 @@ $schoolroomNameCaps is well-equipped, with wall screens to display lessons. Thes <br> <<if $schoolroomUpgradeSkills == 1>> - $schoolroomNameCaps provides slaves with some intermediate skills, including a solid foundation in oral sex, efficient and safe prostitution, and the rudiments of courtesanship. + $schoolroomNameCaps provides slaves with some intermediate skills, including a solid foundation in sex, efficient and safe prostitution, and the rudiments of courtesanship. <<else>> <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>> $schoolroomNameCaps inculcates the basic skills necessary to a sex slave. [[Upgrade the curriculum to cover some intermediate skills|Schoolroom][$cash -= _Tmult1, $schoolroomUpgradeSkills = 1]] //Costs ¤_Tmult1// diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index 7920dca9f94..75dba0cfa55 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -210,8 +210,8 @@ <<if ($slaves[_i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].oralSkill > 10))>> <<if ($slaves[_i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].whoreSkill > 10))>> <<if ($slaves[_i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].entertainSkill > 10))>> - <<if ($slaves[_i].analSkill > 10) || ($slaves[_i].anus < 1)>> - <<if ($slaves[_i].vaginalSkill > 10) || ($slaves[_i].vagina < 1)>> + <<if ($slaves[_i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].analSkill > 10))>> + <<if ($slaves[_i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].vaginalSkill > 10)) || ($slaves[_i].vagina < 0)>> <<removeJob $slaves[_i] "schoolroom">> <<set _restedSlaves++, _dI--, _DL-->> <<continue>> -- GitLab