diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 15a8de2da1a1cd416e334ff198cfc4b830140542..5567f03b840470cb3d1dd0a2703bb621fe79ef45 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ Pregmod 04/12/2019 + 4 + -fixed issues with salon skin treatments + -fixed inflation errors + 3 -fixes diff --git a/src/js/utilJS.js b/src/js/utilJS.js index 1610af3941806f55167efba1a457a24bd7b2184a..9a818220e493659114da787fe9373181146c883f 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -1693,6 +1693,7 @@ window.changeSkinTone = function(skin, value) { } else if (newSkin < 1) { newSkin = 1; } + let prop; for (prop in skinToMelanin) { if (!skinToMelanin.hasOwnProperty(prop)) continue; if (newSkin >= skinToMelanin[prop]) return prop; diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index be562bf78006634c3c2175e7b8c87c64a44e0998..99641825de8b6877b490f20c1347e220ffdf10d7 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -643,22 +643,22 @@ $His skin is $activeSlave.skin. <<set _needsSpacers = 0>> <<if (skinToneLevel($activeSlave.skin) > 1)>> <<if _needsSpacers == 1>> | <</if>> - [[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + [[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <<set _needsSpacers = 1>> <</if>> <<if (skinToneLevel($activeSlave.skin) > 8)>> <<if _needsSpacers == 1>> | <</if>> - [[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + [[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <<set _needsSpacers = 1>> <</if>> <<if (skinToneLevel($activeSlave.skin) < 18)>> <<if _needsSpacers == 1>> | <</if>> - [[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + [[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <<set _needsSpacers = 1>> <</if>> <<if (skinToneLevel($activeSlave.skin) < 25)>> <<if _needsSpacers == 1>> | <</if>> - [[Blacken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + [[Blacken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <<set _needsSpacers = 1>> <</if>> <</if>> @@ -670,13 +670,13 @@ $His skin is $activeSlave.skin. <<elseif (skinToneLevel($activeSlave.skin) > 20)>> $His skin is so dark in color that any attempt at natural tanning is not likely to appear on $his skin. <<else>> - [["Sun tan " + $his + " skin"|Salon][$activeSlave.skin = "sun tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + [["Sun tan " + $his + " skin"|Salon][$activeSlave.skin = "sun tanned", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <<set _needsSpacers = 1>> <</if>> <</if>> <<if ($activeSlave.skin != "spray tanned")>> <<if _needsSpacers == 1>> | <</if>> - [["Spray tan " + $his + " skin"|Salon][$activeSlave.skin = "spray tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + [["Spray tan " + $his + " skin"|Salon][$activeSlave.skin = "spray tanned", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <</if>> <</if>>