From 8ee81bbca9f8fb36de2aaaf9a3efbdcbd848e95f Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Sun, 10 Mar 2019 00:23:21 -0500
Subject: [PATCH] Replaced commaNum() and numberToWords() with num()
---
devNotes/Useful JS Function Documentation.txt | 5 +-
src/SecExp/attackHandler.tw | 40 +--
src/SecExp/attackReport.tw | 32 +-
src/SecExp/encyclopediaSecExpMain.tw | 2 +-
src/SecExp/rebellionHandler.tw | 36 +--
src/SecExp/rebellionOptions.tw | 16 +-
src/SecExp/rebellionReport.tw | 12 +-
src/SecExp/secBarracks.tw | 8 +-
src/SecExp/securityHQ.tw | 2 +-
src/SecExp/securityReport.tw | 2 +-
src/SecExp/unitsBattleReport.tw | 4 +-
src/SecExp/unitsRebellionReport.tw | 2 +-
src/SecExp/weaponsManufacturing.tw | 2 +-
src/SpecialForce/SpecialForce.js | 6 +-
src/SpecialForce/WeeklyChoices.tw | 4 +-
src/cheats/mod_EditArcologyCheat.tw | 2 +-
src/facilities/farmyard/farmyard.tw | 2 +-
.../nursery/longChildDescription.tw | 12 +-
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/js/economyJS.js | 3 +-
src/js/utilJS.js | 277 +++++++++---------
src/pregmod/analyzePlayerPregnancy.tw | 2 +-
src/pregmod/analyzePregnancy.tw | 2 +-
src/pregmod/manageCorporation.tw | 2 +-
src/pregmod/managePersonalAffairs.tw | 28 +-
src/pregmod/rePregInventorText.tw | 2 +-
src/pregmod/widgets/economyWidgets.tw | 24 +-
src/uncategorized/arcmgmt.tw | 6 +-
src/uncategorized/arcologyDescription.tw | 2 +-
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/buySlaves.tw | 6 +-
src/uncategorized/costsReport.tw | 6 +-
src/uncategorized/costsWidgets.tw | 14 +-
src/uncategorized/longSlaveDescription.tw | 16 +-
src/uncategorized/manageArcology.tw | 14 +-
src/uncategorized/manufacturing.tw | 2 +-
src/uncategorized/pens.tw | 6 +-
src/uncategorized/policies.tw | 12 +-
src/uncategorized/reRecruit.tw | 4 +-
src/uncategorized/repBudget.tw | 2 +-
src/uncategorized/reputation.tw | 6 +-
src/uncategorized/seNonlethalPit.tw | 2 +-
src/uncategorized/storyCaption.tw | 6 +-
src/utility/descriptionWidgetsFlesh.tw | 74 ++---
src/utility/descriptionWidgetsStyle.tw | 2 +-
45 files changed, 357 insertions(+), 356 deletions(-)
diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 53c2eebea66..1c43d2d4bae 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -167,8 +167,9 @@ lispReplace(string) - Returns the string lispified.
nippleColor(slave) - Returns the slave's nipple color.
UtilJS [script]
- commaNum() - Returns the value thousand separated with ',' if $formatNumbers > 0 else provides the raw value.
- line 138 of src/SpecialForce/Report.tw, '...focused their <<print commaNum($SFUnit.Troops)>> troops'
+ TODO: update this
+ num() - Returns the value thousand separated with ',' if $formatNumbers > 0 else provides the raw value.
+ line 138 of src/SpecialForce/Report.tw, '...focused their <<print num($SFUnit.Troops)>> troops'
if $formatNumbers > 0 'focused their 1,589 troops' else 'focused their 1589 troops'
cashFormat() - uses the above function to return the value thousand separated with ',' if $formatNumbers > 0 else provides the raw value. either way prepends ¤ (the fc domination) symbol.
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 75abf368f29..72baef5108d 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -1120,14 +1120,14 @@
<br>
<br>
__Army__:
- <br>troops: <<print commaNum(Math.round($troopCount))>>
- <br>attack: <<print commaNum(Math.round(_attack))>>
- <br>defense: <<print commaNum(Math.round(_defense))>>
- <br>hp: <<print commaNum(Math.round(_hp))>>
- <br>morale: <<print commaNum(Math.round(_morale))>>
+ <br>troops: <<print num(Math.round($troopCount))>>
+ <br>attack: <<print num(Math.round(_attack))>>
+ <br>defense: <<print num(Math.round(_defense))>>
+ <br>hp: <<print num(Math.round(_hp))>>
+ <br>morale: <<print num(Math.round(_morale))>>
<br>attack modifier: <<if _atkMod > 0>>+<</if>>_atkMod%
<br>defense modifier: <<if _defMod > 0>>+<</if>>_defMod%
- <br>average base HP: <<print commaNum(Math.round(_baseHp))>>
+ <br>average base HP: <<print num(Math.round(_baseHp))>>
<br>militia morale modifier: <<if _militiaMod > 0>>+<</if>>_militiaMod%
<br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod%
<br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod%
@@ -1143,17 +1143,17 @@
<br>
<br>
__Tactics__:
- <br>tactic chance of success: <<print commaNum(Math.round(_tacChance * 100))>>%
+ <br>tactic chance of success: <<print num(Math.round(_tacChance * 100))>>%
<br>was tactic chosen successful?: <<if $tacticsSuccessful == 1>> yes <<else>> no<</if>>
<br>
<br>
__Enemy__:
- <br>enemy troops: <<print commaNum(Math.round($attackTroops))>>
- <br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>>
- <br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>>
- <br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>>
- <br>enemy morale: <<print commaNum(Math.round(_enemyMorale))>>
- <br>enemy base Hp: <<print commaNum(Math.round(_enemyBaseHp))>>
+ <br>enemy troops: <<print num(Math.round($attackTroops))>>
+ <br>enemy attack: <<print num(Math.round(_enemyAttack))>>
+ <br>enemy defense: <<print num(Math.round(_enemyDefense))>>
+ <br>enemy Hp: <<print num(Math.round(_enemyHp))>>
+ <br>enemy morale: <<print num(Math.round(_enemyMorale))>>
+ <br>enemy base Hp: <<print num(Math.round(_enemyBaseHp))>>
<br>enemy morale modifier: <<if _enemyMod > 0>>+<</if>>_enemyMod%
<<if _enemyMoraleTroopMod > 0>>
<br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
@@ -1168,15 +1168,15 @@
/* player army attacks */
<<set _damage = Math.clamp(_attack - _enemyDefense,_attack * 0.1,_attack)>>
<br>
- <<if $showBattleStatistics == 1>> player damage: <<print commaNum(Math.round(_damage))>><</if>>
+ <<if $showBattleStatistics == 1>> player damage: <<print num(Math.round(_damage))>><</if>>
<<set _enemyHp -= _damage>>
<br>
- <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print commaNum(Math.round(_enemyHp))>><</if>>
+ <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print num(Math.round(_enemyHp))>><</if>>
<<set $enemyLosses += _damage / _enemyBaseHp>>
<<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _enemyBaseHp,0,_damage*1.5)>>
<<set _enemyMorale -= _moraleDamage>>
<br>
- <<if $showBattleStatistics == 1>> remaining enemy morale: <<print commaNum(Math.round(_enemyMorale))>><</if>>
+ <<if $showBattleStatistics == 1>> remaining enemy morale: <<print num(Math.round(_enemyMorale))>><</if>>
<<if _enemyHp <= 0 || _enemyMorale <= 0>>
<br>
<<if $showBattleStatistics == 1>> <br>Victory!<</if>>
@@ -1191,10 +1191,10 @@
<<set _damage = _enemyAttack * 0.1>>
<</if>>
<br>
- <<if $showBattleStatistics == 1>> enemy damage: <<print commaNum(Math.round(_damage))>><</if>>
+ <<if $showBattleStatistics == 1>> enemy damage: <<print num(Math.round(_damage))>><</if>>
<<set _hp -= _damage>>
<br>
- <<if $showBattleStatistics == 1>> remaining hp: <<print commaNum(Math.round(_hp))>><</if>>
+ <<if $showBattleStatistics == 1>> remaining hp: <<print num(Math.round(_hp))>><</if>>
<<set $losses += _damage / _baseHp>>
<<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _baseHp,0,_damage*1.5)>>
<<set _morale -= _moraleDamage>>
@@ -1221,8 +1221,8 @@
<<if $showBattleStatistics == 1>>
<br>
- <br>Losses: <<print commaNum(Math.trunc($losses))>>
- <br>Enemy losses: <<print commaNum(Math.trunc($enemyLosses))>>
+ <br>Losses: <<print num(Math.trunc($losses))>>
+ <br>Enemy losses: <<print num(Math.trunc($enemyLosses))>>
<</if>>
<<if $battleResult > 3 || $battleResult < -3>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 72e1d536430..c258dbdf444 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -130,9 +130,9 @@
<hr>
<<if $attackType == "raiders">>
- Today, the _day of _month _year, our arcology was attacked by a band of wild raiders, <<print commaNum(Math.trunc($attackTroops))>> men strong.
+ Today, the _day of _month _year, our arcology was attacked by a band of wild raiders, <<print num(Math.trunc($attackTroops))>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
- Our defense forces, <<print commaNum(Math.trunc($troopCount))>> strong, clashed with them
+ Our defense forces, <<print num(Math.trunc($troopCount))>> strong, clashed with them
<<if $battleTerrain == "urban">>
in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
<<elseif $battleTerrain == "rural">>
@@ -149,9 +149,9 @@
in the wastelands outside the free city territory,
<</if>>
<<if $enemyLosses != $attackTroops>>
- inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
+ inflicting <<print num(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
<<else>>
- completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
+ completely annihilating their troops, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
<</if>>
<</if>>
<<if $battleResult == 3>>
@@ -192,9 +192,9 @@
You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
<</if>>
<<elseif $attackType == "free city">>
- Today, the _day of _month _year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, <<print commaNum(Math.trunc($attackTroops))>> men strong.
+ Today, the _day of _month _year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, <<print num(Math.trunc($attackTroops))>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
- Our defense forces, <<print commaNum(Math.trunc($troopCount))>> strong, clashed with them
+ Our defense forces, <<print num(Math.trunc($troopCount))>> strong, clashed with them
<<if $battleTerrain == "urban">>
in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
<<elseif $battleTerrain == "rural">>
@@ -211,9 +211,9 @@
in the wastelands outside the free city territory,
<</if>>
<<if $enemyLosses != $attackTroops>>
- inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
+ inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
<<else>>
- completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty.<<else>> zero casualties.<</if>>
+ completely annihilating their troops, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty.<<else>> zero casualties.<</if>>
<</if>>
<</if>>
<<if $battleResult == 3>>
@@ -254,9 +254,9 @@
You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
<</if>>
<<elseif $attackType == "freedom fighters">>
- Today, the _day of _month _year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, <<print commaNum(Math.trunc($attackTroops))>> men strong.
+ Today, the _day of _month _year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, <<print num(Math.trunc($attackTroops))>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
- Our defense forces, <<print commaNum(Math.trunc($troopCount))>> strong, clashed with them
+ Our defense forces, <<print num(Math.trunc($troopCount))>> strong, clashed with them
<<if $battleTerrain == "urban">>
in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
<<elseif $battleTerrain == "rural">>
@@ -273,9 +273,9 @@
in the wastelands outside the free city territory,
<</if>>
<<if $enemyLosses != $attackTroops>>
- inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
+ inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
<<else>>
- completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
+ completely annihilating their troops, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
<</if>>
<</if>>
<<if $battleResult == 3>>
@@ -316,9 +316,9 @@
You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
<</if>>
<<elseif $attackType == "old world">>
- Today, the _day of _month _year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, <<print commaNum(Math.trunc($attackTroops))>> men strong.
+ Today, the _day of _month _year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, <<print num(Math.trunc($attackTroops))>> men strong.
<<if $battleResult != 1 && $battleResult != 0 && $battleResult != -1>>
- Our defense forces, <<print commaNum(Math.trunc($troopCount))>> strong, clashed with them
+ Our defense forces, <<print num(Math.trunc($troopCount))>> strong, clashed with them
<<if $battleTerrain == "urban">>
in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
<<elseif $battleTerrain == "rural">>
@@ -335,9 +335,9 @@
in the wastelands outside the free city territory,
<</if>>
<<if $enemyLosses != $attackTroops>>
- inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
+ inflicting <<print $enemyLosses>> casualties, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<elseif $losses > 0>> a casualty <<else>> zero <</if>> themselves.
<<else>>
- completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
+ completely annihilating their troops, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties. <<elseif $losses > 0>> a casualty. <<else>> zero casualties.<</if>>
<</if>>
<</if>>
<<if $battleResult == 3>>
diff --git a/src/SecExp/encyclopediaSecExpMain.tw b/src/SecExp/encyclopediaSecExpMain.tw
index ceac9dd53b6..10d0f182caf 100644
--- a/src/SecExp/encyclopediaSecExpMain.tw
+++ b/src/SecExp/encyclopediaSecExpMain.tw
@@ -11,7 +11,7 @@
<br><br>Statistics:
@@.darkviolet; <br><strong>Authority</strong>:@@
<br> Representing the power the player holds over the arcology. If @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ is how well the protagonist is known, @@.darkviolet;authority@@ is how much is feared or respected.
- Authority influences many things, but it is mainly used to enact edicts, who, similarly to policies, allow to shape the sociopolitical profile of your arcology. Like @@.green;reputation,@@ @@.darkviolet;authority@@ has a maximum of <<print commaNum(20000)>>.
+ Authority influences many things, but it is mainly used to enact edicts, who, similarly to policies, allow to shape the sociopolitical profile of your arcology. Like @@.green;reputation,@@ @@.darkviolet;authority@@ has a maximum of <<print num(20000)>>.
@@.deepskyblue;<br> <br><strong>Security</strong>:@@
<br> Representing how safe the arcology is, how likely it is for a citizen to get stabbed, killed or simply mugged in the streets as well as wider concerns like
diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw
index 57ced876ffc..07186a0b433 100644
--- a/src/SecExp/rebellionHandler.tw
+++ b/src/SecExp/rebellionHandler.tw
@@ -318,25 +318,25 @@ __Difficulty__:
<br>
<br>
__Army__:
-<br>troops: <<print commaNum(Math.round($troopCount))>>
-<br>attack: <<print commaNum(Math.round(_attack))>>
-<br>defense: <<print commaNum(Math.round(_defense))>>
+<br>troops: <<print num(Math.round($troopCount))>>
+<br>attack: <<print num(Math.round(_attack))>>
+<br>defense: <<print num(Math.round(_defense))>>
<br>engagement rule modifier: <<if _engageMod > 0>>+<</if>><<print _engageMod>>%
-<br>Hp: <<print commaNum(Math.round(_hp))>>
-<br>base HP: <<print commaNum(Math.round(_baseHp))>>
-<br>morale: <<print commaNum(Math.round(_morale))>>
+<br>Hp: <<print num(Math.round(_hp))>>
+<br>base HP: <<print num(Math.round(_baseHp))>>
+<br>morale: <<print num(Math.round(_morale))>>
<<if _enemyMoraleTroopMod > 0>>
<br>morale increase due to troop numbers: +<<print _moraleTroopMod>>%
<</if>>
<br>
<br>
__Rebels__:
-<br>enemy troops: <<print commaNum(Math.round($attackTroops))>>
-<br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>>
-<br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>>
-<br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>>
-<br>enemy base Hp: <<print commaNum(Math.round(_enemyBaseHp))>>
-<br>enemy morale: <<print commaNum(Math.round(_enemyMorale))>>
+<br>enemy troops: <<print num(Math.round($attackTroops))>>
+<br>enemy attack: <<print num(Math.round(_enemyAttack))>>
+<br>enemy defense: <<print num(Math.round(_enemyDefense))>>
+<br>enemy Hp: <<print num(Math.round(_enemyHp))>>
+<br>enemy base Hp: <<print num(Math.round(_enemyBaseHp))>>
+<br>enemy morale: <<print num(Math.round(_enemyMorale))>>
<<if _enemyMoraleTroopMod > 0>>
<br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
<</if>>
@@ -350,15 +350,15 @@ __Rebels__:
/* player army attacks */
<<set _damage = Math.clamp(_attack - _enemyDefense,_attack * 0.1,_attack)>>
<br>
- <<if $showBattleStatistics == 1>> player damage: <<print commaNum(Math.round(_damage))>><</if>>
+ <<if $showBattleStatistics == 1>> player damage: <<print num(Math.round(_damage))>><</if>>
<<set _enemyHp -= _damage>>
<br>
- <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print commaNum(Math.round(_enemyHp))>><</if>>
+ <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print num(Math.round(_enemyHp))>><</if>>
<<set $enemyLosses += _damage / _enemyBaseHp>>
<<set _moraleDamage = Math.clamp(_damage/ 2 + _damage / _enemyBaseHp,0,_damage*1.5)>>
<<set _enemyMorale -= _moraleDamage>>
<br>
- <<if $showBattleStatistics == 1>> remaining enemy morale: <<print commaNum(Math.round(_enemyMorale))>><</if>>
+ <<if $showBattleStatistics == 1>> remaining enemy morale: <<print num(Math.round(_enemyMorale))>><</if>>
<<if _enemyHp <= 0 || _enemyMorale <= 0>>
<<if $showBattleStatistics == 1>> <br>Victory!<</if>>
<<set $battleResult = 3>>
@@ -372,16 +372,16 @@ __Rebels__:
<<set _damage = _enemyAttack * 0.1>>
<</if>>
<br>
- <<if $showBattleStatistics == 1>> enemy damage: <<print commaNum(Math.round(_damage))>><</if>>
+ <<if $showBattleStatistics == 1>> enemy damage: <<print num(Math.round(_damage))>><</if>>
<<if $SFGear>> <<set _S = .85>> <<else>> <<set _S = 1>> <</if>>
<<set _hp -= _damage*_S>>
<br>
- <<if $showBattleStatistics == 1>> remaining hp: <<print commaNum(Math.round(_hp))>><</if>>
+ <<if $showBattleStatistics == 1>> remaining hp: <<print num(Math.round(_hp))>><</if>>
<<set $losses += _damage / _baseHp>>
<<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _baseHp,0,_damage*1.5)>>
<<set _morale -= _moraleDamage>>
<br>
- <<if $showBattleStatistics == 1>> remaining morale: <<print commaNum(Math.round(_morale))>><</if>>
+ <<if $showBattleStatistics == 1>> remaining morale: <<print num(Math.round(_morale))>><</if>>
<<if _hp <= 0 || _morale <= 0>>
<<if $showBattleStatistics == 1>> <br>Defeat!<</if>>
<<set $battleResult = -3>>
diff --git a/src/SecExp/rebellionOptions.tw b/src/SecExp/rebellionOptions.tw
index 0935bf038e6..68818878f8c 100644
--- a/src/SecExp/rebellionOptions.tw
+++ b/src/SecExp/rebellionOptions.tw
@@ -11,7 +11,7 @@
<<if $slaveRebellion == 1>>
In the end it happened, the slaves of your arcology dared took up arms and rose up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting slaves and the security forces.
- It appears <strong><<print commaNum(Math.trunc($attackTroops))>></strong> rebels are in the streets right now, building barricades and freeing their peers. They are
+ It appears <strong><<print num(Math.trunc($attackTroops))>></strong> rebels are in the streets right now, building barricades and freeing their peers. They are
<<if $attackEquip <= 0>>
<strong>poorly armed</strong>.
<<elseif $attackEquip == 1>>
@@ -24,7 +24,7 @@
<strong>extremely well armed</strong>.
<</if>>
<<if $irregulars > 0>>
- <<print commaNum(Math.trunc($irregulars))>> of your citizens took up arms to defend their arcology owner.
+ <<print num(Math.trunc($irregulars))>> of your citizens took up arms to defend their arcology owner.
<</if>>
<<set _count = 0>>
<<if $rebellingID.length > 0>>
@@ -97,16 +97,16 @@
<</if>>
<</if>>
<</for>>
- <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SF.Squad.Troops)>> strong<</if>>
+ <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print num($SF.Squad.Troops)>> strong<</if>>
are called to defend the arcology from this menace.
<<else>>
- <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SF.Squad.Troops)>> strong<</if>> <</if>>
+ <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print num($SF.Squad.Troops)>> strong<</if>> <</if>>
are called to defend the arcology from this menace.
<</if>>
<hr>
<<else>>
In the end it happened, the citizens of your arcology dared took up arms and rose up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting residents and the security forces.
- It appears <<print commaNum(Math.trunc($attackTroops))>> rebels are in the streets right now, building barricades and destroying your property. They are
+ It appears <<print num(Math.trunc($attackTroops))>> rebels are in the streets right now, building barricades and destroying your property. They are
<<if $attackEquip <= 0>>
<strong>poorly armed</strong>.
<<elseif $attackEquip == 1>>
@@ -119,7 +119,7 @@
<strong>extremely well armed</strong>.
<</if>>
<<if $irregulars > 0>>
- <<print commaNum(Math.trunc($irregulars))>> of your citizens took up arms to defend their arcology owner.
+ <<print num(Math.trunc($irregulars))>> of your citizens took up arms to defend their arcology owner.
<</if>>
<<set _count = 0>>
<br>
@@ -192,10 +192,10 @@
<</if>>
<</if>>
<</for>>
- <<if $securityForceActive == 1>>and $securityForceName, <<print commaNum($securityForcePersonnel)>> strong<</if>>
+ <<if $securityForceActive == 1>>and $securityForceName, <<print num($securityForcePersonnel)>> strong<</if>>
are called to defend the arcology from this menace.
<<else>>
- <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and $securityForceName, <<print commaNum($securityForcePersonnel)>> strong<</if>><</if>>
+ <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and $securityForceName, <<print num($securityForcePersonnel)>> strong<</if>><</if>>
are called to defend the arcology from this menace.
<</if>>
<hr>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index afef8415185..14f6afe0087 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -82,11 +82,11 @@
<hr>
<<if $slaveRebellion == 1>>
- Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print commaNum(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, <<print commaNum(Math.trunc($troopCount))>> strong, fought with them street by street
+ Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print num(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, <<print num(Math.trunc($troopCount))>> strong, fought with them street by street
<<if $enemyLosses != $attackTroops>>
- inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
+ inflicting <<print num(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
<<else>>
- completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
+ completely annihilating their troops, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
<</if>>
<<if $SFGear>>
More units were able to survive thanks to wearing $SF.Lower's combat armor suits.
@@ -214,11 +214,11 @@
<<set $rebelDefeatAftermath = 5>>
<</if>>
<<else>>
- Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print commaNum(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up to dethrone their arcology owner. Our defense force, <<print commaNum($troopCount)>> strong, fought with them street by street
+ Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print num(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up to dethrone their arcology owner. Our defense force, <<print num($troopCount)>> strong, fought with them street by street
<<if $enemyLosses != $attackTroops>>
- inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
+ inflicting <<print num(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
<<else>>
- completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
+ completely annihilating their troops, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
<</if>>
<<if $SFGear>>
More units were able to survive thanks to wearing $SF.Lower's combat armor suits.
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index 05ece2be7e1..3e790e49e25 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -130,7 +130,7 @@ While this a sore sight for many citizens of $arcologies[0].name, the barracks s
<hr>
__Units__
<br>
-Your current maximum number of units is <<print $maxUnits>> (<<print commaNum($secBots.maxTroops+(50*$maxUnits))>> troops), <<print $activeUnits>> (<<print commaNum($secBots.maxTroops+($slavesEmployedManpower)+($militiaEmployedManpower)+($mercEmployedManpower))>> troops) are active and <<print (2 * $readiness)>> units can be deployed. <<if $secBarracksUpgrades.luxury > 0>>The barracks provides <<print $secBarracksUpgrades.luxury * 5>>% bonus morale when battle occurs.<</if>> <<if $secBarracksUpgrades.training > 0>>The training facility will increase the effectiveness of your units with time.<</if>>
+Your current maximum number of units is <<print $maxUnits>> (<<print num($secBots.maxTroops+(50*$maxUnits))>> troops), <<print $activeUnits>> (<<print num($secBots.maxTroops+($slavesEmployedManpower)+($militiaEmployedManpower)+($mercEmployedManpower))>> troops) are active and <<print (2 * $readiness)>> units can be deployed. <<if $secBarracksUpgrades.luxury > 0>>The barracks provides <<print $secBarracksUpgrades.luxury * 5>>% bonus morale when battle occurs.<</if>> <<if $secBarracksUpgrades.training > 0>>The training facility will increase the effectiveness of your units with time.<</if>>
<<if $activeUnits >= $maxUnits>>
<br>You have reached the maximum number of units. You'll have to disband one or enlarge the barracks before forming a new unit.
<</if>>
@@ -165,7 +165,7 @@ Your current maximum number of units is <<print $maxUnits>> (<<print commaNum($s
<br><br>__Slaves__
<br>/* slaves */
-You are free to organize your menial slaves into fighting units. Currently you have <<print commaNum($menials)>> slaves available, while <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print commaNum($slavesTotalCasualties)>>.
+You are free to organize your menial slaves into fighting units. Currently you have <<print num($menials)>> slaves available, while <<print num($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print num($slavesTotalCasualties)>>.
<<silently>><<= MenialPopCap()>><</silently>>
<<set _menialPrice = menialSlaveCost()>>
<<set _bulkMax = $PopCap-$menials-$fuckdolls-$menialBioreactors>>
@@ -302,7 +302,7 @@ __Militia__
<<elseif $militiaRecruitment == 2>>
By establishing obligatory military service to obtain citizenship you have enlarged your manpower pool to be approximately 5% of the arcology's citizens population.
<</if>>
- Your current total manpower is <<print commaNum($militiaTotalManpower)>>, of which <<print commaNum($militiaEmployedManpower)>> is in active duty. You lost in total <<print commaNum($militiaTotalCasualties)>> citizens, leaving you with <<print commaNum($militiaFreeManpower)>> available citizens.
+ Your current total manpower is <<print num($militiaTotalManpower)>>, of which <<print num($militiaEmployedManpower)>> is in active duty. You lost in total <<print num($militiaTotalCasualties)>> citizens, leaving you with <<print num($militiaFreeManpower)>> available citizens.
<br>
<<set _mL = $militiaUnits.length>>
<<if $militiaFreeManpower > 0 && $activeUnits < $maxUnits>>
@@ -419,7 +419,7 @@ __Militia__
__Mercenaries__
<br>/* mercenaries */
With the installation of a mercenary company in the arcology, many other are attracted to your free city, hoping to land a contract with you.
- You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print commaNum($mercTotalManpower)>> mercenaries in your arcology, of which <<print commaNum($mercEmployedManpower)>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print commaNum($mercTotalCasualties)>> mercenaries have died defending your arcology.
+ You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print num($mercTotalManpower)>> mercenaries in your arcology, of which <<print num($mercEmployedManpower)>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print num($mercTotalCasualties)>> mercenaries have died defending your arcology.
<br>
<<set _meL = $mercUnits.length>>
<<if $mercFreeManpower > 0 && $activeUnits < $maxUnits>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index dee3622d2a2..c0f4bac243d 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -15,7 +15,7 @@ Security headquarters
The security headquarters stand in front of you. Innumerable screens flood with light the great central room. <<if $secMenials > 0>>Some slaves see you enter and interrupt their work to greet you.<</if>> From here you can build a safe and prosperous arcology.
<br>
/* security level. Slaves */
-You have <span id="secHel"> <<print commaNum($secMenials)>> </span> slaves working in the HQ. $reqMenials are required and you have <span id="hel"> <<print commaNum($menials)>> </span> free menial slaves.
+You have <span id="secHel"> <<print num($secMenials)>> </span> slaves working in the HQ. $reqMenials are required and you have <span id="hel"> <<print num($menials)>> </span> free menial slaves.
<<if $secMenials < $reqMenials>>
You do not have enough slaves here. You will not receive the full benefit of the installed upgrades.
<<else>>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index fa1ea2cb75d..38fd379631b 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -21,7 +21,7 @@
<strong>Security</strong>:
<<if $secMenials > 0>>
- <<print commaNum($secMenials)>> slaves work to improve the security of your arcology,
+ <<print num($secMenials)>> slaves work to improve the security of your arcology,
<<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>>
while your mercenaries and security drones tirelessly patrol the streets to keep them safe.
<<elseif $arcologyUpgrade.drones == 1>>
diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw
index 5e61ee17df9..fce1092cc1b 100644
--- a/src/SecExp/unitsBattleReport.tw
+++ b/src/SecExp/unitsBattleReport.tw
@@ -7,7 +7,7 @@
<</if>>
<<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<br>
- <<print commaNum($SF.Squad.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered.
+ <<print num($SF.Squad.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered.
<</if>>
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
@@ -126,7 +126,7 @@
<br>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$SF.Squad.Troops)>>
- <<print commaNum($SF.Squad.Troops)>> soldiers from $SF.Lower joined the battle:
+ <<print num($SF.Squad.Troops)>> soldiers from $SF.Lower joined the battle:
<<if _loss <= 0>>
no casualties
<<elseif _loss <= 10>>
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 62e03082e5d..235bbacc991 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -9,7 +9,7 @@
Security drones: no casualties suffered.
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br>$SF.Lower, <<print commaNum($SF.Squad.Troops)>> strong, was called to join the battle: no casualties suffered.
+ <br>$SF.Lower, <<print num($SF.Squad.Troops)>> strong, was called to join the battle: no casualties suffered.
<</if>>
<<set _count = 0>>
<<if $loyalID.length > 0>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 02c30b35092..889fe12a0c7 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -30,7 +30,7 @@ many small old world nations as the advanced technology that free cities have av
<</if>>
<br>
<<if $weapMenials> 0>>Assigned here are $weapMenials slaves working to produce as much equipment as possible.<<else>>There are no assigned menial slaves here. The spaces is manned exclusively by low rank citizens.<</if>>
-You own <<print commaNum($menials)>> free menial slaves. This manufacturing complex can house 500 at most, with <<print 500 - $weapMenials>> free slots.
+You own <<print num($menials)>> free menial slaves. This manufacturing complex can house 500 at most, with <<print 500 - $weapMenials>> free slots.
<br>
<<silently>><<= MenialPopCap()>><</silently>>
<<set _menialPrice = menialSlaveCost()>>
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index b08de3d40cd..2f7dbda0dbb 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -364,7 +364,7 @@ window.SFReport = function() {
if (V.secExp > 0) V.authority += V.SF.Size*10; V.authority=Math.clamp(V.authority, 0, 20000);
income += Math.ceil( ( (baseLine* (0.09+Multiplier.troop/NO).toFixed(2) * (0.09+Multiplier.unit/NO).toFixed(2) * (0.09+Multiplier.action/NO).toFixed(2) * (0.09+Multiplier.depravity/NO).toFixed(2) ) - (upkeep*N1).toFixed(2) )/V.SF.Size/5+S.Troops/1000 ); S.Troops += Math.round(FNG/2);
- if (V.debugMode > 0) r += `<br>income:${commaNum(income)}, troop:${commaNum((0.09+Multiplier.troop/NO).toFixed(2))}, unit:${commaNum((0.09+Multiplier.unit/NO).toFixed(2))}, action:${commaNum((0.09+Multiplier.action/NO).toFixed(2))}, depravity:${commaNum((0.09+Multiplier.depravity/NO).toFixed(2))}, upkeep:${commaNum((upkeep*N1).toFixed(2))}`;
+ if (V.debugMode > 0) r += `<br>income:${num(income)}, troop:${num((0.09+Multiplier.troop/NO).toFixed(2))}, unit:${num((0.09+Multiplier.unit/NO).toFixed(2))}, action:${num((0.09+Multiplier.action/NO).toFixed(2))}, depravity:${num((0.09+Multiplier.depravity/NO).toFixed(2))}, upkeep:${num((upkeep*N1).toFixed(2))}`;
if (V.economy < 100) if (V.SF.Target === "raiding") { income=Math.ceil(income*14); } else if (V.SF.Target === "secure") { income=Math.ceil(income*20); } else { income=Math.ceil(income*50); } //Remove line if hard mode ever gets fixed.
if (income >= target) profit=1; delete V.SF.Subsidy; cashX(income, "specialForces");
if (S.Troops > unitCap) S.Troops=unitCap;
@@ -380,7 +380,7 @@ window.SFReport = function() {
V.SF.Colonel.Talk=0; V.SF.Colonel.Fun=0;
r += `<br>__Week ${V.week} operational report for ${V.SF.Lower}__:`;
- r += `<br>${V.SF.Caps} focused their ${commaNum(S.Troops)} troops on `;
+ r += `<br>${V.SF.Caps} focused their ${num(S.Troops)} troops on `;
if (V.SF.Target === "recruit") {
r += `recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.`;
} else if (V.SF.Target === "secure") {
@@ -559,7 +559,7 @@ window.FlavourText = function(View) {
"use strict"; const V=State.variables,T=State.temporary,S=V.SF.Squad;
V.nextButton = "Return to Operations"; V.nextLink = "Firebase"; V.Tour=0;
function TroopDec() {
- const common=`the ${commaNum(V.SF.Squad.Troops)} members of ${V.SF.Lower}`;
+ const common=`the ${num(V.SF.Squad.Troops)} members of ${V.SF.Lower}`;
if (S.Troops < 100) {return `sparsely occupied, ${common} residing within them concentrating together in a corner. The hundreds of empty beds and lockers visibly herald the future`;}
else if (S.Troops < 400) {return `lightly occupied, with ${common} starting to spread out across them`;}
else if (S.Troops < 800) {return `moderately occupied, though ${common} residing within have a considerable amount of extra room`;}
diff --git a/src/SpecialForce/WeeklyChoices.tw b/src/SpecialForce/WeeklyChoices.tw
index 03c38a19a46..df7fafea2f6 100644
--- a/src/SpecialForce/WeeklyChoices.tw
+++ b/src/SpecialForce/WeeklyChoices.tw
@@ -52,8 +52,8 @@
<br>"If you need me for anything else, let me know."
<<if $SF.MercCon.History >= 1>> <br>
<<link "Merc meetup report.">> <<replace "#result0">>
- <br><br>While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
- <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
+ <br><br>While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print num($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print num($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
+ <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print num($SF.MercCon.TotalMenials)>> menial slaves and <<print num($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</replace>> <</link>>
<</if>>
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index 6b60c017d4e..481603859e9 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -186,7 +186,7 @@ Custom: <<textbox "$language" $language "MOD_Edit Arcology Cheat">>
<</if>>
<</nobr>>*/
-<br>Arcology sex slaves: <<print commaNum($NPCSlaves)>>
+<br>Arcology sex slaves: <<print num($NPCSlaves)>>
<<textbox "$NPCSlaves" $NPCSlaves>>
<br>Arcology prosperity: $arcologies[0].prosperity
<<textbox "$arcologies[0].prosperity" $arcologies[0].prosperity>>
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index 84c46326557..4ddcf9de863 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -111,7 +111,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
Assigned here are $farmMenials slaves working to produce as much food as possible.
<</if>>
<<if $farmMenialsSpace > 0>>
- You <<if $menials > 0>> own <<print commaNum($menials)>><<else>>don't own any<</if>> free menial slaves. $farmyardNameCaps can house <<print $farmMenialsSpace>> menial slaves total, with <<print $farmMenialsSpace - $farmMenials>> free slots.
+ You <<if $menials > 0>> own <<print num($menials)>><<else>>don't own any<</if>> free menial slaves. $farmyardNameCaps can house <<print $farmMenialsSpace>> menial slaves total, with <<print $farmMenialsSpace - $farmMenials>> free slots.
<</if>>
<br>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 8c06c38cd19..16f2b93a3e5 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -243,23 +243,23 @@ $he's
<</if>>
<<if ($activeChild.oralCount + $activeChild.vaginalCount + $activeChild.analCount + $activeChild.mammaryCount + $activeChild.penetrativeCount) > 0>>
- and has been fucked about <<print commaNum($activeChild.oralCount + $activeChild.vaginalCount + $activeChild.analCount + $activeChild.mammaryCount + $activeChild.penetrativeCount)>> times, including
+ and has been fucked about <<print num($activeChild.oralCount + $activeChild.vaginalCount + $activeChild.analCount + $activeChild.mammaryCount + $activeChild.penetrativeCount)>> times, including
<<if $activeChild.mammaryCount > 0>>
- <<print commaNum($activeChild.mammaryCount)>> mammary,
+ <<print num($activeChild.mammaryCount)>> mammary,
<</if>>
<<if $activeChild.vaginalCount > 0>>
- <<print commaNum($activeChild.vaginalCount)>> vanilla,
+ <<print num($activeChild.vaginalCount)>> vanilla,
<</if>>
<<if $activeChild.analCount > 0>>
- <<print commaNum($activeChild.analCount)>> anal,
+ <<print num($activeChild.analCount)>> anal,
<</if>>
<<if $activeChild.penetrativeCount > 0>>
- <<print commaNum($activeChild.penetrativeCount)>> penetrating,
+ <<print num($activeChild.penetrativeCount)>> penetrating,
<</if>>
<<if ($activeChild.penetrativeCount+$activeChild.mammaryCount+$activeChild.vaginalCount+$activeChild.analCount) > 0>>
and
<</if>>
- <<print commaNum($activeChild.oralCount)>> oral sexual encounters.
+ <<print num($activeChild.oralCount)>> oral sexual encounters.
<<else>>
<<if $week-$activeChild.weekAcquired >= 1>>
and
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 9398dfcbdfa..4632adc3195 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1740,7 +1740,7 @@ FUTURE SOCIETIES
<br><br>— Lawrence, W. G., //Guide to Modern Slavery, Online Edition. Accessed April 2, 2032.////
- <br><br>''Future Society Models'' are societal goals the player can select and pursue for the arcology. It is possible to maintain four future society goals at once. The first is unlocked after week 5 for players with greater than rumored(<<print commaNum(3000)>>) @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]],@@ or at game start with the Social Engineering character option; the rest unlock as the player achieves higher @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ levels.
+ <br><br>''Future Society Models'' are societal goals the player can select and pursue for the arcology. It is possible to maintain four future society goals at once. The first is unlocked after week 5 for players with greater than rumored(<<print num(3000)>>) @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]],@@ or at game start with the Social Engineering character option; the rest unlock as the player achieves higher @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ levels.
<br><br>All societies approve of specific things, usually slaves with specific characteristics; some societies also have dislikes. All societies are advanced by the things they approve of and slowed by the things they disapprove of, and all societies give and take @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ when approving and disapproving. All societies unlock unique events, arcology upgrades, and slave behaviors; some even unlock special clothing.
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index e2441ada283..287993ff216 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1217,7 +1217,6 @@ window.forceNeg = function(x) {
return -Math.abs(x);
};
-
Number.prototype.toFixedHTML = function() {
- return commaNum(Number.prototype.toFixed.apply(this, arguments)).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>');
+ return num(Number.prototype.toFixed.apply(this, arguments)).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>');
};
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index e1d6c6340dc..109d5aa1efc 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -465,6 +465,7 @@ As a categorizer
<</if>>
<<print $cats.muscleCat.cat(_Slave.muscles)>>
*/
+
window.Categorizer = function() {
this.cats = Array.prototype.slice.call(arguments)
.filter(function(e, i, a) {
@@ -477,6 +478,7 @@ window.Categorizer = function() {
return b[0] - a[0]; /* reverse sort */
});
};
+
window.Categorizer.prototype.cat = function(val, def) {
let result = def;
if (typeof val === 'number' && !isNaN(val)) {
@@ -495,21 +497,129 @@ window.Categorizer.prototype.cat = function(val, def) {
return result;
};
-window.commaNum = function(s) {
- if (!s) {
- return 0;
+window.num = function(x) {
+ const V = State.variables;
+ let max = V.showNumbersMax;
+
+ function commaNum(s) {
+ if (!s) {
+ return 0;
+ }
+ if (State.variables.formatNumbers !== 1) {
+ return s;
+ }
+ return s.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
}
- if (State.variables.formatNumbers !== 1) {
- return s;
+
+ if (V.showNumbers !== 2) {
+ if (x === 0) {
+ return 'zero';
+ }
+
+ let ONE_TO_NINETEEN = [
+ 'one', 'two', 'three', 'four', 'five',
+ 'six', 'seven', 'eight', 'nine', 'ten',
+ 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen',
+ 'sixteen', 'seventeen', 'eighteen', 'nineteen',
+ ];
+
+ let TENS = [
+ 'ten', 'twenty', 'thirty', 'forty', 'fifty',
+ 'sixty', 'seventy', 'eighty', 'ninety',
+ ];
+
+ let SCALES = ['thousand', 'million', 'billion', 'trillion'];
+
+ // helper function for use with Array.filter
+ function isTruthy(item) {
+ return !!item;
+ }
+
+ // convert a number into "chunks" of 0-999
+ function chunk(number) {
+ let thousands = [];
+
+ while (number > 0) {
+ thousands.push(number % 1000);
+ number = Math.floor(number / 1000);
+ }
+
+ return thousands;
+ }
+
+ // translate a number from 1-999 into English
+ function inEnglish(number) {
+ let hundreds;
+ let tens;
+ let ones;
+ let words = [];
+
+ if (number < 20) {
+ return ONE_TO_NINETEEN[number - 1]; // may be undefined
+ }
+
+ if (number < 100) {
+ ones = number % 10;
+ tens = number / 10 | 0; // equivalent to Math.floor(number / 10)
+
+ words.push(TENS[tens - 1]);
+ words.push(inEnglish(ones));
+
+ return words.filter(isTruthy).join('-');
+ }
+
+ hundreds = number / 100 | 0;
+ words.push(inEnglish(hundreds));
+ words.push('hundred');
+ words.push(inEnglish(number % 100));
+
+ return words.filter(isTruthy).join(' ');
+ }
+
+ // append the word for a scale. Made for use with Array.map
+ function appendScale(chunk, exp) {
+ let scale;
+ if (!chunk) {
+ return null;
+ }
+ scale = SCALES[exp - 1];
+ return [chunk, scale].filter(isTruthy).join(' ');
+ }
+
+ let string = chunk(x)
+ .map(inEnglish)
+ .map(appendScale)
+ .filter(isTruthy)
+ .reverse()
+ .join(' ');
+
+ if (V.showNumbers === 1) {
+ if (x <= max) {
+ if (x > 0) {
+ return string;
+ } else {
+ return `negative ${ string}`;
+ }
+ } else {
+ return commaNum(x);
+ }
+ } else {
+ if (x > 0) {
+ return string;
+ } else {
+ return `negative ${ string}`;
+ }
+ }
+ } else {
+ return commaNum(x);
}
- return s.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
window.cashFormat = function(s) {
if (!s) {
s = 0;
}
- return `¤${ commaNum(s)}`;
+ return `¤${ num(s)}`;
};
window.repFormat = function(s) {
@@ -517,11 +627,11 @@ window.repFormat = function(s) {
/* if (!s) { s = 0; }*/
if (V.cheatMode === 1 || V.debugMode === 1) {
if (s > 0) {
- return `@@.green;${ commaNum(Math.round(s * 100) / 100) } rep@@`;
+ return `@@.green;${ num(Math.round(s * 100) / 100) } rep@@`;
} else if (s < 0) {
- return `@@.red;${ commaNum(Math.round(s * 100) / 100) } rep@@`;
+ return `@@.red;${ num(Math.round(s * 100) / 100) } rep@@`;
} else {
- return `${commaNum(Math.round(s * 100) / 100) } rep`;
+ return `${num(Math.round(s * 100) / 100) } rep`;
}
} else {
/* In order to calculate just how much any one category matters so we can show a "fuzzy" symbolic value to the player, we need to know how "busy" reputation was this week. To calculate this, I ADD income to expenses. Why? 100 - 100 and 10000 - 10000 BOTH are 0, but a +50 event matters a lot more in the first case than the second. I exclude overflow from the calculation because it's not a "real" expense for our purposes, and divide by half just to make percentages a bit easier. */
@@ -553,6 +663,22 @@ window.repFormat = function(s) {
}
};
+window.massFormat = function (s) {
+ if (!s) {
+ s = 0;
+ }
+ if (s >= 1000) {
+ s = num(Math.trunc(s / 1000));
+ if (s !== 1) {
+ return `${s} tons`;
+ } else {
+ return `${s} ton`;
+ }
+ } else {
+ return `${num(s)} kg`;
+ }
+};
+
window.budgetLine = function(category, title) {
let income;
let expenses;
@@ -604,22 +730,6 @@ window.budgetLine = function(category, title) {
}
};
-window.massFormat = function(s) {
- if (!s) {
- s = 0;
- }
- if (s >= 1000) {
- s = commaNum(Math.trunc(s / 1000));
- if (s !== 1) {
- return `${s} tons`;
- } else {
- return `${s} ton`;
- }
- } else {
- return `${commaNum(s)} kg`;
- }
-};
-
window.isFloat = function(n) {
return n === +n && n !== (n|0);
};
@@ -628,115 +738,6 @@ window.isInt = function(n) {
return n === +n && n === (n|0);
};
-window.numberWithCommas = function(x) {
- return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-};
-
-window.numberToWords = function(x) {
- const V = State.variables;
- let max = V.showNumbersMax;
-
- if (V.showNumbers !== 2) {
- if (x === 0) {
- return 'zero';
- }
-
- let ONE_TO_NINETEEN = [
- 'one', 'two', 'three', 'four', 'five',
- 'six', 'seven', 'eight', 'nine', 'ten',
- 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen',
- 'sixteen', 'seventeen', 'eighteen', 'nineteen',
- ];
-
- let TENS = [
- 'ten', 'twenty', 'thirty', 'forty', 'fifty',
- 'sixty', 'seventy', 'eighty', 'ninety',
- ];
-
- let SCALES = ['thousand', 'million', 'billion', 'trillion'];
-
- // helper function for use with Array.filter
- function isTruthy(item) {
- return !!item;
- }
-
- // convert a number into "chunks" of 0-999
- function chunk(number) {
- let thousands = [];
-
- while (number > 0) {
- thousands.push(number % 1000);
- number = Math.floor(number / 1000);
- }
-
- return thousands;
- }
-
- // translate a number from 1-999 into English
- function inEnglish(number) {
- let hundreds; let tens; let ones; let words = [];
-
- if (number < 20) {
- return ONE_TO_NINETEEN[number - 1]; // may be undefined
- }
-
- if (number < 100) {
- ones = number % 10;
- tens = number / 10 | 0; // equivalent to Math.floor(number / 10)
-
- words.push(TENS[tens - 1]);
- words.push(inEnglish(ones));
-
- return words.filter(isTruthy).join('-');
- }
-
- hundreds = number / 100 | 0;
- words.push(inEnglish(hundreds));
- words.push('hundred');
- words.push(inEnglish(number % 100));
-
- return words.filter(isTruthy).join(' ');
- }
-
- // append the word for a scale. Made for use with Array.map
- function appendScale(chunk, exp) {
- let scale;
- if (!chunk) {
- return null;
- }
- scale = SCALES[exp - 1];
- return [chunk, scale].filter(isTruthy).join(' ');
- }
-
- let string = chunk(x)
- .map(inEnglish)
- .map(appendScale)
- .filter(isTruthy)
- .reverse()
- .join(' ');
-
- if (V.showNumbers === 1) {
- if (x <= max) {
- if (x > 0) {
- return string;
- } else {
- return `negative ${ string}`;
- }
- } else {
- return commaNum(x);
- }
- } else {
- if (x > 0) {
- return string;
- } else {
- return `negative ${ string}`;
- }
- }
- } else {
- return commaNum(x);
- }
-};
-
window.jsRandom = function(min, max) {
return Math.floor(Math.random()*(max-min+1)+min);
};
@@ -1419,16 +1420,16 @@ window.induceLactation = /** @param {App.Entity.SlaveState} slave */ function in
window.ResearchLabStockPile = function() {
const V = State.variables;
return `__Stockpile__
- Prosthetics interfaces: ${commaNum(V.stockpile.basicPLimbInterface + V.stockpile.advPLimbInterface)}
+ Prosthetics interfaces: ${num(V.stockpile.basicPLimbInterface + V.stockpile.advPLimbInterface)}
Basic : $stockpile.basicPLimbInterface
Advanced: $stockpile.advPLimbInterface
- Limbs: ${commaNum(V.stockpile.basicPLimb + V.stockpile.advSexPLimb + V.stockpile.advGracePLimb + V.stockpile.advCombatPLimb + V.stockpile.cyberneticPLimb)}
+ Limbs: ${num(V.stockpile.basicPLimb + V.stockpile.advSexPLimb + V.stockpile.advGracePLimb + V.stockpile.advCombatPLimb + V.stockpile.cyberneticPLimb)}
Basic: $stockpile.basicPLimb
Sex: $stockpile.advSexPLimb
Beauty: $stockpile.advGracePLimb
Combat: $stockpile.advCombatPLimb
Cybernetic: $stockpile.cyberneticPLimb
- Implants: ${commaNum(V.stockpile.ocularImplant + V.stockpile.cochlearImplant + V.stockpile.erectileImplant)}
+ Implants: ${num(V.stockpile.ocularImplant + V.stockpile.cochlearImplant + V.stockpile.erectileImplant)}
Ocular: $stockpile.ocularImplant
Cochlear: $stockpile.cochlearImplant
// Erectile: $stockpile.erectileImplant//
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index f3e12841056..fe588df8d51 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -13,7 +13,7 @@
<br><br>
Overall statistics:
<br> Fetal count: $PC.womb.length
- <br> Estimated womb volume: <<print commaNum(Math.round($PC.belly))>> cc
+ <br> Estimated womb volume: <<print num(Math.round($PC.belly))>> cc
<br><br>
Furthest developed pregnancy:
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 891048297c2..d237821bc70 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -17,7 +17,7 @@
<br><br>
Overall statistics:
<br> Fetal count: $activeSlave.womb.length
- <br> Estimated womb volume: <<print commaNum(Math.round($activeSlave.bellyPreg))>> cc
+ <br> Estimated womb volume: <<print num(Math.round($activeSlave.bellyPreg))>> cc
<br><br>
Furthest developed pregnancy:
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index 652628a1b94..59684837ba6 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -1376,7 +1376,7 @@ __Dividend__
<br><br>
__Shares__
-<br>You own <<print commaNum($personalShares)>> shares while another <<print commaNum($publicShares)>> shares are traded publicly. The going rate on the market for 1000 shares is currently @@.yellowgreen;<<print cashFormat(corpSharePrice())>>.@@
+<br>You own <<print num($personalShares)>> shares while another <<print num($publicShares)>> shares are traded publicly. The going rate on the market for 1000 shares is currently @@.yellowgreen;<<print cashFormat(corpSharePrice())>>.@@
<br>The corporation can buyback 1000 shares for @@.red;<<print cashFormat(corpSharePrice(-1000))>>@@ or issue 1000 shares and net @@.yellowgreen;<<print cashFormat(corpSharePrice(1000))>>.@@
<<if $corpCash > corpSharePrice(-1000)>>
<<if $publicShares <= $personalShares - 2000 && $publicShares > 0>> /*It won't buy back player shares if the corporation is entirely owned by the player*/
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 721f3f7f337..00402781e86 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -434,17 +434,17 @@ In total, you have given birth to:
<<if $PC.slavesKnockedUp > 0>>
<br>
<<if $PC.dick == 1>>
- You've knocked up <<print commaNum($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
+ You've knocked up <<print num($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print num($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
<<else>>
- Before your sex change, you knocked up <<print commaNum($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>>.
+ Before your sex change, you knocked up <<print num($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print num($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>>.
<</if>>
<<else>>
<<if $PC.slavesFathered > 0>>
<br>
<<if $PC.dick == 1>>
- You've fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
+ You've fathered <<print num($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
<<else>>
- Before your sex change, you fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>>.
+ Before your sex change, you fathered <<print num($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>>.
<</if>>
<</if>>
<</if>>
@@ -536,37 +536,37 @@ In total, you have given birth to:
<br><br>
Before your sex change, you had given birth to:
<<if $PC.birthElite > 0>>
- <br><<print commaNum($PC.birthElite)>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
+ <br><<print num($PC.birthElite)>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
<</if>>
<<if $PC.birthMaster > 0>>
- <br><<print commaNum($PC.birthMaster)>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
+ <br><<print num($PC.birthMaster)>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
<</if>>
<<if $PC.birthClient > 0>>
- <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
+ <br><<print num($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
<</if>>
<<if $PC.birthDegenerate > 0>>
- <br><<print commaNum($PC.birthDegenerate)>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
+ <br><<print num($PC.birthDegenerate)>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
<</if>>
<<if $PC.birthArcOwner > 0>>
- <br><<print commaNum($PC.birthArcOwner)>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
+ <br><<print num($PC.birthArcOwner)>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
<</if>>
<<if $PC.birthCitizen > 0>>
- <br><<print commaNum($PC.birthCitizen)>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
+ <br><<print num($PC.birthCitizen)>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
<</if>>
<<if $PC.birthOther > 0>>
- <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
+ <br><<print num($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
<</if>>
<<if $PC.birthSelf > 0>>
- <br><<print commaNum($PC.birthSelf)>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you.
+ <br><<print num($PC.birthSelf)>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you.
<</if>>
<</if>>
<<if $PC.slavesKnockedUp > 0>>
<br><br>
- You've knocked up <<print commaNum($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
+ You've knocked up <<print num($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print num($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
<<else>>
<<if $PC.slavesFathered > 0>>
<br><br>
- You've fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
+ You've fathered <<print num($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
<</if>>
<</if>>
diff --git a/src/pregmod/rePregInventorText.tw b/src/pregmod/rePregInventorText.tw
index 940480217fd..7da749f3452 100644
--- a/src/pregmod/rePregInventorText.tw
+++ b/src/pregmod/rePregInventorText.tw
@@ -3,7 +3,7 @@
<<setNonlocalPronouns $seeDicks>>
The interview starts about halfway into a special episode of "Husbandry with Millie." The show's host is introducing a who's who of important figures in the slave breeding community. As you turn on the show, Millie seems to have just completed another interview.
<br><br>
- "Everybody, give one last round of applause for renowned breakout porn star 'Twinner Jennie'!" she says. "Who'd have thought an eighteen year old slave could be pregnant with their own eighteen year old cloned sister? Quite a world — thank you again for that fascinating interview! Our next guest on 'Husbandry with Millie' is a clever 'broodmother' class breeding slave and mother of <<= commaNum($activeSlave.birthsTotal)>> children from the $continent arcology of '$arcologies[0].name.' Everybody, please give a hearty welcome to <<= SlaveFullName($activeSlave)>>!"
+ "Everybody, give one last round of applause for renowned breakout porn star 'Twinner Jennie'!" she says. "Who'd have thought an eighteen year old slave could be pregnant with their own eighteen year old cloned sister? Quite a world — thank you again for that fascinating interview! Our next guest on 'Husbandry with Millie' is a clever 'broodmother' class breeding slave and mother of <<= num($activeSlave.birthsTotal)>> children from the $continent arcology of '$arcologies[0].name.' Everybody, please give a hearty welcome to <<= SlaveFullName($activeSlave)>>!"
<br><br>
The first thing that the audience sees of your slave is a colossal $activeSlave.skin orb pressing forward through an inadequate looking faux doorway at the rear of the set. "Husbandry with Millie" is a show about breeders and for breeders, and the host, Millie, has seen pregnant slaves of innumerable sizes and descriptions. Despite this, she does a clear double take as your slave enters, and enters, and enters stage right, $his grossly distorted belly seeming to go on forever as it precedes $him. $He is always growing, and you are constantly increasing the size of $his menial entourage to ensure $his unhindered mobility. As a result, a veritable platoon of masked menials can be seen throwing themselves into your overladen babyfactory before $his
<<if ($activeSlave.boobs >= 20000)>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index 99e69b2ec2b..6c04d9a1e00 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -470,7 +470,7 @@
<<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- Bought <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> units for <<print cashFormat(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))*500*State.variables[$args[0]+"AssetPrice"])>>
+ Bought <<print num(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> units for <<print cashFormat(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))*500*State.variables[$args[0]+"AssetPrice"])>>
<</replace>>
<<set State.variables[$args[0]+"Assets"] += (eval(parse('_Num' + $args[0]))) * 500>>
<<set $corpCash -= (eval(parse('_Num' + $args[0]))) * 500 * State.variables[$args[0]+"AssetPrice"]>>
@@ -478,7 +478,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<print commaNum(Math.floor(State.variables[$args[0]+"Assets"]/500))>> unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<print num(Math.floor(State.variables[$args[0]+"Assets"]/500))>> unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
<<else>>
@@ -493,7 +493,7 @@
<<set _DesPerc = State.temporary[$args[1]]>>
<<set State.temporary[$args[1]] = Math.floor((Math.clamp((Number.parseFloat(State.temporary[$args[1]])/100),0,1)*$corpCash)/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- Purchased <<print commaNum(State.temporary[$args[1]])>> units (<<print commaNum((State.temporary[$args[1]]*(State.variables[$args[0]+"AssetPrice"] * 50000)/$corpCash).toFixed(2))>>% of cash, desired was _DesPerc)
+ Purchased <<print num(State.temporary[$args[1]])>> units (<<print num((State.temporary[$args[1]]*(State.variables[$args[0]+"AssetPrice"] * 50000)/$corpCash).toFixed(2))>>% of cash, desired was _DesPerc)
<</replace>>
<<set State.variables[$args[0]+"Assets"] += (eval(parse('_Num' + $args[0]))) * 500>>
<<set $corpCash -= (eval(parse('_Num' + $args[0]))) * 500 * State.variables[$args[0]+"AssetPrice"]>>
@@ -501,7 +501,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<print commaNum(Math.floor(State.variables[$args[0]+"Assets"]/500))>> unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<print num(Math.floor(State.variables[$args[0]+"Assets"]/500))>> unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Successful buy */
@@ -512,13 +512,13 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<print commaNum(Math.floor(State.variables[$args[0]+"Assets"]/500))>> unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<print num(Math.floor(State.variables[$args[0]+"Assets"]/500))>> unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>><</replace>>
/* Unsuccessful buy but have enough cash for more than 1 unit */
<<elseif $corpCash > 500 * State.variables[$args[0]+"AssetPrice"]>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- The corp can only buy <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> more unit<<if Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)) > 1 >>s<</if>> of $args[0] assets.
+ The corp can only buy <<print num(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> more unit<<if Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)) > 1 >>s<</if>> of $args[0] assets.
<</replace>>
<<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
@@ -532,7 +532,7 @@
/* Sell all */
<<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- Sold <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> units for <<print cashFormat(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)*500*State.variables[$args[0]+"AssetPrice"])>>
+ Sold <<print num(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> units for <<print cashFormat(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)*500*State.variables[$args[0]+"AssetPrice"])>>
<</replace>>
<<set State.temporary[$args[1]] = Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)>>
<<set State.variables[$args[0]+"Assets"] -= eval(parse('_Num' + $args[0])) * 500>>
@@ -541,7 +541,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print num(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Error if decimal or not "all" or "max" string */
@@ -556,7 +556,7 @@
<<set _DesPerc = State.temporary[$args[1]]>>
<<set State.temporary[$args[1]] = Math.ceil((State.variables[$args[0]+"Assets"]-500)/500*(Math.clamp((Number.parseFloat(State.temporary[$args[1]])/100),0,1)))>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- Sold <<print commaNum(State.temporary[$args[1]])>> units (<<print commaNum((State.temporary[$args[1]]*100/((State.variables[$args[0]+"Assets"]-500)/500)).toFixed(2))>>% of $args[0] assets, desired was _DesPerc)
+ Sold <<print num(State.temporary[$args[1]])>> units (<<print num((State.temporary[$args[1]]*100/((State.variables[$args[0]+"Assets"]-500)/500)).toFixed(2))>>% of $args[0] assets, desired was _DesPerc)
<</replace>>
<<set State.variables[$args[0]+"Assets"] -= eval(parse('_Num' + $args[0])) * 500>>
<<set $corpCash += eval(parse('_Num' + $args[0])) * 500 * State.variables[$args[0]+"AssetPrice"]>>
@@ -564,7 +564,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print num(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Successful sell */
@@ -575,13 +575,13 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if (State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if (State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print num(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>><</replace>>
/* Unsuccessful sell but have enough assets for more than 1 unit */
<<elseif State.variables[$args[0]+"Assets"] > 500>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- The corp can only sell <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> more unit<<if Math.ceil((State.variables[$args[0]+"Assets"]-500)/500) > 1 >>s<</if>> of $args[0] assets.
+ The corp can only sell <<print num(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> more unit<<if Math.ceil((State.variables[$args[0]+"Assets"]-500)/500) > 1 >>s<</if>> of $args[0] assets.
<</replace>>
<<set State.temporary[$args[1]] = Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 05113cef22b..79b401fca82 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1117,14 +1117,14 @@ You own
<</if>>
<</if>>
<</if>>
- <<if $menials > 1>> <<print commaNum($menials)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
+ <<if $menials > 1>> <<print num($menials)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
<<run cashX(_menialEarnings, "menialTrades")>>
<</if>>
<<if $menialBioreactors > 0>>
<<set _bioreactorEarnings = $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>>
<<if $dairy && $dairyUpgradeMenials>><<set _bioreactorEarnings += $menialBioreactors*5>><</if>>
- <<if $menialBioreactors > 1>> <<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
+ <<if $menialBioreactors > 1>> <<print num($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
<<if $fuckdolls > 0>>and<</if>>
<<run cashX(_bioreactorEarnings, "menialBioreactors")>>
<</if>>
@@ -1133,7 +1133,7 @@ You own
<<if $fuckdolls > 0>>
<<set _fuckdollsEarnings = $fuckdolls*(15+(10*$arcologies[0].FSDegradationistLaw))>>
<<if $arcade && $arcadeUpgradeMenials>><<set _fuckdollsEarnings += $fuckdolls*5>><</if>>
- <<if $fuckdolls > 1>> <<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>>
+ <<if $fuckdolls > 1>> <<print num($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>>
<<set _fuckdollsEarnings += random(1,10)>>
<<run cashX(_fuckdollsEarnings, "fuckdolls")>>
<</if>>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index e0a8f0ecce1..935c3e49089 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -613,7 +613,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
The noise in the thriving open space is almost oppressive, with the sounds of drunken merriment, traditional music, and distant intercourse forming an omnipresent hum.
<</if>>
-<<print commaNum($ACitizens)>> citizens and <<print commaNum($ASlaves+$slaves.length)>> slaves live in $arcologies[0].name.
+<<print num($ACitizens)>> citizens and <<print num($ASlaves+$slaves.length)>> slaves live in $arcologies[0].name.
<<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>Every citizen has military responsibilities, which are a point of pride to many, with most opting to wear utilitarian clothing even when off duty.<</if>>
<<if $arcologies[0].FSAztecRevivalistLaw == 1>>Most citizens wear satin loincloths and cloaks, distinguished from those of slaves by the richness of their adornments.<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index abaca9fbff5..ad99733a1c4 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -767,7 +767,7 @@ Choose a tattoo style:
<br>
<<if $activeSlave.abortionTat > 0>>
<<if $activeSlave.abortionTat > 1>>
- $He has a series of numberToWords($activeSlave.abortionTat) crossed out baby-shaped tattoos<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach.
+ $He has a series of num($activeSlave.abortionTat) crossed out baby-shaped tattoos<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach.
<<else>>
$He has a single crossed out baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach.
<</if>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 00b3f666ea9..0e40d66ff02 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -308,7 +308,7 @@ The parts of your arcology you own can house a total of $PopCap menial slaves.
<br>
<<if $menials > 1>>
- You own <<print commaNum(Math.trunc($menials))>> menial slaves.
+ You own <<print num(Math.trunc($menials))>> menial slaves.
<<elseif $menials > 0>>
You own one menial slave.
<<else>>
@@ -372,7 +372,7 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
<</if>>
<<if $fuckdolls > 1>>
- <br>You own <<print commaNum(Math.trunc($fuckdolls))>> standard Fuckdolls.
+ <br>You own <<print num(Math.trunc($fuckdolls))>> standard Fuckdolls.
<<elseif $fuckdolls > 0>>
<br>You own one standard Fuckdoll.
<<elseif $arcologies[0].FSPaternalist == "unset">>
@@ -412,7 +412,7 @@ The market price of standard Fuckdolls is <<print cashFormat(_menialPrice*2)>>.
<</if>>
<<if $menialBioreactors > 1>>
- <br>You own <<print commaNum(Math.trunc($menialBioreactors))>> standard bioreactors.
+ <br>You own <<print num(Math.trunc($menialBioreactors))>> standard bioreactors.
<<elseif $menialBioreactors > 0>>
<br>You own one standard bioreactor.
<<elseif $arcologies[0].FSPaternalist == "unset">>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 71acb6f942c..f0daed4644c 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -66,13 +66,13 @@ your personal living expenses are @@.yellowgreen;<<print cashFormat(Math.trunc($
<br> __Orphanage__ fee: @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100+$privateOrphanageTotal*500+_breederTuition)>>@@
<<set _arcologyCosts += $citizenOrphanageTotal*100+$privateOrphanageTotal*500+_breederTuition>>
<<if $citizenOrphanageTotal > 0>>
- <br> Citizen: @@.yellowgreen;<<print cashFormat(100)>>@@ per child. Currently <<print commaNum($citizenOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100)>>@@.
+ <br> Citizen: @@.yellowgreen;<<print cashFormat(100)>>@@ per child. Currently <<print num($citizenOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100)>>@@.
<</if>>
<<if $privateOrphanageTotal > 0>>
- <br> Private: @@.yellowgreen;<<print cashFormat(500)>>@@ per child. Currently <<print commaNum($privateOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($privateOrphanageTotal*500)>>@@.
+ <br> Private: @@.yellowgreen;<<print cashFormat(500)>>@@ per child. Currently <<print num($privateOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($privateOrphanageTotal*500)>>@@.
<</if>>
<<if $breederOrphanageTotal > 0>>
- <br> Since <<print commaNum($breederOrphanageTotal)>> of your slaves' children are being raised into productive members of society in a society funded school, you pay a flat @@.yellowgreen;<<print cashFormat(50)>>@@ usage fee.
+ <br> Since <<print num($breederOrphanageTotal)>> of your slaves' children are being raised into productive members of society in a society funded school, you pay a flat @@.yellowgreen;<<print cashFormat(50)>>@@ usage fee.
<</if>>
<</if>>
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index b952e9b8177..3e0a2fc31ff 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -462,9 +462,9 @@
<<if $args[0].lastWeeksRepIncome == 0>>
had no positive effect on your reputation, but
<<else>>
- improved your reputation by @@.green;<<print commaNum($args[0].lastWeeksRepIncome)>>@@ and
+ improved your reputation by @@.green;<<print num($args[0].lastWeeksRepIncome)>>@@ and
<</if>>
- over $his entire time with you, $he gained @@.green;<<print commaNum($args[0].lifetimeRepIncome)>>@@.
+ over $his entire time with you, $he gained @@.green;<<print num($args[0].lifetimeRepIncome)>>@@.
<</if>>
<<if $args[0].lifetimeRepExpenses != 0>>
<br>
@@ -472,18 +472,18 @@
<<if $args[0].lastWeeksRepExpenses == 0>>
had no negative effect on your reputation, but
<<else>>
- lowered your reputation by @@.red;<<print commaNum($args[0].lastWeeksRepExpenses)>>@@ and
+ lowered your reputation by @@.red;<<print num($args[0].lastWeeksRepExpenses)>>@@ and
<</if>>
- over $his entire time with you, $he cost @@.red;<<print commaNum($args[0].lifetimeRepExpenses)>>@@.
+ over $his entire time with you, $he cost @@.red;<<print num($args[0].lifetimeRepExpenses)>>@@.
<</if>>
<br>
Overall then, $he has changed your reputation by
<<if _repTotal > 0>>
- @@.green;<<print commaNum(_repTotal)>>@@
+ @@.green;<<print num(_repTotal)>>@@
<<elseif _repTotal < 0>>
- @@.red;<<print commaNum(_repTotal)>>@@
+ @@.red;<<print num(_repTotal)>>@@
<<else>>
- <<print commaNum(_repTotal)>>
+ <<print num(_repTotal)>>
<</if>>
<<else>> /* lowercasedonkey: TODO: I don't like how vague my placeholder is. Probably need to set up some kind of sliding scale to describe how much rep (roughly) she has made or lost. Need to get a sense of common ranges. */
<br>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 3eba3043a13..699f35304ca 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -389,23 +389,23 @@ is
<</if>>
<<if ($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount) > 0>>
- and has been fucked about <<print commaNum($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount)>> times, including
+ and has been fucked about <<print num($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount)>> times, including
<<if $activeSlave.mammaryCount > 0>>
- <<print commaNum($activeSlave.mammaryCount)>> mammary,
+ <<print num($activeSlave.mammaryCount)>> mammary,
<</if>>
<<if $activeSlave.vaginalCount > 0>>
- <<print commaNum($activeSlave.vaginalCount)>> vanilla,
+ <<print num($activeSlave.vaginalCount)>> vanilla,
<</if>>
<<if $activeSlave.analCount > 0>>
- <<print commaNum($activeSlave.analCount)>> anal,
+ <<print num($activeSlave.analCount)>> anal,
<</if>>
<<if $activeSlave.penetrativeCount > 0>>
- <<print commaNum($activeSlave.penetrativeCount)>> penetrating,
+ <<print num($activeSlave.penetrativeCount)>> penetrating,
<</if>>
<<if ($activeSlave.penetrativeCount+$activeSlave.mammaryCount+$activeSlave.vaginalCount+$activeSlave.analCount) > 0>>
and
<</if>>
- <<print commaNum($activeSlave.oralCount)>> oral sexual encounters.
+ <<print num($activeSlave.oralCount)>> oral sexual encounters.
<<else>>
<<if $week-$activeSlave.weekAcquired >= 1>>
and
@@ -501,9 +501,9 @@ is
<</if>>
<<if ($activeSlave.lactation > 0) && ($activeSlave.milk < 20)>>
- $He has given a small quantity of milk<<if ($activeSlave.cum > 0)>> and about <<print commaNum($activeSlave.cum)>> deciliters of cum<</if>>.
+ $He has given a small quantity of milk<<if ($activeSlave.cum > 0)>> and about <<print num($activeSlave.cum)>> deciliters of cum<</if>>.
<<elseif ($activeSlave.milk > 1)>>
- $He has given about <<print commaNum($activeSlave.milk)>> liters of milk<<if ($activeSlave.cum > 0)>> and about <<print commaNum($activeSlave.cum)>> deciliters of cum<</if>>.
+ $He has given about <<print num($activeSlave.milk)>> liters of milk<<if ($activeSlave.cum > 0)>> and about <<print num($activeSlave.cum)>> deciliters of cum<</if>>.
<</if>>
<<if ($activeSlave.birthsTotal != 0)>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index ae53475b18f..c0b86af57bf 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -165,7 +165,7 @@ __Special Arcology Upgrades__
<br><br>
-Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
+Your slaves have participated in approximately <<print num($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print num($oralTotal)>> primarily oral, <<print num($vaginalTotal)>> vanilla, <<print num($mammaryTotal)>> mammary, <<print num($analTotal)>> anal, and <<print num($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print num($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print num($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print num($birthsTotal)>> times.
<<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>>
<<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
@@ -173,26 +173,26 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi
<<if $secExp == 1 && $battlesEnabled == 1>>
<br><br>
<<if $SF.Toggle === 0||$SF.Active === 0>>
- Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
+ Your army counts <<print num($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
<<elseif $SF.Toggle && $SF.Active >= 1>>
- Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SF.Squad.Troops)>> total soldiers of which <<print commaNum($SF.Squad.Troops)>> under the special force command and the rest under your direct control.
+ Your army counts <<print num($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SF.Squad.Troops)>> total soldiers of which <<print num($SF.Squad.Troops)>> under the special force command and the rest under your direct control.
<</if>>
<<if $hasFoughtOnce == 1>>
- Your troops were involved in <<print commaNum($battlesCount)>> battles of which <<print commaNum($majorBattlesCount)>> were major engagements. You won
+ Your troops were involved in <<print num($battlesCount)>> battles of which <<print num($majorBattlesCount)>> were major engagements. You won
<<if $battlesCount == $PCvictories>>
all of them.
<<elseif $battlesCount == $PClosses>>
none of them.
<<else>>
- <<print commaNum($PCvictories)>> of them, while the enemy managed to gain the upper hand in the other <<print commaNum($PClosses)>>.
+ <<print num($PCvictories)>> of them, while the enemy managed to gain the upper hand in the other <<print num($PClosses)>>.
<</if>>
<</if>>
<<if $rebellionsCount >= 1>>
- Your arcology was involved in <<print commaNum($rebellionsCount)>> rebellions. You won <<print commaNum($PCrebWon)>> of them, while the rebels defeated your forces in <<print commaNum($PCrebLoss)>>.
+ Your arcology was involved in <<print num($rebellionsCount)>> rebellions. You won <<print num($PCrebWon)>> of them, while the rebels defeated your forces in <<print num($PCrebLoss)>>.
<</if>>
-During all battles you lost a total of <<print commaNum($militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties)>> men, while scoring a total of <<print commaNum($totalKills)>> kills.
+During all battles you lost a total of <<print num($militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties)>> men, while scoring a total of <<print num($totalKills)>> kills.
<</if>>
<br><br>
diff --git a/src/uncategorized/manufacturing.tw b/src/uncategorized/manufacturing.tw
index 794fdc4c900..deb09d2f597 100644
--- a/src/uncategorized/manufacturing.tw
+++ b/src/uncategorized/manufacturing.tw
@@ -16,7 +16,7 @@ This is a space in the arcology's service areas,
<<if $sectors[$AS].type == "Sweatshops">>
<<if $menials > 0>>
<br><br>
- You own <<print commaNum($menials)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
+ You own <<print num($menials)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
<<if $menials > $Sweatshops*500>>
the remainder is assigned to various odd jobs in the arcology.
<<elseif $menials == $Sweatshops*500>>
diff --git a/src/uncategorized/pens.tw b/src/uncategorized/pens.tw
index 0a52b8c577f..97ee9f422d2 100644
--- a/src/uncategorized/pens.tw
+++ b/src/uncategorized/pens.tw
@@ -10,14 +10,14 @@ This is a space in the arcology's service areas, designed to house hundreds of s
<br><br>
You own
<<if $menials > 0>>
- <<if $menials > 1>><<print commaNum($menials)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
+ <<if $menials > 1>><<print num($menials)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
<</if>>
<<if $menialBioreactors > 0>>
- <<if $menialBioreactors > 1>><<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
+ <<if $menialBioreactors > 1>><<print num($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
<<if $fuckdolls > 0>>and<</if>>
<</if>>
<<if $fuckdolls > 0>>
- <<if $fuckdolls > 1>><<print commaNum($fuckdolls)>> standard Fuckdolls,<<else>>one Fuckdoll,<</if>>
+ <<if $fuckdolls > 1>><<print num($fuckdolls)>> standard Fuckdolls,<<else>>one Fuckdoll,<</if>>
<</if>>
<<if $menials+$menialBioreactors+$fuckdolls > 0>>partially<</if>>
housed in this sector.
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 98afff45998..e35e2747044 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -151,19 +151,19 @@
<</if>>
<<if $SexMilestoneRetirement == 1>>
- <br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked <<print commaNum($retirementSex)>> times.
+ <br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked <<print num($retirementSex)>> times.
[[Repeal|Policies][$SexMilestoneRetirement = 0]]
<br> Set a new retirement requirement: <<textbox "$retirementSex" $retirementSex "Policies">>
<</if>>
<<if $MilkMilestoneRetirement == 1>>
- <br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given <<print commaNum($retirementMilk)>> liters of milk.
+ <br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given <<print num($retirementMilk)>> liters of milk.
[[Repeal|Policies][$MilkMilestoneRetirement = 0]]
<br> Set a new retirement requirement: <<textbox "$retirementMilk" $retirementMilk "Policies">>
<</if>>
<<if $CumMilestoneRetirement == 1>>
- <br>''Productive Bull Retirement:'' slaves will be rewarded with their freedom once they have given <<print commaNum($retirementCum)>> deciliters of cum.
+ <br>''Productive Bull Retirement:'' slaves will be rewarded with their freedom once they have given <<print num($retirementCum)>> deciliters of cum.
[[Repeal|Policies][$CumMilestoneRetirement = 0]]
<br> Set a new retirement requirement: <<textbox "$retirementCum" $retirementCum "Policies">>
<</if>>
@@ -903,15 +903,15 @@
<<if $CitizenRetirement == 1>>
<<if $SexMilestoneRetirement == 0>>
- <br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked <<print commaNum($retirementSex)>> times.
+ <br>''Sexual Milestone Retirement:'' slaves will be rewarded with their freedom once they have been fucked <<print num($retirementSex)>> times.
[[Implement|Policies][$SexMilestoneRetirement = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]
<</if>>
<<if $MilkMilestoneRetirement == 0>>
- <br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given <<print commaNum($retirementMilk)>> liters of milk.
+ <br>''Productive Cow Retirement:'' slaves will be rewarded with their freedom once they have given <<print num($retirementMilk)>> liters of milk.
[[Implement|Policies][$MilkMilestoneRetirement = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]
<</if>>
<<if $CumMilestoneRetirement == 0>>
- <br>''Productive Bull Retirement:'' slaves will be rewarded with their freedom once they have given <<print commaNum($retirementCum)>> deciliters of cum.
+ <br>''Productive Bull Retirement:'' slaves will be rewarded with their freedom once they have given <<print num($retirementCum)>> deciliters of cum.
[[Implement|Policies][$CumMilestoneRetirement = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]
<</if>>
<<if $BirthsMilestoneRetirement == 0>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index bff03653c80..3a6b9947bdf 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2012,7 +2012,7 @@
Your Head Girl sends you a discreet message that _he2 may have found a slave for you. $HeadGirl.slaveName duly ushers a girl into your office. $He looks very young, like a dissolute party girl. $He bites $his lip nervously when $he sees you, and looks to $HeadGirl.slaveName for guidance. $HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
<br><br>
-"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= numberToWords($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw $HeadGirl.slaveName and _he2 wa<<s>> ju<<s>>t <<s>>o gra<<c>>eful and beautiful and _he2 <<s>>eemed <<s>>o confident in what _he2 wa<<s>> doing and who _he2 wa<<s>> and I talked to _him2 and _he2 <<s>>aid _he2 wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>> and <<s>>tuff." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
+"<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= num($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw $HeadGirl.slaveName and _he2 wa<<s>> ju<<s>>t <<s>>o gra<<c>>eful and beautiful and _he2 <<s>>eemed <<s>>o confident in what _he2 wa<<s>> doing and who _he2 wa<<s>> and I talked to _him2 and _he2 <<s>>aid _he2 wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>> and <<s>>tuff." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
<<case "male recruit">>
@@ -2020,7 +2020,7 @@ Your Head Girl sends you a discreet message that _he2 may have found a slave for
Your Head Girl sends you a discreet message that _he2 may have found a slave for you. $HeadGirl.slaveName duly ushers an androgynous young person into your office. $He's dressed as a girl and acts like one. $He looks very young, like a dissolute party girl. $He bites $his lip nervously when $he sees you, and looks to $HeadGirl.slaveName for guidance. $HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
<br><br>
-"<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= numberToWords($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw $HeadGirl.slaveName and _he2 wa<<s>> ju<<s>>t <<s>>o beautiful and ha<<s>> a dick like me and _he2 <<s>>eemed <<s>>o confident in what _he2 wa<<s>> doing and who _he2 wa<<s>> and I talked to _him2 and _he2 <<s>>aid _he2 wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>>." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
+"<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, my name i<<s>> $activeSlave.slaveName. I'm, um, bored, I gue<<ss>>. I go to club<<s>> and get drunk and fuck guy<<s>> and it'<<s>> ju<<s>>t kinda boring. I thought it would be different when I turned <<= num($activeSlave.actualAge)>>, but that wa<<s>> a couple month<<s>> ago and, well, nothing'<<s>> different. I <<s>>aw $HeadGirl.slaveName and _he2 wa<<s>> ju<<s>>t <<s>>o beautiful and ha<<s>> a dick like me and _he2 <<s>>eemed <<s>>o confident in what _he2 wa<<s>> doing and who _he2 wa<<s>> and I talked to _him2 and _he2 <<s>>aid _he2 wa<<s>> your Head Girl and... I want to be like _him2. Can I be your <<s>>lave? I'd be good, I'm good at <<s>>ucking dick<<s>>." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
<<case "whore recruit">>
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index f539894bc0a..779b06f136c 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -170,7 +170,7 @@ for(var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
<<set $lastWeeksRepProfits.Total = ($lastWeeksRepIncome.Total + $lastWeeksRepExpenses.Total)>>
/* each "profit" item is calculated on this sheet, and there's two ways to generate a profit total: the difference of the income and expense totals, and adding all the profit items. If they aren't the same, I probably forgot to properly add an item's profit calculation to this sheet.*/
<<if $lastWeeksRepProfits.Total != hashSum($lastWeeksRepProfits) - $lastWeeksRepProfits.Total>>/* The profits object includes the total number of profits, so we have to subtract it back out */
- <<print (commaNum(Math.trunc(hashSum($lastWeeksRepProfits)-$lastWeeksRepProfits.Total)))>><br>
+ <<print (num(Math.trunc(hashSum($lastWeeksRepProfits)-$lastWeeksRepProfits.Total)))>><br>
@@.red;Fix profit calc<br>@@
<</if>>
<<print repFormat(Math.trunc($lastWeeksRepProfits.Total))>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 609f582864c..d1225e4f3dc 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -623,7 +623,7 @@ On formal occasions, you are announced as $PCTitle.
The public @@.green;approves@@ of the way you're providing for $citizenOrphanageTotal of your slaves' children to be raised as citizens.
<<= FSChange("Paternalist", $citizenOrphanageTotal)>>
<<if $privateOrphanageTotal > 0>>
- Raising <<print commaNum($privateOrphanageTotal)>> of your slaves' children privately is considered even more @@.green;impressive.@@
+ Raising <<print num($privateOrphanageTotal)>> of your slaves' children privately is considered even more @@.green;impressive.@@
<<set _care = $privateOrphanageTotal*2>>
<<= FSChange("Paternalist", _care)>>
<</if>>
@@ -635,7 +635,7 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<<elseif $privateOrphanageTotal > 0>>
<<if $arcologies[0].FSPaternalist != "unset">>
- Raising <<print commaNum($privateOrphanageTotal)>> of your slaves' children privately is considered extremely @@.green;impressive.@@
+ Raising <<print num($privateOrphanageTotal)>> of your slaves' children privately is considered extremely @@.green;impressive.@@
<<set _care = $privateOrphanageTotal*2>>
<<= FSChange("Paternalist", _care)>>
<<elseif $arcologies[0].FSDegradationist != "unset">>
@@ -643,7 +643,7 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<</if>>
<<if $breederOrphanageTotal > 0 && $arcologies[0].FSRepopulationFocus != "unset">>
- The public @@.green;approves@@ of the way you've dedicated <<print commaNum($breederOrphanageTotal)>> of your slaves' children to be raised into future breeders.
+ The public @@.green;approves@@ of the way you've dedicated <<print num($breederOrphanageTotal)>> of your slaves' children to be raised into future breeders.
<<set _futureBreeders = Math.round((($breederOrphanageTotal/100)+1))>>
<<= FSChange("Repopulationist", _futureBreeders)>>
<</if>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 36b0715f8cb..aa185dc3d12 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -1086,7 +1086,7 @@
<<else>>
<<set _minutesLasted = random(1,5)>>
<<if _canRun == 1>>
- $activeSlave.slaveName is quick, but not quick enough. $He manages to last almost <<= numberToWords(_minutesLasted)>> full minutes before the _animal.species finally catches $him.
+ $activeSlave.slaveName is quick, but not quick enough. $He manages to last almost <<= num(_minutesLasted)>> full minutes before the _animal.species finally catches $him.
<<elseif _canRun == 0>>
$activeSlave.slaveName isn't quick enough to avoid the beast, and $he only manages to last a pitiful thirty seconds before the _animal.species catches $him.
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index f7db94bdb91..035caf005f0 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -193,7 +193,7 @@
<</if>>
<br>Upkeep |
<</if>><<print cashFormat($costs)>>
-<br><br>@@.pink;Total Sex Slaves@@ | <<print commaNum(_SL)>>
+<br><br>@@.pink;Total Sex Slaves@@ | <<print num(_SL)>>
<br>@@.pink;Penthouse Beds@@ |
<<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>>
<br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>>
@@ -265,7 +265,7 @@
<<else>>
@@color:rgb(0,255,0);unknown@@
<</if>>
-(<<print commaNum($rep)>>)
+(<<print num($rep)>>)
</span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
@@ -371,7 +371,7 @@
<<else>>
@@color:rgb(211,0,204);harmless@@
<</if>>
-(<<print commaNum($authority)>>)
+(<<print num($authority)>>)
</span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 1c9bc224e37..3c842d9a920 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1011,66 +1011,66 @@ $His
<<elseif $activeSlave.boobs < 500>><<print either("perky", "small")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill B-cups.
<<elseif $activeSlave.boobs < 650>><<print either("healthy", "curved")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill C-cups.
<<elseif $activeSlave.boobs < 800>><<print either("big", "sizable")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill D-cups.
-<<elseif $activeSlave.boobs < 1000>><<print either("large", "big")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill DD-cups.
-<<elseif $activeSlave.boobs < 1200>><<print either("proud", "hefty")>> <<print either("tits", "breasts", "mammaries", "udders", "boobs")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill F-cups.
-<<elseif $activeSlave.boobs < 1400>><<print either("hefty", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill G-cups.
-<<elseif $activeSlave.boobs < 1600>><<print either("massive", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill H-cups.
-<<elseif $activeSlave.boobs < 1800>><<print either("enormous", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill I-cups.
-<<elseif $activeSlave.boobs < 2050>><<print either("titanic", "enormous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill J-cups.
-<<elseif $activeSlave.boobs < 2300>><<print either("stupendous", "titanic")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill K-cups.
-<<elseif $activeSlave.boobs < 2600>><<print either("magnificent", "stupendous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill L-cups.
-<<elseif $activeSlave.boobs < 2900>><<print either("impressive", "magnificent")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill M-cups.
-<<elseif $activeSlave.boobs < 3250>><<print either("awe-inspiring", "impressive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill N-cups.
-<<elseif $activeSlave.boobs < 3600>><<print either("absurd", "awe-inspiring")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill O-cups.
-<<elseif $activeSlave.boobs < 3950>><<print either("disproportionate", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill P-cups.
-<<elseif $activeSlave.boobs < 4300>><<print either("shocking", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill Q-cups.
-<<elseif $activeSlave.boobs < 4700>><<print either("striking", "jaw-dropping")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill R-cups.
+<<elseif $activeSlave.boobs < 1000>><<print either("large", "big")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill DD-cups.
+<<elseif $activeSlave.boobs < 1200>><<print either("proud", "hefty")>> <<print either("tits", "breasts", "mammaries", "udders", "boobs")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill F-cups.
+<<elseif $activeSlave.boobs < 1400>><<print either("hefty", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill G-cups.
+<<elseif $activeSlave.boobs < 1600>><<print either("massive", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill H-cups.
+<<elseif $activeSlave.boobs < 1800>><<print either("enormous", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill I-cups.
+<<elseif $activeSlave.boobs < 2050>><<print either("titanic", "enormous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill J-cups.
+<<elseif $activeSlave.boobs < 2300>><<print either("stupendous", "titanic")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill K-cups.
+<<elseif $activeSlave.boobs < 2600>><<print either("magnificent", "stupendous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill L-cups.
+<<elseif $activeSlave.boobs < 2900>><<print either("impressive", "magnificent")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill M-cups.
+<<elseif $activeSlave.boobs < 3250>><<print either("awe-inspiring", "impressive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill N-cups.
+<<elseif $activeSlave.boobs < 3600>><<print either("absurd", "awe-inspiring")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill O-cups.
+<<elseif $activeSlave.boobs < 3950>><<print either("disproportionate", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill P-cups.
+<<elseif $activeSlave.boobs < 4300>><<print either("shocking", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill Q-cups.
+<<elseif $activeSlave.boobs < 4700>><<print either("striking", "jaw-dropping")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill R-cups.
<<elseif $activeSlave.boobs < 5000+($activeSlave.muscles*10) && $activeSlave.physicalAge <= 3>>
<<if ($activeSlave.amp == 1)>>
- <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups and are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups and are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles > 5)>>
- <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups and are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups and are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
- <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups and are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups and are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
<</if>>
-<<elseif $activeSlave.boobs < 5100>><<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups.
-<<elseif $activeSlave.boobs < 5500>><<print either("frightening", "unmissable")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill T-cups.
-<<elseif $activeSlave.boobs < 6000>><<print either("unmissable", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill U-cups.
-<<elseif $activeSlave.boobs < 6500>><<print either("attention-grabbing", "spectacular")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill V-cups.
-<<elseif $activeSlave.boobs < 7000>><<print either("spectacular", "obviously engineered")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill W-cups.
-<<elseif $activeSlave.boobs < 7500>><<print either("obviously engineered", "disproportionate")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill X-cups.
-<<elseif $activeSlave.boobs < 8000>><<print either("disproportionate", "nearly inhuman")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill Y-cups.
-<<elseif $activeSlave.boobs < 8500>><<print either("nearly inhuman", "nearly alien")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill Z-cups.
+<<elseif $activeSlave.boobs < 5100>><<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill S-cups.
+<<elseif $activeSlave.boobs < 5500>><<print either("frightening", "unmissable")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill T-cups.
+<<elseif $activeSlave.boobs < 6000>><<print either("unmissable", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill U-cups.
+<<elseif $activeSlave.boobs < 6500>><<print either("attention-grabbing", "spectacular")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill V-cups.
+<<elseif $activeSlave.boobs < 7000>><<print either("spectacular", "obviously engineered")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill W-cups.
+<<elseif $activeSlave.boobs < 7500>><<print either("obviously engineered", "disproportionate")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill X-cups.
+<<elseif $activeSlave.boobs < 8000>><<print either("disproportionate", "nearly inhuman")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill Y-cups.
+<<elseif $activeSlave.boobs < 8500>><<print either("nearly inhuman", "nearly alien")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> would fill Z-cups.
<<elseif $activeSlave.boobs < 10000+($activeSlave.muscles*20) && $activeSlave.physicalAge <= 12>>
<<if ($activeSlave.amp == 1)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print num($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles >= 5)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print num($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print num($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
<</if>>
<<elseif $activeSlave.boobs < 20000+($activeSlave.muscles*50) && $activeSlave.physicalAge < 18>>
<<if ($activeSlave.amp == 1)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print num($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles >= 5)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print num($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print num($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
<</if>>
-<<elseif $activeSlave.boobs < 20000>><<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.
+<<elseif $activeSlave.boobs < 20000>><<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.
<<elseif $activeSlave.boobs < 30000+($activeSlave.muscles*100) && $activeSlave.physicalAge >= 18>>
<<if $activeSlave.amp == 1>>
- <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles > 5)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
- <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
<</if>>
<<else>>
<<if $activeSlave.amp == 1>>
- <<print either("tits", "boobs", "mammaries")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so immense it is safer to leave $him resting atop them. $His udders each weigh more than twice the rest of $his body, since $his body consists of nothing but $his head, torso, and breasts.
+ <<print either("tits", "boobs", "mammaries")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> are so immense it is safer to leave $him resting atop them. $His udders each weigh more than twice the rest of $his body, since $his body consists of nothing but $his head, torso, and breasts.
<<else>>
- <<print either("tits", "boobs", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so gargantuan that they effectively immobilize $him. $He's most comfortable lying down.
+ <<print either("tits", "boobs", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print num($activeSlave.boobs)>> CCs each,<</if>> are so gargantuan that they effectively immobilize $him. $He's most comfortable lying down.
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index b8c90b4416f..0d363caad70 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -3609,7 +3609,7 @@ $His
<</if>>
<<elseif _pregCollar == 2>>
<<if $activeSlave.pregWeek < 0>>
- "<<= numberToWords($activeSlave.pregWeek*-1)>> week<<if $activeSlave.pregWeek != -1>>s<</if>> until I can get preggers again!"
+ "<<= num($activeSlave.pregWeek*-1)>> week<<if $activeSlave.pregWeek != -1>>s<</if>> until I can get preggers again!"
<<elseif $activeSlave.pregKnown == 1>>
<<if $activeSlave.broodmother == 2>>
<<if $activeSlave.preg > 37>>
--
GitLab