From c788bda05480f8362f934eb81c4d4b9712bf96d1 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Mon, 22 Apr 2019 19:43:26 +0200 Subject: [PATCH] OralSkillIncrease --- src/pregmod/saClothes.tw | 4 ++-- src/uncategorized/RESS.tw | 6 +++--- src/uncategorized/dairyReport.tw | 2 +- src/uncategorized/hgApplication.tw | 8 ++++---- src/uncategorized/ptWorkaround.tw | 6 +++--- src/uncategorized/saLiveWithHG.tw | 2 +- src/uncategorized/saPleaseYou.tw | 4 ++-- src/uncategorized/saRelationships.tw | 2 +- src/uncategorized/saTakeClasses.tw | 4 ++-- src/uncategorized/saWhore.tw | 2 +- src/utility/miscWidgets.tw | 11 ----------- 11 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw index c8478b59d07..914cf0a4ae7 100644 --- a/src/pregmod/saClothes.tw +++ b/src/pregmod/saClothes.tw @@ -408,13 +408,13 @@ <<if ($slaves[$i].collar == "dildo gag")>> <<if $slaves[$i].skill.oral <= 10>> Living gagged by a dildo, $he can't help but get better at having things down $his throat. - <<set $skillIncrease = 5>><<OralSkillIncrease $slaves[$i]>> + <<set $skillIncrease = 5>><<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <</if>> <</if>> <<if ($slaves[$i].collar == "massive dildo gag")>> <<if $slaves[$i].skill.oral < 75>> Living gagged by such an immense dildo, $he can't help but get even better at having giant things rammed down $his throat. - <<set $skillIncrease = 5>><<OralSkillIncrease $slaves[$i]>> + <<set $skillIncrease = 5>><<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 28f7b7b922b..ad4c00ebb5c 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -6963,7 +6963,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <</if>> <<if $activeSlave.skill.oral <= 10>> $He can't help but learn how to deepthroat. - <<OralSkillIncrease $activeSlave>> + <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <</if>> <</replace>> <</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take virginity//<</if>> @@ -15166,7 +15166,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <<replace "#result">> Simple problems require simple solutions — $he'll get fucked in the mouth until $he either gets over $his hang-ups about oral or learns to hide them. You drag the protesting $activeSlave.slaveName out in public, chain $him low so that $his mouth is available, and tell $him that $he'll suck dicks until $he gets through five in a row without grimacing, gagging, or resisting. You have a comfortable chair brought out to you and settle in to watch the show. $activeSlave.slaveName tries, $he really does. But when word gets out as to the conditions of $his enslavement, $his users take a perverse enjoyment in being rougher than usual to evoke the exact reactions $he's trying to avoid. By the third failed streak, you've started to grow bored of the spectacle, but luckily you find entertainment in conversation with those who have already been entertained by poor $activeSlave.slaveName. Before long more chairs have been brought up and an impromptu salon has been set up alongside the blowbang line. By the sixth failed streak, an enterprising citizen has set up a small bar and is serving drinks. By the ninth, you've delegated watching $activeSlave.slaveName to your assistant. You personally break the eleventh streak after $he reached four, to general acclaim from your newfound friends and a toast to your virility. - When the fourteenth streak is finally successful, there are serious talks about making these blowbang salons a regular occurrence and some backslapping directed towards you for your innovation in genteel hedonism. While you seriously doubt $activeSlave.slaveName enjoys oral sex any more than $he did at the start of the day, $he's certainly @@.green;learned to keep $his feelings on the matter to $himself.@@ $He did, however, @@.red;have quite a rough time@@ of it<<if $activeSlave.skill.oral <= 30>>, though $he did learn a thing or two about sucking dick.<<set $skillIncrease = 10>><<OralSkillIncrease $activeSlave>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons. + When the fourteenth streak is finally successful, there are serious talks about making these blowbang salons a regular occurrence and some backslapping directed towards you for your innovation in genteel hedonism. While you seriously doubt $activeSlave.slaveName enjoys oral sex any more than $he did at the start of the day, $he's certainly @@.green;learned to keep $his feelings on the matter to $himself.@@ $He did, however, @@.red;have quite a rough time@@ of it<<if $activeSlave.skill.oral <= 30>>, though $he did learn a thing or two about sucking dick.<<set $skillIncrease = 10>><<= SkillIncrease.Oral($activeSlave, $skillIncrease)>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons. <<set $activeSlave.health -= 10, $activeSlave.sexualFlaw = "none">> <<set _oralSeed = random(65,80)>> <<set $activeSlave.counter.oral += _oralSeed, $activeSlave.counter.publicUse += _oralSeed, $oralTotal += _oralSeed>> @@ -19695,7 +19695,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <<replace "#result">> You tell $him $he'll get fucked in the mouth until $he either gets over the idea of being special for $his education or until all $his learning is fucked out of $his head. You drag the protesting $activeSlave.slaveName out into a public plaza, restrain $him in stocks so that $his mouth is available, and inform the gathering crowd of citizens that this particular slave thinks $himself more than a fuckhole because of some fancy 'education'. <br><br> - When you return later in the evening, it becomes abundantly clear that your citizenry taught $activeSlave.slaveName a harsh lesson about a slave's place in $arcologies[0].name. $activeSlave.slaveName has certainly @@.green;learned to keep any pretentious thoughts about $his education in $his head.@@ $He did, however, @@.red;have quite a rough time@@ sucking all those dicks<<if $activeSlave.skill.oral <= 30>>, though $he did learn about sucking dick, so $he can't claim enslavement isn't educational.<<set $skillIncrease = 10>><<OralSkillIncrease $activeSlave>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons. + When you return later in the evening, it becomes abundantly clear that your citizenry taught $activeSlave.slaveName a harsh lesson about a slave's place in $arcologies[0].name. $activeSlave.slaveName has certainly @@.green;learned to keep any pretentious thoughts about $his education in $his head.@@ $He did, however, @@.red;have quite a rough time@@ sucking all those dicks<<if $activeSlave.skill.oral <= 30>>, though $he did learn about sucking dick, so $he can't claim enslavement isn't educational.<<set $skillIncrease = 10>><<= SkillIncrease.Oral($activeSlave, $skillIncrease)>><<else>>.<</if>> And last of all, you and $activeSlave.slaveName did make @@.green;quite a good impression@@ today, though for widely differing reasons. <<set $activeSlave.health -= 10>> <<set _blowBang = random(65,80)>> <<set $activeSlave.counter.oral += _blowBang, $activeSlave.counter.publicUse += _blowBang, $oralTotal += _blowBang>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 8dc3f1ead0e..5c8ab29a912 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -197,7 +197,7 @@ <</if>> <<if ($Milkmaid.skill.oral < 90)>> <<set $skillIncrease = 3>> - <<OralSkillIncrease $slaves[_FLs]>> + <<= SkillIncrease.Oral($slaves[_FLs], $skillIncrease)>> <</if>> <<if ($Milkmaid.sexualQuirk == "caring")>> <<set $milkmaidTrustBonus++>> diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw index 51ed0e9ec32..9ad5623b3ca 100644 --- a/src/uncategorized/hgApplication.tw +++ b/src/uncategorized/hgApplication.tw @@ -232,17 +232,17 @@ $He punishes $activeSlave.slaveName whenever $he sees _him2 breaking the rules y <<set $activeSlave.training = 0>> <<if ($HeadGirl.fetish == "cumslut") && ($HeadGirl.fetishStrength > 60)>> In spare moments $he teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. $His enthusiasm for oral sex is infectious. $activeSlave.slaveName's @@.green;oral skills have improved.@@ - <<set $skillIncrease = random(5,10)>><<OralSkillIncrease $activeSlave>> + <<set $skillIncrease = random(5,10)>><<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <<elseif ($HeadGirl.dick > 0) && canPenetrate($HeadGirl)>> In spare moments $he teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your Head Girl uses $his penis as an effective teaching tool. $activeSlave.slaveName's @@.green;oral skills have improved.@@ - <<set $skillIncrease = random(5,10)>><<OralSkillIncrease $activeSlave>> + <<set $skillIncrease = random(5,10)>><<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <<elseif ($HeadGirl.clit > 2)>> In spare moments $he teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. Your Head Girl uses $his pseudophallus-sized clit as an effective teaching tool. $activeSlave.slaveName's @@.green;oral skills have improved.@@ - <<set $skillIncrease = random(5,10)>><<OralSkillIncrease $activeSlave>> + <<set $skillIncrease = random(5,10)>><<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <<else>> In spare moments $he teaches $activeSlave.slaveName how to suck cocks, cunts, and assholes. $activeSlave.slaveName's @@.green;oral skills have improved.@@ <</if>> -<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<OralSkillIncrease $activeSlave>> +<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <<elseif $HGtraining == "anal skill">> diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw index 45395352ecd..d31cad5d93e 100644 --- a/src/uncategorized/ptWorkaround.tw +++ b/src/uncategorized/ptWorkaround.tw @@ -344,7 +344,7 @@ <</if>> <<if $activeSlave.skill.oral <= 10>> Since $he's orally unskilled, you start with $his mouth. $He <<if $PC.dick == 1>>sucks your dick<<else>>eats you out<</if>>, of course, but $his training is more creative than just that. You give $him delicious hard candies to suck and feed $him phallic fruits and vegetables that $he must deepthroat before $he can eat. As $his skill improves, $he wears a gag with an inward-facing dildo, which is swapped out for a bigger size every so often. You only let $him orgasm when $he's sucking, and before long $he's associating giving someone oral pleasure with experiencing pleasure $himself. @@.lime;$His oral skills have improved.@@ - <<OralSkillIncrease $activeSlave>> + <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <<elseif ($activeSlave.skill.vaginal <= 10) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>> Since $he's vaginally unskilled, and not a virgin, you start with $his pussy. @@.lime;$His vaginal skills have improved.@@ <<VaginalSkillIncrease $activeSlave>> @@ -353,7 +353,7 @@ <<AnalSkillIncrease $activeSlave>> <<elseif $activeSlave.skill.oral <= 30>> Since $he's sexually experienced, you work with $him on the finer points of oral sex. @@.lime;$His oral skills have improved.@@ - <<OralSkillIncrease $activeSlave>> + <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <<elseif ($activeSlave.skill.vaginal <= 30) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>> Since $he's sexually experienced, you work with $him on the finer points of penetrative sex. $He can already fuck pretty well, but $his muscular control could be improved. $He works $his Kegel muscles all week, using fingers, dildos, and your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> as training tools. $He becomes expert enough that $he is able to make you cum without any thrusting at all by you or any riding by $him; $he just flexes $his muscles enough to <<if $PC.dick == 0>>grind the fake phallus back against your cunt<<else>>stimulate you<</if>>. @@.lime;$His vaginal skills have improved.@@ <<VaginalSkillIncrease $activeSlave>> @@ -362,7 +362,7 @@ <<AnalSkillIncrease $activeSlave>> <<elseif $activeSlave.skill.oral < 100>> $He is already a skilled oral whore, but $his skills can be polished further. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also expand $his oral endurance, enabling $him to deepthroat for extended periods. @@.lime;$His oral skills have improved.@@ - <<OralSkillIncrease $activeSlave>> + <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> <<elseif ($activeSlave.skill.vaginal < 100) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>> $He is already a skilled pussy slut, but $his skills can be polished further. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also work with $him to develop a personal regimen of vaginal muscle exercises. This will enable $him to squeeze and massage dicks with $his practiced vaginal walls. @@.lime;$His vaginal skills have improved.@@ <<VaginalSkillIncrease $activeSlave>> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 0d2ac526e12..ce5b653defd 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -222,7 +222,7 @@ <<set $skillIncrease = 10>> <<if ($slaves[$i].skill.oral <= 30)>> $HeadGirl.slaveName wants to come home to a talented tongue, so _he2 trains $slaves[$i].slaveName's oral skills. - <<OralSkillIncrease $slaves[$i]>> + <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <<elseif ($slaves[$i].vagina > 0) && ($slaves[$i].skill.vaginal <= 30)>> $HeadGirl.slaveName wants _his2 personal sex slave to be as skilled with $his pussy as possible, so _he2 trains $slaves[$i].slaveName's vaginal skills. <<VaginalSkillIncrease $slaves[$i]>> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index e5f32975740..f0f34845cbc 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -383,7 +383,7 @@ serves you this week. <</if>> <<if ($slaves[$i].skill.oral < 100)>> After a lot of time spent <<if $PC.dick == 1>>sucking you off<<if $PC.vagina == 1>> and eating you out<</if>><<else>>eating you out<</if>>, $his oral skill improves. - <<OralSkillIncrease $slaves[$i]>> + <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <</if>> <<if $slaves[$i].fetish == "cumslut">> <<if $slaves[$i].fetishKnown == 1>> @@ -1055,7 +1055,7 @@ serves you this week. <<if $slaves[$i].fetish != "mindbroken">> <<if ($slaves[$i].skill.oral < 100)>> After a lot of time spent with <<if $PC.dick == 1>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, $his oral skill improves. - <<OralSkillIncrease $slaves[$i]>> + <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <<elseif ($slaves[$i].skill.vaginal < 100) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>> After a lot of time spent getting fucked, $his vaginal skill improves. <<VaginalSkillIncrease $slaves[$i]>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 7f7a66cf69e..b06c452632b 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1457,7 +1457,7 @@ _SlaveI.slaveName's <<if _SlaveI.relationship >= 5>>wife<<else>>lover<</if>> is older, more experienced, and <<if (_SlaveJ.skill.oral > _SlaveI.skill.oral)>> better at blowjobs than $he is. They are such good slaves that the senior _girl2 serves as a mentor to the junior, improving $his oral skills. - <<set $skillIncrease = 5>><<OralSkillIncrease _SlaveI>> + <<set $skillIncrease = 5>><<= SkillIncrease.Oral(_SlaveI, $skillIncrease)>> <<elseif (_SlaveJ.skill.anal > _SlaveI.skill.anal) && (_SlaveI.anus > 0)>> better at taking a buttfuck than $he is, and they are such good slaves that the senior _girl2 serves as a mentor to the junior, improving $his anal skills. <<set $skillIncrease = 5>><<AnalSkillIncrease _SlaveI>> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index 60ff204f23d..1e94880bc6a 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -150,7 +150,7 @@ <<set _seed = 1>> <<elseif ($slaves[$i].skill.oral <= 10)>> Since $he is orally incompetent, $he is taught basic gag reflex suppression exercises and other simple oral things. - <<OralSkillIncrease $slaves[$i]>> + <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <<elseif ($slaves[$i].skill.vaginal <= 10) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>> Since $he is unskilled at using $his pussy, $he is taught Kegel exercises and other simple vaginal skills. <<VaginalSkillIncrease $slaves[$i]>> @@ -172,7 +172,7 @@ <<elseif ($schoolroomUpgradeSkills == 1)>> <<if ($slaves[$i].skill.oral <= 30)>> Having completed the basic sex slave curriculum, $he studies more advanced ways to use $his lips and tongue to please cocks, cunts, and asses. - <<OralSkillIncrease $slaves[$i]>> + <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <<elseif ($slaves[$i].skill.whoring <= 30)>> Having completed the basic sex slave curriculum, $he studies intermediate prostitution, including how to stay as safe as possible and maximize $his efficiency. <<WhoreSkillIncrease $slaves[$i]>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index f3be3cad23d..751475dac1e 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -456,7 +456,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d <<else>> $He shows diligence, and $his sexual skills improve, according to what the customers demand<<if !canDoVaginal($slaves[$i])>> and what's possible for $him<</if>>. <<set $skillIncrease = 5+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)+$oralUseWeight>> - <<OralSkillIncrease $slaves[$i]>> + <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> <<if canDoAnal($slaves[$i])>> <<set $skillIncrease = 5+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)+$analUseWeight>> <<AnalSkillIncrease $slaves[$i]>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index e5951ea84a1..e4d9e2a7075 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -487,17 +487,6 @@ <</if>> <</widget>> -/% - Call as <<OralSkillIncrease>> - $args[0]: Slave. - $skillIncrease: Amount of increase. -%/ -<<widget "OralSkillIncrease">> - -<<= SkillIncrease.Oral($args[0], $skillIncrease)>> - -<</widget>> - /% Call as <<VaginalSkillIncrease>> $args[0]: Slave. -- GitLab