diff --git a/src/Mods/SecExp/SecExpBackwardCompatibility.tw b/src/Mods/SecExp/SecExpBackwardCompatibility.tw
index 969ce8f11c87a486d9c69e9762075d730c1e3fcd..7c59d88428e9d5076e5759de504de261ec8faaa3 100644
--- a/src/Mods/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/Mods/SecExp/SecExpBackwardCompatibility.tw
@@ -563,9 +563,6 @@
<<if ndef $SFIntervention>>
<<set $SFIntervention = 0>>
<</if>>
-<<if ndef $rebellingID>>
- <<set $rebellingID = []>>
-<</if>>
<<if ndef $saveValid>>
<<set $saveValid = 0>>
<</if>>
diff --git a/src/Mods/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js
index a739c0e6192ea9c13dc460d49ffec937b713aa23..67defdae1fa91fa53edc3d464493094c751bcb80 100644
--- a/src/Mods/SecExp/js/secExp.js
+++ b/src/Mods/SecExp/js/secExp.js
@@ -169,9 +169,9 @@ App.SecExp.conflict = (function() {
militiaC++;
}
- militiaC += V.militiaUnits.filter((u) => u.active === 1 && V.loyalID.includes(u.ID)).length;
- slavesC += V.slaveUnits.filter((u) => u.active === 1 && V.loyalID.includes(u.ID)).length;
- mercsC += V.mercUnits.filter((u) => u.active === 1 && V.loyalID.includes(u.ID)).length;
+ militiaC += V.militiaUnits.filter((u) => u.active === 1 && !V.rebellingID.includes(u.ID)).length;
+ slavesC += V.slaveUnits.filter((u) => u.active === 1 && !V.rebellingID.includes(u.ID)).length;
+ mercsC += V.mercUnits.filter((u) => u.active === 1 && !V.rebellingID.includes(u.ID)).length;
}
if(input === '') {
@@ -220,7 +220,7 @@ App.SecExp.conflict = (function() {
if (V.secBots.active === 1) {
troops += V.secBots.troops;
}
- countHumanTroops((u) => u.active === 1 && V.loyalID.includes(u.ID));
+ countHumanTroops((u) => u.active === 1 && !V.rebellingID.includes(u.ID));
if (V.SF.Toggle && V.SF.Active >= 1) {
troops += App.SecExp.troopsFromSF();
}
diff --git a/src/Mods/SecExp/rebellionGenerator.tw b/src/Mods/SecExp/rebellionGenerator.tw
index cb17b7b64985b00b84490a19aa7287f10395511f..2f52477998af4229265376c60d9230666de7485c 100644
--- a/src/Mods/SecExp/rebellionGenerator.tw
+++ b/src/Mods/SecExp/rebellionGenerator.tw
@@ -288,10 +288,7 @@
<</if>>
/* resetting ID list */
-<<unset $rebellingID>>
<<set $rebellingID = []>>
-<<unset $loyalID>>
-<<set $loyalID = []>>
/* if a rebellion fires determine amount of rebels and rebelling units */
<<if $slaveRebellion == 1>>
@@ -323,9 +320,6 @@
<<set $rebellingID.push($slaveUnits[_i].ID)>>
<</if>>
<</if>>
- <<if !($rebellingID.includes($slaveUnits[_i].ID))>>
- <<set $loyalID.push($slaveUnits[_i].ID)>>
- <</if>>
<</for>>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
<<if $militiaUnits[_i].loyalty < 10>>
@@ -341,9 +335,6 @@
<<set $rebellingID.push($militiaUnits[_i].ID)>>
<</if>>
<</if>>
- <<if !($rebellingID.includes($militiaUnits[_i].ID))>>
- <<set $loyalID.push($militiaUnits[_i].ID)>>
- <</if>>
<</for>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
<<if $mercUnits[_i].loyalty < 10>>
@@ -359,9 +350,6 @@
<<set $rebellingID.push($mercUnits[_i].ID)>>
<</if>>
<</if>>
- <<if !($rebellingID.includes($mercUnits[_i].ID))>>
- <<set $loyalID.push($mercUnits[_i].ID)>>
- <</if>>
<</for>>
<<set $attackEquip = Math.clamp($weaponsLaw + random(-2,1),0,4)>>
<<elseif $citizenRebellion == 1>>
@@ -393,9 +381,6 @@
<<set $rebellingID.push($militiaUnits[_i].ID)>>
<</if>>
<</if>>
- <<if !($rebellingID.includes($militiaUnits[_i].ID))>>
- <<set $loyalID.push($militiaUnits[_i].ID)>>
- <</if>>
<</for>>
<<for _i = 0; _i < $slaveUnits.length; _i++>>
<<if $slaveUnits[_i].loyalty < 10>>
@@ -411,9 +396,6 @@
<<set $rebellingID.push($slaveUnits[_i].ID)>>
<</if>>
<</if>>
- <<if !($rebellingID.includes($slaveUnits[_i].ID))>>
- <<set $loyalID.push($slaveUnits[_i].ID)>>
- <</if>>
<</for>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
<<if $mercUnits[_i].loyalty < 10>>
@@ -429,9 +411,6 @@
<<set $rebellingID.push($mercUnits[_i].ID)>>
<</if>>
<</if>>
- <<if !($rebellingID.includes($mercUnits[_i].ID))>>
- <<set $loyalID.push($mercUnits[_i].ID)>>
- <</if>>
<</for>>
<<set $attackEquip = Math.clamp($weaponsLaw + random(-1,1),0,4)>>
<<else>>
diff --git a/src/Mods/SecExp/rebellionHandler.tw b/src/Mods/SecExp/rebellionHandler.tw
index 2682d53b923997f71f86cae2c302738f0a01d76b..a250c2910385e82ce53cd7fe6e7f875d1936f968 100644
--- a/src/Mods/SecExp/rebellionHandler.tw
+++ b/src/Mods/SecExp/rebellionHandler.tw
@@ -59,7 +59,7 @@
<</if>>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
- <<if $militiaUnits[_i].active == 1 && $loyalID.includes($militiaUnits[_i].ID)>>
+ <<if $militiaUnits[_i].active == 1 && (!$rebellingID.includes($militiaUnits[_i].ID))>>
<<set _unit = App.SecExp.getUnit("Militia", _i)>>
<<set _attack += _unit.attack>>
<<set _defense += _unit.defense>>
@@ -67,7 +67,7 @@
<</if>>
<</for>>
<<for _i = 0; _i < $slaveUnits.length; _i++>>
- <<if $slaveUnits[_i].active == 1 && $loyalID.includes($slaveUnits[_i].ID)>>
+ <<if $slaveUnits[_i].active == 1 && (!$rebellingID.includes($slaveUnits[_i].ID))>>
<<set _unit = App.SecExp.getUnit("Slaves", _i)>>
<<set _attack += _unit.attack>>
<<set _defense += _unit.defense>>
@@ -75,7 +75,7 @@
<</if>>
<</for>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
- <<if $mercUnits[_i].active == 1 && $loyalID.includes($mercUnits[_i].ID)>>
+ <<if $mercUnits[_i].active == 1 && (!$rebellingID.includes($mercUnits[_i].ID))>>
<<set _unit = App.SecExp.getUnit("Mercs", _i)>>
<<set _attack += _unit.attack>>
<<set _defense += _unit.defense>>
diff --git a/src/Mods/SecExp/rebellionOptions.tw b/src/Mods/SecExp/rebellionOptions.tw
index 8e7da9e0b9fff123a19a2ac5890864954295d233..217ea1b5c755c6f90bc6dffe2c5423d84f0bc3c3 100644
--- a/src/Mods/SecExp/rebellionOptions.tw
+++ b/src/Mods/SecExp/rebellionOptions.tw
@@ -63,14 +63,15 @@
betrayed you and joined the insurrection.
<</if>>
<<set _count = 0>>
- <<if $loyalID.length > 0>>
+ <<set _loyalUnits = $militiaUnits.length + $slaveUnits.length + $mercUnits.length - $rebellingID.length>>
+ <<if _loyalUnits > 0>>
<br>
<br>
<<if $arcologyUpgrade.drones == 1>>Your security drones,<</if>>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
- <<if $militiaUnits[_i].active == 1 && ($loyalID.includes($militiaUnits[_i].ID))>>
+ <<if $militiaUnits[_i].active == 1 && (!$rebellingID.includes($militiaUnits[_i].ID))>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$militiaUnits[_i].platoonName,
<<else>>
$militiaUnits[_i].platoonName
@@ -78,9 +79,9 @@
<</if>>
<</for>>
<<for _i = 0; _i < $slaveUnits.length; _i++>>
- <<if $slaveUnits[_i].active == 1 && ($loyalID.includes($slaveUnits[_i].ID))>>
+ <<if $slaveUnits[_i].active == 1 && (!$rebellingID.includes($slaveUnits[_i].ID))>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$slaveUnits[_i].platoonName,
<<else>>
$slaveUnits[_i].platoonName
@@ -88,16 +89,16 @@
<</if>>
<</for>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
- <<if $mercUnits[_i].active == 1 && ($loyalID.includes($mercUnits[_i].ID))>>
+ <<if $mercUnits[_i].active == 1 && (!$rebellingID.includes($mercUnits[_i].ID))>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$mercUnits[_i].platoonName,
<<else>>
$mercUnits[_i].platoonName
<</if>>
<</if>>
<</for>>
- <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print num($SF.ArmySize)>> strong<</if>>
+ <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print num($SF.ArmySize)>> strong<</if>>
are called to defend the arcology from this menace.
<<else>>
<<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print num($SF.ArmySize)>> strong<</if>> <</if>>
@@ -159,13 +160,14 @@
<</if>>
<br>
<<set _count = 0>>
- <<if $loyalID.length > 0>>
+ <<set _loyalUnits = $militiaUnits.length + $slaveUnits.length + $mercUnits.length - $rebellingID.length>>
+ <<if _loyalUnits > 0>>
<br>
<<if $arcologyUpgrade.drones == 1>>Your security drones,<</if>>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
- <<if $militiaUnits[_i].active == 1 && ($loyalID.includes($militiaUnits[_i].ID))>>
+ <<if $militiaUnits[_i].active == 1 && (!$rebellingID.includes($militiaUnits[_i].ID))>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$militiaUnits[_i].platoonName,
<<else>>
$militiaUnits[_i].platoonName
@@ -173,9 +175,9 @@
<</if>>
<</for>>
<<for _i = 0; _i < $slaveUnits.length; _i++>>
- <<if $slaveUnits[_i].active == 1 && ($loyalID.includes($slaveUnits[_i].ID))>>
+ <<if $slaveUnits[_i].active == 1 && (!$rebellingID.includes($slaveUnits[_i].ID))>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$slaveUnits[_i].platoonName,
<<else>>
$slaveUnits[_i].platoonName
@@ -183,9 +185,9 @@
<</if>>
<</for>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
- <<if $mercUnits[_i].active == 1 && ($loyalID.includes($mercUnits[_i].ID))>>
+ <<if $mercUnits[_i].active == 1 && (!$rebellingID.includes($mercUnits[_i].ID))>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$mercUnits[_i].platoonName,
<<else>>
$mercUnits[_i].platoonName
diff --git a/src/Mods/SecExp/unitsRebellionReport.tw b/src/Mods/SecExp/unitsRebellionReport.tw
index 73534c482ef5add94aecacca3146bb4e3437b63c..e4586ae34de5519c12191c561df2cac703ce7879 100644
--- a/src/Mods/SecExp/unitsRebellionReport.tw
+++ b/src/Mods/SecExp/unitsRebellionReport.tw
@@ -12,13 +12,14 @@
<br>$SF.Lower, <<print num($SF.ArmySize)>> strong, was called to join the battle: no casualties suffered.
<</if>>
<<set _count = 0>>
- <<if $loyalID.length > 0>>
+ <<set _loyalUnits = $militiaUnits.length + $slaveUnits.length + $mercUnits.length - $rebellingID.length>>
+ <<if _loyalUnits > 0>>
<br>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
- <<if $militiaUnits[_i].active == 1 && ($loyalID.includes($militiaUnits[_i].ID))>>
+ <<if $militiaUnits[_i].active == 1 && (!$rebellingID.includes($militiaUnits[_i].ID))>>
<<set $militiaUnits[_i].battlesFought++>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$militiaUnits[_i].platoonName,
<<else>>
$militiaUnits[_i].platoonName
@@ -26,10 +27,10 @@
<</if>>
<</for>>
<<for _i = 0; _i < $slaveUnits.length; _i++>>
- <<if $slaveUnits[_i].active == 1 && ($loyalID.includes($slaveUnits[_i].ID))>>
+ <<if $slaveUnits[_i].active == 1 && (!$rebellingID.includes($slaveUnits[_i].ID))>>
<<set $slaveUnits[_i].battlesFought++>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$slaveUnits[_i].platoonName,
<<else>>
$slaveUnits[_i].platoonName
@@ -37,10 +38,10 @@
<</if>>
<</for>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
- <<if $mercUnits[_i].active == 1 && ($loyalID.includes($mercUnits[_i].ID))>>
+ <<if $mercUnits[_i].active == 1 && (!$rebellingID.includes($mercUnits[_i].ID))>>
<<set $mercUnits[_i].battlesFought++>>
<<set _count++>>
- <<if _count < $loyalID.length>>
+ <<if _count < _loyalUnits>>
$mercUnits[_i].platoonName,
<<else>>
$mercUnits[_i].platoonName
@@ -176,7 +177,7 @@
<</if>>
<<if App.SecExp.conflict.deployedUnits('militia') >= 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
- <<if $militiaUnits[_j].active == 1 && $loyalID.includes($militiaUnits[_j].ID)>>
+ <<if $militiaUnits[_j].active == 1 && !$rebellingID.includes($militiaUnits[_j].ID)>>
<br><br>
<<set $militiaUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
@@ -218,7 +219,7 @@
<<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>
<<set _med = 0>>
<<for _j = 0; _j < $slaveUnits.length; _j++>>
- <<if $slaveUnits[_j].active == 1 && $loyalID.includes($slaveUnits[_j].ID)>>
+ <<if $slaveUnits[_j].active == 1 && !$rebellingID.includes($slaveUnits[_j].ID)>>
<br><br>
<<set $slaveUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
@@ -263,7 +264,7 @@
<</if>>
<<if App.SecExp.conflict.deployedUnits('mercs') >= 1>>
<<for _j = 0; _j < $mercUnits.length; _j++>>
- <<if $mercUnits[_j].active == 1 && $loyalID.includes($mercUnits[_j].ID)>>
+ <<if $mercUnits[_j].active == 1 && !$rebellingID.includes($mercUnits[_j].ID)>>
<br><br>
<<set $mercUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 76f18de06ba35e10122e1f6d252958317d3cf364..fc2f6b751c4383b2a52b05fef32d42c4ce69633b 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -1546,7 +1546,6 @@ Target destination: <b><span id="targetLocation">$activeChild.targetLocation</sp
<<if $cheatMode>>
<br>''Cheatmode:''
<<link "Retrieve immediately" "Nursery Retrieval Workaround">>
- <<set $nurseryOldID = $cribs[$i].ID>>
<<set $readySlave = $cribs.pluck([$i], [$i])>>
<</link>>
<</if>>
diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
index 46b0c7e404c21743e281022ac5a2aae8e2bbfa92..0a15f53b40e3736bd75083d1a11e66a9ae767c36 100644
--- a/src/facilities/nursery/nurseryRetrievalWorkaround.tw
+++ b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
@@ -13,7 +13,7 @@ $readySlave.slaveName has been discharged from $nurseryName and is ready to beco
/* TODO:
<<if $nurseryOrgans.length > 0>>
<<for _i = 0; _i < $nurseryOrgans.length; _i++>>
- <<if $nurseryOrgans[_i].ID == $nurseryOldID>>
+ <<if $nurseryOrgans[_i].ID == $activeSlave.ID>>
<<set _newOrgan = {type: $nurseryOrgans[_i].type, weeksToCompletion: $nurseryOrgans[_i].weeksToCompletion, ID: $activeSlave.ID}>>
<<if _newOrgan.weeksToCompletion <= 0>>
<<set $completedOrgans.push($nurseryOrgans[_i])>>
diff --git a/src/facilities/nursery/widgets/children/childSummary.js b/src/facilities/nursery/widgets/children/childSummary.js
index 0ba86b5aa61596fb29fb5444472f39a49df9921b..655e4bdab3e99e89183ba525936f3a950f89af1c 100644
--- a/src/facilities/nursery/widgets/children/childSummary.js
+++ b/src/facilities/nursery/widgets/children/childSummary.js
@@ -53,10 +53,8 @@ App.Facilities.Nursery.ChildSummary = function(child) {
r += " ";
}
}
- V.desc = SlaveTitle(child);
- const firstLetter = V.desc.substring(0, 1).toUpperCase();
- V.desc = firstLetter + V.desc.substring(1);
- r += `<strong><span class="coral">${V.desc}${abbreviate.physicals === 2? '.' : ''}</span></strong> `;
+ const desc = capFirstChar(SlaveTitle(child));
+ r += `<strong><span class="coral">${desc}${abbreviate.physicals === 2? '.' : ''}</span></strong> `;
if (V.seeRace) {
r += `<span class="tan">`;
if (abbreviate.race === 1) {
@@ -3821,7 +3819,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
} else if (child.mother === -1) {
r += `Your daughter`;
if (child.relationship < -1) {
- res += ` & ${PCrelationshipTerm(child)}`;
+ r += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
@@ -3844,7 +3842,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
} else if (child.father === -1 && child.mother !== -1) {
r += `Your daughter`;
if (child.relationship < -1) {
- res += ` & ${PCrelationshipTerm(child)}`;
+ r += ` & ${PCrelationshipTerm(child)}`;
handled = 1;
}
r += " ";
diff --git a/src/facilities/nursery/widgets/utils/nurseryUtils.js b/src/facilities/nursery/widgets/utils/nurseryUtils.js
index ec19f95653090d18e7e08ddd8554e8fc9cf570ac..a20b79001d1aba4cd9223a03c2443746ad232564 100644
--- a/src/facilities/nursery/widgets/utils/nurseryUtils.js
+++ b/src/facilities/nursery/widgets/utils/nurseryUtils.js
@@ -35,8 +35,6 @@ App.Facilities.Nursery.childList = function childList() {
}
if (child.actualAge >= 18) {
- V.nurseryOldID = child.ID;
-
if (child.targetLocation === "freedom") {
V.freedSlaves.push(child);
}
diff --git a/src/interaction/rename.js b/src/interaction/rename.js
index c852ef4feb9d553cb105f6a7a60f7e76823d2799..6785d52bfc8cafc070cab8f6d31b0ce0fe7005d8 100644
--- a/src/interaction/rename.js
+++ b/src/interaction/rename.js
@@ -115,7 +115,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName = "", oldSurname = ""} =
slave.devotion += 5;
slave.trust += 5;
} else if (oldSurname === V.PC.slaveSurname) {
- r.push(`${He}'s devastated that you'd rename ${him} something other than your name. ${He}'s <span class="trust dec">terrified</span> that you intend to discard ${him} as your slave ${V.wife}, and <span class="devotion dec">saddened</span> that you would take away something that was precious to ${him}.`);
+ r.push(`${He}'s devastated that you'd rename ${him} something other than your name. ${He}'s <span class="trust dec">terrified</span> that you intend to discard ${him} as your slave ${wife}, and <span class="devotion dec">saddened</span> that you would take away something that was precious to ${him}.`);
slave.devotion -= 5;
slave.trust -= 5;
}
@@ -140,7 +140,7 @@ App.UI.SlaveInteract.rename = function(slave, {oldName = "", oldSurname = ""} =
r.push(`When you tell ${him} that ${he}'s to be known as ${slave.slaveName} ${slave.slaveSurname} now, ${he} nods with approval feeling <span class="trust inc">that ${he} may hold at least some value in your eyes.</span>`);
slave.trust += 5;
} else if (oldSurname === V.PC.slaveSurname) {
- r.push(`${He} accepts that you'd rename ${him} something other than your name. ${He}'s <span class="trust dec">a little scared</span> that you intend to discard ${him} as your slave ${V.wife}, or worse, but realizes this was not only a possibility, but likely.`);
+ r.push(`${He} accepts that you'd rename ${him} something other than your name. ${He}'s <span class="trust dec">a little scared</span> that you intend to discard ${him} as your slave ${wife}, or worse, but realizes this was not only a possibility, but likely.`);
slave.trust -= 5;
}
}
diff --git a/src/personalAssistant/assistant.js b/src/personalAssistant/assistant.js
index 848c946ec417d7bf96e5e383c36b1b1dbc983d9c..c00c4970e6ddd8278e8e47710b54034ed1e7d7ec 100644
--- a/src/personalAssistant/assistant.js
+++ b/src/personalAssistant/assistant.js
@@ -17,7 +17,7 @@ globalThis.assistant = (function() {
if (V.assistant.appearance === "incubus" && V.diversePronouns > 0) {
o.main = {pronoun: App.Data.Pronouns.Kind.male};
o.market = {pronoun: App.Data.Pronouns.Kind.female};
- } else if (V.assistantAppearance === "succubus" && V.diversePronouns > 0) {
+ } else if (V.assistant.appearance === "succubus" && V.diversePronouns > 0) {
o.main = {pronoun: App.Data.Pronouns.Kind.female};
o.market = {pronoun: App.Data.Pronouns.Kind.male};
} else {