From 535fa1fe17eec5e71cf6e6359511f81b4656f675 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 13 Sep 2020 02:27:35 -0400
Subject: [PATCH] initRules to js
---
src/gui/options/options.tw | 2 +-
src/init/storyInit.tw | 2 +-
src/js/assayJS.js | 26 +++-
src/uncategorized/initRules.tw | 269 ---------------------------------
4 files changed, 24 insertions(+), 275 deletions(-)
delete mode 100644 src/uncategorized/initRules.tw
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
index d0a8a8f67d4..d551efed161 100644
--- a/src/gui/options/options.tw
+++ b/src/gui/options/options.tw
@@ -625,7 +625,7 @@
<<run _option.addComment("Enable cheat mode to edit genetics.")>>
<</if>>
- <<run _options.addOption("Rules Assistant").addCustomElement('<<button "Reset Rules">><<set $defaultRules=[]>><<include "Init Rules">><<goto "Rules Assistant">><</button>>')>>
+ <<run _options.addOption("Rules Assistant").addCustomElement('<<button "Reset Rules">><<run initRules()>><<goto "Rules Assistant">><</button>>')>>
<<run _options.addOption("Passage Profiler is", "profiler")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 8dc2aa0e04a..c1a54c8f9e6 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -28,7 +28,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $PC = basePlayer()>>
<<run WombInit($PC)>>
<<run cashX(10000, "personalBusiness")>>
- <<include "Init Rules">>
+ <<run initRules()>>
<<else>> /* imported save (NG+) */
<<run App.Data.NewGamePlus()>>
<</if>>
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index a642ccb99db..72735be83df 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -370,7 +370,7 @@ globalThis.SlaveFullBirthName = function(slave) {
*/
globalThis.PoliteRudeTitle = function(slave) {
const PC = V.PC;
- const {s, ss, title} = getEnunciation(slave);
+ const { s, ss, title } = getEnunciation(slave);
let r = "";
if (slave.nationality === "Japanese") {
@@ -1350,7 +1350,7 @@ globalThis.menialPopCap = function() {
r += "You don't have enough room for all your menial bioreactors and are obliged to sell some.";
}
}
- return {text: r, value: popCap};
+ return { text: r, value: popCap };
};
/**
@@ -1579,7 +1579,7 @@ globalThis.retirementReady = function(slave) {
* @param {App.Entity.SlaveState} slave
* @param {number} [weeks=1]
*/
-globalThis.ageSlaveWeeks = function(slave, weeks=1) {
+globalThis.ageSlaveWeeks = function(slave, weeks = 1) {
if (V.seeAge !== 0) { // birthdays enabled
for (let i = 0; i < weeks; ++i) {
slave.birthWeek++;
@@ -1597,7 +1597,7 @@ globalThis.ageSlaveWeeks = function(slave, weeks=1) {
* @param {App.Entity.SlaveState} slave
* @param {boolean} [forceDevelopment=false]
*/
-globalThis.ageSlave = function(slave, forceDevelopment=false) {
+globalThis.ageSlave = function(slave, forceDevelopment = false) {
slave.physicalAge++;
slave.actualAge++;
if (slave.geneMods.NCS === 0) {
@@ -1632,3 +1632,21 @@ globalThis.isShelterSlave = function(slave) {
globalThis.perceivedGender = function(slave) {
return -1;
};
+
+globalThis.initRules = function() {
+ V.defaultRules = [
+ {
+ name: "Obedient Slaves",
+ condition: {
+ function: "between",
+ data: {
+ attribute: "devotion",
+ value: [20, null]
+ },
+ },
+ set: {
+ removalAssignment: "rest",
+ }
+ },
+ ];
+};
diff --git a/src/uncategorized/initRules.tw b/src/uncategorized/initRules.tw
deleted file mode 100644
index 4c203c95100..00000000000
--- a/src/uncategorized/initRules.tw
+++ /dev/null
@@ -1,269 +0,0 @@
-:: Init Rules
-
-<<silently>>
-
-<<set _activeRule = emptyDefaultRule()>>
-<<set _activeRule.name = "Obedient Slaves">>
-<<set _activeRule.condition.function = "between">>
-<<set _activeRule.condition.data = { attribute: "devotion", value: [20, null] }>>
-<<set _activeRule.set.removalAssignment = "rest">>
-<<set $defaultRules.push(_activeRule)>>
-
-/*
-<<set _activeRule = {
- ID: 2,
- name: "Disobedient Slaves",
- condition: {
- id: "<=",
- first: {
- id: "(name)",
- name: "devotion"
- },
- second: {
- id: "(number)",
- value: 20
- }
- },
- releaseRules: "no default setting",
- clitSetting: "no default setting",
- clitSettingXY: "no default setting",
- clitSettingXX: "no default setting",
- clitSettingEnergy: "no default setting",
- speechRules: "no default setting",
- clothes: "no default setting",
- collar: "no default setting",
- shoes: "no default setting",
- virginAccessory: "no default setting",
- aVirginAccessory: "no default setting",
- vaginalAccessory: "no default setting",
- aVirginDickAccessory: "no default setting",
- dickAccessory: "no default setting",
- bellyAccessory: "no default setting",
- aVirginButtplug: "no default setting",
- buttplug: "no default setting",
- eyeColor: "no default setting",
- makeup: "no default setting",
- nails: "no default setting",
- hColor: "no default setting",
- hLength: "no default setting",
- haircuts: "no default setting",
- hStyle: "no default setting",
- pubicHColor: "no default setting",
- pubicHStyle: "no default setting",
- nipplesPiercing: "no default setting",
- areolaePiercing: "no default setting",
- clitPiercing: "no default setting",
- vaginaLube: "no default setting",
- vaginaPiercing: "no default setting",
- dickPiercing: "no default setting",
- anusPiercing: "no default setting",
- lipsPiercing: "no default setting",
- tonguePiercing: "no default setting",
- earPiercing: "no default setting",
- nosePiercing: "no default setting",
- eyebrowPiercing: "no default setting",
- navelPiercing: "no default setting",
- corsetPiercing: "no default setting",
- boobsTat: "no default setting",
- buttTat: "no default setting",
- vaginaTat: "no default setting",
- dickTat: "no default setting",
- lipsTat: "no default setting",
- anusTat: "no default setting",
- shouldersTat: "no default setting",
- armsTat: "no default setting",
- legsTat: "no default setting",
- backTat: "no default setting",
- stampTat: "no default setting",
- curatives: "no default setting",
- livingRules: "spare",
- restRules: "no default setting",,
- relationshipRules: "no default setting",
- standardPunishment: "no default setting",
- standardReward: "no default setting",
- diet: "no default setting",
- dietCum: "no default setting",
- dietMilk: "no default setting",
- muscles: "no default setting",
- XY: "no default setting",
- XX: "no default setting",
- gelding: "no default setting",
- preg: "no default setting",
- growth: {
- boobs: "no default setting",
- butt: "no default setting",
- lips: "no default setting",
- dick: "no default setting",
- balls: "no default setting"
- },
- aphrodisiacs: "no default setting",
- autoSurgery: 0,
- autoBrand: 0,
- pornFameSpending: "no default setting",
- dietGrowthSupport: 0,
- eyewear: "no default setting",
- earwear: "no default setting",
- assignment: [],
- excludeAssignment: [],
- setAssignment: "no default setting",
- facility: [],
- excludeFacility: [],
- excludeSpecialSlaves: false,
- facilityRemove: false,
- removalAssignment: "rest",
- selectedSlaves: [],
- excludedSlaves: [],
- surgery: {
- eyes: "no default setting",
- lactation: "no default setting",
- prostate: "no default setting",
- cosmetic: "no default setting",
- accent: "no default setting",
- shoulders: "no default setting",
- shouldersImplant: "no default setting",
- boobs: "no default setting",
- hips: "no default setting",
- hipsImplant: "no default setting",
- butt: "no default setting",
- faceShape: "no default setting",
- lips: "no default setting",
- holes: "no default setting"
- },
- lactationRules: "no default setting",
- mobilityRules: "no default setting",
- underArmHColor: "no default setting",
- underArmHStyle: "no default setting",
- eyebrowHColor: "no default setting",
- eyebrowHStyle: "no default setting",
- drug: "no default setting"
-}>>
-<<set $defaultRules.push(_activeRule)>>
-
-<<set _activeRule = {
- ID: 3,
- name: "Unhealthy Slaves",
- condition: {
- id: "<",
- first: {
- id: "(name)",
- name: "health"
- },
- second: {
- id: "(number)",
- value: -10
- }
- },
- releaseRules: "no default setting",
- clitSetting: "no default setting",
- clitSettingXY: "no default setting",
- clitSettingXX: "no default setting",
- clitSettingEnergy: "no default setting",
- speechRules: "no default setting",
- clothes: "no default setting",
- collar: "no default setting",
- shoes: "no default setting",
- virginAccessory: "no default setting",
- aVirginAccessory: "no default setting",
- vaginalAccessory: "no default setting",
- dickAccessory: "no default setting",
- aVirginDickAccessory: "no default setting",
- bellyAccessory: "no default setting",
- aVirginButtplug: "no default setting",
- buttplug: "no default setting",
- eyeColor: "no default setting",
- makeup: "no default setting",
- nails: "no default setting",
- hColor: "no default setting",
- hLength: "no default setting",
- haircuts: "no default setting",
- hStyle: "no default setting",
- pubicHColor: "no default setting",
- pubicHStyle: "no default setting",
- nipplesPiercing: "no default setting",
- areolaePiercing: "no default setting",
- clitPiercing: "no default setting",
- vaginaLube: "no default setting",
- vaginaPiercing: "no default setting",
- dickPiercing: "no default setting",
- anusPiercing: "no default setting",
- lipsPiercing: "no default setting",
- tonguePiercing: "no default setting",
- earPiercing: "no default setting",
- nosePiercing: "no default setting",
- eyebrowPiercing: "no default setting",
- navelPiercing: "no default setting",
- corsetPiercing: "no default setting",
- boobsTat: "no default setting",
- buttTat: "no default setting",
- vaginaTat: "no default setting",
- dickTat: "no default setting",
- lipsTat: "no default setting",
- anusTat: "no default setting",
- shouldersTat: "no default setting",
- armsTat: "no default setting",
- legsTat: "no default setting",
- backTat: "no default setting",
- stampTat: "no default setting",
- curatives: "applied",
- livingRules: "no default setting",
- relationshipRules: "no default setting",
- standardPunishment: "no default setting",
- standardReward: "no default setting",
- diet: "no default setting",
- dietCum: "no default setting",
- dietMilk: "no default setting",
- muscles: "no default setting",
- XY: "no default setting",
- XX: "no default setting",
- gelding: "no default setting",
- preg: "no default setting",
- growth: {
- boobs: "no default setting",
- butt: "no default setting",
- lips: "no default setting",
- dick: "no default setting",
- balls: "no default setting"
- },
- aphrodisiacs: "no default setting",
- autoSurgery: 0,
- autoBrand: 0,
- pornFameSpending: "no default setting",
- dietGrowthSupport: 0,
- eyewear: "no default setting",
- earwear: "no default setting",
- assignment: [],
- excludeAssignment: [],
- setAssignment: "no default setting",
- facility: [],
- excludeFacility: [],
- excludeSpecialSlaves: false,
- facilityRemove: false,
- removalAssignment: "rest",
- selectedSlaves: [],
- excludedSlaves: [],
- surgery: {
- eyes: "no default setting",
- lactation: "no default setting",
- prostate: "no default setting",
- cosmetic: "no default setting",
- accent: "no default setting",
- shoulders: "no default setting",
- shouldersImplant: "no default setting",
- boobs: "no default setting",
- hips: "no default setting",
- hipsImplant: "no default setting",
- butt: "no default setting",
- faceShape: "no default setting",
- lips: "no default setting",
- holes: "no default setting"
- },
- lactationRules: "no default setting",
- underArmHColor: "no default setting",
- underArmHStyle: "no default setting",
- eyebrowHColor: "no default setting",
- eyebrowHStyle: "no default setting",
- drug: "no default setting"
-}>>
-<<set $defaultRules.push(_activeRule)>>
-*/
-<</silently>>
--
GitLab