diff --git a/src/events/recETS/recetsAddictMotherDaughter.js b/src/events/recETS/recetsAddictMotherDaughter.js index db3f4f0315bce2e4c8b2d6dd3ee232164c6c4f07..c73e503a99528ea0904b329a2f09d0fc4114e6c4 100644 --- a/src/events/recETS/recetsAddictMotherDaughter.js +++ b/src/events/recETS/recetsAddictMotherDaughter.js @@ -68,7 +68,7 @@ App.Events.recetsAddictMotherDaughter = class recetsAddictMotherDaughter extends const choices = []; if (V.cash >= contractCost) { - choices.push(new App.Events.Result(`Accept ${his} proposal and enslave ${him}`, enslave, `This will cost ${contractCost}`)); + choices.push(new App.Events.Result(`Accept ${his} proposal and enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`)); choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost - contractCost)}`)); if (V.cash >= (contractCost * 2)) { choices.push(new App.Events.Result(`Manipulate ${him} to enslave both mother and ${daughter2}`, both, `This will cost ${cashFormat(contractCost * 2)}`)); diff --git a/src/events/recETS/recetsMismatchedPair.js b/src/events/recETS/recetsMismatchedPair.js index 63b8f80d381d3e20218a697aecf3030d8a64cf5c..ede9d5c653a9994c91df5ca99a060e5c59b07e7c 100644 --- a/src/events/recETS/recetsMismatchedPair.js +++ b/src/events/recETS/recetsMismatchedPair.js @@ -114,8 +114,8 @@ App.Events.recetsMismatchedPair = class recetsMismatchedPair extends App.Events. const choices = []; if (V.cash >= contractCost) { - choices.push(new App.Events.Result(`Enslave the sissy slut`, enslave, `This will cost ${contractCost}`)); - choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`)); + choices.push(new App.Events.Result(`Enslave the sissy slut`, enslave, `This will cost ${cashFormat(contractCost)}`)); + choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`)); if (V.cash >= (contractCost * 2)) { choices.push(new App.Events.Result(`Enslave both`, both, `This will cost ${cashFormat(contractCost * 2)}`)); } diff --git a/src/events/scheduled/seFctvRemote.js b/src/events/scheduled/seFctvRemote.js index f36306360c6dcdfc69659542f950f3f6c129a794..c70011e8ddd86bca34ff858ed2bb62aeddf93897 100644 --- a/src/events/scheduled/seFctvRemote.js +++ b/src/events/scheduled/seFctvRemote.js @@ -312,7 +312,7 @@ App.Events.SEfctvRemote = class SEfctvRemote extends App.Events.BaseEvent { choices.push(new App.Events.Result(`Enslave ${him}`, enslave)); choices.push(new App.Events.Result(`Sentence ${him} to a day in a wall with a TV, then enslave ${him}`, stocks)); } else { - choices.push(new App.Events.Result(null, null, `Cannot afford the ${contractCost} to enslave`)); + choices.push(new App.Events.Result(null, null, `Cannot afford the ${cashFormat(contractCost)} to enslave`)); } choices.push(new App.Events.Result(`Let ${him} go`, release)); choices.push(new App.Events.Result(`Let ${him} go but release the footage`, releaseFootage)); diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js index a21b82c831a33624b17bde9135b6e487bfc47d6a..fff3a3d306e310b91148163ed4884c8ed2a1d43d 100644 --- a/src/js/slaveCostJS.js +++ b/src/js/slaveCostJS.js @@ -382,7 +382,7 @@ globalThis.BeautyArray = (function() { break; case "freckles": case "heavily freckled": - if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10)) { + if (skinToneLevel(slave.skin).isBetween(5, 10)) { adjustBeauty("Freckles", 2); if (App.Data.misc.redheadColors.includes(slave.hColor)) { adjustBeauty("Freckles: Redhead", 2); diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js index a8eadc79375588f086cab2c6b37d4010346c8a88..1436e041d18382fdc1d9993c5f6b2470d11a7e3e 100644 --- a/src/npc/descriptions/skin.js +++ b/src/npc/descriptions/skin.js @@ -77,7 +77,7 @@ App.Desc.skin = function(slave, descType) { r.push(`${slave.skin} and lightly spotted.`); } else if (slave.markings === "freckles") { r.push(`${slave.skin} and lightly`); - if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) { + if (skinToneLevel(slave.skin).isBetween(5, 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) { r.push(`freckled, an attractive combination.`); } else { r.push(`freckled.`); @@ -86,7 +86,7 @@ App.Desc.skin = function(slave, descType) { r.push(`${slave.skin} and heavily spotted.`); } else if (slave.markings === "heavily freckled") { r.push(`${slave.skin} and heavily`); - if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) { + if (skinToneLevel(slave.skin).isBetween(5, 10) && (App.Data.misc.redheadColors.includes(slave.hColor))) { r.push(`freckled, an attractive combination.`); } else { r.push(`freckled.`);