From 2839bdd13bfc739e20546179a53702dd748b7c7e Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 3 Sep 2021 19:04:58 -0400
Subject: [PATCH 1/4] strip autosurgery toggle
---
devTools/types/FC/RA.d.ts | 1 -
src/js/rulesAssistant.js | 2 +-
src/js/rulesAssistantOptions.js | 9 ---------
src/js/rulesAutosurgery.js | 2 +-
4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/devTools/types/FC/RA.d.ts b/devTools/types/FC/RA.d.ts
index f9816fcdafd..fd19e4aa5a0 100644
--- a/devTools/types/FC/RA.d.ts
+++ b/devTools/types/FC/RA.d.ts
@@ -163,7 +163,6 @@ declare namespace FC {
growth: RuleGrowthSetters;
hyper_drugs: number;
aphrodisiacs: number;
- autoSurgery: number;
autoBrand: number;
pornFeed: number;
pornFameSpending: number;
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index d55dc280328..5b9bc86fb06 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -5,7 +5,7 @@
*/
globalThis.hasSurgeryRule = function(slave, rules) {
return rules.some(
- rule => ruleApplied(slave, rule) && rule.set.autoSurgery > 0);
+ rule => ruleApplied(slave, rule));
};
/**
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 97cd3cb19f6..698c910909a 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1902,7 +1902,6 @@ App.RA.options = (function() {
class AutosurgeryTab extends Tab {
constructor(tabButtons) {
super("autosurgery", "Autosurgery", tabButtons);
- this.appendChild(new AutosurgerySwitch());
this.appendChild(new VoiceSurgeryList());
this.appendChild(new VisionSurgeryList());
this.appendChild(new HearingSurgeryList());
@@ -2170,14 +2169,6 @@ App.RA.options = (function() {
}
}
- class AutosurgerySwitch extends BooleanSwitch {
- constructor() {
- super("Assistant-applied implants (Autosurgery global switch)", [0, 1]);
- this.setValue(current_rule.set.autoSurgery);
- this.onchange = (value) => current_rule.set.autoSurgery = value;
- }
- }
-
class IntensiveGrowthSwitch extends BooleanSwitch {
constructor() {
super("Use intensive growth drugs for healthy slaves", [0, 1]);
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 082b03a08d3..46d33f52087 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -44,7 +44,7 @@ globalThis.rulesAutosurgery = (function() {
function surgeryFromRules(slave) {
let thisSurgery = autoSurgerySelector(
V.defaultRules
- .filter(x => ruleApplied(slave, x) && x.set.autoSurgery === 1)
+ .filter(x => ruleApplied(slave, x))
.map(x => x.set));
if ((thisSurgery.hips !== null) && (thisSurgery.butt !== null)) {
if (slave.hips < -1) {
--
GitLab
From bc10ab95f99b03f01c7a3c17d4f9e326f2c03d86 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 3 Sep 2021 19:09:26 -0400
Subject: [PATCH 2/4] BC
---
src/data/backwardsCompatibility/datatypeCleanup.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index ab9a80a5305..d4d1dcedacd 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -2420,6 +2420,7 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
break;
}
delete set.eyeColor;
+ delete set.autoSurgery;
// Look for and remove pieces of a rule that would apply an accessory that is not in data. A common example is the old "chastity" accessories, which have now been moved to a different system
const vaginalAccessories = new Set([
--
GitLab
From 7814469acb296a0cf9c337bf28f170014f794ddd Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 3 Sep 2021 19:10:13 -0400
Subject: [PATCH 3/4] bump version
---
src/002-config/fc-version.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 7b1bb075ff0..8e55bd9e56d 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "4.0.0-alpha.8",
commitHash: null,
- release: 1138 // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
+ release: 1139 // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
};
--
GitLab
From 811efc08bb1d9e4fb6ea99e4730c007d897b7ba4 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 3 Sep 2021 19:37:03 -0400
Subject: [PATCH 4/4] add surgery description to page intro
---
src/js/rulesAssistantOptions.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 698c910909a..5354180fdd4 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1178,6 +1178,7 @@ App.RA.options = (function() {
const greeting = App.UI.DOM.makeElement("p", null, "scene-intro");
App.UI.DOM.appendNewElement("div", greeting, `${properTitle()}, I will review your slaves and make changes that will have a beneficial effect. Apologies, ${properTitle()}, but this function is... not fully complete. It may have some serious limitations. Please use the '${noDefaultSetting.text}' option to identify areas I should not address.`);
App.UI.DOM.appendNewElement("div", greeting, `For things like breast, butt, lip, dick, and ball injections, you need to only set the growth targets in Physical Regimen and I'll try to figure out how to best achieve them. You probably won't need a separate rule for each of them, or have to worry about ending the injections.`);
+ App.UI.DOM.appendNewElement("div", greeting, `Please note that surgeries will only be applied to slaves that are in the penthouse, and will not be applied until the end of the week. Surgery outcomes are included in a slave's individual report, instead of with the other effects of the RA.`);
const summary = App.UI.DOM.appendNewElement("div", greeting, `You can always see an overview of all of your rules in the `);
summary.append(App.UI.DOM.passageLink("summary view", "Rules Assistant Summary"));
summary.append(`.`);
--
GitLab