From 20df3037dc632984e2c34d02df345bbc7d3837a1 Mon Sep 17 00:00:00 2001
From: AlyxMS <alyxms@live.com>
Date: Sun, 14 May 2023 05:30:52 +0800
Subject: [PATCH] Fix indents
---
js/003-data/drugs/002-moddedDrugsData.js | 12 +--
mods/custom drugs.md | 98 ++++++++++++------------
src/endWeek/player/prDrugs.js | 20 ++---
src/endWeek/saDrugs.js | 22 +++---
src/interaction/siPhysicalRegimen.js | 56 +++++++-------
src/player/managePersonalAffairs.js | 52 ++++++-------
6 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/js/003-data/drugs/002-moddedDrugsData.js b/js/003-data/drugs/002-moddedDrugsData.js
index cd53dbf9093..3cd446b65ac 100644
--- a/js/003-data/drugs/002-moddedDrugsData.js
+++ b/js/003-data/drugs/002-moddedDrugsData.js
@@ -4,10 +4,10 @@ App.Mods.Drugs.list = [];
//An optional function to act as the middle man between the user and App.Mods.Drugs.list, to add optional parameters and for potential future compatibility purposes.
App.Mods.Drugs.add = function (...drugs) {
- drugs.forEach(drug => {
- drug.isSlaveDrug ??= true;
- drug.isPCDrug ??= false;
- drug.isConsumerGrade ??= false;
- App.Mods.Drugs.list.push(drug);
- });
+ drugs.forEach(drug => {
+ drug.isSlaveDrug ??= true;
+ drug.isPCDrug ??= false;
+ drug.isConsumerGrade ??= false;
+ App.Mods.Drugs.list.push(drug);
+ });
};
\ No newline at end of file
diff --git a/mods/custom drugs.md b/mods/custom drugs.md
index 0efb17bb126..9d7870a7b2a 100644
--- a/mods/custom drugs.md
+++ b/mods/custom drugs.md
@@ -16,54 +16,54 @@ To add custom drugs through modding, pass object(s) with the following propertie
## Example:
```js
App.Mods.Drugs.add(
- {
- name: "hip enhancer",
- text: "Hip enhancer",
- type: "Structural",
- available: function (slave) {
- return slave.indentureRestrictions < 2;
- },
- enable: function (slave) {
- //Disable if the slave's hip is already very wide or wider.
- if (slave.hips < 2) return true;
- else return "Hips are already too wide";
- },
- effect: function (slave) {
- //Get the pronouns of the slaves to be used in end week report.
- const { he, him, his, himself, He, His } = getPronouns(slave);
- if (slave.hips >= 2) {
- //If the slave's hips is already very wide, stop the drug regimen, notify in end week report.
- slave.drugs = "no drugs";
- return ` ${His} hips is already as wide is possible, <span class="yellow">${his} drug regimen has been ended.</span>`;
- } else {
- //If not, widen hips and notify in end week report.
- slave.hips++;
- return ` The hip enhancer <span class="lime">widens ${his} hip</span>.`;
- }
- }
- },
- /* More than one drug can be added at a time */
- {
- //Drug name should be unique, but two drug with identical name is okay if one is for PC and one is for slaves.
- name: "hip enhancer",
- text: "Hip enhancer",
- //PC Drugs do not require type
- isPCDrug: true,
- isConsumerGrade: true,
- available: () => true,
- enable: function (slave) {
- if (slave.hips < 2) return true;
- else return "Your hips are already too wide";
- },
- effect: function (slave) {
- if (slave.hips >= 2) {
- slave.drugs = "no drugs";
- return "Your hips is already as wide is possible, <span class=\"yellow\">your drug regimen has ended.</span>";
- } else {
- slave.hips++;
- return "The hip enhancer <span class=\"lime\">widens your hip</span>.";
- }
- }
- }
+ {
+ name: "hip enhancer",
+ text: "Hip enhancer",
+ type: "Structural",
+ available: function (slave) {
+ return slave.indentureRestrictions < 2;
+ },
+ enable: function (slave) {
+ //Disable if the slave's hip is already very wide or wider.
+ if (slave.hips < 2) return true;
+ else return "Hips are already too wide";
+ },
+ effect: function (slave) {
+ //Get the pronouns of the slaves to be used in end week report.
+ const { he, him, his, himself, He, His } = getPronouns(slave);
+ if (slave.hips >= 2) {
+ //If the slave's hips is already very wide, stop the drug regimen, notify in end week report.
+ slave.drugs = "no drugs";
+ return ` ${His} hips is already as wide is possible, <span class="yellow">${his} drug regimen has been ended.</span>`;
+ } else {
+ //If not, widen hips and notify in end week report.
+ slave.hips++;
+ return ` The hip enhancer <span class="lime">widens ${his} hip</span>.`;
+ }
+ }
+ },
+ /* More than one drug can be added at a time */
+ {
+ //Drug name should be unique, but two drug with identical name is okay if one is for PC and one is for slaves.
+ name: "hip enhancer",
+ text: "Hip enhancer",
+ //PC Drugs do not require type
+ isPCDrug: true,
+ isConsumerGrade: true,
+ available: () => true,
+ enable: function (slave) {
+ if (slave.hips < 2) return true;
+ else return "Your hips are already too wide";
+ },
+ effect: function (slave) {
+ if (slave.hips >= 2) {
+ slave.drugs = "no drugs";
+ return "Your hips is already as wide is possible, <span class=\"yellow\">your drug regimen has ended.</span>";
+ } else {
+ slave.hips++;
+ return "The hip enhancer <span class=\"lime\">widens your hip</span>.";
+ }
+ }
+ }
);
```
\ No newline at end of file
diff --git a/src/endWeek/player/prDrugs.js b/src/endWeek/player/prDrugs.js
index 396371aa4bb..88b5cbe0ae4 100644
--- a/src/endWeek/player/prDrugs.js
+++ b/src/endWeek/player/prDrugs.js
@@ -1596,16 +1596,16 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
//Adds a default to handle unexpected(modded) drugs
default:
- {
- const drug = App.Mods.Drugs.list.filter(drug => drug.isPCDrug).find(e => e.name === PC.drugs);
- if (drug) {
- r.push(drug.effect(PC));
- }
- else {
- console.error(`Drug effect of ${PC.drugs} not found!`);
- PC.drugs = "no drugs";
- }
- }
+ {
+ const drug = App.Mods.Drugs.list.filter(drug => drug.isPCDrug).find(e => e.name === PC.drugs);
+ if (drug) {
+ r.push(drug.effect(PC));
+ }
+ else {
+ console.error(`Drug effect of ${PC.drugs} not found!`);
+ PC.drugs = "no drugs";
+ }
+ }
}
if (["hyper breast injections", "hyper butt injections", "growth stimulants", "hyper penis enhancement", "hyper testicle enhancement", "super fertility drugs"].includes(PC.drugs)) {
if (!canEatFood(PC)) {
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index 3b1a0dbb02c..c76dba14074 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -1538,17 +1538,17 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
break;
//Adds a default to handle unexpected(modded) drugs
- default:
- {
- const drug = App.Mods.Drugs.list.filter(drug => !drug.isPCDrug).find(e => e.name === slave.drugs);
- if (drug) {
- r += drug.effect(slave);
- }
- else {
- console.error(`Drug effect of ${slave.drugs} not found!`);
- slave.drugs = "no drugs";
- }
- }
+ default:
+ {
+ const drug = App.Mods.Drugs.list.filter(drug => !drug.isPCDrug).find(e => e.name === slave.drugs);
+ if (drug) {
+ r += drug.effect(slave);
+ }
+ else {
+ console.error(`Drug effect of ${slave.drugs} not found!`);
+ slave.drugs = "no drugs";
+ }
+ }
}
if (slave.drugs !== "no drugs" && slave.drugs !== "appetite suppressors") {
if (V.arcologies[0].FSBodyPuristLaw === 0) {
diff --git a/src/interaction/siPhysicalRegimen.js b/src/interaction/siPhysicalRegimen.js
index 08ef16a78fd..80942cc5cf8 100644
--- a/src/interaction/siPhysicalRegimen.js
+++ b/src/interaction/siPhysicalRegimen.js
@@ -267,32 +267,32 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
el.append(title);
//Put mod added drugs into categories:
- const modDrugs = new Map();
- App.Mods.Drugs.list.filter(drug => !drug.isPCDrug && drug.available(slave)).forEach(drug => {
- let typeArray;
- //Allow drugs to be added to vanilla categories
- switch (drug.type) {
- case "Lips": typeArray = lips; break;
- case "Breasts": typeArray = breasts; break;
- case "Nipples": typeArray = nipples; break;
- case "Butt": typeArray = butt; break;
- case "Dick":
- case "Clit": typeArray = dick; break;
- case "Fertility": typeArray = fertility; break;
- case "Hormones": typeArray = hormones; break;
- case "Psych": typeArray = psych; break;
- case "Misc": typeArray = misc; break;
- default:
- if (!modDrugs.has(drug.type)) modDrugs.set(drug.type, []);
- typeArray = modDrugs.get(drug.type);
- }
- //Test if drug should be enabled and push to array
- if (drug.enable(slave) === true) {
- typeArray.push({ text: drug.text, updateSlave: { drugs: drug.name } });
- } else {
- typeArray.push({ text: drug.text, disabled: drug.enable(slave) });
- }
- });
+ const modDrugs = new Map();
+ App.Mods.Drugs.list.filter(drug => !drug.isPCDrug && drug.available(slave)).forEach(drug => {
+ let typeArray;
+ //Allow drugs to be added to vanilla categories
+ switch (drug.type) {
+ case "Lips": typeArray = lips; break;
+ case "Breasts": typeArray = breasts; break;
+ case "Nipples": typeArray = nipples; break;
+ case "Butt": typeArray = butt; break;
+ case "Dick":
+ case "Clit": typeArray = dick; break;
+ case "Fertility": typeArray = fertility; break;
+ case "Hormones": typeArray = hormones; break;
+ case "Psych": typeArray = psych; break;
+ case "Misc": typeArray = misc; break;
+ default:
+ if (!modDrugs.has(drug.type)) modDrugs.set(drug.type, []);
+ typeArray = modDrugs.get(drug.type);
+ }
+ //Test if drug should be enabled and push to array
+ if (drug.enable(slave) === true) {
+ typeArray.push({ text: drug.text, updateSlave: { drugs: drug.name } });
+ } else {
+ typeArray.push({ text: drug.text, disabled: drug.enable(slave) });
+ }
+ });
appendLabeledChoiceRow("Lips", lips, el);
appendLabeledChoiceRow("Breasts", breasts, el);
@@ -305,8 +305,8 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
appendLabeledChoiceRow("Psych", psych, el);
appendLabeledChoiceRow("Misc", misc, el);
- //Add modded rows
- modDrugs.forEach((drugArray, drugType) => appendLabeledChoiceRow(drugType, drugArray, el));
+ //Add modded rows
+ modDrugs.forEach((drugArray, drugType) => appendLabeledChoiceRow(drugType, drugArray, el));
return el;
}
diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js
index e92a49711eb..80684aa5242 100644
--- a/src/player/managePersonalAffairs.js
+++ b/src/player/managePersonalAffairs.js
@@ -1077,19 +1077,19 @@ App.UI.managePersonalAffairs = function() {
}));
}
- //Modded consumer grade PC drugs
- App.Mods.Drugs.list.filter(drug => drug.isPCDrug && drug.isConsumerGrade && drug.available(PC)).forEach(drug => {
- if (PC.drugs !== drug.name) {
- if (drug.enable(PC) === true) {
- links.push(App.UI.DOM.link(drug.text, () => {
- PC.drugs = drug.name;
- App.UI.DOM.replace(drugsDiv, drugs);
- }));
- } else {
- links.push(App.UI.DOM.disabledLink(drug.text, [drug.enable(PC)]));
- }
- }
- })
+ //Modded consumer grade PC drugs
+ App.Mods.Drugs.list.filter(drug => drug.isPCDrug && drug.isConsumerGrade && drug.available(PC)).forEach(drug => {
+ if (PC.drugs !== drug.name) {
+ if (drug.enable(PC) === true) {
+ links.push(App.UI.DOM.link(drug.text, () => {
+ PC.drugs = drug.name;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(drug.text, [drug.enable(PC)]));
+ }
+ }
+ })
text.push(App.UI.DOM.generateLinksStrip(links));
@@ -1512,19 +1512,19 @@ App.UI.managePersonalAffairs = function() {
}
}
- //Modded slave grade PC drugs
- App.Mods.Drugs.list.filter(drug => drug.isPCDrug && !drug.isConsumerGrade && drug.available(PC)).forEach(drug => {
- if (PC.drugs !== drug.name) {
- if (drug.enable(PC) === true) {
- links.push(App.UI.DOM.link(drug.text, () => {
- PC.drugs = drug.name;
- App.UI.DOM.replace(drugsDiv, drugs);
- }));
- } else {
- links.push(App.UI.DOM.disabledLink(drug.text, [drug.enable(PC)]));
- }
- }
- })
+ //Modded slave grade PC drugs
+ App.Mods.Drugs.list.filter(drug => drug.isPCDrug && !drug.isConsumerGrade && drug.available(PC)).forEach(drug => {
+ if (PC.drugs !== drug.name) {
+ if (drug.enable(PC) === true) {
+ links.push(App.UI.DOM.link(drug.text, () => {
+ PC.drugs = drug.name;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(drug.text, [drug.enable(PC)]));
+ }
+ }
+ })
text.push(App.UI.DOM.generateLinksStrip(links));
--
GitLab