diff --git a/src/SpecialForce/Proposal.tw b/src/SpecialForce/Proposal.tw
index 72ca2c8bb32f7ad3d7694ec5aa4d74a9951ab7cb..fd04ace1eb007934f4453ade086258277c914d85 100644
--- a/src/SpecialForce/Proposal.tw
+++ b/src/SpecialForce/Proposal.tw
@@ -1,34 +1,21 @@
:: Security Force Proposal [nobr]
-<<set $nextButton = " ">>
-<span id="result">
+<<set $nextButton = " ", _price = 20000>>
+The Free Cities were founded on the principles of unrestrained anarcho-capitalism. To those with such beliefs, the very idea of possessing an armed force, a key tool of government control, or weapons at all, was anathema.
+<br><br>
+In the period since, however, your citizens have seen the value in weaponry. They watched on their news-feed as some Free Cities were sacked by the armies and mobs of the old world, driven by their hatred of the citizens' luxurious lifestyles. They've seen other Cities toppled from within, by slave conspiracies or infighting among citizen groupings with differing beliefs. They've witnessed the distressingly rapid rise of fanatical anti-slavery organizations, who would like nothing more than to see them slowly bled by their own chattel. They are learned people, and they know what happens to slaveowners who lose their power.
+<br><br>
+They've also seen the results of your policies. Your actions towards the arming of both yourself and the arcology proved critical, and ensured their safety when the old world came for them. And your victory over the Daughters of Liberty, who the citizens know would have executed every single one of them, has created an opportunity. If you insisted upon the creation of a standing 'special' force for the arcology, many would support you and, more importantly, nobody of note would object.
+<br><br>
+Such a force would solve many problems. More soldiers would mean more control, which is very good for you. More soldiers would mean more security for the arcology and the approaches to it, which is very good for business. More soldiers would mean more obedience from rebellious slaves who can see how powerless they truly are, which is very good for everybody. The force would be tiny compared to the old world militaries that still exist, but money and technology can, of course, overcome massive numerical inferiority. This being the Free Cities, they would have other uses besides security. Perhaps, in time, you could exert some manner of influence on the old world itself.
+<br><br>
+''This is a unique and very important opportunity'', and is possible only because of your recent victory over the Daughters. If you do not seize it, the memories and fears of your citizens will fade,and you will not be able to raise the matter again.
- The Free Cities were founded on the principles of unrestrained anarcho-capitalism. To those with such beliefs, the very idea of possessing an armed force, a key tool of government control, or weapons at all, was anathema.
- <br><br>
- In the period since, however, your citizens have seen the value in weaponry. They watched on their news-feed as some Free Cities were sacked by the armies and mobs of the old world, driven by their hatred of the citizens' luxurious lifestyles. They've seen other Cities toppled from within, by slave conspiracies or infighting among citizen groupings with differing beliefs. They've witnessed the distressingly rapid rise of fanatical anti-slavery organizations, who would like nothing more than to see them slowly bled by their own chattel. They are learned people, and they know what happens to slaveowners who lose their power.
- <br><br>
- They've also seen the results of your policies. Your actions towards the arming of both yourself and the arcology proved critical, and ensured their safety when the old world came for them. And your victory over the Daughters of Liberty, who the citizens know would have executed every single one of them, has created an opportunity. If you insisted upon the creation of a standing 'special' force for the arcology, many would support you and, more importantly, nobody of note would object.
- <br><br>
- Such a force would solve many problems. More soldiers would mean more control, which is very good for you. More soldiers would mean more security for the arcology and the approaches to it, which is very good for business. More soldiers would mean more obedience from rebellious slaves who can see how powerless they truly are, which is very good for everybody. The force would be tiny compared to the old world militaries that still exist, but money and technology can, of course, overcome massive numerical inferiority. This being the Free Cities, they would have other uses besides security. Perhaps, in time, you could exert some manner of influence on the old world itself.
- <br><br>
- ''This is a unique and very important opportunity'', and is possible only because of your recent victory over the Daughters. If you do not seize it, the memories and fears of your citizens will fade,and you will not be able to raise the matter again.
-
- <<set _price = 20000>>
- <<if $PC.warfare >= 100>>
- <<set _price *= .5>>
- <<elseif $PC.warfare >= 50||$PC.career === "arcology owner">>
- <<set _price *= .75>>
- <</if>>
- <br><<link "Prepare for an announcement." "Security Force Naming-Colonel">>
- <<replace "#result">>
- <<= App.SF.Init()>>
- <<set $SF.IntroProgress = -1>>
- <<run cashX(forceNeg(_price), "specialForces")>>
- <</replace>>
- <</link>><br>//Initial costs are @@.yellowgreen;<<print cashFormat(_price)>>@@ and upon establishment the force will have significant support costs until it is self-sufficient.//
- <br><<link "The current measures are enough." "RIE Eligibility Check">>
- <<replace "#result">>
- <<set $SF.Active = 0>>
- <</replace>>
- <</link>>
-</span>
\ No newline at end of file
+<<if $PC.warfare >= 100>>
+ <<set _price *= 0.5>>
+<<elseif $PC.warfare >= 50||$PC.career === "arcology owner">>
+ <<set _price *= 0.75>>
+<</if>>
+<br>[[Prepare for an announcement.|Security Force Naming-Colonel][$SF.Active = 1, $SF.IntroProgress = -1, App.SF.Init(), cashX(-_price, "specialForces")]]
+<br> //Initial costs are @@.yellowgreen;<<print cashFormat(_price)>>@@ and upon establishment the force will have significant support costs until it is self-sufficient.//
+<br>[[The current measures are enough|RIE Eligibility Check][$SF.Active = 0]]
\ No newline at end of file
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 7c94a665095ca8e0d6fc181b311e3a72bf71e148..57f05c859dc42e3aacc0174aa5f1f609892c2395 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -1,62 +1,66 @@
// V=SugarCube.State.variables, T=SugarCube.State.temporary;
App.SF.Init = function() {
const V = State.variables;
- if (V.SF === undefined) V.SF = {};
- if (V.SF.UC === undefined) V.SF.UC = {};
- V.SF.Depravity = V.SF.Depravity || 0;
- V.SF.Size = V.SF.Size || 0;
- V.SF.Upgrade = V.SF.Upgrade || 0;
- V.SF.Gift = V.SF.Gift || 0;
- V.SF.UC.Assign = V.SF.UC.Assign || 0;
- V.SF.UC.Lock = V.SF.UC.Lock || 0;
- V.SF.UC.num = V.SF.UC.num || 0;
- V.SF.ROE = V.SF.ROE || "hold";
- V.SF.Target = V.SF.Target || "recruit";
- V.SF.Regs = V.SF.Regs || "strict";
- V.SF.Caps = V.SF.Caps || "The Special Force";
- V.SF.Lower = V.SF.Lower || "the special force";
-
- if (V.SF.Squad === undefined) V.SF.Squad = {};
- V.SF.Squad.Troops = V.SF.Squad.Troops || 40;
- V.SF.Squad.Armoury = V.SF.Squad.Armoury || 0;
- V.SF.Squad.Firebase = V.SF.Squad.Firebase || 0;
- V.SF.Squad.AV = V.SF.Squad.AV || 0;
- V.SF.Squad.TV = V.SF.Squad.TV || 0;
- V.SF.Squad.Drones = V.SF.Squad.Drones || 0;
- V.SF.Squad.Drugs = V.SF.Squad.Drugs || 0;
- V.SF.Squad.PGT = V.SF.Squad.PGT || 0;
- V.SF.Squad.AA = V.SF.Squad.AA || 0;
- V.SF.Squad.TA = V.SF.Squad.TA || 0;
- V.SF.Squad.SpacePlane = V.SF.Squad.SpacePlane || 0;
- V.SF.Squad.GunS = V.SF.Squad.GunS || 0;
-
- if (V.SF.Squad.Satellite === undefined) V.SF.Squad.Satellite = {};
- V.SF.Squad.Satellite.lv = V.SF.Squad.Satellite.lv || 0;
- V.SF.Squad.Satellite.InOrbit = V.SF.Squad.Satellite.InOrbit || 0;
- V.SF.Squad.GiantRobot = V.SF.Squad.GiantRobot || 0;
- V.SF.Squad.MissileSilo = V.SF.Squad.MissileSilo || 0;
- V.SF.Squad.AircraftCarrier = V.SF.Squad.AircraftCarrier || 0;
- V.SF.Squad.Sub = V.SF.Squad.sub || 0;
- V.SF.Squad.HAT = V.SF.Squad.HAT || 0;
-
- if (V.SF.Colonel === undefined) V.SF.Colonel = {};
- V.SF.Colonel.Core = V.SF.Colonel.Core || "";
- V.SF.Colonel.Talk = V.SF.Colonel.Talk || 0;
- V.SF.Colonel.Fun = V.SF.Colonel.Fun || 0;
- V.SF.Colonel.Status = V.SF.Colonel.Status || 0;
-
- if (V.SF.MercCon === undefined) V.SF.MercCon = {};
- V.SF.MercCon.History = V.SF.MercCon.History || 0;
- V.SF.MercCon.CanAttend = V.SF.MercCon.CanAttend || -2;
- V.SF.MercCon.Income = V.SF.MercCon.Income || 0;
- V.SF.MercCon.Revenue = V.SF.MercCon.Revenue || 0;
- V.SF.MercCon.Mercs = V.SF.MercCon.Mercs || 0;
- V.SF.MercCon.Menials = V.SF.MercCon.Menials || 0;
- V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalMenials || 0;
- V.SF.MercCon.TotalMercs = V.SF.MercCon.TotalMercs || 0;
-
+ if (passage() === "init" || passage() === "New Game Plus") V.SF = {Active: -1};
+ V.SF.Toggle = V.SF.Toggle || 0;
+ V.SF.FS = V.SF.FS || {};
V.SF.FS.Tension = V.SF.FS.Tension || -1;
- App.SF.AAR(0);
+ if (V.SF.Toggle && V.SF.Active >= 1) {
+ V.SF.UC = V.SF.UC || {};
+ V.SF.Depravity = V.SF.Depravity || 0;
+ V.SF.Size = V.SF.Size || 0;
+ V.SF.Upgrade = V.SF.Upgrade || 0;
+ V.SF.Gift = V.SF.Gift || 0;
+ V.SF.UC.Assign = V.SF.UC.Assign || 0;
+ V.SF.UC.Lock = V.SF.UC.Lock || 0;
+ V.SF.UC.num = V.SF.UC.num || 0;
+ V.SF.ROE = V.SF.ROE || "hold";
+ V.SF.Target = V.SF.Target || "recruit";
+ V.SF.Regs = V.SF.Regs || "strict";
+ V.SF.Caps = V.SF.Caps || "The Special Force";
+ V.SF.Lower = V.SF.Lower || "the special force";
+
+ V.SF.Squad = V.SF.Squad || {};
+ V.SF.Squad.Troops = V.SF.Squad.Troops || 40;
+ V.SF.Squad.Armoury = V.SF.Squad.Armoury || 0;
+ V.SF.Squad.Firebase = V.SF.Squad.Firebase || 0;
+ V.SF.Squad.AV = V.SF.Squad.AV || 0;
+ V.SF.Squad.TV = V.SF.Squad.TV || 0;
+ V.SF.Squad.Drones = V.SF.Squad.Drones || 0;
+ V.SF.Squad.Drugs = V.SF.Squad.Drugs || 0;
+ V.SF.Squad.PGT = V.SF.Squad.PGT || 0;
+ V.SF.Squad.AA = V.SF.Squad.AA || 0;
+ V.SF.Squad.TA = V.SF.Squad.TA || 0;
+ V.SF.Squad.SpacePlane = V.SF.Squad.SpacePlane || 0;
+ V.SF.Squad.GunS = V.SF.Squad.GunS || 0;
+
+ V.SF.Squad.Satellite = V.SF.Squad.Satellite || {};
+ V.SF.Squad.Satellite.lv = V.SF.Squad.Satellite.lv || 0;
+ V.SF.Squad.Satellite.InOrbit = V.SF.Squad.Satellite.InOrbit || 0;
+ V.SF.Squad.GiantRobot = V.SF.Squad.GiantRobot || 0;
+ V.SF.Squad.MissileSilo = V.SF.Squad.MissileSilo || 0;
+ V.SF.Squad.AircraftCarrier = V.SF.Squad.AircraftCarrier || 0;
+ V.SF.Squad.Sub = V.SF.Squad.sub || 0;
+ V.SF.Squad.HAT = V.SF.Squad.HAT || 0;
+
+ V.SF.Colonel = V.SF.Colonel || {};
+ V.SF.Colonel.Core = V.SF.Colonel.Core || "";
+ V.SF.Colonel.Talk = V.SF.Colonel.Talk || 0;
+ V.SF.Colonel.Fun = V.SF.Colonel.Fun || 0;
+ V.SF.Colonel.Status = V.SF.Colonel.Status || 0;
+
+ V.SF.MercCon = V.SF.MercCon || {};
+ V.SF.MercCon.History = V.SF.MercCon.History || 0;
+ V.SF.MercCon.CanAttend = V.SF.MercCon.CanAttend || -2;
+ V.SF.MercCon.Income = V.SF.MercCon.Income || 0;
+ V.SF.MercCon.Revenue = V.SF.MercCon.Revenue || 0;
+ V.SF.MercCon.Mercs = V.SF.MercCon.Mercs || 0;
+ V.SF.MercCon.Menials = V.SF.MercCon.Menials || 0;
+ V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalMenials || 0;
+ V.SF.MercCon.TotalMercs = V.SF.MercCon.TotalMercs || 0;
+
+ App.SF.AAR(0);
+ }
// V.arcologies[0].SFRaid = 1; V.arcologies[0].SFRaidTarget = -1;
/* if (typeof V.SF.Facility === "undefined") {
V.SF.Facility = {
@@ -261,62 +265,55 @@ App.SF.BC = function() {
App.SF.Init();
}
} else if (typeof V.SF === "object") {
- if (V.SF.MercCon && V.SF.MercCon.View) { delete V.SF.MercCon.View; }
- if (V.SF.UC === undefined) {
- if (V.SF.SpecOps !== undefined && V.SF.SpecOpsLock !== undefined) {
- V.SF.UC = {Assign: V.SF.SpecOps, Lock: V.SF.SpecOpsLock};
- } else {
- V.SF.UC = {Assign: 0, Lock: 0};
+ App.SF.Init();
+
+ if (V.SF.MercCon !== undefined) {
+ if( V.SF.MercCon.View !== undefined) {
+ delete V.SF.MercCon.View;
}
- delete V.SF.SpecOps;
- delete V.SF.SpecOpsLock;
+ if (V.SF.MercCon.Helots !== undefined) {
+ V.SF.MercCon.Menials = V.SF.MercCon.Helots;
+ delete V.SF.MercCon.Helots;
+ }
+ if (V.SF.MercCon.TotalHelots !== undefined) {
+ V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots;
+ delete V.SF.MercCon.TotalHelots;
+ }
+ }
+
+ if (V.SF.SpecOps !== undefined && V.SF.SpecOpsLock !== undefined) {
+ V.SF.UC = {Assign: V.SF.SpecOps, Lock: V.SF.SpecOpsLock};
}
- if (V.SF.UC.num === undefined) {
+ delete V.SF.SpecOps;
+ delete V.SF.SpecOpsLock;
+ if (V.SFUC !== undefined) {
V.SF.UC.num = V.SFUC || 0;
}
delete V.SFUC;
- if (V.SF.Active === -1) {
- App.SF.Init();
- }
- if (V.SF.MWU) {
+
+ if (V.SF.MWU !== undefined) {
delete V.SF.MWU;
}
if (V.SpecOpsLock !== undefined) {
V.SF.SpecOpsLock = V.SpecOpsLock;
}
delete V.SpecOpsLock;
- if (V.SF.Upgrade === undefined) {
+ if (V.SF.U !== undefined) {
V.SF.Upgrade = V.SF.U || 0;
}
delete V.SF.U;
- if (V.SF.Gift === undefined) {
+ if (V.SF.WG !== undefined) {
V.SF.Gift = V.SF.WG || 0;
}
delete V.SF.WG;
- if (V.SF.MercCon === undefined) {
- App.SF.Init();
- }
- if (V.SF.MercCon.Helots !== undefined) {
- V.SF.MercCon.Menials = V.SF.MercCon.Helots;
- delete V.SF.MercCon.Helots;
- } else {
- V.SF.MercCon.Menials = 0;
- }
- if (V.SF.MercCon.TotalHelots !== undefined) {
- V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots;
- delete V.SF.MercCon.TotalHelots;
- } else {
- V.SF.MercCon.TotalMenials = 0;
- }
-
if (V.SF.Bonus !== undefined) {
delete V.SF.Bonus;
}
if (V.SF.Depravity < 0) {
V.SF.Depravity = 0;
}
- if (V.SF.Size === undefined) {
+ if (V.SF.Units !== undefined) {
V.SF.Size = V.SF.Units;
}
delete V.SF.Units;
@@ -332,27 +329,14 @@ App.SF.BC = function() {
V.SF.Colonel = V.SFColonel;
}
delete V.SFColonel;
- if (V.SF.Squad.Satellite !== undefined && V.SatLaunched === undefined) {
- V.SF.Squad.Sat = {lv: 0, InOrbit: 0};
+ if (V.SF.Squad !== undefined && V.SF.Squad.Satellite !== undefined && V.SatLaunched !== undefined) {
+ V.SF.Squad.Sat = {lv: V.SF.Squad.Satellite, InOrbit: V.SatLaunched};
V.SF.Squad.Satellite = V.SF.Squad.Sat;
delete V.SF.Squad.Sat;
delete V.SatLaunched;
delete V.SFUnit;
}
}
- if (V.SF.Squad !== undefined && V.SF.Squad.Satellite.lv === undefined) {
- V.SF.Squad.Sat = {lv: V.SF.Squad.Satellite, InOrbit: 0};
- V.SF.Squad.Satellite = V.SF.Squad.Sat;
- delete V.SF.Squad.Sat;
- }
- // if (V.SF.Facility === undefined) App.SF.Init();
- if (V.SF.Squad.Satellite === undefined) {
- V.SF.Squad.Satellite = {lv: 0, InOrbit: 0};
- }
- if (V.SF.FS === undefined) {
- V.SF.FS = {Tension: -1};
- }
- if (V.SF.Toggle && V.SF.Active >= 1) App.SF.Init();
}
InitClean();
MainClean();
@@ -2754,6 +2738,9 @@ App.SF.Count = function() {
V.SF.Size = C(V.SF.Size, 0, T.max);
T.T1 = 0;
+ T.SFSubsidy = 5000 * (1 + ((S.Troops / 100) + (V.SF.Size / 100)));
+ App.SF.NameCapsCheck();
+
if (E > 100) {
T.Env = 4;
} else if (E > 67) {
@@ -2765,33 +2752,33 @@ App.SF.Count = function() {
if (V.SF.Size >= 30) {
T.T1 = 1;
}
- T.SFSubsidy = 5000 * (1 + ((V.SF.Squad.Troops / 100) + (V.SF.Size / 100)));
- App.SF.NameCapsCheck();
+
if (V.SF.IntroProgress > -1) {
delete V.SF.IntroProgress;
}
- if (V.SF.MercCon === undefined) {
- App.SF.Init();
- }
+
if (V.SF.Size === T.max) {
delete V.SF.Upgrade;
}
+
if (V.SF.BadOutcome !== undefined) {
delete V.SF.BadOutcome;
}
- if (V.SF.FS === undefined) {
- V.SF.FS = {Tension: -1};
- }
- if (V.SF.tour === undefined) {
+
+ if (V.Tour !== undefined) {
V.SF.tour = V.Tour || 0;
+ delete V.Tour;
}
- delete V.Tour;
+ V.SF.tour = V.SF.tour || 0;
+
if (V.arcologies[0].SFRaid !== undefined) {
delete V.arcologies[0].SFRaid;
}
+
if (V.arcologies[0].SFRaidTarget !== undefined) {
delete V.arcologies[0].SFRaidTarget;
}
+
if (V.SF.Facility !== undefined) {
delete V.SF.Facility;
}
@@ -2817,7 +2804,7 @@ App.SF.UpgradeCost = function(cost, unit) {
return Math.ceil(value);
};
-window.progress = function(x, max) {
+App.SF.progress = function(x, max) {
"use strict";
let out = `â`,
z, i;
diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw
index b05bacee2b483ee8747d121c82310a9dfb95a7ca..bf1659e52816786f336b22b4caa42df033e38549 100644
--- a/src/SpecialForce/Upgrades.tw
+++ b/src/SpecialForce/Upgrades.tw
@@ -2,7 +2,7 @@
<br><br>
<<if $SF.Size !== _max>>
- Total upgrade progress: <<print progress($SF.Size,_max)>> $SF.Size/_max(<<print ($SF.Size/_max).toFixed(2)*100>>%) <<if $SF.Size < 30>> <br>//<<print (30-$SF.Size )>> more upgrades is needed until the next tier unlocks.// <</if>>
+ Total upgrade progress: <<print App.SF.progress($SF.Size,_max)>> $SF.Size/_max(<<print ($SF.Size/_max).toFixed(2)*100>>%) <<if $SF.Size < 30>> <br>//<<print (30-$SF.Size )>> more upgrades is needed until the next tier unlocks.// <</if>>
<<else>>
There are no more upgrades available.
<</if>>
@@ -22,7 +22,7 @@
<<else>>
//Cannot afford to upgrade the Firebase.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cF)>>@@// <span style="float:right;"> <<print progress($SF.Squad.Firebase)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cF)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Firebase)>> </span> <br>
<<elseif $SF.Squad.Firebase === _FU>>
//The Firebase has been fully upgraded.// <br>
<</if>>
@@ -34,7 +34,7 @@
<<else>>
//Cannot afford to upgrade the Armory.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cA)>>@@// <span style="float:right;"> <<print progress($SF.Squad.Armoury)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cA)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Armoury)>> </span> <br>
<<elseif $SF.Squad.Armoury === _AU>>
//The Armory has been fully upgraded.// <br>
<</if>>
@@ -46,7 +46,7 @@
<<else>>
//Cannot afford to upgrade the Drug Lab.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cDrugs)>>@@// <span style="float:right;"> <<print progress($SF.Squad.Drugs)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cDrugs)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Drugs)>> </span> <br>
<<elseif $SF.Squad.Drugs === _DrugsU>>
//The Drug Lab has been fully upgraded.// <br>
<</if>>
@@ -58,7 +58,7 @@
<<else>>
//Cannot afford to upgrade the Drone Bay.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cDrones)>>@@// <span style="float:right;"> <<print progress($SF.Squad.Drones)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cDrones)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Drones)>> </span> <br>
<<elseif $SF.Squad.Drones === _DU>>
//The Drone Bay has been fully upgraded.// <br>
<</if>>
@@ -72,7 +72,7 @@
<<else>>
//Cannot afford to upgrade the Attack Vehicle Fleet.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cAV)>>@@// <span style="float:right;"> <<print progress($SF.Squad.AV)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cAV)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.AV)>> </span> <br>
<<elseif $SF.Squad.AV === _AVU>>
//The Attack Vehicle Fleet has been fully upgraded.// <br>
<</if>>
@@ -86,7 +86,7 @@
<<else>>
//Cannot afford to upgrade Transport Vehicle Fleet.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cTV)>>@@// <span style="float:right;"> <<print progress($SF.Squad.TV)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cTV)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.TV)>> </span> <br>
<<elseif $SF.Squad.TV === _TVU>>
//The Transport Vehicle Fleet has been fully upgraded.// <br>
<</if>>
@@ -100,9 +100,9 @@
<<else>>
//Cannot afford to upgrade Prototype Goliath Tank.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cPGT)>>@@// <span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cPGT)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.PGT)>> </span> <br>
<<elseif $SF.Squad.PGT === _PGTU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.PGT)>> </span> <br>
<<elseif $SF.Squad.PGT === _PGTU>>
//The Prototype Goliath Tank has been fully upgraded.// <br>
<</if>>
@@ -118,7 +118,7 @@
<<else>>
//Cannot afford to upgrade Attack Aircraft Fleet.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cAA)>>@@// <span style="float:right;"> <<print progress($SF.Squad.AA)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cAA)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.AA)>> </span> <br>
<<elseif $SF.Squad.AA === _AAU>>
//The Attack Aircraft Fleet has been fully upgraded.// <br>
<</if>>
@@ -132,7 +132,7 @@
<<else>>
//Cannot afford to upgrade the Transport Aircraft Fleet.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cTA)>>@@// <span style="float:right;"> <<print progress($SF.Squad.TA)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cTA)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.TA)>> </span> <br>
<<elseif $SF.Squad.TA === _TAU>>
//The Transport Aircraft Fleet has been fully upgraded.// <br>
<</if>>
@@ -146,9 +146,9 @@
<<else>>
//Cannot afford to upgrade the Spaceplane.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cSP)>>@@//<span style="float:right;"> <<print progress($SF.Squad.SpacePlane)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cSP)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.SpacePlane)>> </span> <br>
<<elseif $SF.Squad.SpacePlane === _SPU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.SpacePlane)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.SpacePlane)>> </span> <br>
<<elseif $SF.Squad.SpacePlane === _SPU>>
//The Spaceplane has been fully upgraded.// <br>
<</if>>
@@ -162,9 +162,9 @@
<<else>>
//Cannot afford to upgrade Gunship.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cGunS)>>@@//<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cGunS)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.GunS)>> </span> <br>
<<elseif $SF.Squad.GunS === _GunSU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.GunS)>> </span> <br>
<<elseif $SF.Squad.GunS === _GunSU>>
//The Gunship has been fully upgraded.// <br>
<</if>>
@@ -180,9 +180,9 @@
<<else>>
//Cannot afford to upgrade Satellite.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cSat)>>@@//<span style="float:right;"> <<print progress($SF.Squad.Satellite.lv)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cSat)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.Satellite.lv)>> </span> <br>
<<elseif $SF.Squad.Satellite.lv === _SatU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.Satellite.lv)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.Satellite.lv)>> </span> <br>
<<else>>
//The Satellite has been fully upgraded.// <br>
<</if>>
@@ -197,9 +197,9 @@
<<else>>
//Cannot afford to upgrade the Giant Robot.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cGR)>>@@//<span style="float:right;"> <<print progress($SF.Squad.GiantRobot)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cGR)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.GiantRobot)>> </span> <br>
<<elseif $SF.Squad.GiantRobot === _GRU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.GiantRobot)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.GiantRobot)>> </span> <br>
<<else>>
//The Giant Robot has been fully upgraded.// <br>
<</if>>
@@ -213,9 +213,9 @@
<<else>>
//Cannot afford to upgrade Cruise Missile.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cMS)>>@@//<span style="float:right;"> <<print progress($SF.Squad.MissileSilo)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cMS)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.MissileSilo)>> </span> <br>
<<elseif $SF.Squad.MissileSilo === _MSU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.MissileSilo)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.MissileSilo)>> </span> <br>
<<else>>
//The Cruise Missile has been fully upgraded.// <br>
<</if>>
@@ -231,9 +231,9 @@
<<else>>
//Cannot afford to upgrade Aircraft Carrier.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cAC)>>@@//<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span> <br>
+ //Costs @@.red;<<print cashFormat(_cAC)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.AircraftCarrier)>> </span> <br>
<<elseif $SF.Squad.AircraftCarrier === _ACU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.AircraftCarrier)>> </span> <br>
<<else>>
//The Aircraft Carrier has been fully upgraded.// <br>
<</if>>
@@ -247,9 +247,9 @@
<<else>>
//Cannot afford to upgrade Submarine//
<</if>>
- //Costs @@.red;<<print cashFormat(_cSub)>>@@//<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span>
+ //Costs @@.red;<<print cashFormat(_cSub)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.Sub)>> </span>
<<elseif $SF.Squad.Sub === _SubU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.Sub)>> </span>
<<else>>
//The Submarine has been fully upgraded.// <br>
<</if>>
@@ -263,9 +263,9 @@
<<else>>
//Cannot afford to upgrade Amphibious Transport.//
<</if>>
- //Costs @@.red;<<print cashFormat(_cHAT)>>@@//<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span>
+ //Costs @@.red;<<print cashFormat(_cHAT)>>@@//<span style="float:right;"> <<print App.SF.progress($SF.Squad.HAT)>> </span>
<<elseif $SF.Squad.HAT === _HATU && $PC.warfare < 75>>
- //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span> <br>
+ //Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.HAT)>> </span> <br>
<<else>>
//The Amphibious Transport has been fully upgraded.// <br>
<</if>>
diff --git a/src/facilities/masterSuite/masterSuiteFramework.js b/src/facilities/masterSuite/masterSuiteFramework.js
index ccfaa1b637b79c131b3eb6d40dc05afa0b250cdd..e2cd09cac5bb4ff3b4999e5d439505fe3f55d507 100644
--- a/src/facilities/masterSuite/masterSuiteFramework.js
+++ b/src/facilities/masterSuite/masterSuiteFramework.js
@@ -40,6 +40,10 @@ App.Entity.Facilities.MasterSuiteFuckToyJob = class extends App.Entity.Facilitie
return r;
}
+
+ get _employeeIDsVariableName() {
+ return "MastSiIDs";
+ }
};
App.Entity.Facilities.ConcubineJob = class extends App.Entity.Facilities.ManagingJob {
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 68f9a95aca48aeeb11ab4adf117f1b4ae69fdd6f..fabe80df7a936194dce5a37e6dad0b5491ba46af 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1512,7 +1512,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $DefaultBirthDestination = "individually decided fates">>
<<set $abbreviateHormoneBalance = 2>>
-<<if def $SF.Toggle>> <<set $SF = {Toggle:$SF.Toggle}>> <<else>> <<set $SF = {Toggle:0}>> <</if>>
-<<set $SF.Active=-1, $SF.FS = {Tension:-1}>>
+<<= App.SF.Init()>>
<<goto "Alpha disclaimer">>
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index 1cfae417864cef1774a75b5788a710cd9b8b96f8..80a9153ca67bbc43c82f6024ed878c23aa38fa9a 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -1,10 +1,8 @@
/* OPEN MAIN */
-App.UI.View.MainLinks = function() {
+App.UI.View.MainLinks = function () {
"use strict";
const V = State.variables;
- const PA = Array.isArray(V.personalAttention) ? V.personalAttention.map(function(x) {
- return getSlave(x.ID);
- }) : [];
+ const PA = Array.isArray(V.personalAttention) ? V.personalAttention.map(x => getSlave(x.ID)) : [];
let r = '';
if (V.PCWounded === 1) {
@@ -124,9 +122,7 @@ App.UI.View.MainLinks = function() {
/* cycle through slaves, for each slave cycle through completed organs and track how many are of the interrogated slave (and if organs have a slaves to be implanted on) */
for (let i = 0; i < V.slaves.length; i++) {
let slaveOrgans = 0;
- V.completedOrgans.forEach(organ => {
- if (organ.ID === V.slaves[i].ID) { slaveOrgans++; }
- });
+ V.completedOrgans.forEach(organ => { if (organ.ID === V.slaves[i].ID) { slaveOrgans++; } });
/* if the interrogated slave has one or more organs ready: */
if (slaveOrgans > 0) {
r += '<br><span class="yellow">The fabricator has completed ';
@@ -149,7 +145,7 @@ App.UI.View.MainLinks = function() {
if (V.adjustProstheticsCompleted > 0) {
for (let j = 0; j < V.adjustProsthetics.length; j++) {
if (getSlave(V.adjustProsthetics[j].slaveID) !== undefined) {
- let i = V.slaveIndices[V.adjustProsthetics[j].slaveID];
+ const i = V.slaveIndices[V.adjustProsthetics[j].slaveID];
if (V.adjustProsthetics[j].workLeft <= 0) {
r += `<br><span class="yellow">The lab has completed <<= addA(setup.prosthetics[$adjustProsthetics[${j}].id].name)>> for</span> <span id="name"><<= "[[SlaveFullName($slaves[${i}])|Slave Interact][$activeSlave = $slaves[${i}]]]">>,</span> <span class="yellow"> which is ready to be attached.</span>`;
}
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 60dd55bb852828526948a502c6dc460c09451682..85d9c11a4b12d0918b17f5bb38e79d7b0117ef53 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -311,19 +311,19 @@ window.removeSlave = function removeSlave(index) {
State.variables.slaveIndices = slaves2indices();
return ret;
};
+
window.removeChild = function removeChild(index) {
- const ret = State.variables.cribs.deleteAt(index);
- return ret;
+ return State.variables.cribs.deleteAt(index);
};
/**
* @param {App.Entity.SlaveState[]} [slaves]
* @returns {Object.<number, number>}
*/
-window.slaves2indices = function slaves2indices(slaves) {
- slaves = slaves || State.variables.slaves;
+window.slaves2indices = function slaves2indices(slaves = State.variables.slaves) {
return slaves.reduce((acc, slave, i) => { acc[slave.ID] = i; return acc; }, {});
};
+
/**
* @param {number} ID
* @returns {App.Entity.SlaveState}
@@ -332,9 +332,9 @@ window.getSlave = function getSlave(ID) {
const index = State.variables.slaveIndices[ID];
return index === undefined ? undefined : State.variables.slaves[index];
};
+
window.getChild = function getChild(ID) {
- const V = State.variables;
- return V.cribs.find(function(s) {return s.ID === ID;});
+ return State.variables.cribs.find(s => s.ID === ID);
};
App.Utils.Pronouns = class {
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index d775a0b60c50724a81d59ec474d19108e9387f6b..0fcc266f1b98cae9238c5791aca57e66ea26e45e 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -201,11 +201,13 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
/**
* @param {App.Entity.SlaveState} slave
- * @param {number} isIncubatorSlave
+ * @param {boolean} [isIncubatorSlave]
*/
- function SlaveDatatypeCleanup(slave, isIncubatorSlave) {
+ function SlaveDatatypeCleanup(slave, isIncubatorSlave = false) {
V = State.variables;
- if (isIncubatorSlave !== true) { slaveAgeDatatypeCleanup(slave); }
+ if (!isIncubatorSlave) {
+ slaveAgeDatatypeCleanup(slave);
+ }
slavePhysicalDatatypeCleanup(slave);
slaveFaceDatatypeCleanup(slave);
slaveHairDatatypeCleanup(slave);
@@ -1670,9 +1672,7 @@ window.FacilityDatatypeCleanup = (function() {
if (!Array.isArray(facilityIDArray)) {
facilityIDArray = [];
} else if (typeof facilityIDArray[0] === "object") {
- facilityIDArray = facilityIDArray.map(function(a) {
- return a.ID;
- });
+ facilityIDArray = facilityIDArray.map(a => a.ID);
}
}
helperFunction(V.BrothiIDs);
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 0c92b469acd7ad1f7ef1e18f0094dce7e0524106..56df0d3ff6874c551a49f057fc9ecd36f32e95d0 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1399,8 +1399,7 @@ window.getSlaveStatisticData = function(s, facility) {
return data;
};
-window.initFacilityStatistics = function(facility) {
- facility = facility || {};
+window.initFacilityStatistics = function(facility = {}) {
facility.adsIncome = 0;
facility.maintenance = 0;
facility.totalIncome = 0;
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index 641ef7329c818484e4baec887d273b81f071fc89..853e4d66669c5c5c5cfc03816ebe5b13a1af97d4 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -22,7 +22,6 @@ window.getPregBellySize = function(s) {
* @returns {string}
*/
window.bellyAdjective = function(slave) {
- slave = slave || State.variables.activeSlave;
if (slave.belly >= 1500) {
if (slave.belly >= 1000000) {
if (slave.preg > slave.pregData.normalBirth/4) {
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index a5e7d3fdb7924f14125c5000f6fa841b5feead62..e05b2e9cb99d73328b7e34e0c12d72bcd9efe28b 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -27,10 +27,9 @@ window.raceToNationality = function raceToNationality(slave) {
* @param {string | Object} nationality
* @param {string | Object} race
* @param {boolean} male
- * @param {undefined} [filter]
+ * @param {undefined} [filter] Default: allow all
*/
-window.generateName = function generateName(nationality, race, male, filter) {
- filter = filter || _.stubTrue; /* default: allow all */
+window.generateName = function generateName(nationality, race, male, filter = _.stubTrue) {
const lookup = (male ? setup.malenamePoolSelector : setup.namePoolSelector);
const result = jsEither(
(lookup[`${nationality}.${race}`] || lookup[nationality] ||
@@ -46,10 +45,9 @@ window.generateName = function generateName(nationality, race, male, filter) {
* @param {string | number} nationality
* @param {any} race
* @param {any} male
- * @param {() => true} filter
+ * @param {() => true} [filter] Default: allow all
*/
-window.generateSurname = function generateSurname(nationality, race, male, filter) {
- filter = filter || _.stubTrue; /* default: allow all */
+window.generateSurname = function generateSurname(nationality, race, male, filter = _.stubTrue) {
const result = jsEither(
(setup.surnamePoolSelector[`${nationality}.${race}`] ||
setup.surnamePoolSelector[nationality] ||
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 0b97e20f5f8f393af42e132535223c155b4b1f90..b76da962f4a9f0a14fdfe1d5eed1ef27afe5eede 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -816,10 +816,10 @@ App.UI.SlaveList.slaveSelectionList = function () {
/**
* Displays assignment filter links, whose action are generated by the callback
* @param {assignmentFilterGenerateCallback} callback
- * @param {boolean} includeExperianced
+ * @param {boolean} includeExperienced
* @returns {string}
*/
- function _assignmentFilter(callback, includeExperianced) {
+ function _assignmentFilter(callback, includeExperienced) {
let filters = {
all: "All"
};
@@ -837,14 +837,14 @@ App.UI.SlaveList.slaveSelectionList = function () {
for (const f in filters) {
links.push(App.UI.passageLink(filters[f], passage, callback(f)));
}
- if (includeExperianced) {
- links.push(`<span class="lime">${App.UI.passageLink('Experianced', passage, callback('experianced'))}</span>`);
+ if (includeExperienced) {
+ links.push(`<span class="lime">${App.UI.passageLink('Experienced', passage, callback('experienced'))}</span>`);
}*/
for (const f in filters) {
links.push(`<<link "${filters[f]}">>${callback(f)}<</link>>`);
}
- if (includeExperianced) {
- links.push(`<span class="lime"><<link "Experianced">>${callback('experianced')}<</link>></span>`);
+ if (includeExperienced) {
+ links.push(`<span class="lime"><<link "Experienced">>${callback('experienced')}<</link>></span>`);
}
return links.join(' | ');
@@ -864,7 +864,7 @@ App.UI.SlaveList.slaveSelectionList = function () {
case 'all':
unfilteredIndices = Array.from({length: slaves.length}, (v, i) => i);
break;
- case 'experianced':
+ case 'experienced':
unfilteredIndices = slaves.reduce((acc, s, idx) => {
if (options.expCheck(s)) {
acc.push(idx);
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index 3a225da8e2683093a5d319d4e5d2c07c571675f0..b9c0d306b971023d5af65e6f0079d643d150a44d 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -653,8 +653,7 @@ window.tooBigButt = function(slave) {
* @param {App.Entity.SlaveState} slave
* @returns {boolean}
*/
-window.isVegetable = function(slave) {
- slave = slave || State.variables.activeSlave;
+window.isVegetable = function (slave) {
if (!slave) {
return false;
}
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 67b99d1ddffdc6fa9f47556ac4b07af6f275ec76..feee5723793dde47d5f952897c5398661fce146d 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -363,12 +363,10 @@ window.lispReplace = function(text) {
/**
* @param {App.Entity.SlaveState} slave
- * @param {Object} arcology // I think
+ * @param {Object} arcology
* @returns {number}
*/
window.repGainSacrifice = function(slave, arcology) {
- slave = slave || State.variables.activeSlave;
- arcology = arcology || State.variables.arcologies[0];
if (!slave || !arcology || arcology.FSAztecRevivalist === "unset" || arcology.FSAztecRevivalist <= 0) {
return 0;
}
@@ -435,8 +433,7 @@ window.toJson = function(obj) {
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-window.nippleColor = function(slave) {
- slave = slave || State.variables.activeSlave;
+window.nippleColor = function (slave) {
if (skinToneLevel(slave.skin) < 8) {
if (slave.preg > slave.pregData.normalBirth / 4 || (slave.counter.birthsTotal > 0 && slave.lactation > 0)) {
return "brown";
diff --git a/src/pregmod/reMaleArcologyOwner.tw b/src/pregmod/reMaleArcologyOwner.tw
index c1522f5c6a2bfa9a58f22710ebab5fb1009688ef..54a6ecb9b77a253d436b3a9fb51a4b3fb031a608 100644
--- a/src/pregmod/reMaleArcologyOwner.tw
+++ b/src/pregmod/reMaleArcologyOwner.tw
@@ -26,7 +26,7 @@ He strikes a fine balance in conversation with you, firm enough to not overpower
<<set $trinkets.push($desc)>>
<</replace>>
<</link>>
-<<if ($PC.preg >= 28 && $PC.pregMood = 2) || $PC.boobsBonus >= 2 || $PC.butt >= 2>>
+<<if ($PC.preg >= 28 && $PC.pregMood == 2) || $PC.boobsBonus >= 2 || $PC.butt >= 2>>
<br><<link "Convince him to make the first move">>
<<replace "#result">>
<<set _randomForeignFS = random(1,100)>>
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index 34347e97a1f70bb6ea4dd6f5b46c19652d7bcadd..2de0d8319a3b09b09d6712dbb3fd872a8e103e73 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -4,7 +4,7 @@
<<setLocalPronouns $activeSlave >>
<<run Enunciate($activeSlave)>>
-<<set _activeSlaveRepSacrifice = repGainSacrifice()>>
+<<set _activeSlaveRepSacrifice = repGainSacrifice($activeSlave, $arcologies[0])>>
<<if $sacrificeType == "penance">>
You inform $activeSlave.slaveName that $he's been chosen to take part in a ritual sacrifice to Xochiquetzal, the goddess of carnal love, excess, and sexual release.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index e9526a8d4db17ebb360fa8779f279bda104a662f..c83886f6583382ad41a7c54a5546414212aadea1 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3518,9 +3518,14 @@ Updating gene pool records:
<<set _Slave.eyes = -4>>
<</if>>
- <<if ndef _Slave.custom>>
- <<set _Slave.custom = {tattoo: _Slave.customTat}>> /* should be the only thing needed */
- <</if>>
+ <<if ndef _Slave.custom>> <<set _Slave.custom = {}>> <</if>>
+ <<set _Slave.custom.tattoo = _Slave.customTat || "">>
+ <<set _Slave.custom.label = _Slave.custom.label || "">>
+ <<set _Slave.custom.desc = _Slave.custom.desc || "">>
+ <<set _Slave.custom.title = _Slave.custom.title || "">>
+ <<set _Slave.custom.titleLisp = _Slave.custom.titleLisp || "">>
+ <<set _Slave.custom.hairVector = _Slave.custom.hairVector || 0>>
+ <<set _Slave.custom.image = _Slave.custom.image || null>>
<<run App.Entity.Utils.GenePoolRecordCleanup(_Slave)>>
<<set $genePool[_bci] = _Slave>>
diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw
index f892a8721469061dd5cbb5e131595c1846bdb482..118ae1a2bb5b47846a6075d0530d4c13761c577a 100644
--- a/src/uncategorized/bgSelect.tw
+++ b/src/uncategorized/bgSelect.tw
@@ -12,4 +12,4 @@
<br><br>''Appoint a bodyguard from your devoted slaves:''
<br><br>[[None|Bodyguard Workaround][$i = -1]]
<br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "BG Workaround")>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "Bodyguard Workaround")>>
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index 98113a7d0fd141e97fec1f68db408e3c31c9fc64..3072a46099cb15eafaa6b419efee535991c9b0af 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -88,4 +88,4 @@ _HGName
<br><br>''Appoint a Head Girl from among your devoted slaves:''
<br><br>[[None|HG Workaround][$i = -1]]
<br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.headGirlSuite, "HG Select")>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.headGirlSuite, "HG Workaround")>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 21a3df46373c57c6fbbde157d38b909fd34cc32a..49996fcea8270776ae969e577625788cc12e007a 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -391,7 +391,7 @@
<</if>>
<</if>>
<</if>>
-<<set _activeSlaveRepSacrifice = repGainSacrifice()>>
+<<set _activeSlaveRepSacrifice = repGainSacrifice($activeSlave, $arcologies[0])>>
<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0)>>
| <<link "Sacrifice $him on the altar" "Aztec Slave Sacrifice">><<set $sacrificeType = "life">><</link>>//This will kill $him and gain you _activeSlaveRepSacrifice reputation//
<</if>>