From 343bd162e642f944f4d46363127738d13207ce02 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Mon, 22 Apr 2019 22:40:20 +0200 Subject: [PATCH] second pass --- src/uncategorized/RESS.tw | 6 +++--- src/uncategorized/ptWorkaround.tw | 26 +++++++++++++------------- src/uncategorized/saLiveWithHG.tw | 10 +++++----- src/uncategorized/saPleaseYou.tw | 13 ++++++------- src/uncategorized/saTakeClasses.tw | 26 +++++++++++++------------- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 41b4088a8cc..b63f2b979b3 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -6956,14 +6956,14 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <<if $activeSlave.nipples == "fuckable">> <<set $activeSlave.counter.mammary += 2, $mammaryTotal += 2>> <</if>> - <<set $skillIncrease = 10>> + <<set _skillIncrease = 10>> <<if $activeSlave.skill.anal <= 10 && canDoAnal($activeSlave)>> $He can't help but learn how to take a rough buttfuck. - <<= SkillIncrease.Anal($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Anal($activeSlave, _skillIncrease)>> <</if>> <<if $activeSlave.skill.oral <= 10>> $He can't help but learn how to deepthroat. - <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Oral($activeSlave, _skillIncrease)>> <</if>> <</replace>> <</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take virginity//<</if>> diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw index a1082be69c6..bfaae334eef 100644 --- a/src/uncategorized/ptWorkaround.tw +++ b/src/uncategorized/ptWorkaround.tw @@ -344,43 +344,43 @@ <</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.@@ - <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Oral($activeSlave, _trainingEfficiency)>> <<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.@@ - <<= SkillIncrease.Vaginal($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Vaginal($activeSlave, _trainingEfficiency)>> <<elseif ($activeSlave.skill.anal <= 10) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>> Since $he's anally unskilled, and not an anal virgin, you start with $his ass. @@.lime;$His anal skills have improved.@@ - <<= SkillIncrease.Anal($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Anal($activeSlave, _trainingEfficiency)>> <<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.@@ - <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Oral($activeSlave, _trainingEfficiency)>> <<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.@@ - <<= SkillIncrease.Vaginal($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Vaginal($activeSlave, _trainingEfficiency)>> <<elseif ($activeSlave.skill.anal <= 30) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>> Since $he's anally experienced, you work with $him on the finer points of penetrative sex. $He can already take it up $his ass, but $his muscular control could be improved. $He works $his Kegel muscles and anal sphincter 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>>squeeze the fake phallus<<else>>stimulate you<</if>>. @@.lime;$His anal skills have improved.@@ - <<= SkillIncrease.Anal($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Anal($activeSlave, _trainingEfficiency)>> <<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.@@ - <<= SkillIncrease.Oral($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Oral($activeSlave, _trainingEfficiency)>> <<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.@@ - <<= SkillIncrease.Vaginal($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Vaginal($activeSlave, _trainingEfficiency)>> <<elseif ($activeSlave.skill.anal < 100) && ($activeSlave.anus > 0) && canDoAnal($activeSlave)>> $He is already a skilled anal bitch, 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 knowledge of sexual positions. $He learns to balance $himself on tiptoe for the challenge of standing anal sex without support. @@.lime;$His sexual skills have improved.@@ - <<= SkillIncrease.Anal($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Anal($activeSlave, _trainingEfficiency)>> <<elseif $activeSlave.skill.whoring <= 10>> Since $he's dangerously naïve about selling sex, you teach $him the basics of self protection and business. @@.lime;$His prostitution skills have improved.@@ - <<= SkillIncrease.Whore($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Whore($activeSlave, _trainingEfficiency)>> <<elseif $activeSlave.skill.entertainment <= 10>> Since $he's rough and unskilled at entertainment, you teach $him the basics of polite conversation, music, and dance. @@.lime;$His entertainment skills have improved.@@ - <<= SkillIncrease.Entertain($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Entertain($activeSlave, _trainingEfficiency)>> <<elseif $activeSlave.skill.whoring <= 30>> Since $he has only basic entertainment skills, you teach $him to steer clients to more lucrative sex acts. @@.lime;$His prostitution skills have improved.@@ - <<= SkillIncrease.Whore($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Whore($activeSlave, _trainingEfficiency)>> <<elseif $activeSlave.skill.entertainment <= 30>> Since $he has only basic entertainment skills, you teach $him more about poise and Free Cities etiquette. @@.lime;$His entertainment skills have improved.@@ - <<= SkillIncrease.Entertain($activeSlave, $skillIncrease)>> + <<= SkillIncrease.Entertain($activeSlave, _trainingEfficiency)>> <<else>> $He's learned everything you can teach, and is now a masterful <<if ($activeSlave.skill.vaginal >= 100)>> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 70cd4dd5c9b..2122ca1099f 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -219,19 +219,19 @@ <</if>> <</if>> -<<set $skillIncrease = 10>> +<<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. - <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> + <<= 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. - <<= SkillIncrease.Vaginal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Vaginal($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].anus > 0) && ($slaves[$i].skill.anal <= 30)>> $HeadGirl.slaveName wants _his2 personal sex slave to be a skillful backdoor whore, so _he2 trains $slaves[$i].slaveName's anal skills. - <<= SkillIncrease.Anal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Anal($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.entertainment <= 10)>> $HeadGirl.slaveName wants to be kept amused in _his2 occasional free time, so _he2 trains $slaves[$i].slaveName's entertainment skills. - <<= SkillIncrease.Entertain($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Entertain($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].sexualFlaw != "none")>> $HeadGirl.slaveName is annoyed by $slaves[$i].slaveName's sexual flaws, so _he2 @@.green;trains@@ $him out of them. <<set $slaves[$i].sexualFlaw = "none">> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index 8445a44ae42..baa00fa17a0 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -3,7 +3,6 @@ serves you this week. <<set _trainingEfficiency = 5+Math.trunc($slaves[$i].devotion/30)+(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>> -<<set $skillIncrease = _trainingEfficiency>> <<set _oralUse = 0, _analUse = 0, _vaginalUse = 0, _mammaryUse = 0, _penetrativeUse = 0>> <<set _fetishChangeChance = fetishChangeChance($slaves[$i])>> @@ -108,7 +107,7 @@ serves you this week. <</if>> <<if ($slaves[$i].skill.vaginal < 100)>> After a lot of time spent having vanilla sex, $his vaginal skill improves. - <<= SkillIncrease.Vaginal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Vaginal($slaves[$i], _trainingEfficiency)>> <</if>> <</if>> <<if $PC.dick == 1>> @@ -239,7 +238,7 @@ serves you this week. <</if>> <<if ($slaves[$i].skill.anal < 100)>> After a lot of time spent getting buttfucked, $his anal skill improves. - <<= SkillIncrease.Anal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Anal($slaves[$i], _trainingEfficiency)>> <</if>> <<if $slaves[$i].fetish == "buttslut">> <<if $slaves[$i].fetishKnown == 1>> @@ -383,7 +382,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. - <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Oral($slaves[$i], _trainingEfficiency)>> <</if>> <<if $slaves[$i].fetish == "cumslut">> <<if $slaves[$i].fetishKnown == 1>> @@ -1055,13 +1054,13 @@ 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. - <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Oral($slaves[$i], _trainingEfficiency)>> <<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. - <<= SkillIncrease.Vaginal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Vaginal($slaves[$i], _trainingEfficiency)>> <<elseif ($slaves[$i].skill.anal < 100) && ($slaves[$i].anus != 0) && canDoAnal($slaves[$i])>> After a lot of time spent taking it up the ass, $his anal skill improves. - <<= SkillIncrease.Anal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Anal($slaves[$i], _trainingEfficiency)>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index 56992df0ab5..a89a193792f 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -142,7 +142,7 @@ <</if>> <<set _seed = 0>> - <<set $skillIncrease = 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>> + <<set _skillIncrease = 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>> <<for _j = 0; _j < _learning; _j++>> <<if ($slaves[$i].devotion <= 20) && (_seed == 0)>> Since $he is wanting in basic obedience, $he suffers through courses on @@.hotpink;$his place@@ in the Free Cities world. @@ -150,41 +150,41 @@ <<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. - <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> + <<= 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. - <<= SkillIncrease.Vaginal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Vaginal($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.vaginal <= 10) && ($slaves[$i].vagina >= 0)>> Since $he is unskilled at using $his pussy and not permitted to learn through practice, $he is taught Kegel exercises, vaginal basics and several new positions. - <<= SkillIncrease.Vaginal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Vaginal($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.anal <= 10) && ($slaves[$i].anus > 0) && canDoAnal($slaves[$i])>> Since $he is a novice at taking it up $his butt, $he is taught relaxation exercises and other simple anal basics. - <<= SkillIncrease.Anal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Anal($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.anal <= 10) && ($slaves[$i].anus >= 0)>> Since $he is a novice at taking it up $his butt and not permitted to learn through practice, $he is taught relaxation exercises and other simple anal basics. - <<= SkillIncrease.Anal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Anal($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.whoring <= 10)>> Since $he has little idea what's involved in selling $his body, $he is taught basic safety practices and other simple prostitution skills. - <<= SkillIncrease.Whore($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Whore($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.entertainment <= 10)>> Since $his entertainment value is limited to $his holes, $he is taught simple conversational skills and other courtesan's essentials. - <<= SkillIncrease.Entertain($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Entertain($slaves[$i], _skillIncrease)>> <<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. - <<= SkillIncrease.Oral($slaves[$i], $skillIncrease)>> + <<= 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. - <<= SkillIncrease.Whore($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Whore($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.entertainment <= 30)>> Having completed the basic sex slave curriculum, $he studies courtesanship, including social dynamics and flirtation more subtle than straightforward begging for sex. - <<= SkillIncrease.Entertain($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Entertain($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.vaginal <= 30) && ($slaves[$i].vagina >= 0)>> Having completed the basic sex slave curriculum, $he studies more advanced techniques and exotic positions to make use of $his <<if $slaves[$i].vagina == 0>>virgin pussy for use in $his first time<<else>>pussy<</if>>. - <<= SkillIncrease.Vaginal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Vaginal($slaves[$i], _skillIncrease)>> <<elseif ($slaves[$i].skill.anal <= 30)>> Having completed the basic sex slave curriculum, $he studies more advanced techniques and exotic positions to make use of $his <<if $slaves[$i].vagina == 0>>virgin ass for use in $his first time<<else>>ass<</if>>. - <<= SkillIncrease.Anal($slaves[$i], $skillIncrease)>> + <<= SkillIncrease.Anal($slaves[$i], _skillIncrease)>> <</if>> <</if>> <</for>> -- GitLab