From 55b0ac1a5d40eb6f93e63c11a8d24f24af72fc8b Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Thu, 14 Feb 2019 17:39:52 +0100 Subject: [PATCH] Devotion overflow and serve the public balance --- src/js/summaryWidgets.js | 4 ++-- src/uncategorized/saServeThePublic.tw | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/summaryWidgets.js b/src/js/summaryWidgets.js index 43a3266e738..6af4e66e07c 100644 --- a/src/js/summaryWidgets.js +++ b/src/js/summaryWidgets.js @@ -8,7 +8,7 @@ window.SlaveStatClamp = /** @param {App.Entity.SlaveState} slave */ function Sla else if ((slave.trust < 100) && (slave.trust > 20)) slave.trust += (Math.trunc((slave.devotion-100)*5)/10); else - repX(10*(slave.devotion-100), "slavesViewOfPC", slave); + repX(4*(slave.devotion-100), "slavesViewOfPC", slave); slave.devotion = 100; } else if (slave.devotion < -95) slave.devotion = -100; @@ -18,7 +18,7 @@ window.SlaveStatClamp = /** @param {App.Entity.SlaveState} slave */ function Sla else if (slave.devotion < 100 && slave.devotion > 20) slave.devotion += Math.trunc(slave.trust-100); else - repX(10*(slave.trust-100), "slavesViewOfPC", slave); + repX(4*(slave.trust-100), "slavesViewOfPC", slave); slave.trust = 100; } else if (slave.trust < -95) slave.trust = -100; diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index cf48b56d4c5..95a3b696af0 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -1053,13 +1053,13 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <<if ($slaves[$i].assignment == "recruit girls")>> <<elseif $slaves[$i].assignment == "serve in the club">> - <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.1), "publicServantClub", $slaves[$i])>> + <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.15), "publicServantClub", $slaves[$i])>> <<elseif $slaves[$i].assignment == "serve the public">> - <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.1), "publicServant", $slaves[$i])>> + <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.15), "publicServant", $slaves[$i])>> <<else>> - <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.1), "serving the public in an unregistered building", $slaves[$i])>> + <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.15), "serving the public in an unregistered building", $slaves[$i])>> <</if>> -<<set _incomeStats.income += Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.1)>> +<<set _incomeStats.income += Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[$i].entertainSkill))*0.15)>> /* FACILITY DECORATION IMPACTS */ -- GitLab