From b1de40d0a8be22fee6f40c6d332856946c5bc0b1 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Wed, 9 Jun 2021 20:39:19 +1200
Subject: [PATCH 1/5] minorTweakingPool
---
src/Mods/SpecialForce/SpecialForce.js | 2 +-
src/events/recFS/recfsArabianRevivalist.js | 6 +++---
src/events/recFS/recfsAssetExpansionist.js | 6 +++---
src/events/recFS/recfsAssetExpansionistTwo.js | 6 +++---
src/events/recFS/recfsAztecRevivalist.js | 6 +++---
src/events/recFS/recfsBodyPurist.js | 6 +++---
src/events/recFS/recfsBodyPuristTwo.js | 6 +++---
src/events/recFS/recfsChattelReligionist.js | 6 +++---
src/events/recFS/recfsChattelReligionistTwo.js | 6 +++---
src/events/recFS/recfsChineseRevivalist.js | 6 +++---
src/events/recFS/recfsDegradationist.js | 6 +++---
src/events/recFS/recfsDegradationistTwo.js | 6 +++---
src/events/recFS/recfsEdoRevivalist.js | 6 +++---
src/events/recFS/recfsGenderFundamentalist.js | 6 +++---
src/events/recFS/recfsGenderFundamentalistTwo.js | 6 +++---
src/events/recFS/recfsGenderRadicalist.js | 6 +++---
src/events/recFS/recfsGenderRadicalistTwo.js | 6 +++---
src/events/recFS/recfsHedonisticDecadence.js | 6 +++---
src/events/recFS/recfsHedonisticDecadenceTwo.js | 6 +++---
src/events/recFS/recfsIntellectualDependency.js | 6 +++---
src/events/recFS/recfsIntellectualDependencyTwo.js | 6 +++---
src/events/recFS/recfsMaturityPreferentialist.js | 6 +++---
src/events/recFS/recfsMaturityPreferentialistTwo.js | 6 +++---
src/events/recFS/recfsNeoImperialist.js | 6 +++---
src/events/recFS/recfsPastoralist.js | 6 +++---
src/events/recFS/recfsPastoralistTwo.js | 6 +++---
src/events/recFS/recfsPaternalist.js | 6 +++---
src/events/recFS/recfsPaternalistTwo.js | 6 +++---
src/events/recFS/recfsPetiteAdmiration.js | 6 +++---
src/events/recFS/recfsPetiteAdmirationTwo.js | 6 +++---
src/events/recFS/recfsPhysicalIdealist.js | 6 +++---
src/events/recFS/recfsPhysicalIdealistTwo.js | 6 +++---
src/events/recFS/recfsRepopulationEfforts.js | 6 +++---
src/events/recFS/recfsRepopulationEffortsTwo.js | 6 +++---
src/events/recFS/recfsRestart.js | 6 +++---
src/events/recFS/recfsRestartTwo.js | 6 +++---
src/events/recFS/recfsRomanRevivalist.js | 6 +++---
src/events/recFS/recfsSlaveProfessionalism.js | 6 +++---
src/events/recFS/recfsSlaveProfessionalismTwo.js | 6 +++---
src/events/recFS/recfsSlimnessEnthusiast.js | 6 +++---
src/events/recFS/recfsSlimnessEnthusiastTwo.js | 6 +++---
src/events/recFS/recfsStatuesqueGlorification.js | 6 +++---
src/events/recFS/recfsStatuesqueGlorificationTwo.js | 6 +++---
src/events/recFS/recfsSubjugationist.js | 6 +++---
src/events/recFS/recfsSubjugationistTwo.js | 6 +++---
src/events/recFS/recfsSupremacist.js | 6 +++---
src/events/recFS/recfsSupremacistTwo.js | 6 +++---
src/events/recFS/recfsTransformationFetishist.js | 6 +++---
src/events/recFS/recfsTransformationFetishistTwo.js | 6 +++---
src/events/recFS/recfsYouthPreferentialist.js | 6 +++---
src/events/recFS/recfsYouthPreferentialistTwo.js | 6 +++---
src/facilities/ads.js | 2 +-
src/facilities/wardrobe/wardrobeShopping.js | 12 ++++++------
src/js/economyJS.js | 6 +++---
54 files changed, 161 insertions(+), 161 deletions(-)
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 3afc8640edd..21488906b43 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -910,7 +910,7 @@ App.SF.fsIntegration = (function() {
}
if (V.SF.FS[selectedFS].gift < 1 || (V.SF.FS[selectedFS].lv < 100 && !confictingFSs.includes(V.SF.FS[selectedFS]))) {
- InputText0 += ` [[${InputText1}|Firebase][cashX(-${cost}, "specialForcesCap"), $SF.FS.Tension += ${tension}, $SF.FS.${[selectedFS]}.gift = ${gift}, $SF.FS.${[selectedFS]}.lv += ${fsIncrease}]]`;
+ InputText0 += ` [[${InputText1}|Firebase][cashX(-${num(cost)}, "specialForcesCap"), $SF.FS.Tension += ${tension}, $SF.FS.${[selectedFS]}.gift = ${gift}, $SF.FS.${[selectedFS]}.lv += ${fsIncrease}]]`;
if (fsIncrease > 0) {
InputText0 += ` (FS acceptance:<span class='green'>+${fsIncrease}%,</span>`;
}
diff --git a/src/events/recFS/recfsArabianRevivalist.js b/src/events/recFS/recfsArabianRevivalist.js
index 6d3c928efe2..6905947b41c 100644
--- a/src/events/recFS/recfsArabianRevivalist.js
+++ b/src/events/recFS/recfsArabianRevivalist.js
@@ -56,10 +56,10 @@ App.Events.recFSArabianRevivalist = class recFSArabianRevivalist extends App.Eve
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsAssetExpansionist.js b/src/events/recFS/recfsAssetExpansionist.js
index 8cc29c2b553..f9d9fa05a04 100644
--- a/src/events/recFS/recfsAssetExpansionist.js
+++ b/src/events/recFS/recfsAssetExpansionist.js
@@ -53,10 +53,10 @@ App.Events.recFSAssetExpansionist = class recFSAssetExpansionist extends App.Eve
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsAssetExpansionistTwo.js b/src/events/recFS/recfsAssetExpansionistTwo.js
index 7d994c89fb0..faada00ba9d 100644
--- a/src/events/recFS/recfsAssetExpansionistTwo.js
+++ b/src/events/recFS/recfsAssetExpansionistTwo.js
@@ -52,10 +52,10 @@ App.Events.recFSAssetExpansionistTwo = class recFSAssetExpansionistTwo extends A
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsAztecRevivalist.js b/src/events/recFS/recfsAztecRevivalist.js
index 1f04507ede6..31704d4a8dd 100644
--- a/src/events/recFS/recfsAztecRevivalist.js
+++ b/src/events/recFS/recfsAztecRevivalist.js
@@ -52,10 +52,10 @@ App.Events.recFSAztecRevivalist = class recFSAztecRevivalist extends App.Events.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsBodyPurist.js b/src/events/recFS/recfsBodyPurist.js
index 9b410b8fc29..5b9aacaddaa 100644
--- a/src/events/recFS/recfsBodyPurist.js
+++ b/src/events/recFS/recfsBodyPurist.js
@@ -41,10 +41,10 @@ App.Events.recFSBodyPurist = class recFSBodyPurist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsBodyPuristTwo.js b/src/events/recFS/recfsBodyPuristTwo.js
index f2f2645c9a3..f0179f59ada 100644
--- a/src/events/recFS/recfsBodyPuristTwo.js
+++ b/src/events/recFS/recfsBodyPuristTwo.js
@@ -46,10 +46,10 @@ App.Events.recFSBodyPuristTwo = class recFSBodyPuristTwo extends App.Events.Base
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsChattelReligionist.js b/src/events/recFS/recfsChattelReligionist.js
index 5c0792f69c3..2750e9ec2d3 100644
--- a/src/events/recFS/recfsChattelReligionist.js
+++ b/src/events/recFS/recfsChattelReligionist.js
@@ -44,10 +44,10 @@ App.Events.recFSChattelReligionist = class recFSChattelReligionist extends App.E
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsChattelReligionistTwo.js b/src/events/recFS/recfsChattelReligionistTwo.js
index 610dd8c7885..6f5cfba913f 100644
--- a/src/events/recFS/recfsChattelReligionistTwo.js
+++ b/src/events/recFS/recfsChattelReligionistTwo.js
@@ -51,10 +51,10 @@ App.Events.recFSChattelReligionistTwo = class recFSChattelReligionistTwo extends
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsChineseRevivalist.js b/src/events/recFS/recfsChineseRevivalist.js
index ac2bcd2f8b9..6053565c420 100644
--- a/src/events/recFS/recfsChineseRevivalist.js
+++ b/src/events/recFS/recfsChineseRevivalist.js
@@ -53,10 +53,10 @@ App.Events.recFSChineseRevivalist = class recFSChineseRevivalist extends App.Eve
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsDegradationist.js b/src/events/recFS/recfsDegradationist.js
index a980fc50952..08bea97b680 100644
--- a/src/events/recFS/recfsDegradationist.js
+++ b/src/events/recFS/recfsDegradationist.js
@@ -75,10 +75,10 @@ App.Events.recFSDegradationist = class REFSDegradationist extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsDegradationistTwo.js b/src/events/recFS/recfsDegradationistTwo.js
index 64df143e00f..64ae4d7126c 100644
--- a/src/events/recFS/recfsDegradationistTwo.js
+++ b/src/events/recFS/recfsDegradationistTwo.js
@@ -62,10 +62,10 @@ App.Events.recFSDegradationistTwo = class REFSDegradationistTwo extends App.Even
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsEdoRevivalist.js b/src/events/recFS/recfsEdoRevivalist.js
index 4c9cfa5017e..dab917ef61e 100644
--- a/src/events/recFS/recfsEdoRevivalist.js
+++ b/src/events/recFS/recfsEdoRevivalist.js
@@ -54,10 +54,10 @@ App.Events.recFSEdoRevivalist = class recFSEdoRevivalist extends App.Events.Base
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsGenderFundamentalist.js b/src/events/recFS/recfsGenderFundamentalist.js
index d1c61a46509..cfaa49834da 100644
--- a/src/events/recFS/recfsGenderFundamentalist.js
+++ b/src/events/recFS/recfsGenderFundamentalist.js
@@ -48,10 +48,10 @@ App.Events.recFSGenderFundamentalist = class REFSGenderFundamentalist extends Ap
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsGenderFundamentalistTwo.js b/src/events/recFS/recfsGenderFundamentalistTwo.js
index 953a870de96..c3e4e7b3451 100644
--- a/src/events/recFS/recfsGenderFundamentalistTwo.js
+++ b/src/events/recFS/recfsGenderFundamentalistTwo.js
@@ -47,10 +47,10 @@ App.Events.recFSGenderFundamentalistTwo = class REFSGenderFundamentalistTwo exte
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsGenderRadicalist.js b/src/events/recFS/recfsGenderRadicalist.js
index c437dcfcc6d..6c58229de10 100644
--- a/src/events/recFS/recfsGenderRadicalist.js
+++ b/src/events/recFS/recfsGenderRadicalist.js
@@ -43,10 +43,10 @@ App.Events.recFSGenderRadicalist = class REFSGenderRadicalist extends App.Events
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsGenderRadicalistTwo.js b/src/events/recFS/recfsGenderRadicalistTwo.js
index a3a261f4618..ce34e04f2b3 100644
--- a/src/events/recFS/recfsGenderRadicalistTwo.js
+++ b/src/events/recFS/recfsGenderRadicalistTwo.js
@@ -46,10 +46,10 @@ App.Events.recFSGenderRadicalistTwo = class REFSGenderRadicalistTwo extends App.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsHedonisticDecadence.js b/src/events/recFS/recfsHedonisticDecadence.js
index bd0afe7b5d5..40e5adf241d 100644
--- a/src/events/recFS/recfsHedonisticDecadence.js
+++ b/src/events/recFS/recfsHedonisticDecadence.js
@@ -73,10 +73,10 @@ App.Events.recFSHedonisticDecadence = class recFSHedonisticDecadence extends App
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsHedonisticDecadenceTwo.js b/src/events/recFS/recfsHedonisticDecadenceTwo.js
index b1045cc0ffd..ba60839679e 100644
--- a/src/events/recFS/recfsHedonisticDecadenceTwo.js
+++ b/src/events/recFS/recfsHedonisticDecadenceTwo.js
@@ -52,10 +52,10 @@ App.Events.recFSHedonisticDecadenceTwo = class recFSHedonisticDecadenceTwo exten
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsIntellectualDependency.js b/src/events/recFS/recfsIntellectualDependency.js
index 2596f2c459a..bcf3b138ed2 100644
--- a/src/events/recFS/recfsIntellectualDependency.js
+++ b/src/events/recFS/recfsIntellectualDependency.js
@@ -46,10 +46,10 @@ App.Events.recFSIntellectualDependency = class REFSIntellectualDependency extend
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsIntellectualDependencyTwo.js b/src/events/recFS/recfsIntellectualDependencyTwo.js
index 3f828af1f68..72f9f6c6e5f 100644
--- a/src/events/recFS/recfsIntellectualDependencyTwo.js
+++ b/src/events/recFS/recfsIntellectualDependencyTwo.js
@@ -51,10 +51,10 @@ App.Events.recFSIntellectualDependencyTwo = class REFSIntellectualDependencyTwo
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsMaturityPreferentialist.js b/src/events/recFS/recfsMaturityPreferentialist.js
index ddf39a396c2..14050565986 100644
--- a/src/events/recFS/recfsMaturityPreferentialist.js
+++ b/src/events/recFS/recfsMaturityPreferentialist.js
@@ -57,10 +57,10 @@ App.Events.recFSMaturityPreferentialist = class recFSMaturityPreferentialist ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsMaturityPreferentialistTwo.js b/src/events/recFS/recfsMaturityPreferentialistTwo.js
index 5df9544bd25..db957ac6e5e 100644
--- a/src/events/recFS/recfsMaturityPreferentialistTwo.js
+++ b/src/events/recFS/recfsMaturityPreferentialistTwo.js
@@ -54,10 +54,10 @@ App.Events.recFSMaturityPreferentialistTwo = class recFSMaturityPreferentialistT
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsNeoImperialist.js b/src/events/recFS/recfsNeoImperialist.js
index ca8dbe87752..c1e75d93dcc 100644
--- a/src/events/recFS/recfsNeoImperialist.js
+++ b/src/events/recFS/recfsNeoImperialist.js
@@ -48,10 +48,10 @@ App.Events.recFSNeoImperialist = class recFSNeoImperialist extends App.Events.Ba
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPastoralist.js b/src/events/recFS/recfsPastoralist.js
index 5a774e01114..ea094c685d5 100644
--- a/src/events/recFS/recfsPastoralist.js
+++ b/src/events/recFS/recfsPastoralist.js
@@ -66,10 +66,10 @@ App.Events.recFSPastoralist = class REFSPastoralist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPastoralistTwo.js b/src/events/recFS/recfsPastoralistTwo.js
index 943a5e88513..434c14da1f5 100644
--- a/src/events/recFS/recfsPastoralistTwo.js
+++ b/src/events/recFS/recfsPastoralistTwo.js
@@ -52,10 +52,10 @@ App.Events.recFSPastoralistTwo = class REFSPastoralistTwo extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPaternalist.js b/src/events/recFS/recfsPaternalist.js
index 3dfba470166..3cd8cae6e28 100644
--- a/src/events/recFS/recfsPaternalist.js
+++ b/src/events/recFS/recfsPaternalist.js
@@ -47,10 +47,10 @@ App.Events.recFSPaternalist = class REFSPaternalist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPaternalistTwo.js b/src/events/recFS/recfsPaternalistTwo.js
index 1cd7468246c..ef98bea2435 100644
--- a/src/events/recFS/recfsPaternalistTwo.js
+++ b/src/events/recFS/recfsPaternalistTwo.js
@@ -43,10 +43,10 @@ App.Events.recFSPaternalistTwo = class REFSPaternalistTwo extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPetiteAdmiration.js b/src/events/recFS/recfsPetiteAdmiration.js
index 84d32700459..2b0f6ec807c 100644
--- a/src/events/recFS/recfsPetiteAdmiration.js
+++ b/src/events/recFS/recfsPetiteAdmiration.js
@@ -53,10 +53,10 @@ App.Events.recFSPetiteAdmiration = class recFSPetiteAdmiration extends App.Event
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPetiteAdmirationTwo.js b/src/events/recFS/recfsPetiteAdmirationTwo.js
index 41e625045fa..b6003fea6d6 100644
--- a/src/events/recFS/recfsPetiteAdmirationTwo.js
+++ b/src/events/recFS/recfsPetiteAdmirationTwo.js
@@ -84,10 +84,10 @@ App.Events.recFSPetiteAdmirationTwo = class recFSPetiteAdmirationTwo extends App
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPhysicalIdealist.js b/src/events/recFS/recfsPhysicalIdealist.js
index 24194d7fc4d..0977258561a 100644
--- a/src/events/recFS/recfsPhysicalIdealist.js
+++ b/src/events/recFS/recfsPhysicalIdealist.js
@@ -44,10 +44,10 @@ App.Events.recFSPhysicalIdealist = class recFSPhysicalIdealist extends App.Event
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsPhysicalIdealistTwo.js b/src/events/recFS/recfsPhysicalIdealistTwo.js
index 31afd366520..148b83472de 100644
--- a/src/events/recFS/recfsPhysicalIdealistTwo.js
+++ b/src/events/recFS/recfsPhysicalIdealistTwo.js
@@ -42,10 +42,10 @@ App.Events.recFSPhysicalIdealistTwo = class recFSPhysicalIdealistTwo extends App
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsRepopulationEfforts.js b/src/events/recFS/recfsRepopulationEfforts.js
index 02700c3e148..95454739c99 100644
--- a/src/events/recFS/recfsRepopulationEfforts.js
+++ b/src/events/recFS/recfsRepopulationEfforts.js
@@ -60,10 +60,10 @@ App.Events.recFSRepopulationEfforts = class REFSRepopulationEfforts extends App.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsRepopulationEffortsTwo.js b/src/events/recFS/recfsRepopulationEffortsTwo.js
index c0968fc8bab..138c7f3b9ad 100644
--- a/src/events/recFS/recfsRepopulationEffortsTwo.js
+++ b/src/events/recFS/recfsRepopulationEffortsTwo.js
@@ -56,10 +56,10 @@ App.Events.recFSRepopulationEffortsTwo = class REFSRepopulationEffortsTwo extend
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsRestart.js b/src/events/recFS/recfsRestart.js
index d27ad48aa75..8e65acc4684 100644
--- a/src/events/recFS/recfsRestart.js
+++ b/src/events/recFS/recfsRestart.js
@@ -47,10 +47,10 @@ App.Events.recFSRestart = class recFSRestart extends App.Events.BaseEvent {
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsRestartTwo.js b/src/events/recFS/recfsRestartTwo.js
index d8e09844fa0..c8c57eb3459 100644
--- a/src/events/recFS/recfsRestartTwo.js
+++ b/src/events/recFS/recfsRestartTwo.js
@@ -48,10 +48,10 @@ App.Events.recFSRestartTwo = class recFSRestartTwo extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsRomanRevivalist.js b/src/events/recFS/recfsRomanRevivalist.js
index 350de5d4003..ca40ebc2ba8 100644
--- a/src/events/recFS/recfsRomanRevivalist.js
+++ b/src/events/recFS/recfsRomanRevivalist.js
@@ -53,10 +53,10 @@ App.Events.recFSRomanRevivalist = class recFSRomanRevivalist extends App.Events.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSlaveProfessionalism.js b/src/events/recFS/recfsSlaveProfessionalism.js
index 9a71e538d77..877f9dfd39f 100644
--- a/src/events/recFS/recfsSlaveProfessionalism.js
+++ b/src/events/recFS/recfsSlaveProfessionalism.js
@@ -69,10 +69,10 @@ App.Events.recFSSlaveProfessionalism = class recFSSlaveProfessionalism extends A
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSlaveProfessionalismTwo.js b/src/events/recFS/recfsSlaveProfessionalismTwo.js
index 1156cf48f21..baf6af8fe69 100644
--- a/src/events/recFS/recfsSlaveProfessionalismTwo.js
+++ b/src/events/recFS/recfsSlaveProfessionalismTwo.js
@@ -57,10 +57,10 @@ App.Events.recFSSlaveProfessionalismTwo = class recFSSlaveProfessionalismTwo ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSlimnessEnthusiast.js b/src/events/recFS/recfsSlimnessEnthusiast.js
index 28e69bbf557..5222d32b827 100644
--- a/src/events/recFS/recfsSlimnessEnthusiast.js
+++ b/src/events/recFS/recfsSlimnessEnthusiast.js
@@ -56,10 +56,10 @@ App.Events.recFSSlimnessEnthusiast = class recFSSlimnessEnthusiast extends App.E
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSlimnessEnthusiastTwo.js b/src/events/recFS/recfsSlimnessEnthusiastTwo.js
index 5c6373e5b61..d8f9c0b7da3 100644
--- a/src/events/recFS/recfsSlimnessEnthusiastTwo.js
+++ b/src/events/recFS/recfsSlimnessEnthusiastTwo.js
@@ -56,10 +56,10 @@ App.Events.recFSSlimnessEnthusiastTwo = class recFSSlimnessEnthusiastTwo extends
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsStatuesqueGlorification.js b/src/events/recFS/recfsStatuesqueGlorification.js
index eeea4e40956..71ba42a0e97 100644
--- a/src/events/recFS/recfsStatuesqueGlorification.js
+++ b/src/events/recFS/recfsStatuesqueGlorification.js
@@ -40,10 +40,10 @@ App.Events.recFSStatuesqueGlorification = class recFSStatuesqueGlorification ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsStatuesqueGlorificationTwo.js b/src/events/recFS/recfsStatuesqueGlorificationTwo.js
index 3019a95b434..45adfe142a0 100644
--- a/src/events/recFS/recfsStatuesqueGlorificationTwo.js
+++ b/src/events/recFS/recfsStatuesqueGlorificationTwo.js
@@ -42,10 +42,10 @@ App.Events.recFSStatuesqueGlorificationTwo = class recFSStatuesqueGlorificationT
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSubjugationist.js b/src/events/recFS/recfsSubjugationist.js
index 34ec4eded91..ec35139c78f 100644
--- a/src/events/recFS/recfsSubjugationist.js
+++ b/src/events/recFS/recfsSubjugationist.js
@@ -45,10 +45,10 @@ App.Events.recFSSubjugationist = class REFSSubjugationist extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSubjugationistTwo.js b/src/events/recFS/recfsSubjugationistTwo.js
index 1710e127710..c7b54d92754 100644
--- a/src/events/recFS/recfsSubjugationistTwo.js
+++ b/src/events/recFS/recfsSubjugationistTwo.js
@@ -40,10 +40,10 @@ App.Events.recFSSubjugationistTwo = class REFSSubjugationistTwo extends App.Even
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSupremacist.js b/src/events/recFS/recfsSupremacist.js
index c465176225b..9ca8ed42a1b 100644
--- a/src/events/recFS/recfsSupremacist.js
+++ b/src/events/recFS/recfsSupremacist.js
@@ -39,10 +39,10 @@ App.Events.recFSSupremacist = class REFSSupremacist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsSupremacistTwo.js b/src/events/recFS/recfsSupremacistTwo.js
index 10aacd83ab7..eb8f840fba5 100644
--- a/src/events/recFS/recfsSupremacistTwo.js
+++ b/src/events/recFS/recfsSupremacistTwo.js
@@ -41,10 +41,10 @@ App.Events.recFSSupremacistTwo = class REFSSupremacistTwo extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, 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 ${him}`, enslave, `This will cost ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsTransformationFetishist.js b/src/events/recFS/recfsTransformationFetishist.js
index 03243009195..837b5ec710e 100644
--- a/src/events/recFS/recfsTransformationFetishist.js
+++ b/src/events/recFS/recfsTransformationFetishist.js
@@ -59,10 +59,10 @@ App.Events.recFSTransformationFetishist = class recFSTransformationFetishist ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsTransformationFetishistTwo.js b/src/events/recFS/recfsTransformationFetishistTwo.js
index 0a81bb63db8..175b2f4dc0c 100644
--- a/src/events/recFS/recfsTransformationFetishistTwo.js
+++ b/src/events/recFS/recfsTransformationFetishistTwo.js
@@ -61,10 +61,10 @@ App.Events.recFSTransformationFetishistTwo = class recFSTransformationFetishistT
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsYouthPreferentialist.js b/src/events/recFS/recfsYouthPreferentialist.js
index 143f3f4389d..9edc94b30d0 100644
--- a/src/events/recFS/recfsYouthPreferentialist.js
+++ b/src/events/recFS/recfsYouthPreferentialist.js
@@ -48,10 +48,10 @@ App.Events.recFSYouthPreferentialist = class recFSYouthPreferentialist extends A
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/events/recFS/recfsYouthPreferentialistTwo.js b/src/events/recFS/recfsYouthPreferentialistTwo.js
index 40e6a92faaf..ba508ee0abd 100644
--- a/src/events/recFS/recfsYouthPreferentialistTwo.js
+++ b/src/events/recFS/recfsYouthPreferentialistTwo.js
@@ -47,10 +47,10 @@ App.Events.recFSYouthPreferentialistTwo = class recFSYouthPreferentialistTwo ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${contractCost}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cost}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
} else {
- choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave $${him}.`));
+ choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
App.Events.addResponses(node, choices);
diff --git a/src/facilities/ads.js b/src/facilities/ads.js
index dd94410eb6c..ef7f9ab9439 100644
--- a/src/facilities/ads.js
+++ b/src/facilities/ads.js
@@ -1202,7 +1202,7 @@ App.Ads.report = function(building, preview = false) {
function radioLink(name, variable, value, last) {
let r = ``;
if (V[variable] !== value) {
- r += App.UI.passageLink(name, passage, `$${variable} = ${value}`);
+ r += App.UI.passageLink(name, passage, `${variable} = ${value}`);
} else {
r += name;
}
diff --git a/src/facilities/wardrobe/wardrobeShopping.js b/src/facilities/wardrobe/wardrobeShopping.js
index d0b2c2271f4..64fccef6002 100644
--- a/src/facilities/wardrobe/wardrobeShopping.js
+++ b/src/facilities/wardrobe/wardrobeShopping.js
@@ -133,15 +133,15 @@ App.UI.WardrobeShopping = function() {
}
)
);
- App.UI.DOM.appendNewElement("div", el, ` Costs ¤${cost}`, "detail");
+ App.UI.DOM.appendNewElement("div", el, ` Costs ¤${num(cost)}`, "detail");
} else {
div = App.UI.DOM.disabledLink(
`Order ${clothingObj.title}`,
- [`Cannot afford ¤${cost}`]
+ [`Cannot afford ¤${num(cost)}`]
);
div.style.display = "inline"; // Fixes disabledLink
el.append(div);
- App.UI.DOM.appendNewElement("div", el, `Costs ¤${cost}`, ["red", "detail"]);
+ App.UI.DOM.appendNewElement("div", el, `Costs ¤${num(cost)}`, ["red", "detail"]);
}
} else {
App.UI.DOM.appendNewElement("div", el, clothingObj.owned);
@@ -189,16 +189,16 @@ App.UI.WardrobeShopping = function() {
)
);
if (cost > 0) {
- App.UI.DOM.appendNewElement("span", div, ` Costs ¤${cost}`, "detail");
+ App.UI.DOM.appendNewElement("span", div, ` Costs ¤${num(cost)}`, "detail");
}
} else {
div.append(
App.UI.DOM.disabledLink(
`Order ${obj.title}`,
- [`Cannot afford ¤${cost}`]
+ [`Cannot afford ¤${num(cost)}`]
)
);
- App.UI.DOM.appendNewElement("span", div, ` Costs ¤${cost}`, ["red", "detail"]);
+ App.UI.DOM.appendNewElement("span", div, ` Costs ¤${num(cost)}`, ["red", "detail"]);
}
if (obj.hasOwnProperty("note")) {
App.UI.DOM.appendNewElement("span", div, ` ${obj.note}`, "note");
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index f9f482ea26f..2586ff28039 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -2224,7 +2224,7 @@ The third category, the "slave slot" is completely optional. Sometimes you just
*/
globalThis.cashX = function(cost, what, who) {
if (!Number.isFinite(cost)) {
- V.lastWeeksCashErrors.push(`Expected a finite number for ${what}, but got ${cost}`);
+ V.lastWeeksCashErrors.push(`Expected a finite number for ${what}, but got ${num(cost)}`);
return 0;
}
@@ -2240,7 +2240,7 @@ globalThis.cashX = function(cost, what, who) {
if (typeof V.lastWeeksCashIncome[what] !== 'undefined') {
V.lastWeeksCashIncome[what] += cost;
} else {
- V.lastWeeksCashErrors.push(`Unknown place "${what}" gained you ${cost}`);
+ V.lastWeeksCashErrors.push(`Unknown place "${what}" gained you ${num(cost)}`);
}
// record the slave, if available
@@ -2256,7 +2256,7 @@ globalThis.cashX = function(cost, what, who) {
if (typeof V.lastWeeksCashExpenses[what] !== 'undefined') {
V.lastWeeksCashExpenses[what] += cost;
} else {
- V.lastWeeksCashErrors.push(`Unknown place "${what}" charged you ${cost}`);
+ V.lastWeeksCashErrors.push(`Unknown place "${what}" charged you ${num(cost)}`);
}
// record the slave, if available
--
GitLab
From b7c492a14de62ff914b945533ce6a71f4080005c Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Wed, 9 Jun 2021 20:47:14 +1200
Subject: [PATCH 2/5] drop file
---
src/Mods/SpecialForce/SpecialForce.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 21488906b43..3afc8640edd 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -910,7 +910,7 @@ App.SF.fsIntegration = (function() {
}
if (V.SF.FS[selectedFS].gift < 1 || (V.SF.FS[selectedFS].lv < 100 && !confictingFSs.includes(V.SF.FS[selectedFS]))) {
- InputText0 += ` [[${InputText1}|Firebase][cashX(-${num(cost)}, "specialForcesCap"), $SF.FS.Tension += ${tension}, $SF.FS.${[selectedFS]}.gift = ${gift}, $SF.FS.${[selectedFS]}.lv += ${fsIncrease}]]`;
+ InputText0 += ` [[${InputText1}|Firebase][cashX(-${cost}, "specialForcesCap"), $SF.FS.Tension += ${tension}, $SF.FS.${[selectedFS]}.gift = ${gift}, $SF.FS.${[selectedFS]}.lv += ${fsIncrease}]]`;
if (fsIncrease > 0) {
InputText0 += ` (FS acceptance:<span class='green'>+${fsIncrease}%,</span>`;
}
--
GitLab
From a67eeb34e5f56245a4711144c4611bb43540df01 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Thu, 10 Jun 2021 10:08:11 +1200
Subject: [PATCH 3/5] Implement feedback
---
src/events/recFS/recfsArabianRevivalist.js | 4 ++--
src/events/recFS/recfsAssetExpansionist.js | 4 ++--
src/events/recFS/recfsAssetExpansionistTwo.js | 4 ++--
src/events/recFS/recfsAztecRevivalist.js | 4 ++--
src/events/recFS/recfsBodyPurist.js | 4 ++--
src/events/recFS/recfsBodyPuristTwo.js | 4 ++--
src/events/recFS/recfsChattelReligionist.js | 4 ++--
src/events/recFS/recfsChattelReligionistTwo.js | 4 ++--
src/events/recFS/recfsChineseRevivalist.js | 4 ++--
src/events/recFS/recfsDegradationist.js | 4 ++--
src/events/recFS/recfsDegradationistTwo.js | 4 ++--
src/events/recFS/recfsEdoRevivalist.js | 4 ++--
src/events/recFS/recfsGenderFundamentalist.js | 4 ++--
src/events/recFS/recfsGenderFundamentalistTwo.js | 4 ++--
src/events/recFS/recfsGenderRadicalist.js | 4 ++--
src/events/recFS/recfsGenderRadicalistTwo.js | 4 ++--
src/events/recFS/recfsHedonisticDecadence.js | 4 ++--
src/events/recFS/recfsHedonisticDecadenceTwo.js | 4 ++--
src/events/recFS/recfsIntellectualDependency.js | 4 ++--
src/events/recFS/recfsIntellectualDependencyTwo.js | 4 ++--
src/events/recFS/recfsMaturityPreferentialist.js | 4 ++--
src/events/recFS/recfsMaturityPreferentialistTwo.js | 4 ++--
src/events/recFS/recfsNeoImperialist.js | 4 ++--
src/events/recFS/recfsPastoralist.js | 4 ++--
src/events/recFS/recfsPastoralistTwo.js | 4 ++--
src/events/recFS/recfsPaternalist.js | 4 ++--
src/events/recFS/recfsPaternalistTwo.js | 4 ++--
src/events/recFS/recfsPetiteAdmiration.js | 4 ++--
src/events/recFS/recfsPetiteAdmirationTwo.js | 4 ++--
src/events/recFS/recfsPhysicalIdealist.js | 4 ++--
src/events/recFS/recfsPhysicalIdealistTwo.js | 4 ++--
src/events/recFS/recfsRepopulationEfforts.js | 4 ++--
src/events/recFS/recfsRepopulationEffortsTwo.js | 4 ++--
src/events/recFS/recfsRestart.js | 4 ++--
src/events/recFS/recfsRestartTwo.js | 4 ++--
src/events/recFS/recfsRomanRevivalist.js | 4 ++--
src/events/recFS/recfsSlaveProfessionalism.js | 4 ++--
src/events/recFS/recfsSlaveProfessionalismTwo.js | 4 ++--
src/events/recFS/recfsSlimnessEnthusiast.js | 4 ++--
src/events/recFS/recfsSlimnessEnthusiastTwo.js | 4 ++--
src/events/recFS/recfsStatuesqueGlorification.js | 4 ++--
src/events/recFS/recfsStatuesqueGlorificationTwo.js | 4 ++--
src/events/recFS/recfsSubjugationist.js | 4 ++--
src/events/recFS/recfsSubjugationistTwo.js | 4 ++--
src/events/recFS/recfsSupremacist.js | 4 ++--
src/events/recFS/recfsSupremacistTwo.js | 4 ++--
src/events/recFS/recfsTransformationFetishist.js | 4 ++--
src/events/recFS/recfsTransformationFetishistTwo.js | 4 ++--
src/events/recFS/recfsYouthPreferentialist.js | 4 ++--
src/events/recFS/recfsYouthPreferentialistTwo.js | 4 ++--
src/facilities/wardrobe/wardrobeShopping.js | 12 ++++++------
src/js/economyJS.js | 6 +++---
52 files changed, 109 insertions(+), 109 deletions(-)
diff --git a/src/events/recFS/recfsArabianRevivalist.js b/src/events/recFS/recfsArabianRevivalist.js
index 6905947b41c..179b882020b 100644
--- a/src/events/recFS/recfsArabianRevivalist.js
+++ b/src/events/recFS/recfsArabianRevivalist.js
@@ -56,8 +56,8 @@ App.Events.recFSArabianRevivalist = class recFSArabianRevivalist extends App.Eve
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsAssetExpansionist.js b/src/events/recFS/recfsAssetExpansionist.js
index f9d9fa05a04..59ae0bdc59b 100644
--- a/src/events/recFS/recfsAssetExpansionist.js
+++ b/src/events/recFS/recfsAssetExpansionist.js
@@ -53,8 +53,8 @@ App.Events.recFSAssetExpansionist = class recFSAssetExpansionist extends App.Eve
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsAssetExpansionistTwo.js b/src/events/recFS/recfsAssetExpansionistTwo.js
index faada00ba9d..eb3bf010f3d 100644
--- a/src/events/recFS/recfsAssetExpansionistTwo.js
+++ b/src/events/recFS/recfsAssetExpansionistTwo.js
@@ -52,8 +52,8 @@ App.Events.recFSAssetExpansionistTwo = class recFSAssetExpansionistTwo extends A
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsAztecRevivalist.js b/src/events/recFS/recfsAztecRevivalist.js
index 31704d4a8dd..6ca399b484e 100644
--- a/src/events/recFS/recfsAztecRevivalist.js
+++ b/src/events/recFS/recfsAztecRevivalist.js
@@ -52,8 +52,8 @@ App.Events.recFSAztecRevivalist = class recFSAztecRevivalist extends App.Events.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsBodyPurist.js b/src/events/recFS/recfsBodyPurist.js
index 5b9aacaddaa..a5b8af55d5a 100644
--- a/src/events/recFS/recfsBodyPurist.js
+++ b/src/events/recFS/recfsBodyPurist.js
@@ -41,8 +41,8 @@ App.Events.recFSBodyPurist = class recFSBodyPurist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsBodyPuristTwo.js b/src/events/recFS/recfsBodyPuristTwo.js
index f0179f59ada..5a3fae9d31a 100644
--- a/src/events/recFS/recfsBodyPuristTwo.js
+++ b/src/events/recFS/recfsBodyPuristTwo.js
@@ -46,8 +46,8 @@ App.Events.recFSBodyPuristTwo = class recFSBodyPuristTwo extends App.Events.Base
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsChattelReligionist.js b/src/events/recFS/recfsChattelReligionist.js
index 2750e9ec2d3..31855a3ba6b 100644
--- a/src/events/recFS/recfsChattelReligionist.js
+++ b/src/events/recFS/recfsChattelReligionist.js
@@ -44,8 +44,8 @@ App.Events.recFSChattelReligionist = class recFSChattelReligionist extends App.E
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsChattelReligionistTwo.js b/src/events/recFS/recfsChattelReligionistTwo.js
index 6f5cfba913f..eb31ca037de 100644
--- a/src/events/recFS/recfsChattelReligionistTwo.js
+++ b/src/events/recFS/recfsChattelReligionistTwo.js
@@ -51,8 +51,8 @@ App.Events.recFSChattelReligionistTwo = class recFSChattelReligionistTwo extends
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsChineseRevivalist.js b/src/events/recFS/recfsChineseRevivalist.js
index 6053565c420..1a338f050f8 100644
--- a/src/events/recFS/recfsChineseRevivalist.js
+++ b/src/events/recFS/recfsChineseRevivalist.js
@@ -53,8 +53,8 @@ App.Events.recFSChineseRevivalist = class recFSChineseRevivalist extends App.Eve
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsDegradationist.js b/src/events/recFS/recfsDegradationist.js
index 08bea97b680..690e2ffe8fa 100644
--- a/src/events/recFS/recfsDegradationist.js
+++ b/src/events/recFS/recfsDegradationist.js
@@ -75,8 +75,8 @@ App.Events.recFSDegradationist = class REFSDegradationist extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsDegradationistTwo.js b/src/events/recFS/recfsDegradationistTwo.js
index 64ae4d7126c..68acac386f8 100644
--- a/src/events/recFS/recfsDegradationistTwo.js
+++ b/src/events/recFS/recfsDegradationistTwo.js
@@ -62,8 +62,8 @@ App.Events.recFSDegradationistTwo = class REFSDegradationistTwo extends App.Even
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsEdoRevivalist.js b/src/events/recFS/recfsEdoRevivalist.js
index dab917ef61e..14ee2e67f97 100644
--- a/src/events/recFS/recfsEdoRevivalist.js
+++ b/src/events/recFS/recfsEdoRevivalist.js
@@ -54,8 +54,8 @@ App.Events.recFSEdoRevivalist = class recFSEdoRevivalist extends App.Events.Base
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsGenderFundamentalist.js b/src/events/recFS/recfsGenderFundamentalist.js
index cfaa49834da..4445323e8c8 100644
--- a/src/events/recFS/recfsGenderFundamentalist.js
+++ b/src/events/recFS/recfsGenderFundamentalist.js
@@ -48,8 +48,8 @@ App.Events.recFSGenderFundamentalist = class REFSGenderFundamentalist extends Ap
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsGenderFundamentalistTwo.js b/src/events/recFS/recfsGenderFundamentalistTwo.js
index c3e4e7b3451..614aeafda46 100644
--- a/src/events/recFS/recfsGenderFundamentalistTwo.js
+++ b/src/events/recFS/recfsGenderFundamentalistTwo.js
@@ -47,8 +47,8 @@ App.Events.recFSGenderFundamentalistTwo = class REFSGenderFundamentalistTwo exte
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsGenderRadicalist.js b/src/events/recFS/recfsGenderRadicalist.js
index 6c58229de10..8dd08cceb75 100644
--- a/src/events/recFS/recfsGenderRadicalist.js
+++ b/src/events/recFS/recfsGenderRadicalist.js
@@ -43,8 +43,8 @@ App.Events.recFSGenderRadicalist = class REFSGenderRadicalist extends App.Events
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsGenderRadicalistTwo.js b/src/events/recFS/recfsGenderRadicalistTwo.js
index ce34e04f2b3..d9a8984893a 100644
--- a/src/events/recFS/recfsGenderRadicalistTwo.js
+++ b/src/events/recFS/recfsGenderRadicalistTwo.js
@@ -46,8 +46,8 @@ App.Events.recFSGenderRadicalistTwo = class REFSGenderRadicalistTwo extends App.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsHedonisticDecadence.js b/src/events/recFS/recfsHedonisticDecadence.js
index 40e5adf241d..f1a49288f44 100644
--- a/src/events/recFS/recfsHedonisticDecadence.js
+++ b/src/events/recFS/recfsHedonisticDecadence.js
@@ -73,8 +73,8 @@ App.Events.recFSHedonisticDecadence = class recFSHedonisticDecadence extends App
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsHedonisticDecadenceTwo.js b/src/events/recFS/recfsHedonisticDecadenceTwo.js
index ba60839679e..c76d237f51a 100644
--- a/src/events/recFS/recfsHedonisticDecadenceTwo.js
+++ b/src/events/recFS/recfsHedonisticDecadenceTwo.js
@@ -52,8 +52,8 @@ App.Events.recFSHedonisticDecadenceTwo = class recFSHedonisticDecadenceTwo exten
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsIntellectualDependency.js b/src/events/recFS/recfsIntellectualDependency.js
index bcf3b138ed2..339d4ec2492 100644
--- a/src/events/recFS/recfsIntellectualDependency.js
+++ b/src/events/recFS/recfsIntellectualDependency.js
@@ -46,8 +46,8 @@ App.Events.recFSIntellectualDependency = class REFSIntellectualDependency extend
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsIntellectualDependencyTwo.js b/src/events/recFS/recfsIntellectualDependencyTwo.js
index 72f9f6c6e5f..c12a333a458 100644
--- a/src/events/recFS/recfsIntellectualDependencyTwo.js
+++ b/src/events/recFS/recfsIntellectualDependencyTwo.js
@@ -51,8 +51,8 @@ App.Events.recFSIntellectualDependencyTwo = class REFSIntellectualDependencyTwo
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsMaturityPreferentialist.js b/src/events/recFS/recfsMaturityPreferentialist.js
index 14050565986..0798776bdfe 100644
--- a/src/events/recFS/recfsMaturityPreferentialist.js
+++ b/src/events/recFS/recfsMaturityPreferentialist.js
@@ -57,8 +57,8 @@ App.Events.recFSMaturityPreferentialist = class recFSMaturityPreferentialist ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsMaturityPreferentialistTwo.js b/src/events/recFS/recfsMaturityPreferentialistTwo.js
index db957ac6e5e..a1c08db0db5 100644
--- a/src/events/recFS/recfsMaturityPreferentialistTwo.js
+++ b/src/events/recFS/recfsMaturityPreferentialistTwo.js
@@ -54,8 +54,8 @@ App.Events.recFSMaturityPreferentialistTwo = class recFSMaturityPreferentialistT
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsNeoImperialist.js b/src/events/recFS/recfsNeoImperialist.js
index c1e75d93dcc..6816ed5ef0e 100644
--- a/src/events/recFS/recfsNeoImperialist.js
+++ b/src/events/recFS/recfsNeoImperialist.js
@@ -48,8 +48,8 @@ App.Events.recFSNeoImperialist = class recFSNeoImperialist extends App.Events.Ba
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPastoralist.js b/src/events/recFS/recfsPastoralist.js
index ea094c685d5..9fa68efdce8 100644
--- a/src/events/recFS/recfsPastoralist.js
+++ b/src/events/recFS/recfsPastoralist.js
@@ -66,8 +66,8 @@ App.Events.recFSPastoralist = class REFSPastoralist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPastoralistTwo.js b/src/events/recFS/recfsPastoralistTwo.js
index 434c14da1f5..341ecc44e54 100644
--- a/src/events/recFS/recfsPastoralistTwo.js
+++ b/src/events/recFS/recfsPastoralistTwo.js
@@ -52,8 +52,8 @@ App.Events.recFSPastoralistTwo = class REFSPastoralistTwo extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPaternalist.js b/src/events/recFS/recfsPaternalist.js
index 3cd8cae6e28..6517277184c 100644
--- a/src/events/recFS/recfsPaternalist.js
+++ b/src/events/recFS/recfsPaternalist.js
@@ -47,8 +47,8 @@ App.Events.recFSPaternalist = class REFSPaternalist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPaternalistTwo.js b/src/events/recFS/recfsPaternalistTwo.js
index ef98bea2435..75ecd497e87 100644
--- a/src/events/recFS/recfsPaternalistTwo.js
+++ b/src/events/recFS/recfsPaternalistTwo.js
@@ -43,8 +43,8 @@ App.Events.recFSPaternalistTwo = class REFSPaternalistTwo extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPetiteAdmiration.js b/src/events/recFS/recfsPetiteAdmiration.js
index 2b0f6ec807c..3157008eeae 100644
--- a/src/events/recFS/recfsPetiteAdmiration.js
+++ b/src/events/recFS/recfsPetiteAdmiration.js
@@ -53,8 +53,8 @@ App.Events.recFSPetiteAdmiration = class recFSPetiteAdmiration extends App.Event
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPetiteAdmirationTwo.js b/src/events/recFS/recfsPetiteAdmirationTwo.js
index b6003fea6d6..6d34f0374dd 100644
--- a/src/events/recFS/recfsPetiteAdmirationTwo.js
+++ b/src/events/recFS/recfsPetiteAdmirationTwo.js
@@ -84,8 +84,8 @@ App.Events.recFSPetiteAdmirationTwo = class recFSPetiteAdmirationTwo extends App
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPhysicalIdealist.js b/src/events/recFS/recfsPhysicalIdealist.js
index 0977258561a..0598b81334e 100644
--- a/src/events/recFS/recfsPhysicalIdealist.js
+++ b/src/events/recFS/recfsPhysicalIdealist.js
@@ -44,8 +44,8 @@ App.Events.recFSPhysicalIdealist = class recFSPhysicalIdealist extends App.Event
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsPhysicalIdealistTwo.js b/src/events/recFS/recfsPhysicalIdealistTwo.js
index 148b83472de..17862a6be93 100644
--- a/src/events/recFS/recfsPhysicalIdealistTwo.js
+++ b/src/events/recFS/recfsPhysicalIdealistTwo.js
@@ -42,8 +42,8 @@ App.Events.recFSPhysicalIdealistTwo = class recFSPhysicalIdealistTwo extends App
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsRepopulationEfforts.js b/src/events/recFS/recfsRepopulationEfforts.js
index 95454739c99..d740f7e4541 100644
--- a/src/events/recFS/recfsRepopulationEfforts.js
+++ b/src/events/recFS/recfsRepopulationEfforts.js
@@ -60,8 +60,8 @@ App.Events.recFSRepopulationEfforts = class REFSRepopulationEfforts extends App.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsRepopulationEffortsTwo.js b/src/events/recFS/recfsRepopulationEffortsTwo.js
index 138c7f3b9ad..aae36caf9f0 100644
--- a/src/events/recFS/recfsRepopulationEffortsTwo.js
+++ b/src/events/recFS/recfsRepopulationEffortsTwo.js
@@ -56,8 +56,8 @@ App.Events.recFSRepopulationEffortsTwo = class REFSRepopulationEffortsTwo extend
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsRestart.js b/src/events/recFS/recfsRestart.js
index 8e65acc4684..1600da7a8b4 100644
--- a/src/events/recFS/recfsRestart.js
+++ b/src/events/recFS/recfsRestart.js
@@ -47,8 +47,8 @@ App.Events.recFSRestart = class recFSRestart extends App.Events.BaseEvent {
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsRestartTwo.js b/src/events/recFS/recfsRestartTwo.js
index c8c57eb3459..e72af85715e 100644
--- a/src/events/recFS/recfsRestartTwo.js
+++ b/src/events/recFS/recfsRestartTwo.js
@@ -48,8 +48,8 @@ App.Events.recFSRestartTwo = class recFSRestartTwo extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsRomanRevivalist.js b/src/events/recFS/recfsRomanRevivalist.js
index ca40ebc2ba8..b1f42e5e20a 100644
--- a/src/events/recFS/recfsRomanRevivalist.js
+++ b/src/events/recFS/recfsRomanRevivalist.js
@@ -53,8 +53,8 @@ App.Events.recFSRomanRevivalist = class recFSRomanRevivalist extends App.Events.
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSlaveProfessionalism.js b/src/events/recFS/recfsSlaveProfessionalism.js
index 877f9dfd39f..72ce2157bd1 100644
--- a/src/events/recFS/recfsSlaveProfessionalism.js
+++ b/src/events/recFS/recfsSlaveProfessionalism.js
@@ -69,8 +69,8 @@ App.Events.recFSSlaveProfessionalism = class recFSSlaveProfessionalism extends A
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSlaveProfessionalismTwo.js b/src/events/recFS/recfsSlaveProfessionalismTwo.js
index baf6af8fe69..530f7235dcf 100644
--- a/src/events/recFS/recfsSlaveProfessionalismTwo.js
+++ b/src/events/recFS/recfsSlaveProfessionalismTwo.js
@@ -57,8 +57,8 @@ App.Events.recFSSlaveProfessionalismTwo = class recFSSlaveProfessionalismTwo ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSlimnessEnthusiast.js b/src/events/recFS/recfsSlimnessEnthusiast.js
index 5222d32b827..8f26a9f2921 100644
--- a/src/events/recFS/recfsSlimnessEnthusiast.js
+++ b/src/events/recFS/recfsSlimnessEnthusiast.js
@@ -56,8 +56,8 @@ App.Events.recFSSlimnessEnthusiast = class recFSSlimnessEnthusiast extends App.E
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSlimnessEnthusiastTwo.js b/src/events/recFS/recfsSlimnessEnthusiastTwo.js
index d8f9c0b7da3..2be25768722 100644
--- a/src/events/recFS/recfsSlimnessEnthusiastTwo.js
+++ b/src/events/recFS/recfsSlimnessEnthusiastTwo.js
@@ -56,8 +56,8 @@ App.Events.recFSSlimnessEnthusiastTwo = class recFSSlimnessEnthusiastTwo extends
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsStatuesqueGlorification.js b/src/events/recFS/recfsStatuesqueGlorification.js
index 71ba42a0e97..f6039e57c63 100644
--- a/src/events/recFS/recfsStatuesqueGlorification.js
+++ b/src/events/recFS/recfsStatuesqueGlorification.js
@@ -40,8 +40,8 @@ App.Events.recFSStatuesqueGlorification = class recFSStatuesqueGlorification ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsStatuesqueGlorificationTwo.js b/src/events/recFS/recfsStatuesqueGlorificationTwo.js
index 45adfe142a0..769b7e7e247 100644
--- a/src/events/recFS/recfsStatuesqueGlorificationTwo.js
+++ b/src/events/recFS/recfsStatuesqueGlorificationTwo.js
@@ -42,8 +42,8 @@ App.Events.recFSStatuesqueGlorificationTwo = class recFSStatuesqueGlorificationT
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSubjugationist.js b/src/events/recFS/recfsSubjugationist.js
index ec35139c78f..7df357167af 100644
--- a/src/events/recFS/recfsSubjugationist.js
+++ b/src/events/recFS/recfsSubjugationist.js
@@ -45,8 +45,8 @@ App.Events.recFSSubjugationist = class REFSSubjugationist extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSubjugationistTwo.js b/src/events/recFS/recfsSubjugationistTwo.js
index c7b54d92754..7749b974883 100644
--- a/src/events/recFS/recfsSubjugationistTwo.js
+++ b/src/events/recFS/recfsSubjugationistTwo.js
@@ -40,8 +40,8 @@ App.Events.recFSSubjugationistTwo = class REFSSubjugationistTwo extends App.Even
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSupremacist.js b/src/events/recFS/recfsSupremacist.js
index 9ca8ed42a1b..ac1393a0962 100644
--- a/src/events/recFS/recfsSupremacist.js
+++ b/src/events/recFS/recfsSupremacist.js
@@ -39,8 +39,8 @@ App.Events.recFSSupremacist = class REFSSupremacist extends App.Events.BaseEvent
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsSupremacistTwo.js b/src/events/recFS/recfsSupremacistTwo.js
index eb8f840fba5..3c14dd396f3 100644
--- a/src/events/recFS/recfsSupremacistTwo.js
+++ b/src/events/recFS/recfsSupremacistTwo.js
@@ -41,8 +41,8 @@ App.Events.recFSSupremacistTwo = class REFSSupremacistTwo extends App.Events.Bas
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsTransformationFetishist.js b/src/events/recFS/recfsTransformationFetishist.js
index 837b5ec710e..a6bc02879fc 100644
--- a/src/events/recFS/recfsTransformationFetishist.js
+++ b/src/events/recFS/recfsTransformationFetishist.js
@@ -59,8 +59,8 @@ App.Events.recFSTransformationFetishist = class recFSTransformationFetishist ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsTransformationFetishistTwo.js b/src/events/recFS/recfsTransformationFetishistTwo.js
index 175b2f4dc0c..d276a2aee7f 100644
--- a/src/events/recFS/recfsTransformationFetishistTwo.js
+++ b/src/events/recFS/recfsTransformationFetishistTwo.js
@@ -61,8 +61,8 @@ App.Events.recFSTransformationFetishistTwo = class recFSTransformationFetishistT
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsYouthPreferentialist.js b/src/events/recFS/recfsYouthPreferentialist.js
index 9edc94b30d0..de14b2a9775 100644
--- a/src/events/recFS/recfsYouthPreferentialist.js
+++ b/src/events/recFS/recfsYouthPreferentialist.js
@@ -48,8 +48,8 @@ App.Events.recFSYouthPreferentialist = class recFSYouthPreferentialist extends A
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/events/recFS/recfsYouthPreferentialistTwo.js b/src/events/recFS/recfsYouthPreferentialistTwo.js
index ba508ee0abd..f24e6420812 100644
--- a/src/events/recFS/recfsYouthPreferentialistTwo.js
+++ b/src/events/recFS/recfsYouthPreferentialistTwo.js
@@ -47,8 +47,8 @@ App.Events.recFSYouthPreferentialistTwo = class recFSYouthPreferentialistTwo ext
const choices = [];
if (V.cash >= contractCost) {
- choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${num(contractCost)}`));
- choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${num(cost)}`));
+ choices.push(new App.Events.Result(`Enslave ${him}`, enslave, `This will cost in ${cashFormat(contractCost)}`));
+ choices.push(new App.Events.Result(`Sell ${him} immediately`, sell, `This will bring in ${cashFormat(cost)}`));
} else {
choices.push(new App.Events.Result(null, null, `You lack the necessary funds to enslave ${him}.`));
}
diff --git a/src/facilities/wardrobe/wardrobeShopping.js b/src/facilities/wardrobe/wardrobeShopping.js
index 64fccef6002..83512b5dce7 100644
--- a/src/facilities/wardrobe/wardrobeShopping.js
+++ b/src/facilities/wardrobe/wardrobeShopping.js
@@ -133,15 +133,15 @@ App.UI.WardrobeShopping = function() {
}
)
);
- App.UI.DOM.appendNewElement("div", el, ` Costs ¤${num(cost)}`, "detail");
+ App.UI.DOM.appendNewElement("div", el, ` Costs ${cashFormat(cost)}`, "detail");
} else {
div = App.UI.DOM.disabledLink(
`Order ${clothingObj.title}`,
- [`Cannot afford ¤${num(cost)}`]
+ [`Cannot afford ${cashFormat(cost)}`]
);
div.style.display = "inline"; // Fixes disabledLink
el.append(div);
- App.UI.DOM.appendNewElement("div", el, `Costs ¤${num(cost)}`, ["red", "detail"]);
+ App.UI.DOM.appendNewElement("div", el, `Costs ${cashFormat(cost)}`, ["red", "detail"]);
}
} else {
App.UI.DOM.appendNewElement("div", el, clothingObj.owned);
@@ -189,16 +189,16 @@ App.UI.WardrobeShopping = function() {
)
);
if (cost > 0) {
- App.UI.DOM.appendNewElement("span", div, ` Costs ¤${num(cost)}`, "detail");
+ App.UI.DOM.appendNewElement("span", div, ` Costs ${cashFormat(cost)}`, "detail");
}
} else {
div.append(
App.UI.DOM.disabledLink(
`Order ${obj.title}`,
- [`Cannot afford ¤${num(cost)}`]
+ [`Cannot afford ${cashFormat(cost)}`]
)
);
- App.UI.DOM.appendNewElement("span", div, ` Costs ¤${num(cost)}`, ["red", "detail"]);
+ App.UI.DOM.appendNewElement("span", div, ` Costs ${cashFormat(cost)}`, ["red", "detail"]);
}
if (obj.hasOwnProperty("note")) {
App.UI.DOM.appendNewElement("span", div, ` ${obj.note}`, "note");
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 2586ff28039..8271d54d3f7 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -2224,7 +2224,7 @@ The third category, the "slave slot" is completely optional. Sometimes you just
*/
globalThis.cashX = function(cost, what, who) {
if (!Number.isFinite(cost)) {
- V.lastWeeksCashErrors.push(`Expected a finite number for ${what}, but got ${num(cost)}`);
+ V.lastWeeksCashErrors.push(`Expected a finite number for ${what}, but got ${cashFormat(cost)}`);
return 0;
}
@@ -2240,7 +2240,7 @@ globalThis.cashX = function(cost, what, who) {
if (typeof V.lastWeeksCashIncome[what] !== 'undefined') {
V.lastWeeksCashIncome[what] += cost;
} else {
- V.lastWeeksCashErrors.push(`Unknown place "${what}" gained you ${num(cost)}`);
+ V.lastWeeksCashErrors.push(`Unknown place "${what}" gained you ${cashFormat(cost)}`);
}
// record the slave, if available
@@ -2256,7 +2256,7 @@ globalThis.cashX = function(cost, what, who) {
if (typeof V.lastWeeksCashExpenses[what] !== 'undefined') {
V.lastWeeksCashExpenses[what] += cost;
} else {
- V.lastWeeksCashErrors.push(`Unknown place "${what}" charged you ${num(cost)}`);
+ V.lastWeeksCashErrors.push(`Unknown place "${what}" charged you ${cashFormat(cost)}`);
}
// record the slave, if available
--
GitLab
From c8d2243175e03c3f00e3e0691d0cb84e3c537a76 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Thu, 10 Jun 2021 10:20:52 +1200
Subject: [PATCH 4/5] Additional conversions
---
src/Mods/SpecialForce/SpecialForce.js | 2 +-
src/npc/slaveStats.tw | 6 +++---
src/personalAssistant/assistantOptions.tw | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 3afc8640edd..e14b116def2 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -1406,7 +1406,7 @@ App.SF.AAR = function(endWeekCall = 1) {
upkeep = Math.ceil(upkeep);
profit = income - upkeep;
if (V.debugMode > 0 && endWeekCall > 0) {
- r += `<br>income:${num(income)}, upkeep:${num(upkeep)}, profit:${num(profit)}, troop:${num((0.09+Multiplier.troop/N0).toFixed(2))}, unit:${num((0.09+Multiplier.unit/N0).toFixed(2))}, action:${num((0.09+Multiplier.action/N0).toFixed(2))}, depravity:${num((0.09+Multiplier.depravity/N0).toFixed(2))}, N0: ${N0} N1: ${N1}`;
+ r += `<br>income:${cashFormat(income)}, upkeep:${cashFormat(upkeep)}, profit:${cashFormat(profit)}, troop:${num((0.09+Multiplier.troop/N0).toFixed(2))}, unit:${num((0.09+Multiplier.unit/N0).toFixed(2))}, action:${num((0.09+Multiplier.action/N0).toFixed(2))}, depravity:${num((0.09+Multiplier.depravity/N0).toFixed(2))}, N0: ${N0} N1: ${N1}`;
}
if (endWeekCall > 0) {
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index 919f6724fc2..163fa1c578f 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -61,13 +61,13 @@ ChoosesOwnChastity: _slave.choosesOwnChastity
<br><br>Lifetime:
<br> Cash:
-Expenses: <<= num(_slave.lifetimeCashExpenses)>>,
-Income: <<= num(_slave.lifetimeCashIncome)>>
+Expenses: <<= cashFormat(_slave.lifetimeCashExpenses)>>,
+Income: <<= cashFormat(_slave.lifetimeCashIncome)>>
<br> Rep:
Expenses: <<= num(_slave.lifetimeRepExpenses)>>,
Income: <<= num(_slave.lifetimeRepIncome)>>
<br>LastWeeks:
-<br> CashIncome: <<= num(_slave.lastWeeksCashIncome)>>
+<br> CashIncome: <<= cashFormat(_slave.lastWeeksCashIncome)>>
<br> Rep:
Expenses: <<= num(_slave.lastWeeksRepExpenses)>>,
Income: <<= num(_slave.lastWeeksRepIncome)>>
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index a8f6da47c62..0b7f941c03a 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -143,7 +143,7 @@ Seated at your desk, you glance at the visual representation of
<<run cashX(Math.trunc(-_price), "capEx")>>
<</if>>
<<goto "Assistant Appearance Pack Two">>
- <</link>> //<<if $PC.skill.hacking < 75>> Costs <<= num(_price)>> <<else>> Unencrypted files, ripe for the taking<</if>>//
+ <</link>> //<<if $PC.skill.hacking < 75>> Costs <<= cashFormat(_price)>> <<else>> Unencrypted files, ripe for the taking<</if>>//
<<else>>
You have downloaded a set of heavenly and hellish appearances for your avatar.
<</if>>
--
GitLab
From 032a61677b0590029c8366d6b1935c701593fa31 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Fri, 11 Jun 2021 01:19:57 +1200
Subject: [PATCH 5/5] use repFormat
---
src/js/economyJS.js | 6 +++---
src/npc/slaveStats.tw | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 8271d54d3f7..3e03eb3fef3 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -2287,7 +2287,7 @@ globalThis.cashX = function(cost, what, who) {
*/
globalThis.repX = function(rep, what, who) {
if (!Number.isFinite(rep)) {
- V.lastWeeksRepErrors.push(`Expected a finite number for ${what}, but got ${rep}`);
+ V.lastWeeksRepErrors.push(`Expected a finite number for ${what}, but got ${repFormat(rep)}`);
return 0;
}
@@ -2311,14 +2311,14 @@ globalThis.repX = function(rep, what, who) {
rep = Math.round(Math.pow(1000 * rep + Math.pow(V.rep, 2), 0.5) - V.rep);
V.lastWeeksRepIncome[what] += rep;
} else {
- V.lastWeeksRepErrors.push(`Unknown place "${what}" gained you ${rep}`);
+ V.lastWeeksRepErrors.push(`Unknown place "${what}" gained you ${repFormat(rep)}`);
}
} else if (rep < 0) { // EXPENSES
// record the action
if (typeof V.lastWeeksRepExpenses[what] !== 'undefined') {
V.lastWeeksRepExpenses[what] += rep;
} else {
- V.lastWeeksRepErrors.push(`Unknown place "${what}" cost you ${rep}`);
+ V.lastWeeksRepErrors.push(`Unknown place "${what}" cost you ${repFormat(rep)}`);
}
// record the slave, if available
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index 163fa1c578f..99322475d8c 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -64,13 +64,13 @@ ChoosesOwnChastity: _slave.choosesOwnChastity
Expenses: <<= cashFormat(_slave.lifetimeCashExpenses)>>,
Income: <<= cashFormat(_slave.lifetimeCashIncome)>>
<br> Rep:
-Expenses: <<= num(_slave.lifetimeRepExpenses)>>,
-Income: <<= num(_slave.lifetimeRepIncome)>>
+Expenses: <<= repFormat(_slave.lifetimeRepExpenses)>>,
+Income: <<= repFormat(_slave.lifetimeRepIncome)>>
<br>LastWeeks:
<br> CashIncome: <<= cashFormat(_slave.lastWeeksCashIncome)>>
<br> Rep:
-Expenses: <<= num(_slave.lastWeeksRepExpenses)>>,
-Income: <<= num(_slave.lastWeeksRepIncome)>>
+Expenses: <<= repFormat(_slave.lastWeeksRepExpenses)>>,
+Income: <<= repFormat(_slave.lastWeeksRepIncome)>>
<div class="tab-bar">
<button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
--
GitLab