From d7aac00c643185b8d0ff7d35d6c740bed4f1df39 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 15 Jul 2017 18:08:52 -0400 Subject: [PATCH] Fixes --- src/gui/Encyclopedia/encyclopedia.tw | 2 +- src/npc/descriptions/fBoobs.tw | 4 +-- src/uncategorized/seRaiding.tw | 7 +++--- src/utility/descriptionWidgetsStyle.tw | 2 +- src/utility/summaryWidgets.tw | 35 ++++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 src/utility/summaryWidgets.tw diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 1ed4840addf..e6120ee56f5 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -952,7 +952,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr ''anon'' for putting up with my javascript incompetence. ''anon'' for player family listing. ''anon'' for interchangeable prosthetics, advanced facial surgeries, custom nationality distribution and corporation assets overhaul. -''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, proper slave summary caching and likely one to two of these other anon credits. +''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, anaphrodisiacs, name cleaning, height overhauling, proper slave summary caching and likely one to two of these other anon credits. ''anon'' for filter by assgnment. ''anon'' for forcing dicks onto slavegirls. ''anon'' for forcing dicks into slavegirls and forced slave riding. diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw index 0a10caaae32..4c6ddac1f33 100644 --- a/src/npc/descriptions/fBoobs.tw +++ b/src/npc/descriptions/fBoobs.tw @@ -1,6 +1,5 @@ -:: FBoobs +:: FBoobs [nobr] -<<nobr>> <<set $activeSlave.mammaryCount++, $mammaryTotal++>> <<ClearSummaryCache $activeSlave>> @@ -221,4 +220,3 @@ tits. <</if>> <</for>> <</if>> -<</nobr>> diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw index 59b14442d78..8804c166f34 100644 --- a/src/uncategorized/seRaiding.tw +++ b/src/uncategorized/seRaiding.tw @@ -313,8 +313,9 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<include "Generate XX Slave">> <<set $activeSlave.career = "a classical dancer">> <<set $activeSlave.prestige = 1>> - <<set $activeSlave.face = random(-20,0)>> - <<set $activeSlave.anus to 0>> + <<set $activeSlave.prestigeDesc = "She was the pride of renowned dance troupe.">> + <<set $activeSlave.face = random(-20,40)>> + <<set $activeSlave.anus = 0>> <<set $activeSlave.vagina = 1>> <<set $activeSlave.vaginalSkill = 0>> <<set $activeSlave.analSkill = 0>> @@ -323,7 +324,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<set $activeSlave.entertainSkill = 50>> <<set $activeSlave.teeth = "normal">> <<set $activeSlave.weight = random(-100,-10)>> - is the performing arts theater at the heart of an aristocratic Old World city. The theater itself would usually not be considered a choice target, except that tonight its stage is graced by a renowned dance troupe. The jewel of the troupe's cast is a young girl<<if $pedo_mode == 0, barely past her majority,<</if>> whose performance has been said to bring tears to the eyes of audiences the world over. + is the performing arts theater at the heart of an aristocratic Old World city. The theater itself would usually not be considered a choice target, except that tonight its stage is graced by a renowned dance troupe. The jewel of the troupe's cast is a young girl<<if $pedo_mode == 0>>, barely past her majority,<</if>> whose performance has been said to bring tears to the eyes of audiences the world over. <<elseif $origin == "law enforcement officer">> <<if $pedo_mode == 1>> <<set $activeSlaveOneTimeMinAge = 18>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index d07df51c2f0..1a74c92b312 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -2706,7 +2706,7 @@ $possessiveCap <<elseif ($activeSlave.shoes == "extreme heels")>> painfully high heels that match $possessive teddy. <<else>> - $possesive bare feet. + $possessive bare feet. <</if>> <<case "a slutty maid outfit">> diff --git a/src/utility/summaryWidgets.tw b/src/utility/summaryWidgets.tw new file mode 100644 index 00000000000..5a91443c700 --- /dev/null +++ b/src/utility/summaryWidgets.tw @@ -0,0 +1,35 @@ +:: Summary Widgets [widget nobr] + +/% + Call as <<SlaveStatClamp $slave>> +%/ +<<widget "SlaveStatClamp">> +<<set $args[0].energy = Math.clamp($args[0].energy, 0, 100)>> + +<<if $args[0].devotion > 100>> + <<if $args[0].trust < -95>> + <<set $args[0].trust = -100>> + <<elseif ($args[0].trust < 100) && ($args[0].trust >= -20)>> + <<set $args[0].trust += Math.trunc($args[0].devotion-100)>> + <<else>> + <<set $rep += 10*($args[0].devotion-100)>> + <</if>> + <<set $args[0].devotion = 100>> +<<elseif $args[0].devotion < -95>> + <<set $args[0].devotion = -100>> +<</if>> +<<if $args[0].trust > 100>> + <<if $args[0].devotion < -95>> + <<set $args[0].devotion = -100>> + <<elseif $args[0].devotion < 100>> + <<set $args[0].devotion += Math.trunc($args[0].trust-100)>> + <<else>> + <<set $rep += 10*($args[0].trust-100)>> + <</if>> + <<set $args[0].trust = 100>> +<<elseif $args[0].trust < -95>> + <<set $args[0].trust = -100>> +<</if>> +<<if $args[0].trust < -100>><<set $args[0].trust = -100>><</if>> +<<if $args[0].devotion < -100>><<set $args[0].devotion = -100>><</if>> +<</widget>> -- GitLab