diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index a79da32e166af927ed42553ce4657dad7e8fb6fd..0eb056d6ae95bca4b260104044987341ad4f81ad 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -1933,7 +1933,7 @@ App.Data.misc = {
}
};
-/* Nationalities based on $continent value. Note that $continent can be undefined! */
+/* Nationalities based on V.continent value. Note that V.continent can be undefined! */
App.Data.misc.nationalityPoolSelector = {
"North America": App.Data.misc.northAmericaNationalities,
"South America": App.Data.misc.southAmericaNationalities,
diff --git a/src/endWeek/saSharedVariables.js b/src/endWeek/saSharedVariables.js
index 81608508ffef26ba0ac0ef0768900c84b5ac28bf..dce35fec271d5fd534abd96b96af81fff0333a07 100644
--- a/src/endWeek/saSharedVariables.js
+++ b/src/endWeek/saSharedVariables.js
@@ -49,7 +49,7 @@ App.EndWeek.SASharedVariables = class {
this.pornFameBonus = 1;
/** Used to condense all the possible galactorrhea lactation start points to a single line of text in saLongTermPhysicalEffects. */
this.inappropriateLactation = 0;
- /** TODO: move $slaveUsedRest here after saRules is converted, and find others */
+ /** TODO: move V.slaveUsedRest here after saRules is converted, and find others */
}
/** Compute shared subslave ratio (subslaves per ordinary slave) */
diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js
index 491a310a163420291102d36146a0ccb0a4a225a8..ea2f76c796b3ba5aa1a6a7e65adcd4d48bb1b661 100644
--- a/src/events/intro/initNationalities.js
+++ b/src/events/intro/initNationalities.js
@@ -583,7 +583,7 @@ App.Intro.initNationalities = function() {
/* Nationalities Setup */
if (!V.customVariety) {
- /* If non-custom variety, empties or defines $nationalities */
+ /* If non-custom variety, empties or defines V.nationalities */
V.nationalities = {};
}
const needLocalNationalities = !V.customVariety && !V.internationalTrade;
diff --git a/src/gui/options/descriptionOptions.js b/src/gui/options/descriptionOptions.js
index 6b4e0da08707ff4981c98a0cf8784a82d6660807..95316f47ea60815e05069213b11dfd22ad4af2a5 100644
--- a/src/gui/options/descriptionOptions.js
+++ b/src/gui/options/descriptionOptions.js
@@ -60,7 +60,7 @@ App.UI.descriptionOptions = function() {
.addValueList([["Integers", 2], ["Both", 1], ["Words", 0]]);
if (V.showNumbers === 1) {
- options.addOption("Only numbers up to $showNumbersMax are displayed as words", "showNumbersMax")
+ options.addOption(`Only numbers up to ${V.showNumbersMax} are displayed as words`, "showNumbersMax")
.addValue("Default (20)", 20).showTextBox();
}
diff --git a/src/js/CustomSlave.js b/src/js/CustomSlave.js
index c7b490342668b31f2a7e614f11fbd21f063978eb..ef5f202cc65b69c4e88417575018dee593fc6909 100644
--- a/src/js/CustomSlave.js
+++ b/src/js/CustomSlave.js
@@ -1,7 +1,7 @@
/**
* Contains the parameters for the player's custom slave order.
* Some members are ignored by huskSlave (particularly mental properties).
- * NOTE: $customSlave/$huskSlave IS NOT A SLAVE. Do not treat them like you would treat an instance of SlaveState.
+ * NOTE: V.customSlave/V.huskSlave IS NOT A SLAVE. Do not treat them like you would treat an instance of SlaveState.
*/
App.Entity.CustomSlaveOrder = class CustomSlaveOrder {
constructor() {
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 05184b60941ad0969982dd641a35c1a40ab89055..fe0c3924c6ae3d5b608fb4205f4743d24fa2e822 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -29,7 +29,7 @@ globalThis.assignJob = function(slave, job) {
const idx = V.slaveIndices[slave.ID];
/**
- * this helper makes sure global references global IDs ($HeadGirlID, $AttendantID, etc) are set correctly
+ * this helper makes sure global references global IDs (V.HeadGirlID, V.AttendantID, etc) are set correctly
* @param {string} propName
*/
function uniqueJob(propName) {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 06e96167ea11dfedfb489d766789a578d426d1aa..056ba297b2cc72f891c157a1ed69d560053a08e9 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -7,23 +7,23 @@ globalThis.DJRepBonus = function() {
const djIntel = S.DJ.intelligence + S.DJ.intelligenceImplant;
if (S.DJ.relationship === -3 && S.DJ.devotion > 50) {
value += 0.1;
- // $He tries $his best to be your energetic, cheerful $wife.
+ // $He tries $his best to be your energetic, cheerful ${wife}.
}
if (!canSee(S.DJ)) {
value += 0.15;
}
if ( S.DJ.skill.entertainment > 10 && S.DJ.skill.entertainment <= 30) {
value += 0.05;
- // $DJ.slaveName's basic skills marginally <span class="green">improve</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's basic skills marginally <span class="green">improve</span> the atmosphere in V.clubName.
} else if (S.DJ.skill.entertainment <= 60) {
value += 0.1;
- // $DJ.slaveName's skills <span class="green">improve</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's skills <span class="green">improve</span> the atmosphere in V.clubName.
} else if (S.DJ.skill.entertainment < 100) {
value += 0.15;
- // $DJ.slaveName's skills greatly <span class="green">improve</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's skills greatly <span class="green">improve</span> the atmosphere in V.clubName.
} else if (S.DJ.skill.entertainment >= 100) {
value += 0.20;
- // $DJ.slaveName's mastery immensely <span class="green">;improves</span> the atmosphere in $clubName.
+ // V.DJ.slaveName's mastery immensely <span class="green">;improves</span> the atmosphere in V.clubName.
}
if (S.DJ.muscles > 5 && S.DJ.muscles <= 95) {
value += 0.05;
@@ -1058,7 +1058,7 @@ globalThis.getSlaveCostArray = function(s) {
V.masterSuiteUpgradePregnancy === 1) {
// Extra feeding costs to support pregnancy are covered by master suite luxuries.
// TODO: Include them here anyway?
- retval.push({text: "Extra feeding costs to support pregnancy are covered by $masterSuiteName luxuries", value: 0});
+ retval.push({text: `Extra feeding costs to support pregnancy are covered by ${V.masterSuiteName} luxuries`, value: 0});
} else {
t = "Extra feeding to support ";
if (s.pregControl === "speed up") {
@@ -1470,20 +1470,20 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
const madamIntel = madam.intelligence + madam.intelligenceImplant;
App.EndWeek.saVars.madamBonus = 0;
if (madam.relationship === -3 && madam.devotion > 50) {
- // As your loving $wife, $he does $his best to attract attention to your brothel.
+ // As your loving ${wife}, ${he} does $his best to attract attention to your brothel.
App.EndWeek.saVars.madamBonus += 0.25;
}
if (madam.skill.whoring > 10 && madam.skill.whoring <= 30) {
- // S.Madam.slaveName's basic skills marginally yellowgreen;improve business at $brothelName.
+ // S.Madam.slaveName's basic skills marginally yellowgreen;improve business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.05;
} else if (madam.skill.whoring <= 60) {
- // S.Madam.slaveName's skills yellowgreen;improve business at $brothelName.
+ // S.Madam.slaveName's skills yellowgreen;improve business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.1;
} else if (madam.skill.whoring < 100) {
- // S.Madam.slaveName's skills greatly yellowgreen;improve business at $brothelName.
+ // S.Madam.slaveName's skills greatly yellowgreen;improve business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.15;
} else {
- // S.Madam.slaveName's mastery immensely yellowgreen;improves business at $brothelName.
+ // S.Madam.slaveName's mastery immensely yellowgreen;improves business at V.brothelName.
App.EndWeek.saVars.madamBonus += 0.20;
}
if (madam.actualAge > 35) {
@@ -2181,7 +2181,7 @@ globalThis.initFacilityStatistics = function(facility = {}) {
/*
-Welcome to the new way to spend and make money, all while having it recorded: cashX! In the past, costs were directly deducted from $cash, with something like <<set $cash -= 100>>.
+Welcome to the new way to spend and make money, all while having it recorded: cashX! In the past, costs were directly deducted from V.cash, with something like V.cash -= 100.
The new system will still happily spend your money, but it will also record it in the appropriate budget category and (optionally) the appropriate slave as well.
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index a59df4b695c06781e6c611db5b76716233b3196f..8e2b11a76bf97fa88ec2af3de6660b197dd14528 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -250,7 +250,7 @@ globalThis.FutureSocieties = (function() {
let FSLaw = `${FS}Law`;
if (arcology[FS] === undefined) {
// eslint-disable-next-line no-console
- console.log(`ERROR: bad FS reference, $arcologies[0].${FS} not defined`);
+ console.log(`ERROR: bad FS reference, V.arcologies[0].${FS} not defined`);
return;
}
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index fac661e1abb84f818d347a51ecee3ad5cfda62a1..b25965885ae9744963c8a840e280933f6bd85ffa 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -398,7 +398,7 @@ globalThis.emptyDefaultRule = App.RA.newRule.rule;
/**
* Saves the slave, silently fires the RA, saves the slave's after-RA state, and then reverts the slave.
- * Call and then check potential change against $slaveAfterRA to see if the RA would revert it.
+ * Call and then check potential change against V.slaveAfterRA to see if the RA would revert it.
* @param {App.Entity.SlaveState} slave
*/
globalThis.RulesDeconfliction = function(slave) {
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index 818930d7541957bd65cef9aac1441b4832af4fac..245464e021bfdb959ca036789e36dd982ab138f8 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -244,7 +244,7 @@ globalThis.VCheck = (function() {
}
/**
- * Before using this function, set $partner to the index of the partner in the $slaves array
+ * Before using this function, set V.partner to the index of the partner in the V.slaves array
analTimes is how many times to increment the Anal counts, if there is no Vagina available.
bothTimes is how many times to increment both holes counts (usually it is half of Anal).
In both cases if left undefined it will assume it to be 1.
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index d872a676193912b4d85b82df738f3e822bc07a4e..eceecbd41bfcd32850eaf714614e3c12b9f4b428 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -392,7 +392,7 @@ App.UI.SlaveList.render = function() {
const res = document.createDocumentFragment();
/* Useful for finding weird combinations — usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + passageName + '/' + _Count + '/' + _indexed + '/' + $SlaveSummaryFiler + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + passageName + '/' + _Count + '/' + _indexed + '/' + V.SlaveSummaryFiler + ']'>>
*/
if (IDs.length > 1 && passageName === "Main") {
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index 8265298e9ea6a979ffecf2d0c29461ddb7ab7792..21245d278d7dd34d085c10163115bfe1699b9cf8 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -7,19 +7,19 @@ Design limitations:
Usage from SugarCube code (samples):
-WombInit($slave) - before first pregnancy, at slave creation, of as backward compatibility update.
+WombInit(V.slave) - before first pregnancy, at slave creation, of as backward compatibility update.
-WombImpregnate($slave, $fetus_count, $fatherID, $initial_age) - should be added after normal impregnation code, with already calculated fetus count. ID of father - can be used in future for processing children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
+WombImpregnate(V.slave, V.fetus_count, V.fatherID, V.initial_age) - should be added after normal impregnation code, with already calculated fetus count. ID of father - can be used in future for processing children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
-WombProgress($slave, $time_to_add_to_fetuses, $real_time_to_add_to_fetuses) - after code that update $slave.preg, time to add should be the same.
+WombProgress(V.slave, V.time_to_add_to_fetuses, V.real_time_to_add_to_fetuses) - after code that update V.slave.preg, time to add should be the same.
-$isReady = WombBirthReady($slave, $birth_ready_age) - how many children ready to be birthed if their time to be ready is $birth_ready_age (40 is for normal length pregnancy). Return int - count of ready to birth children, or 0 if no ready exists.
+V.isReady = WombBirthReady(V.slave, V.birth_ready_age) - how many children ready to be birthed if their time to be ready is V.birth_ready_age (40 is for normal length pregnancy). Return int - count of ready to birth children, or 0 if no ready exists.
-$children = WombBirth($slave, $birth_ready_age) - for actual birth. Return array with fetuses objects that birthed (can be used in future) and remove them from womb array of $slave. Should be called at actual birth code in SugarCube. fetuses that not ready remained in womb (array).
+V.children = WombBirth(V.slave, V.birth_ready_age) - for actual birth. Return array with fetuses objects that birthed (can be used in future) and remove them from womb array of V.slave. Should be called at actual birth code in SugarCube. fetuses that not ready remained in womb (array).
-WombFlush($slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logically should use WombBirth($slave, 35) or so before - some children in this event is live capable, others is not.
+WombFlush(V.slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logically should use WombBirth(V.slave, 35) or so before - some children in this event is live capable, others is not.
-$slave.bellyPreg = WombGetVolume($slave) - return double, with current womb volume in CC - for updating $slave.bellyPreg, or if need to update individual fetuses sizes.
+V.slave.bellyPreg = WombGetVolume(V.slave) - return double, with current womb volume in CC - for updating V.slave.bellyPreg, or if need to update individual fetuses sizes.
*/
diff --git a/src/neighbor/neighborDisplay.js b/src/neighbor/neighborDisplay.js
index 8e5d962fd1b7d81fe2e2fee7580d6cebfb709a04..ad90dbedb033ba880e4942e08767c967bb623819 100644
--- a/src/neighbor/neighborDisplay.js
+++ b/src/neighbor/neighborDisplay.js
@@ -34,7 +34,7 @@ App.Neighbor.Display = class {
container.appendChild(this._renderGrid());
} else if (V.neighborDisplay === "list-name") {
container.appendChild(this._renderListName());
- } else { // default if $neighborDisplay is unset for some reason; canonically "list"
+ } else { // default if V.neighborDisplay is unset for some reason; canonically "list"
container.appendChild(this._renderListID());
}
return container;
diff --git a/src/npc/descriptions/limbs.js b/src/npc/descriptions/limbs.js
index e520c22826173e15a37f36143fbbd40c612deea0..4c621ae1e65fdb5a445768c50ee7c014fe849a34 100644
--- a/src/npc/descriptions/limbs.js
+++ b/src/npc/descriptions/limbs.js
@@ -106,7 +106,7 @@ App.Desc.limbChange = function() {
}
/**
- * Displays a selector for prosthetic limbs of getSlave($AS)
+ * Displays a selector for prosthetic limbs of getSlave(V.AS)
* @param {App.Entity.SlaveState} slave
* @param {{}} oldLimbs
* @param {string} [returnTo]
diff --git a/src/npc/generate/generateMarketSlave.js b/src/npc/generate/generateMarketSlave.js
index 8ad6a40d508d6651237758f6a4671641ff91c84f..4f6cafd26f1b6a401a1fb19565f07ac7cc382195 100644
--- a/src/npc/generate/generateMarketSlave.js
+++ b/src/npc/generate/generateMarketSlave.js
@@ -469,7 +469,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
SGProp.race = neighbor.FSSubjugationistRace;
}
if (neighbor.FSRepopulationFocus > 50) {
- genes = "XX"; // "exclusively female" - does not respect $seeDicks
+ genes = "XX"; // "exclusively female" - does not respect V.seeDicks
SGProp.minAge = V.fertilityAge;
}
if (neighbor.FSYouthPreferentialist > 20) {
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 63e88a47b9a08a7fe9b00c94b5d618821edf11b6..25b76da113b47acca9c5a3b6a5c9d1e381308643 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -983,7 +983,7 @@ App.Entity.PlayerState = class PlayerState {
*/
this.readyOva = 0;
/** exclusive variable
- * (uncommon in events)($PC.preg >= 28)
+ * (uncommon in events)(V.PC.preg >= 28)
* how you act when heavily pregnant
* * 0 - no change
* * 1 - submissive and motherly