From 81a0749b713d93fbb8be6b8271877789242e7ae3 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Mon, 22 Apr 2019 19:49:49 +0200 Subject: [PATCH] WhoreSkillIncrease --- src/uncategorized/hgApplication.tw | 2 +- src/uncategorized/ptWorkaround.tw | 4 ++-- src/uncategorized/saTakeClasses.tw | 4 ++-- src/uncategorized/saWhore.tw | 2 +- src/utility/miscWidgets.tw | 11 ----------- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw index a2ca9929844..0d1bbd305f4 100644 --- a/src/uncategorized/hgApplication.tw +++ b/src/uncategorized/hgApplication.tw @@ -282,7 +282,7 @@ $He punishes $activeSlave.slaveName whenever $he sees _him2 breaking the rules y <<set $activeSlave.training = 0>> In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2. $activeSlave.slaveName's @@.green;whoring skills have improved.@@ -<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<WhoreSkillIncrease $activeSlave>> +<<set $skillIncrease = Math.ceil(_effectiveness/10)>><<= SkillIncrease.Whore($activeSlave, $skillIncrease)>> <<elseif $HGtraining == "entertain skill">> diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw index 2d119e2f829..3e8556e6514 100644 --- a/src/uncategorized/ptWorkaround.tw +++ b/src/uncategorized/ptWorkaround.tw @@ -371,13 +371,13 @@ <<= SkillIncrease.Anal($activeSlave, $skillIncrease)>> <<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.@@ - <<WhoreSkillIncrease $activeSlave>> + <<= 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>> <<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.@@ - <<WhoreSkillIncrease $activeSlave>> + <<= 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>> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index 5d58b058d2a..ac4d76298aa 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -165,7 +165,7 @@ <<= 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. - <<WhoreSkillIncrease $slaves[$i]>> + <<= 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]>> @@ -175,7 +175,7 @@ <<= 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]>> + <<= 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]>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index 437d6268a1a..c413870c919 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -470,7 +470,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d <<if ($slaves[$i].skill.whoring < 100)>> $He gains experience as a prostitute. <<set $skillIncrease = 10+Math.floor(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/32)>> - <<WhoreSkillIncrease $slaves[$i]>> + <<= SkillIncrease.Whore($slaves[$i], $skillIncrease)>> <</if>> <</if>> <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index f0ecababa15..5f93180193d 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -487,17 +487,6 @@ <</if>> <</widget>> -/% - Call as <<WhoreSkillIncrease>> - $args[0]: Slave. - $skillIncrease: Amount of increase. -%/ -<<widget "WhoreSkillIncrease">> - -<<= SkillIncrease.Whore($args[0], $skillIncrease)>> - -<</widget>> - /% Call as <<EntertainSkillIncrease>> $args[0]: Slave. -- GitLab