From b00d2e44f3752a7dc25cac4d2e4341134f5a4630 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 13 Jul 2017 15:26:26 -0400
Subject: [PATCH] Small tweaks.
---
devNotes/Extended Family Mode Explained.txt | 46 ++++
src/js/extendedFamilyModeJS.tw | 227 ++++++++++++++++++++
src/js/storyJS.tw | 225 -------------------
src/uncategorized/longSlaveDescription.tw | 2 +
src/uncategorized/slaveSummary.tw | 2 +-
5 files changed, 276 insertions(+), 226 deletions(-)
create mode 100644 devNotes/Extended Family Mode Explained.txt
create mode 100644 src/js/extendedFamilyModeJS.tw
diff --git a/devNotes/Extended Family Mode Explained.txt b/devNotes/Extended Family Mode Explained.txt
new file mode 100644
index 00000000000..660e1694076
--- /dev/null
+++ b/devNotes/Extended Family Mode Explained.txt
@@ -0,0 +1,46 @@
+Extended family mode (mod)
+
+In short, extended family mode replaces the old .relation + .relationTarget system with a completely new system capable of handling a limitless number of relatives. Or at least until your game crashes from trying to handle it all. Fully incompatable with the old system and fully functional with ng+.
+
+
+The backbone of the system: .father and .mother
+
+Everything about a slave's family can be gathered by looking into her mother and father. Beyond the obvious mother-daughter relation, you can check two seperate slaves' parents to see if they are related to each other, allowing for sisters, half-sisters, and with a .birthWeek check, twins with little effort.
+The following values are used with .mother and .father:
+Valid slave IDs (in other words, a value > 0) - Serves as both a target for checks and as a check itself to see if effort should be expended to search for the parent.
+0 - Slave has no known parent. A slave with a parent value of 0 is capable of having a parent added via reRelativeRecruiter
+MissingParentIDs (in other words, a value < -2) - Serves as a placeholder to preserve sibling relations in the case of a parent being sold or lost. Outside of extreme cases, this value will never be restored to its' previous value. $missingParentID starts at -10000 and decrements after application. On NG+, positive values are incremented the same as a normal slave and checked for validity. Should it be invalid, it will be replaced with $missingParentID. Negative values, on the other hand, are decremented by 1200000. Values of -1 and -2 are ignored by the JS, so don't use them. Also -9999 through -9996 are used by hero slaves to preserve their sibling status no matter when they are purchased or obtained during the same game.
+
+
+The limiters: .sisters and .daughters
+Extended family mode is VERY for loop intensive, and as such, has limiters to prevent it from needlessly looping. A value greater than 0 for either of these slave variables signals that slave has a sibling/daughter for various checks. Furthermore, the value of .sisters and .daughters accurately tracks the number of sisters and daughters, particularly for checks that require all of them to be found. You'll learn to hate these, but on the plus side, they can safely be recalculated with no side effects. Nearly entirely handled by <<AddSlave>> and removeActiveSlave, you do not understand how huge of a plus this is.
+
+
+The recruiting check: .canRecruit
+
+Checked by reRelativeRecruiter to see if a slave is eligible to have relatives added. Hero slaves, special slaves, and often event slaves are ineligible for recruiting. Gets disabled if the slave is called into the recruiting event but fails to qualify for additional relatives due to unaddable slots or too many existing relatives.
+
+
+A quick list of the JS that gets things done and various useful JS calls:
+
+sameDad(slave1, slave2) - checks if the slaves share the same father and returns true/false.
+sameMom(slave1, slave2) - checks if the slaves share the same mother and returns true/false.
+sameTParent(slave1, slave2) - an exception catcher that handles such things as "slave1 knocked up slave2 and got impregnated by slave2, their children will be sisters" and returns the sister variable (0 - not related, 1 - twins, 2 - sisters, 3 - half-sisters). (subJS, never call on its own)
+areTwins(slave1, slave2) - checks if the slaves are twins and returns true/false.
+areSisters(slave1, slave2) - combines all of the above and returns the sister variable (0 - not related, 1 - twins, 2 - sisters, 3 - half-sisters). A widely used check to identify sister relatives. Generally gated by a .sisters check. Recommended to use in a <<switch>> macro instead of calling it for each outcome.
+
+totalRelatives(slave) - returns how many relatives a slave has as an integer. Useful both as a check and for its value. Recommended to use as a check in instances where you want a relative, but don't care what it is.
+
+mutualChildren(slave1, slave2, slaves) - checks the slave array for children shared by the two slave arguements and returns the number of mutual children as an integer. Currently used solely to encourage two slaves into a relationship if they have kids together.
+
+The utility JS, courtesy of FCGudder. This JS should only be called if you know it will find something, use your limiters! These will always return the only relative if only one outcome is possible, so technically they can be used creatively. randomAvailable JS should be followed with random JS as a fallback for circumstances where you must find something, but would prefer it to be sensible if possible.
+randomRelatedSlave(slave, filterFunction) - returns a random related slave to the slave passed into it. filterFunction is called in the following JS but not needed if you just want a random relative.
+randomRelatedAvailableSlave(slave) - returns a random available related slave.
+randomSister(slave) - returns a random sister.
+randomTwinSister(slave) - returns a random twin.
+randomAvailableSister(slave) - returns a random available sister.
+randomAvailableTwinSister(slave) - returns a random available twin.
+randomDaughter(slave) - returns a random daughter.
+randomAvailableDaughter(slave) - returns a random available daughter.
+randomParent(slave) - returns a random parent.
+randomAvailableParent(slave) - returns a random available parent.
diff --git a/src/js/extendedFamilyModeJS.tw b/src/js/extendedFamilyModeJS.tw
new file mode 100644
index 00000000000..fcffc8caa71
--- /dev/null
+++ b/src/js/extendedFamilyModeJS.tw
@@ -0,0 +1,227 @@
+:: Extended Family Mode JS [script]
+
+/* see documentation for details /devNotes/Extended Family Mode Explained.txt */
+
+window.sameDad = function(slave1, slave2){
+ if ((slave1.father == slave2.father) && (slave1.father != 0 && slave1.father != -2)) {
+ return true;
+ } else {
+ return false;
+ }
+};
+
+window.sameMom = function(slave1, slave2){
+ if ((slave1.mother == slave2.mother) && (slave1.mother != 0 && slave1.mother != -2)) {
+ return true;
+ } else {
+ return false;
+ }
+};
+
+// testtest catches the case if a mother is a father or a father a mother - thank you familyAnon, for this code
+window.sameTParent = function(slave1, slave2) {
+ if (slave1.mother == slave2.father && slave1.father == slave2.mother && slave1.mother != 0 && slave1.mother != -2 && slave1.father != 0 && slave1.father != -2 && slave1.mother != slave1.father) {
+ return 2;
+ } else if ((slave1.mother == slave2.father || slave1.father == slave2.mother) && slave1.mother != 0 && slave1.mother != -2 && slave2.mother != 0 && slave2.mother != -2 && slave1.mother != slave1.father) {
+ return 3;
+ } else {
+ return 0;
+ }
+};
+
+/*
+window.sameTParent = function(slave1, slave2) {
+ if ((slave1.mother == slave2.father || slave1.father == slave2.mother) && (slave1.mother != 0 && slave1.mother != -2 && slave1.father != 0 && slave1.father != -2)) {
+ return true; //testtest catches the case if a mother is a father or a father a mother
+ } else {
+ return false;
+ }
+};
+*/
+
+window.areTwins = function(slave1, slave2) {
+ if (sameDad(slave1, slave2) == false) {
+ return false;
+ } else if (sameMom(slave1, slave2) == false) {
+ return false;
+ } else if (slave1.actualAge == slave2.actualAge && slave1.birthWeek == slave2.birthWeek) {
+ return true;
+ } else {
+ return false;
+ }
+};
+
+window.areSisters = function(slave1, slave2) {
+ if (slave1.ID == slave2.ID) {
+ return 0; //you are not your own sister
+ } else if ((slave1.father != 0 && slave1.father != -2) || (slave1.mother != 0 && slave1.mother != -2)) {
+ if (sameDad(slave1, slave2) == false && sameMom(slave1, slave2) == true) {
+ return 3; //half sisters
+ } else if (sameDad(slave1, slave2) == true && sameMom(slave1, slave2) == false) {
+ return 3; //half sisters
+ } else if (sameTParent(slave1, slave2) == 3) {
+ return 3; //half sisters
+ } else if (sameTParent(slave1, slave2) == 2) {
+ return 2; //sisters
+ } else if (sameDad(slave1, slave2) == true && sameMom(slave1, slave2) == true) {
+ if (slave1.actualAge == slave2.actualAge && slave1.birthWeek == slave2.birthWeek) {
+ return 1; //twins
+ } else {
+ return 2; //sisters
+ }
+ } else {
+ return 0; //not related
+ }
+ } else {
+ return 0; //not related
+ }
+};
+
+/*
+//3 = half-sisters, 2 = sisters, 1 = twins, 0 = not related
+window.areSisters = function(c1, c2) {
+ if(c1.ID == c2.ID) {
+ return 0;
+ }
+ var sib = 4;
+ if(sameMom(c1, c2)) {
+ sib -= 1;
+ }
+ if(sameDad(c1, c2)) {
+ sib -=1;
+ }
+ if (sib == 2 && c1.actualAge == c2.actualAge && c1.birthWeek == c2.birthWeek) {
+ sib -= 1;
+ }
+ if(sib == 4) {
+ return 0
+ } else {
+ return sib;
+ }
+}
+*/
+
+window.totalRelatives = function(slave) {
+ var relatives = 0;
+ if (slave.mother > 0) {
+ relatives += 1
+ }
+ if (slave.father > 0) {
+ relatives += 1
+ }
+ if (slave.daughters > 0) {
+ relatives += slave.daughters
+ }
+ if (slave.sisters > 0) {
+ relatives += slave.sisters
+ }
+ return relatives
+};
+
+window.mutualChildren = function(slave1, slave2, slaves) {
+ return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length;
+}
+
+window.isSlaveAvailable = function(slave) {
+ if (!slave) {
+ return null;
+ } else if (slave.assignment == "be your agent") {
+ return false;
+ } else if (slave.assignment == "live with your agent") {
+ return false;
+ } else if (slave.assignment == "be confined in the arcade") {
+ return false;
+ } else if (slave.assignment == "work in the dairy" && SugarCube.State.variables.DairyRestraintsSetting >= 2) {
+ return false;
+ } else {
+ return true;
+ }
+};
+
+if (typeof DairyRestraintsSetting == "undefined") {
+ var DairyRestraintsSetting = {
+ setSetting: function (setting) {
+ setting = Number(setting)
+ return setting
+ }
+ };
+ // Raise namespace scope to Global.
+ window.DairyRestraintsSetting = DairyRestraintsSetting;
+};
+
+/* OLD
+window.randomRelatedSlave = function(slave, filterFunction) {
+ if(!slave || !SugarCube) { return undefined; }
+ if(typeof filterFunction !== 'function') { filterFunction = function(s, index, array) { return true; }; }
+ return SugarCube.State.variables.slaves.filter(filterFunction).shuffle().find(function(s, index, array) {return areSisters(slave, s) || s.mother == slave.ID || s.father == slave.ID || slave.ID == s.mother || slave.ID == s.father; })
+}
+*/
+
+window.randomRelatedSlave = function(slave, filterFunction) {
+ if(!slave || !SugarCube) { return undefined; }
+ if(typeof filterFunction !== 'function') {
+ filterFunction = function(s, index, array) { return true; };
+ }
+ var arr = SugarCube.State.variables.slaves.filter(filterFunction)
+ arr.shuffle()
+ return arr.find(function(s, index, array) {
+ return areSisters(slave, s)
+ || slave.ID === s.mother
+ || slave.ID === s.father
+ || s.ID === slave.mother
+ || s.ID === slave.father;
+ })
+}
+
+window.randomRelatedAvailableSlave = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s); });
+}
+
+window.randomSister = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return areSisters(slave, s); });
+}
+
+window.randomTwinSister = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return areSisters(slave, s) == 1; });
+}
+
+window.randomAvailableSister = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && areSisters(slave, s); });
+}
+
+window.randomAvailableTwinSister = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && areSisters(slave, s) == 1; });
+}
+
+window.randomDaughter = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return s.mother == slave.ID || s.father == slave.ID; });
+}
+
+window.randomAvailableDaughter = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && (s.mother == slave.ID || s.father == slave.ID); });
+}
+
+window.randomParent = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return s.ID == slave.mother || s.ID == slave.father; });
+}
+
+window.randomAvailableParent = function(slave) {
+ return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && (s.ID == slave.mother || s.ID == slave.father); });
+}
+
+window.totalPlayerRelatives = function(pc) {
+ var relatives = 0;
+ if (pc.mother > 0) {
+ relatives += 1
+ }
+ if (pc.father > 0) {
+ relatives += 1
+ }
+ if (pc.daughters > 0) {
+ relatives += pc.daughters
+ }
+ if (pc.sisters > 0) {
+ relatives += pc.sisters
+ }
+ return relatives
+};
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 40cd0065322..259169721d7 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -636,154 +636,6 @@ window.tooBigButt = function(slave){
}
};
-/*
-window.sameTParent = function(slave1, slave2) {
- if ((slave1.mother == slave2.father || slave1.father == slave2.mother) && (slave1.mother != 0 && slave1.mother != -2 && slave1.father != 0 && slave1.father != -2)) {
- return true; //testtest catches the case if a mother is a father or a father a mother
- } else {
- return false;
- }
-};
-*/
-
-// testtest catches the case if a mother is a father or a father a mother
-window.sameTParent = function(slave1, slave2) {
- if (slave1.mother == slave2.father && slave1.father == slave2.mother && slave1.mother != 0 && slave1.mother != -2 && slave1.father != 0 && slave1.father != -2 && slave1.mother != slave1.father) {
- return 2;
- } else if ((slave1.mother == slave2.father || slave1.father == slave2.mother) && slave1.mother != 0 && slave1.mother != -2 && slave2.mother != 0 && slave2.mother != -2 && slave1.mother != slave1.father) {
- return 3;
- } else {
- return 0;
- }
-};
-
-
-window.sameDad = function(slave1, slave2){
- if ((slave1.father == slave2.father) && (slave1.father != 0 && slave1.father != -2)) {
- return true;
- } else {
- return false;
- }
-};
-
-window.sameMom = function(slave1, slave2){
- if ((slave1.mother == slave2.mother) && (slave1.mother != 0 && slave1.mother != -2)) {
- return true;
- } else {
- return false;
- }
-};
-
-window.areTwins = function(slave1, slave2) {
- if (sameDad(slave1, slave2) == false) {
- return false;
- } else if (sameMom(slave1, slave2) == false) {
- return false;
- } else if (slave1.actualAge == slave2.actualAge && slave1.birthWeek == slave2.birthWeek) {
- return true;
- } else {
- return false;
- }
-};
-
-/*
-//3 = half-sisters, 2 = sisters, 1 = twins, 0 = not related
-window.areSisters = function(c1, c2) {
- if(c1.ID == c2.ID) {
- return 0;
- }
- var sib = 4;
- if(sameMom(c1, c2)) {
- sib -= 1;
- }
- if(sameDad(c1, c2)) {
- sib -=1;
- }
- if (sib == 2 && c1.actualAge == c2.actualAge && c1.birthWeek == c2.birthWeek) {
- sib -= 1;
- }
- if(sib == 4) {
- return 0
- } else {
- return sib;
- }
-}
-*/
-
-window.areSisters = function(slave1, slave2) {
- if (slave1.ID == slave2.ID) {
- return 0; //you are not your own sister
- } else if ((slave1.father != 0 && slave1.father != -2) || (slave1.mother != 0 && slave1.mother != -2)) {
- if (sameDad(slave1, slave2) == false && sameMom(slave1, slave2) == true) {
- return 3; //half sisters
- } else if (sameDad(slave1, slave2) == true && sameMom(slave1, slave2) == false) {
- return 3; //half sisters
- } else if (sameTParent(slave1, slave2) == 3) {
- return 3; //half sisters
- } else if (sameTParent(slave1, slave2) == 2) {
- return 2; //sisters
- } else if (sameDad(slave1, slave2) == true && sameMom(slave1, slave2) == true) {
- if (slave1.actualAge == slave2.actualAge && slave1.birthWeek == slave2.birthWeek) {
- return 1; //twins
- } else {
- return 2; //sisters
- }
- } else {
- return 0; //not related
- }
- } else {
- return 0; //not related
- }
-};
-
-window.totalRelatives = function(slave) {
- var relatives = 0;
- if (slave.mother > 0) {
- relatives += 1
- }
- if (slave.father > 0) {
- relatives += 1
- }
- if (slave.daughters > 0) {
- relatives += slave.daughters
- }
- if (slave.sisters > 0) {
- relatives += slave.sisters
- }
- return relatives
-};
-
-window.mutualChildren = function(slave1, slave2, slaves) {
- return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length;
-}
-
-if (typeof DairyRestraintsSetting == "undefined") {
- var DairyRestraintsSetting = {
- setSetting: function (setting) {
- setting = Number(setting)
- return setting
- }
- };
- // Raise namespace scope to Global.
- window.DairyRestraintsSetting = DairyRestraintsSetting;
-};
-
-window.isSlaveAvailable = function(slave) {
- if (!slave) {
- return null;
- } else if (slave.assignment == "be your agent") {
- return false;
- } else if (slave.assignment == "live with your agent") {
- return false;
- } else if (slave.assignment == "be confined in the arcade") {
- return false;
- } else if (slave.assignment == "work in the dairy" && DairyRestraintsSetting >= 2) {
- return false;
- } else {
- return true;
- }
-};
-
window.relationTargetWord = function(slave) {
if (!slave) {
return null;
@@ -1250,83 +1102,6 @@ window.mergeRules = function(rules) {
return combinedRule;
}
-/* OLD
-window.randomRelatedSlave = function(slave, filterFunction) {
- if(!slave || !SugarCube) { return undefined; }
- if(typeof filterFunction !== 'function') { filterFunction = function(s, index, array) { return true; }; }
- return SugarCube.State.variables.slaves.filter(filterFunction).shuffle().find(function(s, index, array) {return areSisters(slave, s) || s.mother == slave.ID || s.father == slave.ID || slave.ID == s.mother || slave.ID == s.father; })
-}
-*/
-
-window.randomRelatedSlave = function(slave, filterFunction) {
- if(!slave || !SugarCube) { return undefined; }
- if(typeof filterFunction !== 'function') {
- filterFunction = function(s, index, array) { return true; };
- }
- var arr = SugarCube.State.variables.slaves.filter(filterFunction)
- arr.shuffle()
- return arr.find(function(s, index, array) {
- return areSisters(slave, s)
- || slave.ID === s.mother
- || slave.ID === s.father
- || s.ID === slave.mother
- || s.ID === slave.father;
- })
-}
-
-window.randomRelatedAvailableSlave = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s); });
-}
-
-window.randomSister = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return areSisters(slave, s); });
-}
-
-window.randomTwinSister = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return areSisters(slave, s) == 1; });
-}
-
-window.randomAvailableSister = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && areSisters(slave, s); });
-}
-
-window.randomAvailableTwinSister = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && areSisters(slave, s) == 1; });
-}
-
-window.randomDaughter = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return s.mother == slave.ID || s.father == slave.ID; });
-}
-
-window.randomAvailableDaughter = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && (s.mother == slave.ID || s.father == slave.ID); });
-}
-
-window.randomParent = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return s.ID == slave.mother || s.ID == slave.father; });
-}
-
-window.randomAvailableParent = function(slave) {
- return randomRelatedSlave(slave, function(s, index, array) { return isSlaveAvailable(s) && (s.ID == slave.mother || s.ID == slave.father); });
-}
-
-window.totalPlayerRelatives = function(pc) {
- var relatives = 0;
- if (pc.mother > 0) {
- relatives += 1
- }
- if (pc.father > 0) {
- relatives += 1
- }
- if (pc.daughters > 0) {
- relatives += pc.daughters
- }
- if (pc.sisters > 0) {
- relatives += pc.sisters
- }
- return relatives
-};
-
window.isVegetable = function(slave) {
slave = slave || State.variables.activeSlave;
if(!slave) { return false; }
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index adcf2b0dec2..41d26a6d982 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2499,6 +2499,8 @@ $pronounCap is
Ethnically, she's
<<elseif $activeSlave.nationality == "slave">>
She's been chattel long enough that slavery is effectively her nationality; ethnically, she's
+ <<elseif $activeSlave.nationality == "Stateless">>
+ She has spent so much time in the Free Cities that their statelessness is effectively her nationality; ethnically, she's
<<elseif $activeSlave.nationality == "Zimbabwean" && $activeSlave.race == "white">>
She's originally @@.tan;Rhodesian@@; ethnically, she's
<<else>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index c6521f1d0b3..f8b1a7a7874 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -1433,7 +1433,7 @@ Release rules: _Slave.releaseRules.
Azt Rev
<<case "Arabian Revivalist">>
Ara Rev
-<<case "slave" "none" "">>
+<<case "slave" "none" "" "Stateless">>
None
<<default>>
<<print _Slave.nationality.charAt(0) + _Slave.nationality.charAt(1) + _Slave.nationality.charAt(2)>>
--
GitLab