From a03ab6f5d1be61bf1eebe5687e772543c2437207 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Mon, 22 Apr 2019 19:51:50 +0200 Subject: [PATCH] EntertainSkillIncrease --- src/uncategorized/hgApplication.tw | 4 ++-- src/uncategorized/ptWorkaround.tw | 4 ++-- src/uncategorized/saLiveWithHG.tw | 2 +- src/uncategorized/saTakeClasses.tw | 4 ++-- src/utility/miscWidgets.tw | 11 ----------- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw index 0d1bbd305f4..197fa73b64e 100644 --- a/src/uncategorized/hgApplication.tw +++ b/src/uncategorized/hgApplication.tw @@ -289,11 +289,11 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2. <<set $activeSlave.training = 0>> <<if ($HeadGirl.fetish == "humiliation") && ($HeadGirl.fetishStrength > 60)>> In spare moments $he teaches $activeSlave.slaveName how to entertain. Your Head Girl's enthusiasm for public display is infectious. $activeSlave.slaveName's @@.green;entertainment skills have improved.@@ - <<set $skillIncrease = random(5,10)>><<EntertainSkillIncrease $activeSlave>> + <<set $skillIncrease = random(5,10)>><<= SkillIncrease.Entertain($activeSlave, $skillIncrease)>> <<else>> In spare moments $he teaches $activeSlave.slaveName how to entertain. $activeSlave.slaveName's @@.green;entertainment skills have improved.@@ <</if>> -<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<EntertainSkillIncrease $activeSlave>> +<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<= SkillIncrease.Entertain($activeSlave, $skillIncrease)>> <</if>> <</if>> diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw index 3e8556e6514..a1082be69c6 100644 --- a/src/uncategorized/ptWorkaround.tw +++ b/src/uncategorized/ptWorkaround.tw @@ -374,13 +374,13 @@ <<= SkillIncrease.Whore($activeSlave, $skillIncrease)>> <<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.@@ - <<EntertainSkillIncrease $activeSlave>> + <<= SkillIncrease.Entertain($activeSlave, $skillIncrease)>> <<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)>> <<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.@@ - <<EntertainSkillIncrease $activeSlave>> + <<= SkillIncrease.Entertain($activeSlave, $skillIncrease)>> <<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 d0cb5788aa0..70cd4dd5c9b 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -231,7 +231,7 @@ <<= 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. - <<EntertainSkillIncrease $slaves[$i]>> + <<= 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/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index ac4d76298aa..56992df0ab5 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -168,7 +168,7 @@ <<= 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. - <<EntertainSkillIncrease $slaves[$i]>> + <<= 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. @@ -178,7 +178,7 @@ <<= 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. - <<EntertainSkillIncrease $slaves[$i]>> + <<= 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)>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 5f93180193d..451f5fd8497 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -487,17 +487,6 @@ <</if>> <</widget>> -/% - Call as <<EntertainSkillIncrease>> - $args[0]: Slave. - $skillIncrease: Amount of increase. -%/ -<<widget "EntertainSkillIncrease">> - -<<= SkillIncrease.Entertain($args[0], $skillIncrease)>> - -<</widget>> - <<widget "Master">><<if def $args[0]>><<run Enunciate($args[0])>><<elseif ndef $titleEnunciate>><<run Enunciate($activeSlave)>><</if>>$titleEnunciate<</widget>> <<widget "say">><<if (def $args[0]) && $sayEnunciate != "lisp">>$args[0]<<else>>$sayEnunciate<</if>><</widget>> <<widget "s">>$sEnunciate<</widget>> -- GitLab