From 31e05b0948ff6e003528e645fd572005c472ff0e Mon Sep 17 00:00:00 2001
From: AlacoGit <alacofruxo@gmail.com>
Date: Sat, 15 Mar 2025 13:18:31 +0100
Subject: [PATCH] V.scenario -> V.scenarios
---
src/budget/budget.js | 2 +-
src/events/intro/initNationalities.js | 4 ++--
src/events/intro/introSummary.js | 2 +-
src/facilities/wardrobe/wardrobeShopping.js | 2 +-
src/facilities/wardrobe/wardrobeShoppingData.js | 2 +-
src/interaction/siPhysicalRegimen.js | 2 +-
src/js/rulesAssistantOptions.js | 2 +-
src/npc/interaction/passage/abort.js | 2 +-
src/player/managePersonalAffairs.js | 10 +++++-----
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/budget/budget.js b/src/budget/budget.js
index c38ccfa060f..d531eca05a3 100644
--- a/src/budget/budget.js
+++ b/src/budget/budget.js
@@ -242,7 +242,7 @@ App.Budget.table = function(budgetType) {
...generateRowCategory("Subsidies and Barriers", "subsidiesAndBarriers")
]);
- if (V.scenario.contraceptivesBan) {
+ if (V.scenarios.contraceptivesBan) {
addToggle(generateRowGroup("Abortions", "ABORTIONS"), [
...generateRowCategory("Abortions", "abortions")
]);
diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js
index 3e1387713d6..726abc95969 100644
--- a/src/events/intro/initNationalities.js
+++ b/src/events/intro/initNationalities.js
@@ -445,10 +445,10 @@ App.Intro.initNationalities = function() {
initArcologies();
// remove me in the future when scenarios leave introSummary
- if (V.scenario.contraceptivesBan === 1) {
+ if (V.scenarios.contraceptivesBan === 1) {
V.boughtItem.toys.chastity = 0;
V.policies.contraceptivesBan = 1;
- }
+ }
V.HackingSkillMultiplier = upgradeMultiplier('hacking');
V.upgradeMultiplierArcology = upgradeMultiplier('engineering');
diff --git a/src/events/intro/introSummary.js b/src/events/intro/introSummary.js
index 74bdf760307..dd274d75e94 100644
--- a/src/events/intro/introSummary.js
+++ b/src/events/intro/introSummary.js
@@ -354,7 +354,7 @@ App.Intro.summary = function() {
// Move me to scenarios/scenario starts in the future. Right now I just have no place better to be.
if (V.menstruation === 1) {
- options.addOption("Contraceptives are", "contraceptivesBan", V.scenario)
+ options.addOption("Contraceptives are", "contraceptivesBan", V.scenarios)
.addValue("Banned", 1).on().addValue("Not Banned", 0).off();
options.addComment(`A scenario where contraceptives are completely unavailable. Keep aware of menstrual cycles or face the consequences of dealing with your little accidents; abortion and chastity will cost you. Play with cycle awareness completely hidden to prove yourself a master period investigator!`);
}
diff --git a/src/facilities/wardrobe/wardrobeShopping.js b/src/facilities/wardrobe/wardrobeShopping.js
index d9aa717c626..ded0433890a 100644
--- a/src/facilities/wardrobe/wardrobeShopping.js
+++ b/src/facilities/wardrobe/wardrobeShopping.js
@@ -22,7 +22,7 @@ App.UI.WardrobeShopping = function() {
} else if (V.boughtItem.clothing.dildos === 1 || V.boughtItem.toys.gags === 1 || V.boughtItem.clothing.buttPlugs === 1 || V.boughtItem.clothing.buttPlugTails === 1 || V.boughtItem.clothing.vaginalAttachments === 1) {
r.push(`Some sex toys line the shelves.`);
}
- if (V.scenario.contraceptivesBan === 1 && V.boughtItem.toys.chastity === 1) {
+ if (V.scenarios.contraceptivesBan === 1 && V.boughtItem.toys.chastity === 1) {
r.push(`A box of massively overvalued chastity devices sits in the corner.`);
}
if (V.boughtItem.toys.buckets === 1) {
diff --git a/src/facilities/wardrobe/wardrobeShoppingData.js b/src/facilities/wardrobe/wardrobeShoppingData.js
index c48cc7c9a7b..09251c267ce 100644
--- a/src/facilities/wardrobe/wardrobeShoppingData.js
+++ b/src/facilities/wardrobe/wardrobeShoppingData.js
@@ -292,7 +292,7 @@ App.Data.WardrobeShopping.Accessories = {
note: `Due to unusual market conditions, the price has reached a completely unacceptable price.`,
cost: 500000,
contains: [],
- get requirements() { return (V.scenario.contraceptivesBan !== 0); },
+ get requirements() { return (V.scenarios.contraceptivesBan !== 0); },
owned: "You are well stocked with chastity devices.",
},
"toys.buckets": {
diff --git a/src/interaction/siPhysicalRegimen.js b/src/interaction/siPhysicalRegimen.js
index a8ca9ce0d88..afaf72548f3 100644
--- a/src/interaction/siPhysicalRegimen.js
+++ b/src/interaction/siPhysicalRegimen.js
@@ -507,7 +507,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
[],
"Abort"
));
- if (V.scenario.contraceptivesBan) {
+ if (V.scenarios.contraceptivesBan) {
note += `Will cost ${(cashFormat(50000))}`;
}
}
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 7611deeeafb..da6cfcee12b 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1533,7 +1533,7 @@ App.RA.options = (function() {
if (V.policies.contraceptivesBan === 0) {
this.appendChild(new ContraceptiveList());
}
- if (V.scenario.contraceptivesBan === 0) {
+ if (V.scenarios.contraceptivesBan === 0) {
this.appendChild(new AbortionList());
}
if (V.pregSpeedControl) {
diff --git a/src/npc/interaction/passage/abort.js b/src/npc/interaction/passage/abort.js
index df9a6aedc1d..0c359697c97 100644
--- a/src/npc/interaction/passage/abort.js
+++ b/src/npc/interaction/passage/abort.js
@@ -58,7 +58,7 @@ App.Interact.abort = function(slave) {
slave.preg = rulesDemandContraceptives(slave, V.defaultRules) ? -1 : 0;
TerminatePregnancy(slave);
- if (V.scenario.contraceptivesBan) {
+ if (V.scenarios.contraceptivesBan) {
cashX(forceNeg(50000), "abortions");
}
actX(slave, "abortions");
diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js
index 8aa86fcc4a6..3a7f155ae5d 100644
--- a/src/player/managePersonalAffairs.js
+++ b/src/player/managePersonalAffairs.js
@@ -387,7 +387,7 @@ App.UI.managePersonalAffairs = function() {
} else if (PC.preg >= 8) {
text.push(`You're currently ${num(PC.preg)} ${PC.preg > 1 ? `weeks` : `week`} pregnant${V.PC.pregSource !== -1 && V.PC.pregSource !== -6 ? ", something rather unbecoming for an arcology owner" : ""}.`);
- if (V.scenario.contraceptivesBan === 0) {
+ if (V.scenarios.contraceptivesBan === 0) {
if (!FutureSocieties.isActive('FSRestart', arcology) || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
miniSceneSpan.append(abortLink);
text.push(miniSceneSpan);
@@ -396,7 +396,7 @@ App.UI.managePersonalAffairs = function() {
} else if (PC.preg >= 4 && PC.pregKnown) {
text.push(`You're having morning sickness${V.PC.pregSource !== -1 && V.PC.pregSource !== -6 ? "; it isn't too late to hide your pregnancy if desired.." : ""}.`);
- if (V.scenario.contraceptivesBan === 0) {
+ if (V.scenarios.contraceptivesBan === 0) {
if (!FutureSocieties.isActive('FSRestart', arcology) || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
miniSceneSpan.append(abortLink);
text.push(miniSceneSpan);
@@ -406,7 +406,7 @@ App.UI.managePersonalAffairs = function() {
miniSceneSpan.append(`Your period is late, so the first thing you do is test yourself for a potential pregnancy. A pregnancy test confirms that `, App.UI.DOM.makeElement("span", `you are pregnant. `, ['pregnant']));
PC.pregKnown = 1;
- if (V.scenario.contraceptivesBan === 0) {
+ if (V.scenarios.contraceptivesBan === 0) {
if (!FutureSocieties.isActive('FSRestart', arcology) || V.eugenicsFullControl === 1 || (V.PC.pregSource !== -1 && V.PC.pregSource !== -6)) {
miniSceneSpan.append(abortLink);
@@ -416,7 +416,7 @@ App.UI.managePersonalAffairs = function() {
} else if (PC.preg > 0 && PC.pregKnown) {
text.push(`You have a bun baking in the oven.`);
let div = App.UI.DOM.makeElement("div");
- if (V.scenario.contraceptivesBan === 1) {
+ if (V.scenarios.contraceptivesBan === 1) {
transplantAndTerminateButtons(V.PC, div, {
transplantAllText: "Make it someone else's problem",
transplantText: `Offload #transplantable of your fetuses`,
@@ -433,7 +433,7 @@ App.UI.managePersonalAffairs = function() {
} else if (PC.preg > 0) {
text.push(`Your fertile ${PC.mpreg === 1 ? "ass" : ""}pussy has been thoroughly seeded; there is a chance you are pregnant.`);
let div = App.UI.DOM.makeElement("div");
- if (V.scenario.contraceptivesBan === 0) {
+ if (V.scenarios.contraceptivesBan === 0) {
transplantAndTerminateButtons(V.PC, div, {
terminateText: "Pop some morning after pills",
mode: "terminate",
--
GitLab