diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index e730727c78bfd16ad63d23b5a8c29a61a0496955..b34c5fa3acc38221e67234c78a0d186d80b7ccb3 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-1.5.x
+01/05/2019
+
+ 3
+ -fixes
+ -more cleaning
+ -[!] appears when you can upgrade an FS now too
+
01/03/2019
2
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 77bbf385158c4d7b4fbf00d100248a17db30912c..54a657f8e9059dc63436f14b9d1aa2eb2cb9d65e 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -15073,6 +15073,10 @@ window.DefaultRules = (function() {
slave.collar = rule.collar;
if ((slave.collar == "none"))
r += `${slave.slaveName} has been given no collar.`;
+ else if ((slave.collar == "pretty jewelry"))
+ r += `${slave.slaveName} has been given ${slave.collar}.`;
+ else if ((["dildo gag", "massive dildo gag", "ball gag", "bit gag", "neck corset", "porcelain mask", "bell collar", "bowtie"].includes(slave.collar)))
+ r += `${slave.slaveName} has been given a ${slave.collar}.`;
else
r += `${slave.slaveName} has been given a ${slave.collar} collar.`;
}
@@ -15345,7 +15349,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>slave.slaveName is a virgin and has been given a slave.vaginalAccessory for her pussy.`;
+ r += `<br>slave.slaveName is a virgin and has been given a ${slave.vaginalAccessory} for her pussy.`;
break;
}
}
@@ -15401,7 +15405,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} has been given a slave.vaginalAccessory for her pussy.`;
+ r += `<br>${slave.slaveName} has been given a ${slave.vaginalAccessory} for her pussy.`;
break;
}
}
@@ -15533,7 +15537,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} is an anal virgin and has been given a slave.buttplug for her asshole.`;
+ r += `<br>${slave.slaveName} is an anal virgin and has been given a ${slave.buttplug} for her asshole.`;
break;
}
}
@@ -15590,7 +15594,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} has been given a slave.buttplug for her asshole.`;
+ r += `<br>${slave.slaveName} has been given a ${slave.buttplug} for her asshole.`;
break;
}
}
@@ -15611,7 +15615,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} has been given a slave.buttplugAttachment to attach to her buttplug.`;
+ r += `<br>${slave.slaveName} has been given a ${slave.buttplugAttachment} to attach to her buttplug.`;
break;
}
}
@@ -35163,7 +35167,7 @@ window.GenerateNewSlave = (function(){
return GenerateNewSlave;
})();
-/*SecForceEX JS*/
+/*SecForceEX JS V = SugarCube.State.variables, T = SugarCube.State.temporary;*/
window.SFC = function() {
const V = State.variables;
if (V.SF.MercCon.CanAttend === -1) {return `The Colonel`;}
@@ -35614,25 +35618,41 @@ window.progress = function(x,max) {
return `${out}`;
};
+window.Main = function() {
+ const V = State.variables;
+ V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
+ V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
+}
+window.Squad = function() {
+ const V = State.variables;
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+}
+window.Colonel = function() {
+ const V = State.variables;
+ V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
+}
+window.MercCon = function() {
+ const V = State.variables;
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
+}
+window.Facility = function() {
+ const V = State.variables;
+ V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+}
+
window.SFInit = function() {
- const V = State.variables;
- V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
- V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
- V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
- V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
- V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ Main();Squad();Colonel();MercCon();Facility();
};
window.SFBC = function() {
const V = State.variables;
- function Init() {
+ function InitClean() {
delete V.SFMODToggle;
delete V.securityForceActive;
delete V.securityForceCreate;
delete V.securityForceEventSeen;
}
- function Main() {
+ function MainClean() {
delete V.securityForceActive;
delete V.securityForceRecruit;
delete V.securityForceTrade;
@@ -35652,22 +35672,22 @@ window.SFBC = function() {
delete V.securityForceName;
delete V.SubsidyActive;
}
- function Colonel() {
+ function ColonelClean() {
delete V.SubsidyActive;
delete V.ColonelCore;
delete V.securityForceColonelToken;
delete V.securityForceColonelSexed;
delete V.ColonelRelationship;
}
- function TradeShow() {
+ function TradeShowClean() {
delete V.OverallTradeShowAttendance;
delete V.CurrentTradeShowAttendance;
delete V.TradeShowIncome;
delete V.TotalTradeShowIncome;
- delete V.TradeShowMenials;
- delete V.TotalTradeShowMenials;
+ delete V.TradeShowHelots;
+ delete V.TotalTradeShowHelots;
}
- function Units() {
+ function UnitsClean() {
delete V.securityForcePersonnel;
delete V.securityForceInfantryPower;
delete V.securityForceArcologyUpgrades;
@@ -35686,10 +35706,10 @@ window.SFBC = function() {
delete V.securityForceHeavyAmphibiousTransport;
}
- if ( (V.SF.Toggle || V.SFMODToggle) > 0) {
- if (V.SF == undefined) {
+ if ( (V.SF.Toggle || V.SFMODToggle) > 0 || V.SF === undefined) {
+ if (V.SF === undefined) {
if (V.securityForceEventSeen < 1) { V.securityForceActive = -1 } else { V.securityForceActive = 2 };
- V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; Init();
+ V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; InitClean();
if (V.securityForceName === undefined) V.securityForceName = "the special force";
if (V.SF.Active >= 1) {
Object.assign(V.SF, {
@@ -35703,7 +35723,7 @@ window.SFBC = function() {
Regs:V.securityForceAccountability,
Caps:"The Special Force",
Lower:V.securityForceName,
- Subsidy:V.SubsidyActive}); Main();
+ Subsidy:V.SubsidyActive}); MainClean();
if (V.SF.Lower !== "the special force") V.SF.Caps = V.SF.Lower.replace("the ", "The ");
if (V.ColonelCore === undefined) V.ColonelCore = "";
@@ -35713,27 +35733,19 @@ window.SFBC = function() {
Core:V.ColonelCore,
Talk:V.securityForceColonelToken,
Fun:V.securityForceColonelSexed,
- Status:V.ColonelRelationship}; Colonel();
+ Status:V.ColonelRelationship}; ColonelClean();
if (V.TradeShowIncome === undefined) V.TradeShowIncome = 0;
if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0;
- if (V.TradeShowMenials === undefined) V.TradeShowMenials = 0;
- if (typeof V.TradeShowHelots !== 'undefined' || V.TradeShowHelots !== null) {
- V.TradeShowHelots = undefined;
- delete(V.TradeShowHelots);
- }
- if (V.TotalTradeShowMenials === undefined) V.TotalTradeShowMenials = 0;
- if (typeof V.TotalTradeShowHelots !== 'undefined' || V.TotalTradeShowHelots !== null) {
- V.TotalTradeShowHelots = undefined;
- delete(V.TotalTradeShowHelots);
- }
+ if (V.TradeShowHelots === undefined) V.TradeShowHelots = 0;
+ if (V.TotalTradeShowHelots === undefined) V.TotalTradeShowHelots = 0;
V.SF.MercCon = {
History:V.OverallTradeShowAttendance,
CanAttend:V.CurrentTradeShowAttendance,
Income:V.TradeShowIncome,
Revenue:V.TotalTradeShowIncome,
- Menials:V.TradeShowMenials,
- TotalMenials:V.TotalTradeShowMenials,
+ Menials:V.TradeShowHelots,
+ TotalMenials:V.TotalTradeShowHelots,
Mercs:0,
TotalMercs:0}; TradeShow();
if (V.SF.MercCon.History > 0) V.SF.MercCon.View = 1;
@@ -35765,27 +35777,16 @@ window.SFBC = function() {
MissileSilo:V.securityForceMissileSilo,
AircraftCarrier:V.securityForceAircraftCarrier,
Sub:V.securityForceSubmarine,
- HAT:V.securityForceHeavyAmphibiousTransport}; Units();
+ HAT:V.securityForceHeavyAmphibiousTransport}; UnitsClean();
} else {
- V.SF = {Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1};
- V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
- V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
- V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
- if (V.securityForceName) {
- Init(); Main(); Colonel(); TradeShow(); Units();
- }
+ SFInit();
}
- V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ Facility();
} else {
if (V.SF.Active === -1) SFInit();
- if (V.SF.MWU) {
- delete V.SF.MWU;
- }
- if (V.SpecOpsLock != undefined) {
- V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
- }
- if (V.SF.UC == undefined) {
+ if (V.SF.MWU) delete V.SF.MWU;
+ if (V.SpecOpsLock != undefined) V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
+ 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}; delete V.SF.SpecOps;
delete V.SF.SpecOpsLock;
@@ -35793,50 +35794,41 @@ window.SFBC = function() {
V.SF.UC = {Assign:0, Lock:0};
}
}
- if (V.SF.U != undefined) {
- V.SF.Upgrade = V.SF.U; delete V.SF.U;
- }
- if (V.SF.WG != undefined) {
- V.SF.Gift = V.SF.WG; delete V.SF.WG;
- }
- if (V.SF.Facility == undefined) {
- V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
- }
- if (V.SF.Bonus == undefined) {
- V.SF.Bonus = 0;
- }
- if (V.SF.Depravity < 0) {
- V.SF.Depravity = 0;
- }
- if (V.SF.Size == undefined) {
- V.SF.Size = V.SF.Units; delete V.SF.Units;
- }
- if (V.SFUnit != undefined) {
- if (V.SFUnit.AT != undefined) {
- delete V.SFUnit.AT; V.SFUnitTA = 0;
- }
- V.SF.Squad = V.SFUnit;
- delete V.SFUnit;
+ if (V.SF.U !== undefined) V.SF.Upgrade = V.SF.U; delete V.SF.U;
+ if (V.SF.WG !== undefined) V.SF.Gift = V.SF.WG; delete V.SF.WG;
+ if (V.SF.MercCon != undefined) {
+ V.SF.MercCon.Menials = V.SF.MercCon.Helots;
+ V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots;
+ delete V.SF.MercCon.Helots;delete V.SF.MercCon.TotalHelots;
+ } else {
+ MercCon();
+ }
+
+ if (V.SF.Facility === undefined) Facility();
+ if (V.SF.Bonus === undefined) V.SF.Bonus = 0;
+ if (V.SF.Depravity < 0) V.SF.Depravity = 0;
+ if (V.SF.Size === undefined) V.SF.Size = V.SF.Units; delete V.SF.Units;
+ if (V.SFUnit !== undefined) {
+ if (V.SFUnit.AT !== undefined) delete V.SFUnit.AT; V.SFUnitTA = 0;
+ V.SF.Squad = V.SFUnit; delete V.SFUnit;
V.SF.Squad.Sat = {lv:V.SF.Squad.Satellite, InOrbit:V.SatLaunched};
delete V.SatLaunched;
V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
- if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
- if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
- if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units();
+ if (V.SFTradeShow !== undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
+ if (V.SFColonel !== undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = "";
if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) {
- delete V.SFUnit;
- V.SF.Squad.Sat = {lv:0, InOrbit:0};
- delete V.SatLaunched;
- V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
+ delete V.SFUnit; V.SF.Squad.Sat = {lv:0, InOrbit:0};
+ delete V.SatLaunched; V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
}
}
- if (V.SF.Squad != undefined && V.SF.Squad.Satellite.lv === undefined) {
+ 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.securityForceName !== undefined) InitClean(); MainClean(); ColonelClean(); TradeShowClean(); UnitsClean();
};
window.BadOutcome = function() {
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index fa6010bae88c1d6b5d5c28d61553c3ca92868b79..d6921a0fbc5a859b5b9fecaf500911137d77f50e 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -76,9 +76,9 @@
<<if $SF.MercCon.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>>
- While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Helots)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
+ While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.V.SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
- <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalHelots)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
+ <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.V.SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</if>>
diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js
index 9fc45acd2e2e1317d2b0d8a62ddb7671c799568a..09663802b03aaaef8d81a6280529a32219a41d06 100644
--- a/src/SpecialForce/JS.js
+++ b/src/SpecialForce/JS.js
@@ -1,4 +1,4 @@
-/*SecForceEX JS*/
+/*SecForceEX JS V = SugarCube.State.variables, T = SugarCube.State.temporary;*/
window.SFC = function() {
const V = State.variables;
if (V.SF.MercCon.CanAttend === -1) {return `The Colonel`;}
@@ -449,25 +449,41 @@ window.progress = function(x,max) {
return `${out}`;
};
+window.Main = function() {
+ const V = State.variables;
+ V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
+ V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
+}
+window.Squad = function() {
+ const V = State.variables;
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+}
+window.Colonel = function() {
+ const V = State.variables;
+ V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
+}
+window.MercCon = function() {
+ const V = State.variables;
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
+}
+window.Facility = function() {
+ const V = State.variables;
+ V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+}
+
window.SFInit = function() {
- const V = State.variables;
- V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
- V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
- V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
- V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
- V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ Main();Squad();Colonel();MercCon();Facility();
};
window.SFBC = function() {
const V = State.variables;
- function Init() {
+ function InitClean() {
delete V.SFMODToggle;
delete V.securityForceActive;
delete V.securityForceCreate;
delete V.securityForceEventSeen;
}
- function Main() {
+ function MainClean() {
delete V.securityForceActive;
delete V.securityForceRecruit;
delete V.securityForceTrade;
@@ -487,14 +503,14 @@ window.SFBC = function() {
delete V.securityForceName;
delete V.SubsidyActive;
}
- function Colonel() {
+ function ColonelClean() {
delete V.SubsidyActive;
delete V.ColonelCore;
delete V.securityForceColonelToken;
delete V.securityForceColonelSexed;
delete V.ColonelRelationship;
}
- function TradeShow() {
+ function TradeShowClean() {
delete V.OverallTradeShowAttendance;
delete V.CurrentTradeShowAttendance;
delete V.TradeShowIncome;
@@ -502,7 +518,7 @@ window.SFBC = function() {
delete V.TradeShowHelots;
delete V.TotalTradeShowHelots;
}
- function Units() {
+ function UnitsClean() {
delete V.securityForcePersonnel;
delete V.securityForceInfantryPower;
delete V.securityForceArcologyUpgrades;
@@ -521,10 +537,10 @@ window.SFBC = function() {
delete V.securityForceHeavyAmphibiousTransport;
}
- if ( (V.SF.Toggle || V.SFMODToggle) > 0) {
- if (V.SF == undefined) {
+ if ( (V.SF.Toggle || V.SFMODToggle) > 0 || V.SF === undefined) {
+ if (V.SF === undefined) {
if (V.securityForceEventSeen < 1) { V.securityForceActive = -1 } else { V.securityForceActive = 2 };
- V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; Init();
+ V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; InitClean();
if (V.securityForceName === undefined) V.securityForceName = "the special force";
if (V.SF.Active >= 1) {
Object.assign(V.SF, {
@@ -538,7 +554,7 @@ window.SFBC = function() {
Regs:V.securityForceAccountability,
Caps:"The Special Force",
Lower:V.securityForceName,
- Subsidy:V.SubsidyActive}); Main();
+ Subsidy:V.SubsidyActive}); MainClean();
if (V.SF.Lower !== "the special force") V.SF.Caps = V.SF.Lower.replace("the ", "The ");
if (V.ColonelCore === undefined) V.ColonelCore = "";
@@ -548,7 +564,7 @@ window.SFBC = function() {
Core:V.ColonelCore,
Talk:V.securityForceColonelToken,
Fun:V.securityForceColonelSexed,
- Status:V.ColonelRelationship}; Colonel();
+ Status:V.ColonelRelationship}; ColonelClean();
if (V.TradeShowIncome === undefined) V.TradeShowIncome = 0;
if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0;
@@ -592,27 +608,16 @@ window.SFBC = function() {
MissileSilo:V.securityForceMissileSilo,
AircraftCarrier:V.securityForceAircraftCarrier,
Sub:V.securityForceSubmarine,
- HAT:V.securityForceHeavyAmphibiousTransport}; Units();
+ HAT:V.securityForceHeavyAmphibiousTransport}; UnitsClean();
} else {
- V.SF = {Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1};
- V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
- V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
- V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
- if (V.securityForceName) {
- Init(); Main(); Colonel(); TradeShow(); Units();
- }
+ SFInit();
}
- V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ Facility();
} else {
if (V.SF.Active === -1) SFInit();
- if (V.SF.MWU) {
- delete V.SF.MWU;
- }
- if (V.SpecOpsLock != undefined) {
- V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
- }
- if (V.SF.UC == undefined) {
+ if (V.SF.MWU) delete V.SF.MWU;
+ if (V.SpecOpsLock != undefined) V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
+ 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}; delete V.SF.SpecOps;
delete V.SF.SpecOpsLock;
@@ -620,55 +625,41 @@ window.SFBC = function() {
V.SF.UC = {Assign:0, Lock:0};
}
}
- if (V.SF.U != undefined) {
- V.SF.Upgrade = V.SF.U; delete V.SF.U;
- }
- if (V.SF.WG != undefined) {
- V.SF.Gift = V.SF.WG; delete V.SF.WG;
- }
- if (V.SF.MercCon.Helots != undefined) {
- V.SF.MercCon.Menials = V.SF.MercCon.Helots;
- V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots;
- delete V.SF.MercCon.Helots;delete V.SF.MercCon.TotalHelots;
- }
- if (V.SF.Facility == undefined) {
- V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
- }
- if (V.SF.Bonus == undefined) {
- V.SF.Bonus = 0;
- }
- if (V.SF.Depravity < 0) {
- V.SF.Depravity = 0;
- }
- if (V.SF.Size == undefined) {
- V.SF.Size = V.SF.Units; delete V.SF.Units;
- }
- if (V.SFUnit != undefined) {
- if (V.SFUnit.AT != undefined) {
- delete V.SFUnit.AT; V.SFUnitTA = 0;
- }
- V.SF.Squad = V.SFUnit;
- delete V.SFUnit;
+ if (V.SF.U !== undefined) V.SF.Upgrade = V.SF.U; delete V.SF.U;
+ if (V.SF.WG !== undefined) V.SF.Gift = V.SF.WG; delete V.SF.WG;
+ if (V.SF.MercCon != undefined) {
+ V.SF.MercCon.Menials = V.SF.MercCon.Helots;
+ V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots;
+ delete V.SF.MercCon.Helots;delete V.SF.MercCon.TotalHelots;
+ } else {
+ MercCon();
+ }
+
+ if (V.SF.Facility === undefined) Facility();
+ if (V.SF.Bonus === undefined) V.SF.Bonus = 0;
+ if (V.SF.Depravity < 0) V.SF.Depravity = 0;
+ if (V.SF.Size === undefined) V.SF.Size = V.SF.Units; delete V.SF.Units;
+ if (V.SFUnit !== undefined) {
+ if (V.SFUnit.AT !== undefined) delete V.SFUnit.AT; V.SFUnitTA = 0;
+ V.SF.Squad = V.SFUnit; delete V.SFUnit;
V.SF.Squad.Sat = {lv:V.SF.Squad.Satellite, InOrbit:V.SatLaunched};
delete V.SatLaunched;
V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
- if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
- if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
- if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units();
+ if (V.SFTradeShow !== undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
+ if (V.SFColonel !== undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = "";
if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) {
- delete V.SFUnit;
- V.SF.Squad.Sat = {lv:0, InOrbit:0};
- delete V.SatLaunched;
- V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
+ delete V.SFUnit; V.SF.Squad.Sat = {lv:0, InOrbit:0};
+ delete V.SatLaunched; V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
}
}
- if (V.SF.Squad != undefined && V.SF.Squad.Satellite.lv === undefined) {
+ 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.securityForceName !== undefined) InitClean(); MainClean(); ColonelClean(); TradeShowClean(); UnitsClean();
};
window.BadOutcome = function() {
diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw
index 2973ac83a9fb04925a169ee33396b3509865e0df..3d48a0a15e744866c0d85364cc4a37d4db6207f9 100644
--- a/src/SpecialForce/Report.tw
+++ b/src/SpecialForce/Report.tw
@@ -186,13 +186,13 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week
| <<link "No Accountability">> <<set $SF.Regs = "none">>
<<replace "#accountability">> ''No Accountability'' <</replace>> <</link>>
<<if $SF.MercCon.View > 0 && $SF.MercCon.CanAttend === 1>> <br>''TradeShow'':
- <<set $SF.MercCon.Income = 0,$SF.MercCon.Helots = 0>>
+ <<set $SF.MercCon.Income = 0,$SF.V.SF.MercCon.Menials = 0>>
<<set _TradeShowAttendes = 200,_MenialSlavesPerAttendee = 5>>
<<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>>
<<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>>
During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendees, some decided to also give her some menial slaves as a bonus.<br>
<<set $menials += _MenialSlaves>>
- <<set $SF.MercCon.Helots += _MenialSlaves,$SF.MercCon.TotalHelots += _MenialSlaves>>
+ <<set $SF.V.SF.MercCon.Menials += _MenialSlaves,$SF.V.SF.MercCon.TotalMenials += _MenialSlaves>>
<<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>>
<<set $SF.MercCon.Revenue += _TSProfit>>
<<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>>
diff --git a/src/facilities/nursery/childrenReport.tw b/src/facilities/nursery/childrenReport.tw
index 4d033a7e7662aef1a7c341f38c71b2b2ccb91ded..a22fe4af419a97ce1f0f1da39e3574eb8baf8c5f 100644
--- a/src/facilities/nursery/childrenReport.tw
+++ b/src/facilities/nursery/childrenReport.tw
@@ -270,7 +270,7 @@
<</if>>
<</if>>
<<elseif $nurseryReproductionSetting == 1>>
- Her hormone levels are being carefully managed, @@.green;encouraging early puberty.@@
+ $His hormone levels are being carefully managed, @@.green;encouraging early puberty.@@
<<if $cribs[_nur].ovaries == 1>>
<<set $cribs[_nur].pubertyXX = 1>>
<<set $cribs[_nur].hormoneBalance = 250>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 089fdd0dbd673cc88245af44614abb69194149f4..3b760c7fe7db193286df6d225b17f6c04c09c5fa 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -107,11 +107,12 @@ $nurseryNameCaps
<</if>>
<<if $Matron != 0>>
+ <<setLocalPronouns $Matron>>
<br>
<<if $MatronIgnoresFlaws != 1>>
- $Matron.slaveName will attempt to fix flaws in nannies serving under her. [[Ignore flaws|Nursery][$MatronIgnoresFlaws = 1]]
+ $Matron.slaveName will attempt to fix flaws in nannies serving under $him. [[Ignore flaws|Nursery][$MatronIgnoresFlaws = 1]]
<<else>>
- $Matron.slaveName has been instructed to ignore flaws in the nannies serving under her. [[Fix flaws|Nursery][$MatronIgnoresFlaws = 0]]
+ $Matron.slaveName has been instructed to ignore flaws in the nannies serving under $him. [[Fix flaws|Nursery][$MatronIgnoresFlaws = 0]]
<</if>>
<</if>>
diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw
index d5eca5141970e878784087269600eec182c3c4a0..c7c90d47992426e98e74d659ee1c57a477e6bdd3 100644
--- a/src/facilities/nursery/nurseryReport.tw
+++ b/src/facilities/nursery/nurseryReport.tw
@@ -65,10 +65,10 @@
<<set _idleBonus++>>
*/
<<elseif ($Matron.fetishKnown == 1)>>
- $Matron.slaveName can't keep $him hands to herself, preventing the slaves in the nursery from relaxing completely.
+ $Matron.slaveName can't keep $his hands to $himself, preventing the slaves in the nursery from relaxing completely.
<</if>>
<<if ($Matron.visualAge > 35)>>
- Her apparent maturity encourages the slaves in the nursery to relax and pour out their troubles to $him.
+ $His apparent maturity encourages the slaves in the nursery to relax and pour out their troubles to $him.
<<set _healthBonus++, _idleBonus++>>
<</if>>
<<if ($Matron.intelligence > 0)>>
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index fc6b40d60dce3c0b5458d8524f2ad3a28eaf135a..3baf4a4b50e69a4af0df9df89f643ad1d805065e 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -368,6 +368,10 @@ window.DefaultRules = (function() {
slave.collar = rule.collar;
if ((slave.collar == "none"))
r += `${slave.slaveName} has been given no collar.`;
+ else if ((slave.collar == "pretty jewelry"))
+ r += `${slave.slaveName} has been given ${slave.collar}.`;
+ else if ((["dildo gag", "massive dildo gag", "ball gag", "bit gag", "neck corset", "porcelain mask", "bell collar", "bowtie"].includes(slave.collar)))
+ r += `${slave.slaveName} has been given a ${slave.collar}.`;
else
r += `${slave.slaveName} has been given a ${slave.collar} collar.`;
}
@@ -640,7 +644,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>slave.slaveName is a virgin and has been given a slave.vaginalAccessory for her pussy.`;
+ r += `<br>slave.slaveName is a virgin and has been given a ${slave.vaginalAccessory} for her pussy.`;
break;
}
}
@@ -696,7 +700,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} has been given a slave.vaginalAccessory for her pussy.`;
+ r += `<br>${slave.slaveName} has been given a ${slave.vaginalAccessory} for her pussy.`;
break;
}
}
@@ -828,7 +832,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} is an anal virgin and has been given a slave.buttplug for her asshole.`;
+ r += `<br>${slave.slaveName} is an anal virgin and has been given a ${slave.buttplug} for her asshole.`;
break;
}
}
@@ -885,7 +889,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} has been given a slave.buttplug for her asshole.`;
+ r += `<br>${slave.slaveName} has been given a ${slave.buttplug} for her asshole.`;
break;
}
}
@@ -906,7 +910,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} has been given a slave.buttplugAttachment to attach to her buttplug.`;
+ r += `<br>${slave.slaveName} has been given a ${slave.buttplugAttachment} to attach to her buttplug.`;
break;
}
}
diff --git a/src/js/familyTree.tw b/src/js/familyTree.tw
index 820a2ad338b8caa0f4e1764994e9edf838822a5a..b0e366fc86bbe2af405ffacfc4d1877e78e8fba0 100644
--- a/src/js/familyTree.tw
+++ b/src/js/familyTree.tw
@@ -8,7 +8,7 @@ var lastActiveSlave, lastSlaves, lastPC;
<div id="familyTree"></div>
<span id="familyTreeLink">
- <<link "Pull up the file on her family tree.">>
+ <<link "Pull up the file on $his family tree.">>
<<replace #familyTreeLink>>
<<run renderFamilyTree($slaves, $activeSlave.ID)>>
<</replace>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 67dd4c64be9b6cdb3d456fc21e6dbfa1e72e2c44..82be3cda949087b528571191583c3f84c12d9a83 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -244,7 +244,7 @@ The previous owner seems to have left in something of a hurry.
<<switch $targetArcology.type>>
<<case "Supremacist">>
<<set $oneTimeDisableDisability = 1>>
- <<set $arcologies[0].FSSupremacistLawME = 1>><<include "Generate New Slave">><<set $arcologies[0].FSSupremacistLawME = 0>>
+ <<set $fixedRace = $arcologies[0].FSSupremacistRace>><<include "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
@@ -257,7 +257,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "please you">>
<<case "Subjugationist">>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedRace = $activeArcology.FSSubjugationistRace>><<include "Generate New Slave">>
+ <<set $fixedRace = $arcologies[0].FSSubjugationistRace>><<include "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35)>>
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index aecc71cd684dc0bd452f70f99e83f6fd87100945..85ac245802478ed6a40bd0aa57aab0e71d77fc33 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -1,6 +1,7 @@
:: eliteTakeOver [nobr]
<<set $nextButton = " ">>
+<<setLocalPronouns $Bodyguard>>
<<set _pregSurrender = 0>>
/* preg/lobotomization check */
@@ -31,7 +32,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
What was that last thing he said? It's getting hard to think right. The $PC.refreshment... Drugged... You collapse onto your desk, unconscious.
<br>
<<if $Bodyguard != 0>>
- A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if $Bodyguard.amp < 0>>her cybernetics being locked down<<else>>the overwhelming odds<</if>>. As she and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands.
+ A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if $Bodyguard.amp < 0>>$his cybernetics being locked down<<else>>the overwhelming odds<</if>>. As she and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands.
<<else>>
You'll spend the rest of your life a breeder to the Societal Elite; blinded and muted. More than a slave, but still less than your master. Life isn't so bad, your two most devoted slaves were taken along to keep you happy, and you are treated quite well, possibilities considered. Though once your eggs dry up, odds are your little remaining usefulness will be at an end. Best not to think too much into it.
<<set _pregSurrender = 1>>
@@ -55,7 +56,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
<<if $Bodyguard != 0>>
<br>
<<if $PC.pregSource == -1 || $PC.pregSource == -6>>
- $Bodyguard.slaveName is already doing everything in her power to save you.
+ $Bodyguard.slaveName is already doing everything in $his power to save you.
<<else>>
<<link "Attempt to signal $Bodyguard.slaveName, your bodyguard">>
<<set $finalChoice = "bodyguard">>
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index da76b30fbb39ee1e9601de7347497fe397b5b123..0f1f8f92fecb38b264dee6775e94bcfdc3e80c44 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -260,7 +260,8 @@
<<goto "eliteTakeOverResult">>
<</link>>
<<elseif $Bodyguard != 0>>
- It is now that $Bodyguard.slaveName makes her entrance, pointing her guns at the <<if $eliteLeft < $eliteTotal>>remaining<</if>> elite.
+ <<setLocalPronouns $Bodyguard>>
+ It is now that $Bodyguard.slaveName makes $his entrance, pointing $his guns at the <<if $eliteLeft < $eliteTotal>>remaining<</if>> elite.
She then asks<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, what should I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> "elite" left?
<br>
<<link "Open fire">>
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index 6401a1debb7c264e19e4482817a8430c4daeea66..0a0a199c3eb34aff4f7ae3017c6efa4cf764b9a8 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -120,13 +120,13 @@ You walk around $him, drawing closer and slowly resting your hand on $his head.
<<elseif ($activeSlave.relationship == -3) && $activeSlave.devotion+$activeSlave.trust >= 175>>
Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your slave's utterly willing submission. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> and finally onto your lap<</if>>, relaxing as $he feels your caress. As $he shifts $his weight to your chest, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips. You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her <</if>>devoted and content wife.
<<elseif ($activeSlave.relationship == -2)>>
- Tenderly and lovingly you brush your fingers along $his head, for a moment, appreciating how easily your slave submits to your desire to pat her head. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> allowing you to move $him onto your lap<</if>>, relaxing as $he feels your caresses. As $his weight falls onto you, all of the stress from $his body melts away, and a small, respectful sigh escapes $his pursed lips. You smile fondly, allowing all of the troubles of being an arcology owner drift away, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content servant.
+ Tenderly and lovingly you brush your fingers along $his head, for a moment, appreciating how easily your slave submits to your desire to pat $his head. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> allowing you to move $him onto your lap<</if>>, relaxing as $he feels your caresses. As $his weight falls onto you, all of the stress from $his body melts away, and a small, respectful sigh escapes $his pursed lips. You smile fondly, allowing all of the troubles of being an arcology owner drift away, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content servant.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.amp != 1)>>
As you start to touch $him $he smiles at you and takes your hand, following its movements. You tenderly and lovingly kiss it and let it rest on the side of $his head, before continuing with your ministrations. As opposed to your more submissive slaves, $activeSlave.slaveName takes an active role in your petting, gently guiding where your hand goes along $his head. You enjoy the feel of $his hand on yours, as well as $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>smooth scalp<<else>> hair<</if>>.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
$He stiffens at your touch but slowly relaxes at the sensation of your hand on $his head. You tenderly and lovingly stroke your fingers along $his scalp, enjoying the feeling of your slave's subservience. $He gently, submissively, presses $his head against your hand, like a dog. As you continue <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>kneading $his shaved scalp<<else>>stroking $his hair<</if>>, $he starts to clutch $his thighs, and if you listen you can hear subdued whimpers. $He looks up at you with adoring eyes, and relishes in the pureness of this act as $his master's pet to $his beloved <<= WrittenMaster($activeSlave)>>.
<<elseif $activeSlave.devotion > 50>>
- $He accepts it with devotion, leaning back into your gentle caresses. You tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's willingness to set aside her dignity for headpats. $He leans $his body backward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the sensation of <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tension start to melt away as well.
+ $He accepts it with devotion, leaning back into your gentle caresses. You tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's willingness to set aside $his dignity for headpats. $He leans $his body backward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the sensation of <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tension start to melt away as well.
<<elseif $activeSlave.devotion > 20>>
$He willingly accepts it. As you tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's roiling emotions, and finally submission. You can still sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch. As you continue your ministrations, your slave slowly, and with more then a bit of uncertainty, finally starts to relax. $He looks at you with confusion and trepidation. Your eyes betray nothing however, you simply smile and press $his head into your <<if $PC.boobs == 1>>soft breasts<<else>>masculine chest<</if>>, all the while enjoying the feeling of your <<if $activeSlave.hStyle == "shaven bald" || $activeSlave.bald == 1>>hands gliding over $his smooth head<<else>>fingers gliding through $his hair<</if>>.
<<elseif $activeSlave.devotion >= -20 && $activeSlave.trust < -20>>
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index ce3f960252f2febbda38938169d6520172aa9c59..d8028571577b61efa49d69ea62b48731c8680c4e 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -640,7 +640,7 @@
<</if>>
<</if>>
<<elseif $incubatorReproductionSetting == 1>>
- Her hormone levels are being carefully managed, @@.green;encouraging early puberty.@@
+ $His hormone levels are being carefully managed, @@.green;encouraging early puberty.@@
<<if $tanks[_inc].ovaries == 1>>
<<set $tanks[_inc].pubertyXX = 1>>
<<set $tanks[_inc].hormoneBalance = 250>>
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index df1d4e396e8bfa76ccaca72232eadabc6c54f0c3..48405e08bf9be31a7526f36e811d71f78d7dfe4a 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -1,6 +1,7 @@
:: Incubator Retrieval Workaround [nobr]
-$readySlave.slaveName has been discharged from $incubatorName and is ready for her first ever inspection.
+<<setLocalPronouns $readySlave>>
+$readySlave.slaveName has been discharged from $incubatorName and is ready for $his first ever inspection.
<br><br>
diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index 0e698bcacf749ed82bbca421371a2fb94a61546e..9a3ae0d62977831e9a0a27cc99699c2f9b8cc99b 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -77,5 +77,5 @@
<</if>>
<br><br>
<<else>>
- You abruptly cut $his begging short as you realize $slaveFightingBG.slaveName is already fighting your bodyguard $Bodyguard.slaveName for <<if $slaveFightingBG.genes == "XX">>her<<else>>his<</if>> life this week. [[Cancel the fight|KillSlave][$killChoice = -1]]
+ You abruptly cut $his begging short as you realize $slaveFightingBG.slaveName is already fighting your bodyguard $Bodyguard.slaveName for $his life this week. [[Cancel the fight|KillSlave][$killChoice = -1]]
<</if>>
\ No newline at end of file
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index 15ee8a867c67352677f59fff97a8098642bf8727..1f6a20997ece76cde16f4727d8616a2c8d046a76 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -1,6 +1,7 @@
:: KilledSlave [nobr]
<<if $killChoice <= 0>>
+<<setLocalPronouns $Bodyguard 2>>
<<set _qualifiedFS = []>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
@@ -138,7 +139,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
<<set $activeSlave.trust = -100>>
<<elseif $killChoice == 2>>
- You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate -- if $he wants to live, $he'll have to beat <<if $Bodyguard.genes == "XY" && $diversePronouns == 1>>him<<else>>her<</if>> in hand-to-hand combat in $pitName.
+ You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate -- if $he wants to live, $he'll have to beat _him2 in hand-to-hand combat in $pitName.
<<if $activeSlave.combatSkill == 0>>
The fear on $his face is palpable, though $he nods slowly and agrees, not seeing another choice.
<<else>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 262bf61951a1626cfc99793883db762e532977e5..c0c7b48dcc7a6864e034460c47cbdefe1b7c7837 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -753,7 +753,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<br><<link "Bring in another slave and let $him have fun">>
<<replace "#result">>
- You call in the next passing slave, bind $his hands and feet and present her to the curious new $desc. You gesture towards the bound girl, signifying permission to do whatever $he pleases. Eagerly, $activeSlave.slaveName begins exploring every inch of her body, paying close attention to her nipples and her holes, while you return to your work. It doesn't take long for you to be disrupted by a loud
+ You call in the next passing slave, bind her hands and feet and present her to the curious new $desc. You gesture towards the bound girl, signifying permission to do whatever $he pleases. Eagerly, $activeSlave.slaveName begins exploring every inch of her body, paying close attention to her nipples and her holes, while you return to your work. It doesn't take long for you to be disrupted by a loud
<<if random(1,100) > 50>>
moan emanating from the bound girl. Looking up, you see $activeSlave.slaveName <<if canPenetrate($activeSlave)>>fucking her hard and deep<<else>>licking her cunt<</if>>, hitting all the right places and making the helpless girl squirm with pleasure. Any plea for mercy results in a renewed effort to push the girl over the edge. $activeSlave.slaveName is certainly @@.hotpink;enjoying $his treat,@@ and by the looks of things, may be a developing dom!
<<if random(1,100) > 60 && $activeSlave.fetish == "none">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f2214c8058cf58ee94dc54b0606530394df4ecc4..45f96b1e43299e45b940b1a9c91d82b7ea99a423 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -11222,7 +11222,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Have some fun with $him once $he's using the milkers">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- $activeSlave.slaveName is face down into a special chair a bit like a massage setup<<if $activeSlave.belly >= 1500>>, though with a hole for $his <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> to fit into<</if>>, with $his breasts hanging down so the milkers can work away at $his nipples. As such, $his back and ass are on display as $he grunts and groans with relief. $He starts at your hand on $his back but <<if $activeSlave.devotion > 20>>quickly<<else>>slowly<</if>> relaxes.
+ $activeSlave.slaveName is face down on a special bench much like one used for massages<<if $activeSlave.belly >= 1500>>, though with a hole for $his <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> to fit into<</if>>, with $his breasts hanging down so the milkers can work away at $his nipples. As such, $his back and ass are on display as $he grunts and groans with relief. $He starts at your hand on $his back but <<if $activeSlave.devotion > 20>>quickly<<else>>slowly<</if>> relaxes.
<<if canDoVaginal($activeSlave)>>
The stimulation of the milking has $his soaking wet, and $he whimpers with pleasure as you enter $his sopping pussy. $He's so wet that $his plentiful vaginal secretions make it
<<if canDoAnal($activeSlave)>>
@@ -12415,7 +12415,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Not so fast">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- As $he goes, $he follows the natural human impulse when embarrassed, and turns $his head resolutely away from you, trying very hard to forget making such a fool of $himself. This means that $he does not see your rapid, predatory pursuit of $him; nor does $he hear your careful stride across the flooring. $His first indication that $he's prey is when your hands grab $his around $his
+ As $he goes, $he follows the natural human impulse when embarrassed, and turns $his head resolutely away from you, trying very hard to forget making such a fool of $himself. This means that $he does not see your rapid, predatory pursuit of $him; nor does $he hear your careful stride across the flooring. $His first indication that $he's prey is when your hands grab $him around $his
<<if $activeSlave.bellyPreg >= 5000>>
pregnant belly
<<elseif $activeSlave.belly >= 5000>>
@@ -12473,7 +12473,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $activeSlave.nipples == "inverted">>
You wrap your hands around the bases of $his inverted nipples, and use your strong grip to stimulate and squeeze them until they protrude, much to the writhing slave's anguish.
<<elseif $activeSlave.nipples == "fuckable">>
- You slip your fingers into $his nipples and spread $his wide, making the slave writhe and buck against you.
+ You slip your fingers into $his nipples and spread $him wide, making the slave writhe and buck against you.
<<else>>
You pinch $his nipples and tug them hard, making the slave writhe and buck against you.
<</if>>
@@ -12516,7 +12516,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $PC.belly >= 5000>>
You'd like to lift $him up into a standing fuck, but you are far too pregnant to manage. Instead, you lie on your back and have $him work your legs as you fuck $him.
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
- After a while, you lift $him up as high as you can, freeing your member, and then lower $his back down again, forcing yourself up $his butt instead despite the slave's anxious begging.
+ After a while, you lift $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging.
<<= BothVCheck()>>
It doesn't take long before you fill $his ass with cum.
<<elseif canDoVaginal($activeSlave)>>
@@ -12529,7 +12529,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $activeSlave.belly >= 300000>>
You'd like to lift $him up into a standing fuck, but even you aren't strong enough to lift $his extreme weight. Instead, you choose to have $him ride you; supporting $his _belly middle is a workout in its own right.
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
- After a while, you push $him up as high as you can, freeing your member, and then lower $his back down again, forcing yourself up $his butt instead despite the slave's anxious begging.
+ After a while, you push $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging.
<<= BothVCheck()>>
It doesn't take long before you fill $his ass with cum.
<<elseif canDoVaginal($activeSlave)>>
@@ -12575,24 +12575,24 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
<br><<link "Have $him lick you clean">>
<<replace "#result2">>
- You take $him by the hand and <<if $PC.belly >= 10000>>waddle<<else>>walk<</if>> towards the shower. The sudden loss of your closeness jerks $him rudely out of $his sexual reverie, but $he follows willingly, perhaps distracted by the view as you shed your workout clothes on the way. When you get there, you pull $him in with you, but you do not turn on the water. Instead, you tell $him to wash you. Not understanding, $he turns to switch on the shower, but you catch $him, and insert two sweaty fingers into the slave's compliant mouth. $He sucks on them, taking refuge in the simple task, and then understands what you mean. $He runs $his tongue up your arm, sucking the salty sweat off you as best $he can. Soon, $he bends down and heads for your
+ You take $him by the hand and <<if $PC.belly >= 10000>>waddle<<else>>walk<</if>> towards the shower. The sudden loss of your closeness jerks $him rudely out of her sexual reverie, but $he follows willingly, perhaps distracted by the view as you shed your workout clothes on the way. When you get there, you pull $him in with you, but you do not turn on the water. Instead, you tell $him to wash you. Not understanding, $he turns to switch on the shower, but you catch $him, and insert two sweaty fingers into the slave's compliant mouth. $He sucks on them, taking refuge in the simple task, and then understands what you mean. $He runs $his tongue up your arm, sucking the salty sweat off you as best $he can. Soon, $he bends down and heads for your
<<if $PC.dick == 1>>cock<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>cunt<</if>>
but you pull $him up again and tell $him to do that last.
<<if $PC.belly >= 60000>>
- $He quickly finds something almost as good by licking and sucking $his way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold $his there head there for a while, savoring the erotic sensation before pushing $him along to the rest of your expansive midriff.
+ $He quickly finds something almost as good by licking ,and sucking $his way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold $his head there there for a while, savoring the erotic sensation before pushing her along to the rest of your expansive midriff.
<<elseif $PC.belly >= 5000>>
- $He quickly finds something almost as good by licking and sucking $his way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold $his there head there for a while, savoring the erotic sensation.
+ $He quickly finds something almost as good by licking ,and sucking $his way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold $his head there there for a while, savoring the erotic sensation.
<<elseif $PC.boobsBonus > 2>>
- $He quickly finds something almost as good by licking and sucking $his way up the sweaty crevice between your enormous breasts. When $he reaches your nipples, you hold $his there head there for a while, enjoying $his tongue.
+ $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your enormous breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue.
<<elseif $PC.boobsBonus == 2>>
- $He quickly finds something almost as good by licking and sucking $his way up the sweaty crevice between your huge breasts. When $he reaches your nipples, you hold $his there head there for a while, enjoying $his tongue.
+ $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your huge breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue.
<<elseif $PC.boobsBonus == 1>>
- $He quickly finds something almost as good by licking and sucking $his way up the sweaty crevice between your big breasts. When $he reaches your nipples, you hold $his there head there for a while, enjoying $his tongue.
+ $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your big breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue.
<<elseif $PC.boobs == 1>>
- $He quickly finds something almost as good by licking and sucking $his way up the sweaty crevice between your breasts. When $he reaches your nipples, you hold $his there head there for a while, enjoying $his tongue.
+ $He quickly finds something almost as good by licking ,and sucking $his way up the sweaty crevice between your breasts. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue.
<<else>>
<<if $PC.title == 0>>
- $He settles for kissing and licking $his way up your abs, pecs, and non-existent tits. When $he reaches your nipples, you hold $his there head there for a while, enjoying $his tongue.
+ $He settles for kissing and licking $his way up your abs, pecs, and non-existent tits. When $he reaches your nipples, you hold $his head there there for a while, enjoying $his tongue.
<<else>>
$He settles for kissing and licking $his way up your abs, pecs, and collarbone, before shyly sucking the line of sweat that runs down each of your temples when you perspire heavily off of you.
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index fbcb386c1b3142df71464b3d973f5f8f276786a6..5ac0af06e75bbce913aa96ff3719ec9ad5693d8e 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -115,7 +115,7 @@
<</if>>
<</if>>
<<if $activeSlave.sexualFlaw == "hates penetration">>
- $He has trouble thinking of her vagina as a fuckhole rather than something special to protect and cherish, so her new piercings will be therapeutic. The constant, inescapable stimulation of her labia should force her past her hang-ups.
+ $He has trouble thinking of $his vagina as a fuckhole rather than something special to protect and cherish, so $his new piercings will be therapeutic. The constant, inescapable stimulation of $his labia should force $him past $his hang-ups.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 371f3c943d44b89f0704d7b26d37a066e59e5532..f8eedd24c715d2c900b739c59a0c1b75a3de3137 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -99,11 +99,14 @@ $cellblockNameCaps
<</if>>
<<if $Wardeness != 0 && canPenetrate($Warden)>>
+<<setLocalPronouns $Wardeness>>
<br><br>
<<if $cellblockWardenCumsInside == 1>>
- $Warden.slaveName is permitted to cum inside her inmates when she disciplines them. [[Forbid her from cumming inside|Cellblock][$cellblockWardenCumsInside = 0]]
+ $Warden.slaveName is permitted to cum inside $his inmates when $he disciplines them.
+ <<link "Forbid $him from cumming inside" "Cellblock">><<set $cellblockWardenCumsInside = 0>><</link>>
<<else>>
- $Warden.slaveName is not permitted to cum inside her inmates. [[Let her cum inside|Cellblock][$cellblockWardenCumsInside = 1]] //May result in pregnancies//
+ $Warden.slaveName is not permitted to cum inside $his inmates.
+ <<link "Let $him cum inside" "Cellblock">><<set $cellblockWardenCumsInside = 1>><</link>> //May result in pregnancies//
<</if>>
<</if>>
diff --git a/src/uncategorized/completeCatalog.tw b/src/uncategorized/completeCatalog.tw
index 591d41cb5d56243a60f6b87be740797cb122e1be..9eec5bfffc1ee2a6240922753d4521a9d1bb00d6 100644
--- a/src/uncategorized/completeCatalog.tw
+++ b/src/uncategorized/completeCatalog.tw
@@ -100,4 +100,4 @@
The offered price is <<print cashFormat($slaveCost)>>.
-[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $activeSlave.weekAcquired = $week, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main", $specialSlave = 1]]
+<<link "Buy $his slave contract" "New Slave Intro">><<set $cash -= $slaveCost, $activeSlave.weekAcquired = $week, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main", $specialSlave = 1>><</link>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 9494db08f4a74ef728aa083afc247eda7e9574c3..5cfe26b4eaca6fde132518e223e5e1605edc5190 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -1,10 +1,12 @@
:: Costs Report [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main",_archologyCosts = 0>>
+<<set $nextButton = "Back to Main", $nextLink = "Main",_arcologyCosts = 0>>
<<if $PCSlutContacts == 0>><<set $PCSlutContacts = 1>><</if>>
//Your weekly costs are as follows.//
+<br><br>
+
Since you are
<<if $girls >= 3>>
accustomed to luxury,
@@ -13,33 +15,33 @@ Since you are
<<else>>
used to a fairly normal life,
<</if>>
-your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+(50000/$localEcon))))>>.
-<<set _archologyCosts += Math.trunc($girls*(250+(50000/$localEcon)))>>
+your personal living expenses are <<print cashFormat(Math.trunc($girls*(250+(50000/$localEcon))))>>.
+<<set _arcologyCosts += Math.trunc($girls*(250+(50000/$localEcon)))>>
<<if $arcologies[0].FSRepopulationFocusLaw == 1 && $PC.pregKnown == 1>>
<br>Rent promotion for being a pregnant citizen under ''Universal Pregnancy Subsidy:'' <<print cashFormat(500)>>
- <<set _archologyCosts += 500>>
+ <<set _arcologyCosts += 500>>
<</if>>
<<if $PC.preg == -1>>
<br>Your Contraceptives expenses: <<print cashFormat(25)>>
- <<set _archologyCosts += 25>>
+ <<set _arcologyCosts += 25>>
<<elseif $PC.fertDrugs == 1>>
<br>Your fertility regimen: <<print cashFormat(50)>>
- <<set _archologyCosts += 50>>
+ <<set _arcologyCosts += 50>>
<<elseif $PC.preg >= 16>>
<br>Increased living expenses due to being pregnant: <<print cashFormat(100)>>
- <<set _archologyCosts += 100>>
+ <<set _arcologyCosts += 100>>
<</if>>
<<if $PC.staminaPills == 1>>
<br>Your stamina pills: <<print cashFormat(50)>>
- <<set _archologyCosts += 50>>
+ <<set _arcologyCosts += 50>>
<</if>>
<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine") || ($personalAttention == "hacking")>>
<br><br>
- <<set _cost = 10000*$AgeEffectOnTrainerPricingPC,_archologyCosts += _cost>>
+ <<set _cost = 10000*$AgeEffectOnTrainerPricingPC,_arcologyCosts += _cost>>
<<switch $personalAttention>>
<<case trading>>
__Trading__
@@ -54,51 +56,51 @@ your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+
<<case hacking>>
__Hacking__
<</switch>>
- trainer fees: <<print cashFormat(_cost)>>
+ Trainer Fees: @@.yellowgreen;<<print cashFormat(_cost)>>@@
<</if>>
<</if>>
<<if $breederOrphanageTotal > 0>><<set _breederTuition = 50>><<else>><<set _breederTuition = 0>><</if>>
<<if $citizenOrphanageTotal+$privateOrphanageTotal+$breederOrphanageTotal > 0>>
<br> __Orphanage__ fee: @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100+$privateOrphanageTotal*500+_breederTuition)>>@@
- <<set _archologyCosts += $citizenOrphanageTotal*100+$privateOrphanageTotal*500+_breederTuition>>
+ <<set _arcologyCosts += $citizenOrphanageTotal*100+$privateOrphanageTotal*500+_breederTuition>>
<<if $citizenOrphanageTotal > 0>>
- <br> Citizen: @@.yellowgreen;<<print cashFormat(100)>>@@ per child. Currently <<print commaNum($citizenOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100)>>@@.
+ <br> Citizen: @@.yellowgreen;<<print cashFormat(100)>>@@ per child. Currently <<print commaNum($citizenOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($citizenOrphanageTotal*100)>>@@.
<</if>>
<<if $privateOrphanageTotal > 0>>
- <br> Private: @@.yellowgreen;<<print cashFormat(500)>>@@ per child. Currently <<print commaNum($privateOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($privateOrphanageTotal*500)>>@@.
+ <br> Private: @@.yellowgreen;<<print cashFormat(500)>>@@ per child. Currently <<print commaNum($privateOrphanageTotal)>> are being taught, bringing the total to @@.yellowgreen;<<print cashFormat($privateOrphanageTotal*500)>>@@.
<</if>>
<<if $breederOrphanageTotal > 0>>
- <br> Since <<print commaNum($breederOrphanageTotal)>> of your slaves' children are being raised into productive members of society in a society funded school, you pay a flat @@.yellowgreen;<<print cashFormat(50)>>@@ usage fee.
+ <br> Since <<print commaNum($breederOrphanageTotal)>> of your slaves' children are being raised into productive members of society in a society funded school, you pay a flat @@.yellowgreen;<<print cashFormat(50)>>@@ usage fee.
<</if>>
<</if>>
<<if $peacekeepers != 0 && $peacekeepers.undermining != 0>>
<br> <<print cashFormat($peacekeepers.undermining)>> to undermine political support for the nearby old world peacekeeping mission.
- <<set _archologyCosts += $peacekeepers.undermining>>
+ <<set _arcologyCosts += $peacekeepers.undermining>>
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
<<if $SF.Subsidy>>
<br>__Finacinally supporting $SF.Lower unitll self sufficiency:__ <<print cashFormat(Math.ceil( (10000*($SF.Squad.Troops/10))+(1+($arcologies[0].prosperity/100))+(1+($SF.Size/100)) ))>>
- <<set _archologyCosts += Math.ceil( (10000*($SF.Squad.Troops/10))+(1+($arcologies[0].prosperity/100))+(1+($SF.Size/100)) )>>
+ <<set _arcologyCosts += Math.ceil( (10000*($SF.Squad.Troops/10))+(1+($arcologies[0].prosperity/100))+(1+($SF.Size/100)) )>>
<</if>>
<<if $SF.Bonus>>
<<= Count()>>
<br>__Bonuses for basic FS acceptance amongst $SF.Lower:__ <<print cashFormat(Math.ceil(_SFCashBonus))>>
<br> Colonel <<print cashFormat(_ColonelCashBonus*_Env)>>.
Troop size: <<print commaNum($SF.Squad.Troops)>> and each solider recives <<print cashFormat(_inviTroop*_Env)>>, totalling <<print cashFormat(Math.ceil(_TroopCashBonus*_Env))>>.
- <<set _archologyCosts += _SFCashBonus>>
+ <<set _arcologyCosts += _SFCashBonus>>
<</if>>
<</if>>
<<if $mercenaries > 0>>
<<set _mercCosts = $mercenaries*2000>>
<<if $barracks>><<set _mercCosts *= 0.5>><</if>>
<<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>><<set _mercCosts *= 0.5>><</if>>
- <br>__Mercenary__ expenses: <<print cashFormat(_mercCosts)>>
+ <br>__Mercenary Expenses__: @@.yellowgreen;<<print cashFormat(_mercCosts)>>@@
<<if $barracks>><<else>>//@@.red;Increased by the lack of a barracks.@@//<</if>>
<<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//Reduced by your @@.springgreen;mercenary contacts.@@//<</if>>
- <<set _archologyCosts += _mercCosts>>
+ <<set _arcologyCosts += _mercCosts>>
<</if>>
<<if $citizenRetirementMenials == 1>>
@@ -108,103 +110,120 @@ your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+
<<else>>
<<set _citizenRetirementMenialsCost = ($menials + $slaves.length) * 2>>
<</if>>
- <<set _archologyCosts += _citizenRetirementMenialsCost>>
- <<print cashFormat(_citizenRetirementMenialsCost)>>
+ <<set _arcologyCosts += _citizenRetirementMenialsCost>>
+ @@.yellowgreen;<<print cashFormat(_citizenRetirementMenialsCost)>>@@
<</if>>
<<if $brothel > 0 || $club > 0 || $arcade > 0 || $dairy > 0 || $farmyard > 0>>
- <br>__Archology building maintenance__:
+ <br><br>__Arcology Building Maintenance__:
<<if $brothel > 0>>
<<set _advertising = 0>>
<<if $brothel > 0>>
<<set _advertising = $brothelAdsSpending>>
<</if>>
- Brothel: <<print cashFormat(($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising)>>
- <<set _archologyCosts += ($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising>>
+ <br>
+ Brothel: @@.yellowgreen;<<print cashFormat(($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising)>>@@
+ <<set _arcologyCosts += ($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising>>
<</if>>
<<if $club > 0>>
<<set _advertising= 0>>
<<if $club > 0>>
<<set _advertising = $clubAdsSpending>>
- <<set _archologyCosts += $clubAdsSpending>>
+ <<set _arcologyCosts += $clubAdsSpending>>
<</if>>
- Club: <<print cashFormat(($club*$facilityCost)+(0.2*$clubUpgradePDAs*$club*$facilityCost)+_advertising)>>
- <<set _archologyCosts += ($club*$facilityCost)+(0.2*$clubUpgradePDAs*$club*$facilityCost)+_advertising>>
+ <br>
+ Club: @@.yellowgreen;<<print cashFormat(($club*$facilityCost)+(0.2*$clubUpgradePDAs*$club*$facilityCost)+_advertising)>>@@
+ <<set _arcologyCosts += ($club*$facilityCost)+(0.2*$clubUpgradePDAs*$club*$facilityCost)+_advertising>>
<</if>>
<<if $arcade > 0>>
- Arcade: <<print cashFormat((0.5*$arcade*$facilityCost)+(0.2*$arcadeUpgradeInjectors*$arcade*$facilityCost)+(0.2*$arcadeUpgradeCollectors*$arcade*$facilityCost))>>
- <<set _archologyCosts += (0.5*$arcade*$facilityCost)+(0.2*$arcadeUpgradeInjectors*$arcade*$facilityCost)+(0.2*$arcadeUpgradeCollectors*$arcade*$facilityCost)>>
+ <br>
+ Arcade: @@.yellowgreen;<<print cashFormat((0.5*$arcade*$facilityCost)+(0.2*$arcadeUpgradeInjectors*$arcade*$facilityCost)+(0.2*$arcadeUpgradeCollectors*$arcade*$facilityCost))>>@@
+ <<set _arcologyCosts += (0.5*$arcade*$facilityCost)+(0.2*$arcadeUpgradeInjectors*$arcade*$facilityCost)+(0.2*$arcadeUpgradeCollectors*$arcade*$facilityCost)>>
<</if>>
<<if $dairy > 0>>
- <br>__Dairy__: <<print cashFormat(($dairy*$facilityCost)+(0.2*$dairyFeedersUpgrade*$dairy*$facilityCost)+(0.1*$dairyPregUpgrade*$dairy*$facilityCost))>>
- <<set _archologyCosts += ($dairy*$facilityCost)+(0.2*$dairyFeedersUpgrade*$dairy*$facilityCost)+(0.1*$dairyPregUpgrade*$dairy*$facilityCost)>>
+ <br>
+ Dairy: @@.yellowgreen;<<print cashFormat(($dairy*$facilityCost)+(0.2*$dairyFeedersUpgrade*$dairy*$facilityCost)+(0.1*$dairyPregUpgrade*$dairy*$facilityCost))>>@@
+ <<set _arcologyCosts += ($dairy*$facilityCost)+(0.2*$dairyFeedersUpgrade*$dairy*$facilityCost)+(0.1*$dairyPregUpgrade*$dairy*$facilityCost)>>
<<if $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren > 0>>
- <br> Additional maintenance for milking machines upgraded with biological components: <<print cashFormat(($bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)*100)>>
- <<set _archologyCosts += ($bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)*100>>
+ <br>
+ Additional maintenance for milking machines upgraded with biological components: @@.yellowgreen;<<print cashFormat(($bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)*100)>>@@
+ <<set _arcologyCosts += ($bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)*100>>
<</if>>
<</if>>
<<if $farmyard > 0>> /*TODO: this will also need to be expanded*/
- __Farmyard__: <<print cashFormat($farmyard*$facilityCost)>>
- <<set _archologyCosts += $farmyard*$facilityCost>>
+ <br>
+ Farmyard: @@.yellowgreen;<<print cashFormat($farmyard*$facilityCost)>>@@
+ <<set _arcologyCosts += $farmyard*$facilityCost>>
<</if>>
<</if>>
<<if ($servantsQuarters > 0 && $servantsQuartersUpgradeMonitoring > 0) ||
$nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
($cyberMod != 0 && $researchLab.built == "true")>>
-<br>__Penthouse facility maintenance__:
+<br>__Penthouse Facility Maintenance__:
<<if ($servantsQuarters > 0) && ($servantsQuartersUpgradeMonitoring > 0)>>
- Servants' Quarters: <<print cashFormat((0.2*$servantsQuartersUpgradeMonitoring*$servantsQuarters*$facilityCost))>>
- <<set _archologyCosts += 0.2*$servantsQuartersUpgradeMonitoring*$servantsQuarters*$facilityCost>>
+ <br>
+ Servants' Quarters: @@.yellowgreen;<<print cashFormat((0.2*$servantsQuartersUpgradeMonitoring*$servantsQuarters*$facilityCost))>>@@
+ <<set _arcologyCosts += 0.2*$servantsQuartersUpgradeMonitoring*$servantsQuarters*$facilityCost>>
<</if>>
<<if $nursery > 0>> /*TODO: this will definitely need to be expanded to take into account the number of children and other factors*/
- Nursery: <<print cashFormat($nursery*$facilityCost)>>
- <<set _archologyCosts += $nursery*$facilityCost>>
+ <br>
+ Nursery: @@.yellowgreen;<<print cashFormat($nursery*$facilityCost)>>@@
+ <<set _arcologyCosts += $nursery*$facilityCost>>
<</if>>
<<if ($masterSuiteUpgradePregnancy > 0)>>
- Master Suite: <<print cashFormat(((500*$masterSuiteUpgradePregnancy) + (1000*$masterSuitePregnancyFertilitySupplements)))>>
- <<set _archologyCosts += ((500*$masterSuiteUpgradePregnancy) + (1000*$masterSuitePregnancyFertilitySupplements))>>
+ <br>
+ Master Suite: @@.yellowgreen;<<print cashFormat(((500*$masterSuiteUpgradePregnancy) + (1000*$masterSuitePregnancyFertilitySupplements)))>>@@
+ <<set _arcologyCosts += ((500*$masterSuiteUpgradePregnancy) + (1000*$masterSuitePregnancyFertilitySupplements))>>
<</if>>
<<if $incubator > 0>>
- <br>__Incubation Facility__: <<print cashFormat((10*$incubator*$facilityCost)+(0.2*$incubatorUpgradeWeight*$incubator*$facilityCost)+(0.2*$incubatorUpgradeMuscles*$incubator*$facilityCost)+(0.2*$incubatorUpgradeReproduction*$incubator*$facilityCost)+(0.2*$incubatorUpgradeGrowthStims*$incubator*$facilityCost)+(0.5*$incubatorUpgradeSpeed*$incubator*$facilityCost))>>
- <<set _archologyCosts += (10*$incubator*$facilityCost)+(0.2*$incubatorUpgradeWeight*$incubator*$facilityCost)+(0.2*$incubatorUpgradeMuscles*$incubator*$facilityCost)+(0.2*$incubatorUpgradeReproduction*$incubator*$facilityCost)+(0.2*$incubatorUpgradeGrowthStims*$incubator*$facilityCost)+(0.5*$incubatorUpgradeSpeed*$incubator*$facilityCost)>>
+ <br>
+ Incubation Facility: @@.yellowgreen;<<print cashFormat((10*$incubator*$facilityCost)+(0.2*$incubatorUpgradeWeight*$incubator*$facilityCost)+(0.2*$incubatorUpgradeMuscles*$incubator*$facilityCost)+(0.2*$incubatorUpgradeReproduction*$incubator*$facilityCost)+(0.2*$incubatorUpgradeGrowthStims*$incubator*$facilityCost)+(0.5*$incubatorUpgradeSpeed*$incubator*$facilityCost))>>@@
+ <<set _arcologyCosts += (10*$incubator*$facilityCost)+(0.2*$incubatorUpgradeWeight*$incubator*$facilityCost)+(0.2*$incubatorUpgradeMuscles*$incubator*$facilityCost)+(0.2*$incubatorUpgradeReproduction*$incubator*$facilityCost)+(0.2*$incubatorUpgradeGrowthStims*$incubator*$facilityCost)+(0.5*$incubatorUpgradeSpeed*$incubator*$facilityCost)>>
<<if $incubatorWeightSetting+$incubatorMusclesSetting+$incubatorReproductionSetting > 0>>
- <br> Additional monitoring and maintenance costs for growing children: <<print cashFormat((($incubatorWeightSetting+$incubatorMusclesSetting+$incubatorReproductionSetting+$incubatorGrowthStimsSetting)*500))>>
- <<set _archologyCosts += (($incubatorWeightSetting+$incubatorMusclesSetting+$incubatorReproductionSetting+$incubatorGrowthStimsSetting)*500)>>
+ <br> Additional monitoring and maintenance costs for growing children: @@.yellowgreen;<<print cashFormat((($incubatorWeightSetting+$incubatorMusclesSetting+$incubatorReproductionSetting+$incubatorGrowthStimsSetting)*500))>>@@
+ <<set _arcologyCosts += (($incubatorWeightSetting+$incubatorMusclesSetting+$incubatorReproductionSetting+$incubatorGrowthStimsSetting)*500)>>
<</if>>
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
- <br>__Research Lab__: <<print cashFormat((100*$researchLab.maxSpace))>>
- <<set _archologyCosts += 100*$researchLab.maxSpace>>
- <<if $researchLab.hired != 0>> __Scientists__: <<print cashFormat((300*$researchLab.hired))>> <<set _archologyCosts += 300*$researchLab.hired>> <</if>>
- <<if $researchLab.menials != 0>> __Menial slaves__: <<print cashFormat((100*$researchLab.menials))>> <<set _archologyCosts += 100*$researchLab.menials>> <</if>>
+ <br>
+ Research Lab: @@.yellowgreen;<<print cashFormat((100*$researchLab.maxSpace))>>@@
+ <<set _arcologyCosts += 100*$researchLab.maxSpace>>
+ <<if $researchLab.hired != 0>><br> Scientists: @@.yellowgreen;<<print cashFormat((300*$researchLab.hired))>>@@
+ <<set _arcologyCosts += 300*$researchLab.hired>> <</if>>
+ <<if $researchLab.menials != 0>><br>> Menial Slaves: @@.yellowgreen;<<print cashFormat((100*$researchLab.menials))>>@@
+ <<set _arcologyCosts += 100*$researchLab.menials>> <</if>>
<</if>>
<</if>>
/* security expansion */
<<if $secExp > 0>>
- <br>
+ <br><br>
<<if $edictsUpkeep + $SFSupportUpkeep > 0>>
- __Edicts Upkeep__: <<print cashFormat($edictsUpkeep + $SFSupportUpkeep)>>
- <<set _archologyCosts += ($edictsUpkeep + $SFSupportUpkeep)>>
+ __Edicts Upkeep__: @@.yellowgreen;<<print cashFormat($edictsUpkeep + $SFSupportUpkeep)>>@@
+ <<set _arcologyCosts += ($edictsUpkeep + $SFSupportUpkeep)>>
<</if>>
<<if $propHub != 0 || $secHQ != 0 || $secBarracks != 0 || $riotCenter != 0>>
- <br>__Security apartus maintenance costs__:
+ <br>__Security Apartus Maintenance Costs__:
<<if $propHub != 0>>
+ <br>
Propaganda Hub: @@.yellowgreen;<<print cashFormat($propHubUpkeep)>>@@
- <<set _archologyCosts += $propHubUpkeep>>
+ <<set _arcologyCosts += $propHubUpkeep>>
<</if>>
<<if $secHQ != 0>>
+ <br>
Security Headquarters: @@.yellowgreen;<<print cashFormat(($secHQUpkeep)+(20*$secMenials))>>@@
- <<set _archologyCosts += ($secHQUpkeep)+(20*$secMenials)>>
+ <<set _arcologyCosts += ($secHQUpkeep)+(20*$secMenials)>>
<</if>>
<<if $secBarracks != 0>>
+ <br>
Barracks: @@.yellowgreen;<<print cashFormat($secBarracksUpkeep)>>@@
- <<set _archologyCosts += $secBarracksUpkeep>>
+ <<set _arcologyCosts += $secBarracksUpkeep>>
<</if>>
<<if $riotCenter != 0>>
+ <br>
Riot Control Center: @@.yellowgreen;<<print cashFormat($riotUpkeep)>>@@
- <<set _archologyCosts += $riotUpkeep>>
+ <<set _arcologyCosts += $riotUpkeep>>
<</if>>
<</if>>
@@ -215,151 +234,187 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<else>>
<<set _soldierMod = 2>>
<</if>>
- <<set _milTotal = 0, _slaveTotal = 0, _mercTotal = 0>>
+ <<set _milTotal = 0, _slaveTotal = 0, _mercTotal = 0, _numItems = 0>>
<<if $militiaUnits.length > 0>>
- <br>__Militia platoon(s) upkeep__:
+ <br>__Militia Platoons Upkeep__:
<<for _i = 0; _i < $militiaUnits.length; _i++>>
- <i> <<print ordinalSuffix($militiaUnits.length-[_i])>>:</i> <<print cashFormat($militiaUnits[_i].troops*$soldierUpkeep * _soldierMod)>>
+ <br>
+ <i> <<print ordinalSuffix($militiaUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($militiaUnits[_i].troops*$soldierUpkeep * _soldierMod)>>@@
<<set _milTotal += $militiaUnits[_i].troops*$soldierUpkeep * _soldierMod>>
+ <<set _numItems += 1>>
<</for>>
- <br> __Total__: @@.yellowgreen;<<print cashFormat(_milTotal)>>@@
+ <br><br> ''Total: @@.yellowgreen;<<print cashFormat(_milTotal)>>@@''
<</if>>
<<if $slaveUnits.length > 0>>
- <br>__Slave platoon(s) upkeep__:
+ <br>__Slave Platoons Upkeep__:
<<for _i = 0; _i < $slaveUnits.length; _i++>>
- <i> <<print ordinalSuffix($slaveUnits.length-[_i])>>:</i> <<print cashFormat($slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod)>>
+ <br>
+ <i> <<print ordinalSuffix($slaveUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod)>>@@
<<set _slaveTotal += $slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod>>
<</for>>
- <br> __Total__: @@.yellowgreen;<<print cashFormat(_slaveTotal)>>@@
+ <br><br> ''Total: @@.yellowgreen;<<print cashFormat(_slaveTotal)>>@@''
<</if>>
<<if $mercUnits.length > 0>>
- <br>__Merc platoon(s) upkeep__:
+ <br>__Mercenary Platoons Upkeep__:
<<for _i = 0; _i < $mercUnits.length; _i++>>
- <i> <<print ordinalSuffix($mercUnits.length-[_i])>>:</i> <<print cashFormat($mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod)>>
+ <br>
+ <i> <<print ordinalSuffix($mercUnits.length-[_i])>>:</i> @@.yellowgreen;<<print cashFormat($mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod)>>@@
<<set _mercTotal += $mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod>>
<</for>>
- <br> __Total__: @@.yellowgreen;<<print cashFormat(_mercTotal)>>@@
+ <br><br> ''Total: @@.yellowgreen;<<print cashFormat(_mercTotal)>>@@''
<<if (_milTotal+_slaveTotal+_mercTotal) > 0>>
- <br>__Total defense force__ upkeep: @@.yellowgreen;<<print cashFormat(_milTotal+_slaveTotal+_mercTotal)>>@@
- <<set _archologyCosts += (_milTotal+_slaveTotal+_mercTotal)>>
+ <br>__Total Defense Force Upkeep__: @@.yellowgreen;<<print cashFormat(_milTotal+_slaveTotal+_mercTotal)>>@@
+ <<set _arcologyCosts += (_milTotal+_slaveTotal+_mercTotal)>>
<</if>>
<</if>>
<</if>>
<<if $econWeatherDamage && $disasterResponse > 0>>
<<set _DRUUpkeep = Math.trunc($disasterResponse * 200000 / $localEcon)>>
- <br>__Disaster Response Unit__ expenses: <<print cashFormat(_DRUUpkeep)>>
- <<set _archologyCosts += _DRUUpkeep>>
+ <br>__Disaster Response Unit Expenses__: @@.yellowgreen;<<print cashFormat(_DRUUpkeep)>>@@
+ <<set _arcologyCosts += _DRUUpkeep>>
<</if>>
<<if $antiWeatherFreeze > 0>>
<<set _AWFUpkeep = Math.trunc($antiWeatherFreeze * 200000 / $localEcon)>>
- <br>__Passenger Upgrades__ expenses: <<print cashFormat(_AWFUpkeep)>>
- <<set _archologyCosts += _AWFUpkeep>>
+ <br>__Passenger Upgrades Expenses__: @@.yellowgreen;<<print cashFormat(_AWFUpkeep)>>@@
+ <<set _arcologyCosts += _AWFUpkeep>>
<</if>>
<<if $FSSpending != 0>>
- <br>__Society Shaping__ expenses: <<print cashFormat($FSSpending)>>
- <<set _archologyCosts += $FSSpending>>
+ <br>__Society Shaping Expenses__: @@.yellowgreen;<<print cashFormat($FSSpending)>>@@
+ <<set _arcologyCosts += $FSSpending>>
<</if>>
<<if $Recruiter != 0>>
- <br>__Recruiting__ expenses: <<print cashFormat(250)>>
- <<set _archologyCosts += 250>>
-<</if>>
-<<if $TSS.schoolPresent > 0>>
- <br>__The Slavegirl School__ branch campus upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
-<</if>>
-<<if $GRI.schoolPresent > 0>>
- <br>__Growth Research Institute__ subsidiary lab upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
-<</if>>
-<<if $SCP.schoolPresent > 0>>
- <br>__St. Claver Preparatory__ branch campus upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
-<</if>>
-<<if $LDE.schoolPresent > 0>>
- <br>__L'École des Enculées__ branch campus upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
-<</if>>
-<<if $TGA.schoolPresent > 0>>
- <br>__The Gymnasium-Academy__ branch campus upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
-<</if>>
-<<if $HA.schoolPresent > 0>>
- <br>__The Hippolyta Academy__ branch campus upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+ <br>__Recruiting Expenses__: @@.yellowgreen;<<print cashFormat(250)>>@@
+ <<set _arcologyCosts += 250>>
<</if>>
-<<if $TCR.schoolPresent > 0>>
- <br>__The Cattle Ranch__ local pasture upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+
+<<set _schoolPresent = 0, _schoolSubsidy = 0>>
+<<if ($TSS.schoolPresent > 0)>>
+ <<set _school = "The Slavegirl School">>
+ <<set _schoolPresent = 1>>
+ <<if $TSS.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if ($TFS.schoolPresent > 0) && (($PC.dick < 1) || ($PC.vagina < 1) || ($PC.boobs < 1))>>
- <br>__The Futanari Sisters__ community upkeep: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+<<if ($GRI.schoolPresent > 0)>>
+ <<set _school = "Growth Research Institute">>
+ <<set _schoolPresent = 1>>
+ <<if $GRI.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if $TSS.subsidize != 0>>
- <br>__The Slavegirl School__ branch campus influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+<<if ($SCP.schoolPresent > 0)>>
+ <<set _school = "St. Claver Prepatory">>
+ <<set _schoolPresent = 1>>
+ <<if $SCP.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if $GRI.subsidize != 0>>
- <br>__Growth Research Institute__ subsidiary lab influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+<<if ($LDE.schoolPresent > 0)>>
+ <<set _school = "L'École des Enculées">>
+ <<set _schoolPresent = 1>>
+ <<if $LDE.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if $SCP.subsidize != 0>>
- <br>__St. Claver Preparatory__ branch campus influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+<<if ($TGA.schoolPresent > 0)>>
+ <<set _school = "The Gymnasium-Academy">>
+ <<set _schoolPresent = 1>>
+ <<if $TGA.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if $LDE.subsidize != 0>>
- <br>__L'École des Enculées__ branch campus influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+<<if ($HA.schoolPresent > 0)>>
+ <<set _school = "The Hippolyta Academy">>
+ <<set _schoolPresent = 1>>
+ <<if $HA.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if $TGA.subsidize != 0>>
- <br>__The Gymnasium-Academy__ branch campus influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+<<if ($TCR.schoolPresent > 0)>>
+ <<set _school = "The Cattle Ranch">>
+ <<set _schoolPresent = 1>>
+ <<if $TCR.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if $HA.subsidize != 0>>
- <br>__The Hippolyta Academy__ branch campus influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+<<if ($TFS.schoolPresent > 0)>>
+ <<set _school = "The Futanari Sisters">>
+ <<set _schoolPresent = 1>>
+ <<if $TFS.subsidize != 0>>
+ <<set _schoolSubsidy = 1>>
+ <</if>>
<</if>>
-<<if $TCR.subsidize != 0>>
- <br>__The Cattle Ranch__ local pasture influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+
+<<if _schoolPresent > 0>>
+<<if _school == "Growth Research Institute">>
+ <br>
+ __<<print _school>> Subsidiary Lab Upkeep__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <<set _arcologyCosts += 1000>>
+ <<if _schoolSubsidy > 0>>
+ <br>
+ __<<print _school>> Subsidiary Lab Influence__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <</if>>
+<<elseif _school == "The Cattle Ranch">>
+ <br>
+ __<<print _school>> Local Pasture Upkeep__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <<set _arcologyCosts += 1000>>
+ <<if _schoolSubsidy > 0>>
+ <br>
+ __<<print _school>> Local Pasture Influence__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <</if>>
+<<elseif _school == "The Futanari Sisters">>
+ <br>
+ __<<print _school>> Community Upkeep__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <<set _arcologyCosts += 1000>>
+ <<if _schoolSubsidy > 0>>
+ <br>
+ __<<print _school>> Community Influence__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <</if>>
+<<else>>
+ <br>
+ __<<print _school>> Branch Campus Upkeep__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <<set _arcologyCosts += 1000>>
+ <<if _schoolSubsidy > 0>>
+ <br>
+ __<<print _school>> Branch Campus Influence__: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <</if>>
<</if>>
-<<if $TFS.subsidize != 0>>
- <br>__The Futanari Sisters__ community influence: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
<</if>>
<<if $alwaysSubsidizeGrowth > 0 || $alwaysSubsidizeRep > 0 || $RegularParties > 0>>
- <br>__Weekly costs__:
+ <br>__Weekly Costs__:
<<if $alwaysSubsidizeGrowth > 0>>
- arcology growth subsidy: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
- <<set _archologyCosts += $policyCost>>
+ <br> Arcology Growth Subsidy: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
+ <<set _arcologyCosts += $policyCost>>
<</if>>
<<if $alwaysSubsidizeRep > 0>>
- self-promotion budget: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
- <<set _archologyCosts += $policyCost>>
+ <br> Self-promotion Budget: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
+ <<set _arcologyCosts += $policyCost>>
<</if>>
<<if $RegularParties > 0>>
- social gatherings: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
- <<set _archologyCosts += $policyCost>>
+ <br> Social Gatherings: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
+ <<set _arcologyCosts += $policyCost>>
<</if>>
<</if>>
<<if $ProImmigrationCash == 1>>
- <br>Pro-immigration promotion budget: <<print cashFormat($policyCost)>>
- <<set _archologyCosts += $policyCost>>
+ <br> Pro-immigration Promotion Budget: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
+ <<set _arcologyCosts += $policyCost>>
<</if>>
<<if $AntiEnslavementCash == 1>>
- <br>Anti-enslavement charity budget: <<print cashFormat($policyCost)>>
- <<set _archologyCosts += $policyCost>>
+ <br> Anti-enslavement Charity Budget: @@.yellowgreen;<<print cashFormat($policyCost)>>@@
+ <<set _arcologyCosts += $policyCost>>
<</if>>
<<if $CoursingAssociation == 1>>
- <br>Coursing Association membership: <<print cashFormat(1000)>>
- <<set _archologyCosts += 1000>>
+ <br> Coursing Association Membership: @@.yellowgreen;<<print cashFormat(1000)>>@@
+ <<set _arcologyCosts += 1000>>
<</if>>
-<br>Overall archology costs: @@.yellowgreen;<<print cashFormat(_archologyCosts)>>@@
+<br><br>
+
+''Overall Arcology Costs:'' @@.yellowgreen;<<print cashFormat(_arcologyCosts)>>@@
<br><br>
@@ -443,41 +498,41 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<set _livingExpense = $rulesCost>>
<</if>>
<</switch>>
- <br> <i>Living expenses:</i> <<print cashFormat(_livingExpense)>>
+ <br> <i>Living expenses:</i> @@.yellowgreen;<<print cashFormat(_livingExpense)>>@@
<<set _individualCosts += _livingExpense>>
- <br> <i>Basic slave food cost:</i> <<print cashFormat($foodCost*4)>>
+ <br> <i>Basic slave food cost:</i> @@.yellowgreen;<<print cashFormat($foodCost*4)>>@@
<<set _individualCosts += $foodCost*4>>
<<switch $slaves[$i].diet>>
<<case "fattening" "muscle building">>
- <br> <i>Heavy diet:</i> <<print cashFormat($foodCost)>>
+ <br> <i>Heavy diet:</i> @@.yellowgreen;<<print cashFormat($foodCost)>>@@
<<set _individualCosts += $foodCost>>
<<case "restricted" "slimming">>
- <br> <i>Light diet: //reduced by//</i> <<print cashFormat($foodCost)>>
+ <br> <i>Light diet: //reduced by//</i> @@.yellowgreen;<<print cashFormat($foodCost)>>@@
<<set _individualCosts -= $foodCost>>
<</switch>>
<<if $slaves[$i].weight > 130 || $slaves[$i].weight > 50 || $slaves[$i].weight < -50>>
<br> <i>Caloric adjustment for</i>
<<if $slaves[$i].weight > 130>>
- <i>heavy weight:</i> <<print cashFormat($foodCost*2)>>
+ <i>heavy weight:</i> @@.yellowgreen;<<print cashFormat($foodCost*2)>>@@
<<set _individualCosts += $foodCost*2>>
<<elseif $slaves[$i].weight > 50>>
- <i>high weight:</i> <<print cashFormat($foodCost)>>
+ <i>high weight:</i> @@.yellowgreen;<<print cashFormat($foodCost)>>@@
<<set _individualCosts += $foodCost>>
<<elseif $slaves[$i].weight < -50>>
- <i>light weight:</i> //reduced by// <<print cashFormat($foodCost)>>
+ <i>light weight:</i> //reduced by// @@.yellowgreen;<<print cashFormat($foodCost)>>@@
<<set _individualCosts -= $foodCost>>
<</if>>
<</if>>
<<if $slaves[$i].drugs == "appetite suppressors">>
- <br> <i>Food saved via suppressed appetite:</i> //reduced by// <<print cashFormat($foodCost)>>
+ <br> <i>Food saved via suppressed appetite:</i> //reduced by// @@.yellowgreen;<<print cashFormat($foodCost)>>@@
<<set _individualCosts -= $foodCost>>
<</if>>
<<if $slaves[$i].lactation > 0>>
<br> <i>Food to support
<<if $slaves[$i].lactation > 1>>heavy<<else>>natural<</if>> lactation from
<<if Math.trunc($slaves[$i].boobs/10000) > 2>>absurd udders<<elseif Math.trunc($slaves[$i].boobs/10000) > 1>>enormous boobs<<else>>reasonable breasts<</if>>:</i>
- <<print cashFormat($foodCost*$slaves[$i].lactation*(1+Math.trunc($slaves[$i].boobs/10000)))>>
+ @@.yellowgreen;<<print cashFormat($foodCost*$slaves[$i].lactation*(1+Math.trunc($slaves[$i].boobs/10000)))>>@@
<<set _individualCosts += $foodCost*$slaves[$i].lactation*(1+Math.trunc($slaves[$i].boobs/10000))>>
<</if>>
<<if $slaves[$i].preg > $slaves[$i].pregData.normalBirth/8>>
@@ -487,41 +542,49 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<br> <i>Extra feeding costs to support pregnancy are covered by $masterSuiteName luxuries.</i>
<<else>>
<<set _pAccMult = 1>>
- <br> <i>Extra feeding to support <<if $slaves[$i].pregControl == "speed up">>accelerated <<set _pAccMult = 3>><</if>>pregnancy:</i> <<print cashFormat($foodCost*$slaves[$i].pregType*_pAccMult)>>
+ <br> <i>Extra feeding to support <<if $slaves[$i].pregControl == "speed up">>accelerated <<set _pAccMult = 3>><</if>>pregnancy:</i>
+ @@.yellowgreen;<<print cashFormat($foodCost*$slaves[$i].pregType*_pAccMult)>>@@
<<set _individualCosts += $foodCost*$slaves[$i].pregType*_pAccMult>>
<<if $slaves[$i].pregType >= 10>>
- <br> <i>Specialized food blend to support multiples:</i> <<print cashFormat($foodCost*$slaves[$i].pregType*2*_pAccMult)>>
+ <br> <i>Specialized food blend to support multiples:</i>
+ @@.yellowgreen;<<print cashFormat($foodCost*$slaves[$i].pregType*2*_pAccMult)>>@@
<<set _individualCosts += $foodCost*$slaves[$i].pregType*_pAccMult>>
<<elseif $slaves[$i].pregType >= 30>>
- <br> <i>Concentrated, quick to digest food blend to support extreme multiples:</i> <<print cashFormat($foodCost*$slaves[$i].pregType*_pAccMult)>>
+ <br> <i>Concentrated, quick to digest food blend to support extreme multiples:</i> @@.yellowgreen;<<print cashFormat($foodCost*$slaves[$i].pregType*_pAccMult)>>@@
<<set _individualCosts += $foodCost*2*$slaves[$i].pregType*_pAccMult>>
<<elseif $slaves[$i].pregType >= 50>>
<br> <i>Specialized dietary adjustments and concentrated, quick to digest food required to support absurd multiples:</i> <<print cashFormat($foodCost*$slaves[$i].pregType*3*_pAccMult)>>
<<set _individualCosts += $foodCost*$slaves[$i].pregType*3*_pAccMult>>
<<elseif $slaves[$i].pregType >= 100>>
- <br> <i>Specialized dietary requirements and feeding methods to support absurd multiples:</i> <<print cashFormat($foodCost*$slaves[$i].pregType*5*_pAccMult)>>
+ <br> <i>Specialized dietary requirements and feeding methods to support absurd multiples:</i>
+ @@.yellowgreen;<<print cashFormat($foodCost*$slaves[$i].pregType*5*_pAccMult)>>@@
<<set _individualCosts += $foodCost*$slaves[$i].pregType*5*_pAccMult>>
<</if>>
<</if>>
<</if>>
<<switch $slaves[$i].diet>>
<<case "XX" "XY">>
- <br> <i>Hormone enriched diet:</i> <<print cashFormat(25)>>
+ <br> <i>Hormone enriched diet:</i>
+ @@.yellowgreen;<<print cashFormat(25)>>@@
<<set _individualCosts += 25>>
<<case "XXY">>
- <br> <i>Specialized hermaphrodite diet:</i> <<print cashFormat(75)>>
+ <br> <i>Specialized hermaphrodite diet:</i>
+ @@.yellowgreen;<<print cashFormat(75)>>@@
<<set _individualCosts += 75>>
<<case "cleansing">>
- <br> <i>Chemical cleansing diet:</i> <<print cashFormat(50)>>
+ <br> <i>Chemical cleansing diet:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<<case "fertility">>
- <br> <i>Specialized fertility diet:</i> <<print cashFormat(25)>>
+ <br> <i>Specialized fertility diet:</i>
+ @@.yellowgreen;<<print cashFormat(25)>>@@
<<set _individualCosts += 50>>
<</switch>>
<<if $boobAccessibility != 1>>
<<if ($slaves[$i].boobs > 20000)>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <br> <i>Increased living expenses due to inconveniently huge boobs:</i> <<print cashFormat(50)>>
+ <br> <i>Increased living expenses due to inconveniently huge boobs:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<</if>>
<</if>>
@@ -529,7 +592,8 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<if $pregAccessibility != 1>>
<<if ($slaves[$i].belly >= 60000)>>
<<if ($slaves[$i].assignment != "labor in the production line") && ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <br> <i>Increased living expenses due to an inconveniently huge belly:</i> <<print cashFormat(100)>>
+ <br> <i>Increased living expenses due to an inconveniently huge belly:</i>
+ @@.yellowgreen;<<print cashFormat(100)>>@@
<<set _individualCosts += 100>>
<</if>>
<</if>>
@@ -537,7 +601,8 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<if $dickAccessibility != 1>>
<<if ($slaves[$i].dick > 45)>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <br> <i>Increased living expenses due to an inconveniently huge penis:</i> <<print cashFormat(50)>>
+ <br> <i>Increased living expenses due to an inconveniently huge penis:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<</if>>
<</if>>
@@ -545,7 +610,8 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<if $ballsAccessibility != 1>>
<<if ($slaves[$i].balls > 90)>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <br> <i>Increased living expenses due to inconveniently huge balls:</i> <<print cashFormat(50)>>
+ <br> <i>Increased living expenses due to inconveniently huge balls:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<</if>>
<</if>>
@@ -553,173 +619,212 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<if $buttAccessibility != 1>>
<<if ($slaves[$i].butt > 15)>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <br> <i>Increased living expenses due to an inconveniently huge butt:</i> <<print cashFormat(50)>>
+ <br> <i>Increased living expenses due to an inconveniently huge butt:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<</if>>
<</if>>
<</if>>
<<if !canSee($slaves[$i]) && ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <br> <i>Increased living expenses due to lack of sight:</i> <<print cashFormat(50)>>
+ <br> <i>Increased living expenses due to lack of sight:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<<elseif $slaves[$i].eyes <= -1 && $slaves[$i].eyewear != "corrective glasses" && $slaves[$i].eyewear != "corrective contacts">>
- <br> <i>Increased living expenses due to poor vision:</i> <<print cashFormat(25)>>
+ <br> <i>Increased living expenses due to poor vision:</i>
+ @@.yellowgreen;<<print cashFormat(25)>>@@
<<set _individualCosts += 25>>
<<elseif ($slaves[$i].eyewear == "blurring glasses") || ($slaves[$i].eyewear == "blurring contacts")>>
- <br> <i>Increased living expenses due to blurred vision:</i> <<print cashFormat(25)>>
+ <br> <i>Increased living expenses due to blurred vision:</i>
+ @@.yellowgreen;<<print cashFormat(25)>>@@
<<set _individualCosts += 25>>
<</if>>
<<if !canHear($slaves[$i]) && ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <br> <i>Increased living expenses due to lack of hearing:</i> <<print cashFormat(20)>>
+ <br> <i>Increased living expenses due to lack of hearing:</i>
+ @@.yellowgreen;<<print cashFormat(20)>>@@
<<set _individualCosts += 20>>
<<elseif $slaves[$i].hears <= -1 && $slaves[$i].earwear != "hearing aids">>
- <br> <i>Increased living expenses due to poor hearing:</i> <<print cashFormat(5)>>
+ <br> <i>Increased living expenses due to poor hearing:</i>
+ @@.yellowgreen;<<print cashFormat(5)>>@@
<<set _individualCosts += 5>>
<<elseif ($slaves[$i].earwear == "muffling ear plugs")>>
- <br> <i>Increased living expenses due to muffled hearing:</i> <<print cashFormat(5)>>
+ <br> <i>Increased living expenses due to muffled hearing:</i>
+ @@.yellowgreen;<<print cashFormat(5)>>@@
<<set _individualCosts += 5>>
<</if>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
<<if ($slaves[$i].amp != 0)>>
<<if ($slaves[$i].amp == 1)>>
- <br> <i>Increased living expenses due to limblessness:</i> <<print cashFormat($rulesCost)>>
+ <br> <i>Increased living expenses due to limblessness:</i>
+ @@.yellowgreen;<<print cashFormat($rulesCost)>>@@
<<set _individualCosts += $rulesCost>>
<<else>>
- <br> <i>Increased living expenses due to prosthetics:</i> <<print cashFormat($rulesCost/2)>>
+ <br> <i>Increased living expenses due to prosthetics:</i>
+ @@.yellowgreen;<<print cashFormat($rulesCost/2)>>@@
<<set _individualCosts += $rulesCost/2>>
<</if>>
<<elseif !canWalk($slaves[$i])>>
- <br> <i>Increased living expenses due to immobility:</i> <<print cashFormat($rulesCost)>>
+ <br> <i>Increased living expenses due to immobility:</i>
+ @@.yellowgreen;<<print cashFormat($rulesCost)>>@@
<<set _individualCosts += $rulesCost>>
<</if>>
<</if>>
<<if $slaves[$i].boobs > 10000>>
<<if $slaves[$i].boobsImplantType == 1>>
- <br> <i>Maintenance cost for oversized string implants:</i> <<print cashFormat(50)>>
+ <br> <i>Maintenance cost for oversized string implants:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<</if>>
<</if>>
<<if $slaves[$i].butt > 10>>
<<if $slaves[$i].buttImplantType == 1>>
- <br> <i>Maintenance cost for oversized string implants:</i> <<print cashFormat(50)>>
+ <br> <i>Maintenance cost for oversized string implants:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<</if>>
<</if>>
<<if $slaves[$i].preg > $slaves[$i].pregData.minLiveBirth>>
<<if $universalRulesBirthing == 1>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2)>>
- <br> <i>Coverage cost for daily pregnancy scanning:</i> <<print cashFormat(50)>>
+ <br> <i>Coverage cost for daily pregnancy scanning:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<</if>>
<</if>>
<</if>>
<<if $CitizenRetirement == 1>>
- <br> <i>Retirement account payments:</i> <<print cashFormat(250)>>
+ <br> <i>Retirement account payments:</i>
+ @@.yellowgreen;<<print cashFormat(250)>>@@
<<set _individualCosts += 250>>
<</if>>
<<if ($slaves[$i].inflation == 3)>>
<<switch $slaves[$i].inflationType>>
<<case "water">>
- <br> <i>Costs of specially formulated water for enemas; 2 gallons:</i> <<print cashFormat(100)>>
+ <br> <i>Costs of specially formulated water for enemas; 2 gallons:</i>
+ @@.yellowgreen;<<print cashFormat(100)>>@@
<<set _individualCosts += 100>>
<<case "food">>
- <br> <i>Costs of filler food for slave stuffing; 2 gallons:</i> <<print cashFormat(($foodCost*4))>>
+ <br> <i>Costs of filler food for slave stuffing; 2 gallons:</i>
+ @@.yellowgreen;<<print cashFormat(($foodCost*4))>>@@
<<set _individualCosts += ($foodCost*4)>>
<<case "curative" "aphrodisiac" "tightener">>
- <br> <i>Costs of specially formulated drug mixtures for enemas; 2 gallons:</i> <<print cashFormat((100+($drugsCost*2)))>>
+ <br> <i>Costs of specially formulated drug mixtures for enemas; 2 gallons:</i>
+ @@.yellowgreen;<<print cashFormat((100+($drugsCost*2)))>>@@
<<set _individualCosts += (100+($drugsCost*2))>>
<</switch>>
<<elseif ($slaves[$i].inflation == 2)>>
<<switch $slaves[$i].inflationType>>
<<case "water">>
- <br> <i>Costs of specially formulated water for enemas; 1 gallon:</i> <<print cashFormat(50)>>
+ <br> <i>Costs of specially formulated water for enemas; 1 gallon:</i>
+ @@.yellowgreen;<<print cashFormat(50)>>@@
<<set _individualCosts += 50>>
<<case "food">>
- <br> <i>Costs of filler food for slave stuffing; 1 gallon:</i> <<print cashFormat(($foodCost*2))>>
+ <br> <i>Costs of filler food for slave stuffing; 1 gallon:</i>
+ @@.yellowgreen;<<print cashFormat(($foodCost*2))>>@@
<<set _individualCosts += ($foodCost*4)>>
<<case "curative" "aphrodisiac" "tightener">>
- <br> <i>Costs of specially formulated drug mixtures for enemas; 1 gallon:</i> <<print cashFormat((50+($drugsCost*2)))>>
+ <br> <i>Costs of specially formulated drug mixtures for enemas; 1 gallon:</i>
+ @@.yellowgreen;<<print cashFormat((50+($drugsCost*2)))>>@@
<<set _individualCosts += (50+($drugsCost*2))>>
<</switch>>
<<elseif ($slaves[$i].inflation == 1)>>
<<switch $slaves[$i].inflationType>>
<<case "water">>
- <br> <i>Costs of specially formulated water for enemas; 2 liters:</i> <<print cashFormat(25)>>
+ <br> <i>Costs of specially formulated water for enemas; 2 liters:</i>
+ @@.yellowgreen;<<print cashFormat(25)>>@@
<<set _individualCosts += 25>>
<<case "food">>
- <br> <i>Costs of filler food for slave stuffing; 2 liters:</i> <<print cashFormat(($foodCost))>>
+ <br> <i>Costs of filler food for slave stuffing; 2 liters:</i>
+ <<print cashFormat(($foodCost))>>
<<set _individualCosts += ($foodCost)>>
<<case "curative" "aphrodisiac" "tightener">>
- <br> <i>Costs of specially formulated drug mixtures for enemas; 2 liters:</i> <<print cashFormat((25+($drugsCost*2)))>>
+ <br> <i>Costs of specially formulated drug mixtures for enemas; 2 liters:</i>
+ @@.yellowgreen;<<print cashFormat((25+($drugsCost*2)))>>@@
<<set _individualCosts += (25+($drugsCost*2))>>
<</switch>>
<</if>>
<<switch $slaves[$i].drugs>>
<<case "anti-aging cream">>
- <br> <i>Anti-aging creams:</i> <<print cashFormat(($drugsCost*10))>>
+ <br> <i>Anti-aging creams:</i>
+ <<print cashFormat(($drugsCost*10))>>
<<set _individualCosts += ($drugsCost*10)>>
<<case "female hormone injections" "male hormone injections">>
- <br> <i>Hormonal injections:</i> <<print cashFormat(($drugsCost*5))>>
+ <br> <i>Hormonal injections:</i>
+ @@.yellowgreen;<<print cashFormat(($drugsCost*5))>>@@
<<set _individualCosts += ($drugsCost*5)>>
<<case "growth stimulants">>
- <br> <i>Growth stimulants:</i> <<print cashFormat(($drugsCost*5))>>
+ <br> <i>Growth stimulants:</i>
+ @@.yellowgreen;<<print cashFormat(($drugsCost*5))>>@@
<<set _individualCosts += ($drugsCost*5)>>
<<case "intensive breast injections" "intensive butt injections" "intensive penis enhancement" "intensive testicle enhancement" "intensive lip injections" "hyper breast injections" "hyper butt injections" "hyper penis enhancement" "hyper testicle enhancement" "hyper lip injections">>
- <br> <i>Intensive drugs:</i> <<print cashFormat($drugsCost*5)>>
+ <br> <i>Intensive drugs:</i>
+ @@.yellowgreen;<<print cashFormat($drugsCost*5)>>@@
<<set _individualCosts += $drugsCost*5>>
<<case "sag-B-gone">>
- <br> <i>Questionable infomercial creams:</i> <<print cashFormat(Math.trunc($drugsCost/10))>>
+ <br> <i>Questionable infomercial creams:</i>
+ @@.yellowgreen;<<print cashFormat(Math.trunc($drugsCost/10))>>@@
<<set _individualCosts += ($drugsCost/10)>>
<<case "no drugs" "none">>
<<default>>
- <br> <i>Standard drugs:</i> <<print cashFormat(($drugsCost*2))>>
+ <br> <i>Standard drugs:</i>
+ @@.yellowgreen;<<print cashFormat(($drugsCost*2))>>@@
<<set _individualCosts += ($drugsCost*2)>>
<</switch>>
<<if $slaves[$i].curatives == 1 && $slaves[$i].assignmentVisible != 1>>
<<elseif $slaves[$i].curatives > 0>>
- <br> <i>Health drugs:</i> <<print cashFormat($drugsCost+($slaves[$i].curatives*$drugsCost))>>
+ <br> <i>Health drugs:</i>
+ @@.yellowgreen;<<print cashFormat($drugsCost+($slaves[$i].curatives*$drugsCost))>>@@
<<set _individualCosts += $drugsCost+($slaves[$i].curatives*$drugsCost)>>
<</if>>
<<if ($slaves[$i].aphrodisiacs !== 0)>>
- <br> <i>Aphrodisiacs/Anaphrodisiacs:</i> <<print cashFormat(Math.trunc($drugsCost*Math.abs($slaves[$i].aphrodisiacs)))>>
+ <br> <i>Aphrodisiacs/Anaphrodisiacs:</i>
+ @@.yellowgreen;<<print cashFormat(Math.trunc($drugsCost*Math.abs($slaves[$i].aphrodisiacs)))>>@@
<<set _individualCosts += $drugsCost*Math.abs($slaves[$i].aphrodisiacs)>>
<</if>>
<<if ($slaves[$i].hormones != 0)>>
- <br> <i>Hormones:</i> <<print cashFormat((Math.trunc($drugsCost*Math.abs($slaves[$i].hormones)*0.5)))>>
+ <br> <i>Hormones:</i>
+ @@.yellowgreen;<<print cashFormat((Math.trunc($drugsCost*Math.abs($slaves[$i].hormones)*0.5)))>>@@
<<set _individualCosts += Math.trunc($drugsCost*Math.abs($slaves[$i].hormones)*0.5)>>
<</if>>
<<if ($slaves[$i].bodySwap > 0)>>
- <br> <i>JS-Suppressants:</i> <<print cashFormat(($drugsCost*10*$slaves[$i].bodySwap))>>
+ <br> <i>JS-Suppressants:</i>
+ @@.yellowgreen;<<print cashFormat(($drugsCost*10*$slaves[$i].bodySwap))>>@@
<<set _individualCosts += Math.trunc($drugsCost*10*$slaves[$i].bodySwap)>>
<</if>>
<<if ($slaves[$i].preg == -1) && isFertile($slaves[$i])>>
- <br> <i>Contraceptives:</i> <<print cashFormat((Math.trunc($drugsCost*0.5)))>>
+ <br> <i>Contraceptives:</i>
+ @@.yellowgreen;<<print cashFormat((Math.trunc($drugsCost*0.5)))>>@@
<<set _individualCosts += Math.trunc($drugsCost*0.5)>>
<</if>>
<<if ($studio == 1)>>
<<if ($slaves[$i].pornFameSpending > 0)>>
- <br> <i>Publicity:</i> <<print cashFormat($slaves[$i].pornFameSpending/$PCSlutContacts)>>
+ <br> <i>Publicity:</i>
+ @@.yellowgreen;<<print cashFormat($slaves[$i].pornFameSpending/$PCSlutContacts)>>@@
<<set _individualCosts += ($slaves[$i].pornFameSpending/$PCSlutContacts)>>
<</if>>
<</if>> <<set _total += Math.trunc(_individualCosts)>>
- <br> __Total__: <<print cashFormat(Math.trunc(_individualCosts))>>
+ <br> __Total__:
+ @@.yellowgreen;<<print cashFormat(Math.trunc(_individualCosts))>>@@
<br>
<</for>>
-Overall slave costs: @@.yellowgreen;<<print cashFormat(_total)>>@@.
-<br>Bringing the overall total pre reduction(s) to roughly @@.yellowgreen;<<print cashFormat(_archologyCosts+_total)>>@@.
+<br>Overall slave costs: @@.yellowgreen;<<print cashFormat(_total)>>@@
+
+<br><br>
+
+This brings the overall total to ''@@.yellowgreen;<<print cashFormat(_arcologyCosts+_total)>>@@'' before reductions.
<<if $PC.career == "servant">>
- <br>Using your prior experience, you managed to lower your home's upkeep by <<if $personalAttention == "upkeep">><<if $PC.belly >= 5000>>20%<<else>>25%<</if>><<else>>10%<</if>>.
+ <br>Using your prior experience, you managed to lower your home's upkeep by @@.green;<<if $personalAttention == "upkeep">><<if $PC.belly >= 5000>>20%<<else>>25%<</if>><<else>>10%<</if>>.@@
<</if>>
<<if $secExp == 1>> <br>
<<if $terrain == "oceanic" || $terrain == "marine">>
<<if $docks > 0>>
- <br>The infrastructure you've built eases the transportation and safe handling of the supplies required by the arcology. Upkeep is lowered by <<print $docks * 5>>%
+ <br>The infrastructure you've built eases the transportation and safe handling of the supplies required by the arcology. @@.green;Upkeep is lowered by <<print $docks * 5>>%.@@
<</if>>
<<else>>
<<if $railway > 0>>
- <br>The infrastructure you've built eases the transportation and safe handling of the supplies required by the arcology. Upkeep is lowered by <<print $railway * 5>>%
+ <br>The infrastructure you've built eases the transportation and safe handling of the supplies required by the arcology. @@.green;Upkeep is lowered by <<print $railway * 5>>%.@@
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 1ca97e42ca96b1005dbc82e82318c60a91c5e359..f6d130bb5487d278fcc622183f8b0ede8400e2b8 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -34,7 +34,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if ($dairySlaves > 1)>>
<<if $dairyFeedersSettingChanged == 1>>
- In unison, the milking machines press their feeding phalli into the slaves' mouths and down their throats. Once situated, they begin to facefuck the slaves, who gag and struggle as they figure out how to breathe while this is going on. Once each slave is no longer panicking and is inhaling and exhaling regularly, there is a hydraulic sound and the transparent reservoir of feeding fluid near her head begins to drain. The slaves swallow desperately, their bellies beginning to swell with nutrition and drugs.<br><br>
+ In unison, the milking machines press their feeding phalli into the slaves' mouths and down their throats. Once situated, they begin to facefuck the slaves, who gag and struggle as they figure out how to breathe while this is going on. Once each slave is no longer panicking and is inhaling and exhaling regularly, there is a hydraulic sound and the transparent reservoir of feeding fluid near their head begins to drain. The slaves swallow desperately, their bellies beginning to swell with nutrition and drugs.<br><br>
<<elseif $dairyFeedersSettingChanged == -1>>
In unison, the milking machines withdraw their feeders from the slaves' throats. The slaves gag and cough, strings of feeding fluid and saliva running between their lips and the heads of the feeding phalli. These remain close to their faces so that the slaves can suck them off once they get hungry, which they will, very soon. The slaves' mouths and tongues are very tired, and most of them rest with their mouths open and their tongues hanging out.<br><br>
<</if>>
@@ -155,9 +155,9 @@ $dairyNameCaps is an industrial facility, but there's a viewing gallery for visi
<<case "Chattel Religionist">>
It presents the inmates as lessons, here to expiate their sins in a purgatory created by technology.
<<case "Degradationist">>
- The screens there feature, among a sea of facts and figures about each slave, her most recent brain scan.
+ The screens there feature, among a sea of facts and figures about each slave, their most recent brain scan.
<<case "Repopulation Focus">>
- The gallery is placed for a good view of each slave's swelling breasts and growing pregnancy. A screen is prominently displayed before each slave, detailing the number of babies she produced and the current number occupying her womb.
+ The gallery is placed for a good view of each slave's swelling breasts and growing pregnancy. A screen is prominently displayed before each slave, detailing the number of babies she produced and the current number occupying their womb.
<<case "Eugenics">>
The screens there tell very little about the slaves within. That information is privy only to Society's Elite.
<<case "Asset Expansionist">>
@@ -165,7 +165,7 @@ $dairyNameCaps is an industrial facility, but there's a viewing gallery for visi
<<case "Transformation Fetishist">>
It's designed for VIP visits, since this place is arguably the present apogee of transformationism. Nowhere else can slaves be so radically changed, from humans into something less - and something more.
<<case "Gender Radicalist">>
- The gallery is placed for a good view of each slave's front, from her head to what's between her spread legs.
+ The gallery is placed for a good view of each slave's front, from their head to what's between their spread legs.
<<case "Gender Fundamentalist">>
The gallery is placed for a good view of each slave's breasts, belly, and cunt. Visitors can critically compare each feminine advantage.
<<case "Physical Idealist">>
@@ -209,7 +209,7 @@ $dairyNameCaps
<<case "Chinese Revivalist">>
is clean and traditional. The stalls are constructed of bamboo and carefully shaped wood, and muscle power is used wherever possible. Cows exercise and help out by fetching and carrying as best they can.
<<case "Chattel Religionist">>
- is functional and clean. There are nice quotations from the holy book on the walls, and there is a little shrine designed to allow a cow who has difficulty standing to make her devotions comfortably.
+ is functional and clean. There are nice quotations from the holy book on the walls, and there is a little shrine designed to allow a cow who has difficulty standing to make their devotions comfortably.
<<case "Degradationist">>
is harsh and utilitarian. There are stands to restrain cows who aren't being milked for dosing, punishment, or sexual use. There are cattle prods here and there to use on resistant cows, unproductive cows, or cows one wishes to hear scream.
<<case "Repopulation Focus">>
@@ -253,19 +253,19 @@ $dairyNameCaps
<<if $dairySlaves > 2>>
$dairyNameCaps is working steadily.
<<if ($dairyRestraintsUpgrade == 1) && ($dairyRestraintsSetting > 1)>>
- Each cow is strapped in to her own milking machine. The machines are set up in rows, alternating forward and backward so that the cows are interleaved as closely as possible without touching.
+ Each cow is strapped in to their own milking machine. The machines are set up in rows, alternating forward and backward so that the cows are interleaved as closely as possible without touching.
<<if ($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0)>>
<<if $dairyFeedersSetting == 2>>
- A phallic feeding tube completely fills each cow's mouth and throat, making it eerily quiet in there. Occasionally one of the cows convulses when a particularly long rush of food and drugs flows down her gullet.
+ A phallic feeding tube completely fills each cow's mouth and throat, making it eerily quiet in there. Occasionally one of the cows convulses when a particularly long rush of food and drugs flows down their gullet.
<<else>>
When feeding is required, a phallus extends into cows' mouths.
<</if>>
<</if>>
<<if ($dairyStimulatorsUpgrade == 1) && ($dairyStimulatorsSetting > 0)>>
<<if $dairyStimulatorsSetting == 2>>
- Every cow is being sodomized by a massive phallus. Most are pumping away gently, the strokes taking a long time to push the half-meter of shaft into each slave's rectum and pull it out again. When a slave's balls are ready to give cum, however, the pace quickens, and the agonized slave wriggles in involuntary desperation to escape until she finally stiffens, squirts, and slumps in exhaustion.
+ Every cow is being sodomized by a massive phallus. Most are pumping away gently, the strokes taking a long time to push the half-meter of shaft into each slave's rectum and pull it out again. When a slave's balls are ready to give cum, however, the pace quickens, and the agonized slave wriggles in involuntary desperation to escape until they finally stiffen, squirt, and slump in exhaustion.
<<else>>
- Each cow's anus is periodically fucked by a machine phallus that ejaculates hydration directly up her butt. When a slave's balls are ready to give cum, she is mercilessly sodomized until prostate stimulation forces an orgasm.
+ Each cow's anus is periodically fucked by a machine phallus that ejaculates hydration directly up their butt. When a slave's balls are ready to give cum, they are mercilessly sodomized until prostate stimulation forces an orgasm.
<</if>>
<</if>>
<<if ($dairyPregUpgrade == 1) && ($dairyPregSetting > 0)>>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 6d6e186906efddb38a69bbf7d29d05d55ccda12a..66267d422cf36fe3b71184b0f41b3d429ade3fc9 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -704,6 +704,7 @@
<<if $arcologies[0].FSSupremacistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSSupremacist == $arcologies[0].FSSupremacistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSSupremacistSMR == 1>>
<<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -733,6 +734,7 @@
<<if $arcologies[0].FSSubjugationistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSSubjugationist == $arcologies[0].FSSubjugationistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSSubjugationistSMR == 1>>
<<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -762,6 +764,7 @@
<<if $arcologies[0].FSRepopulationFocusDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSRepopulationFocus == $arcologies[0].FSRepopulationFocusDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSRepopulationFocusSMR == 1>>
<<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -791,6 +794,7 @@
<<if $arcologies[0].FSRestartDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSRestart == $arcologies[0].FSRestartDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSRestartSMR == 1>>
<<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -820,6 +824,7 @@
<<if $arcologies[0].FSGenderRadicalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSGenderRadicalist == $arcologies[0].FSGenderRadicalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSGenderRadicalistSMR == 1>>
<<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -849,6 +854,7 @@
<<if $arcologies[0].FSGenderFundamentalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSGenderFundamentalist == $arcologies[0].FSGenderFundamentalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSGenderFundamentalistSMR == 1>>
<<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -878,6 +884,7 @@
<<if $arcologies[0].FSPaternalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSPaternalist == $arcologies[0].FSPaternalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSPaternalistSMR == 1>>
<<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -907,6 +914,7 @@
<<if $arcologies[0].FSDegradationistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSDegradationist == $arcologies[0].FSDegradationistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSDegradationistSMR == 1>>
<<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -936,6 +944,7 @@
<<if $arcologies[0].FSBodyPuristDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSBodyPurist == $arcologies[0].FSBodyPuristDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSBodyPuristSMR == 1>>
<<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -963,6 +972,7 @@
<<if $arcologies[0].FSTransformationFetishistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSTransformationFetishist == $arcologies[0].FSTransformationFetishistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSTransformationFetishistSMR == 1>>
<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -990,6 +1000,7 @@
<<if $arcologies[0].FSMaturityPreferentialistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSMaturityPreferentialist == $arcologies[0].FSMaturityPreferentialistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSMaturityPreferentialistSMR == 1>>
<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1017,6 +1028,7 @@
<<if $arcologies[0].FSYouthPreferentialistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSYouthPreferentialist == $arcologies[0].FSYouthPreferentialistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSYouthPreferentialistSMR == 1>>
<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1044,6 +1056,7 @@
<<if $arcologies[0].FSSlimnessEnthusiastDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSSlimnessEnthusiast == $arcologies[0].FSSlimnessEnthusiastDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSSlimnessEnthusiastSMR == 1>>
<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1073,6 +1086,7 @@
<<if $arcologies[0].FSAssetExpansionistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSAssetExpansionist == $arcologies[0].FSAssetExpansionistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSAssetExpansionistSMR == 1>>
<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1102,6 +1116,7 @@
<<if $arcologies[0].FSPastoralistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSPastoralist == $arcologies[0].FSPastoralistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSPastoralistSMR == 1>>
<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1131,6 +1146,7 @@
<<if $arcologies[0].FSPhysicalIdealistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSPhysicalIdealist == $arcologies[0].FSPhysicalIdealistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSPhysicalIdealistSMR == 1>>
<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1160,6 +1176,7 @@
<<if $arcologies[0].FSHedonisticDecadenceDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSHedonisticDecadence == $arcologies[0].FSHedonisticDecadenceDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>>
<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1189,6 +1206,7 @@
<<if $arcologies[0].FSChattelReligionistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSChattelReligionist == $arcologies[0].FSChattelReligionistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSChattelReligionistSMR == 1>>
<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1218,6 +1236,7 @@
<<if $arcologies[0].FSRomanRevivalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSRomanRevivalist == $arcologies[0].FSRomanRevivalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSRomanRevivalistSMR == 1>>
<<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1247,6 +1266,7 @@
<<if $arcologies[0].FSAztecRevivalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSAztecRevivalist == $arcologies[0].FSAztecRevivalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSAztecRevivalistSMR == 1>>
<<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1276,6 +1296,7 @@
<<if $arcologies[0].FSEgyptianRevivalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSEgyptianRevivalist == $arcologies[0].FSEgyptianRevivalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSEgyptianRevivalistSMR == 1>>
<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1305,6 +1326,7 @@
<<if $arcologies[0].FSEdoRevivalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSEdoRevivalist == $arcologies[0].FSEdoRevivalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSEdoRevivalistSMR == 1>>
<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1334,6 +1356,7 @@
<<if $arcologies[0].FSArabianRevivalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSArabianRevivalist == $arcologies[0].FSArabianRevivalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSArabianRevivalistSMR == 1>>
<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
<</if>>
@@ -1363,6 +1386,7 @@
<<if $arcologies[0].FSChineseRevivalistDecoration < $FSLockinLevel>>
<<if $arcologies[0].FSChineseRevivalist == $arcologies[0].FSChineseRevivalistDecoration>>
@@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+ <<set $FSReminder = 1>>
<<elseif $arcologies[0].FSChineseRevivalistSMR == 1>>
<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
<</if>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index b907c60515595e7aae45ade0a4eb1097ff30c7bb..18f24582369670826ec5e76062371c9e0f11dede 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -1,7 +1,7 @@
:: Future Society [nobr]
-<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Future Societies">>
+<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Future Societies", $FSReminder = "">>
<<if ndef $arcologies[0].FSSubjugationist>>
<<set $arcologies[0].FSSubjugationist = "unset">>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 67ea8019dcc0bf506b4faa2e1e00f00976355407..e5981aad54ce9f3850042ae2335dc56c274bb24a 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -89,13 +89,13 @@
__''MAIN MENU''__ //[[Summary Options]]//
<<if $rulesAssistantMain != 0>>
- | //<span id="RAButton"><<link "Rules Assistant Options">><<goto "Rules Assistant">><</link>></span>// @@.cyan;[R]@@
+ | //<span id="RAButton"><<link "Rules Assistant Options" "Rules Assistant">><</link>></span>// @@.cyan;[R]@@
<<if $rulesAssistantAuto != 1>>
- | //<<link "Apply Rules Assistant at week end">><<set $rulesAssistantAuto = 1>><<goto "Main">><</link>>//
+ | //<<link "Apply Rules Assistant at week end" "Main">><<set $rulesAssistantAuto = 1>><</link>>//
<<else>>
- | //<<link "Stop applying Rules Assistant at week end">><<set $rulesAssistantAuto = 0>><<goto "Main">><</link>>//
+ | //<<link "Stop applying Rules Assistant at week end" "Main">><<set $rulesAssistantAuto = 0>><</link>>//
<</if>>
- | //<<link "Re-apply Rules Assistant now (this will only check slaves in the Penthouse)">><<for _i = 0;_i < _SL;_i++>><<if $slaves[_i].assignmentVisible == 1 && $slaves[_i].useRulesAssistant == 1>><<= DefaultRules($slaves[_i])>><</if>><</for>><<goto "Main">><</link>>//
+ | //<<link "Re-apply Rules Assistant now (this will only check slaves in the Penthouse)" "Main">><<for _i = 0;_i < _SL;_i++>><<if $slaves[_i].assignmentVisible == 1 && $slaves[_i].useRulesAssistant == 1>><<= DefaultRules($slaves[_i])>><</if>><</for>><</link>>//
<</if>>
<<if $useSlaveSummaryTabs == 1>>
@@ -129,68 +129,70 @@ __''MAIN MENU''__ //[[Summary Options]]//
<<set $slaveAssignmentTab = "overview">>
<<if def _HG>>
''__@@.pink;<<= SlaveFullName($HeadGirl)>>@@__'' is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.
- <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ <span id="manageHG"><strong><<link "Manage Head Girl" "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<set $showOneSlave = "Head Girl">>
<<include "Slave Summary">>
<<elseif (ndef _HG) && ($slaves.length > 1)>>
- You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one" "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<elseif (ndef _HG)>>
//You do not have enough slaves to keep a Head Girl//
<</if>>
<br>
<<if def _RC>>
+ <<setLocalPronouns $slaves[_RC]>>
''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is working
<<if $recruiterTarget != "other arcologies">>
to recruit girls.
<<else>>
as a Sexual
<<if $arcologies[0].influenceTarget == -1>>
- Ambassador, but @@.red;she has no target to influence.@@
+ Ambassador, but @@.red;$he has no target to influence.@@
<<else>>
Ambassador to <<for $i = 0; $i < $arcologies.length; $i++>><<if $arcologies[$i].direction == $arcologies[0].influenceTarget>>$arcologies[$i].name<<break>><</if>><</for>>.
<</if>>
<</if>>
- <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <span id="manageRecruiter"><strong><<link "Manage Recruiter" "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<<set $showOneSlave = "recruit girls">>
<<include "Slave Summary">>
<<else>>
You have @@.red;not@@ selected a Recruiter.
- <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <span id="manageRecruiter"><strong><<link "Select one" "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<</if>>
<<if ($dojo != 0)>>
<br>
<<if def _BG>>
- ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard" "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<<set $showOneSlave = "guard you">>
<<include "Slave Summary">>
<<else>>
- You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one" "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<</if>>
/* Start Italic event text */
<<if (def _BG) && ($slaves[_BG].assignment == "guard you")>>
+ <<setLocalPronouns $slaves[_BG]>>
<<set $i = _BG>>
<<set _GO = "idiot ball">>
<br><<include "Use Guard">>
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <br> [["Use "+$his+" mouth"|FLips][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
+ | [["Play with "+$his+" tits"|FBoobs][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoVaginal($slaves[_BG])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$him|FVagina][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoAnal($slaves[_BG])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Use "+$his+" holes"|FButt][$activeSlave = $slaves[_BG],$nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<<if $slaves[_BG].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$him+" over "+$his+" belly"|FBellyFuck][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<</if>>
/*check*/
<<if canPenetrate($slaves[_BG])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Ride "+$him|FDick][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<<if canDoAnal($slaves[_BG])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$his+" ass"|FAnus][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
- | <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
+ | [["Abuse "+$him|Gameover][$gameover = _GO]]
<</if>>
/* End Italic event text */
@@ -245,62 +247,45 @@ __''MAIN MENU''__ //[[Summary Options]]//
<br>
/* Start Italic event text */
<<for $i = 0; $i < _SL; $i++>>
+ <<capture $i>>
+ <<setLocalPronouns $slaves[$i]>>
<<if ($slaves[$i].assignment == "please you")>>
<br><<include "Toychest">> //In the coming week you plan to concentrate on
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].toyHole != "all her holes">>
- her $slaves[$i].toyHole, but for now://
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoVaginal($slaves[$i])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoAnal($slaves[$i])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
- <<if canDoAnal($slaves[$i])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <<if canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>
- <<if $slaves[$i].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
- /*check*/
- <<if canPenetrate($slaves[$i])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
- <</if>>
- | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ $his $slaves[$i].toyHole, but for now://
<<else>>
- all of her holes equally, but for now://
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoVaginal($slaves[$i])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoAnal($slaves[$i])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
+ all of $his holes equally, but for now://
+ <</if>>
+ <br> [["Use "+$his+" mouth"|FLips][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]] | [["Play with "+$his+" tits"|FBoobs][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
+ <<if canDoVaginal($slaves[$i])>>
+ | [["Fuck "+$him|FVagina][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoAnal($slaves[$i])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <<if canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>
- <<if $slaves[$i].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
+ | [["Use "+$his+" holes"|FButt][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
- /*check*/
- <<if canPenetrate($slaves[$i])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ <</if>>
+ <<if canDoAnal($slaves[$i])>>
+ | [["Fuck "+$his+" ass"|FAnus][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
+ <</if>>
+ <<if canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>
+ <<if $slaves[$i].belly >= 300000>>
+ | [["Fuck "+$him+" over "+$his+" belly"|FBellyFuck][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
- | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<</if>>
+ /*check*/
+ <<if canPenetrate($slaves[$i])>>
+ | [["Ride "+$him|FDick][$activeSlave = $slaves[$i],$nextButton = _j,$nextLink = _k,$returnTo = _l]]
+ <</if>>
+ | [["Abuse "+$him|FAbuse][$activeSlave = $slaves[$i],$nextButton = _j,$nextLink = _k,$returnTo = _l]]
<<else>>
<<if $slaves[$i].toyHole != "all her holes">>
- its $slaves[$i].toyHole.
+ $his $slaves[$i].toyHole.
<<else>>
- all of its holes.
+ all of $his holes.
<</if>>
<</if>>
<</if>>
+ <</capture>>
<</for>>
/* End Italic event text */
<br>
@@ -404,68 +389,70 @@ __''MAIN MENU''__ //[[Summary Options]]//
<<set $slaveAssignmentTab = "overview">>
<<if def _HG>>
''__@@.pink;<<= SlaveFullName($HeadGirl)>>@@__'' is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.
- <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ <span id="manageHG"><strong><<link "Manage Head Girl" "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<set $showOneSlave = "Head Girl">>
<<include "Slave Summary">>
<<elseif (ndef _HG) && ($slaves.length > 1)>>
- You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one" "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<elseif (ndef _HG)>>
//You do not have enough slaves to keep a Head Girl//
<</if>>
<br>
<<if def _RC>>
+ <<setLocalPronouns $slaves[_RC]>>
''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is working
<<if $recruiterTarget != "other arcologies">>
to recruit girls.
<<else>>
as a Sexual
<<if $arcologies[0].influenceTarget == -1>>
- Ambassador, but @@.red;she has no target to influence.@@
+ Ambassador, but @@.red;$he has no target to influence.@@
<<else>>
Ambassador to <<for $i = 0; $i < $arcologies.length; $i++>><<if $arcologies[$i].direction == $arcologies[0].influenceTarget>>$arcologies[$i].name<<break>><</if>><</for>>.
<</if>>
<</if>>
- <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <span id="manageRecruiter"><strong><<link "Manage Recruiter" "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<<set $showOneSlave = "recruit girls">>
<<include "Slave Summary">>
<<else>>
You have @@.red;not@@ selected a Recruiter.
- <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <span id="manageRecruiter"><strong><<link "Select one" "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<</if>>
<<if ($dojo != 0)>>
<br>
<<if def _BG>>
- ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard" "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<<set $showOneSlave = "guard you">>
<<include "Slave Summary">>
<<else>>
- You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one" "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<</if>>
/* Start Italic event text */
<<if (def _BG) && ($slaves[_BG].assignment == "guard you")>>
+ <<setLocalPronouns $slaves[_BG]>>
<<set $i = _BG>>
<<set _GO = "idiot ball">>
<br><<include "Use Guard">>
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <br> [["Use "+$his+" mouth"|FLips][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
+ | [["Play with "+$his+" tits"|FBoobs][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoVaginal($slaves[_BG])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$him|FVagina][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoAnal($slaves[_BG])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Use "+$his+" holes"|FButt][$activeSlave = $slaves[_BG],$nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<<if $slaves[_BG].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$him+" over "+$his+" belly"|FBellyFuck][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<</if>>
/*check*/
<<if canPenetrate($slaves[_BG])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Ride "+$him|FDick][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<<if canDoAnal($slaves[_BG])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$his+" ass"|FAnus][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
- | <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
+ | [["Abuse "+$him|Gameover][$gameover = _GO]]
<</if>>
/* End Italic event text */
@@ -544,93 +531,72 @@ Filter by assignment: |
<<set _j = "Back", _k = "AS Dump", _l = "Main">>
<<for $i = 0; $i < _SL; $i++>>
+<<capture $i>>
<<if ($slaves[$i].assignment == "please you")>>
+ <<setLocalPronouns $slaves[$i]>>
<br><<include "Toychest">> //In the coming week you plan to concentrate on
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].toyHole != "all her holes">>
- her $slaves[$i].toyHole, but for now://
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoVaginal($slaves[$i])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoAnal($slaves[$i])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
- <<if canDoAnal($slaves[$i])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <<if canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>
- <<if $slaves[$i].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
- /*check*/
- <<if canPenetrate($slaves[$i])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
- <</if>>
- | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ $his $slaves[$i].toyHole, but for now://
<<else>>
- all of her holes equally, but for now://
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoVaginal($slaves[$i])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoAnal($slaves[$i])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
+ all of $his holes equally, but for now://
+ <</if>>
+ <br> [["Use "+$his+" mouth"|FLips][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]] | [["Play with "+$his+" tits"|FBoobs][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
+ <<if canDoVaginal($slaves[$i])>>
+ | [["Fuck "+$him|FVagina][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoAnal($slaves[$i])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <<if canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>
- <<if $slaves[$i].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
+ | [["Use "+$his+" holes"|FButt][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
- /*check*/
- <<if canPenetrate($slaves[$i])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ <</if>>
+ <<if canDoAnal($slaves[$i])>>
+ | [["Fuck "+$his+" ass"|FAnus][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
+ <</if>>
+ <<if canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>
+ <<if $slaves[$i].belly >= 300000>>
+ | [["Fuck "+$him+" over "+$his+" belly"|FBellyFuck][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
- | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<</if>>
+ /*check*/
+ <<if canPenetrate($slaves[$i])>>
+ | [["Ride "+$him|FDick][$activeSlave = $slaves[$i],$nextButton = _j,$nextLink = _k,$returnTo = _l]]
+ <</if>>
+ | [["Abuse "+$him|FAbuse][$activeSlave = $slaves[$i],$nextButton = _j,$nextLink = _k,$returnTo = _l]]
<<else>>
<<if $slaves[$i].toyHole != "all her holes">>
- its $slaves[$i].toyHole.
+ $his $slaves[$i].toyHole.
<<else>>
- all of its holes.
+ all of $his holes.
<</if>>
<</if>>
<</if>>
+<</capture>>
<</for>>
<</if>>
<<if (def _BG) && ($slaves[_BG].assignment == "guard you") && ($useSlaveSummaryOverviewTab != 1)>>
<<set $i = _BG>>
+ <<setLocalPronouns $slaves[$i]>>
<<set _GO = "idiot ball">>
<br><<include "Use Guard">>
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <br> [["Use "+$his+" mouth"|FLips][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
+ | [["Play with "+$his+" tits"|FBoobs][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoVaginal($slaves[_BG])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$him|FVagina][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<<if canDoAnal($slaves[_BG])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Use "+$his+" holes"|FButt][$activeSlave = $slaves[_BG],$nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<<if $slaves[_BG].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
- <<if canDoVaginal($slaves[_BG]) || canDoAnal($slaves[_BG])>>
- <<if $slaves[_BG].belly >= 300000>>
- | <<print "[[Fuck her over her belly|FBellyFuck][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$him+" over "+$his+" belly"|FBellyFuck][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<</if>>
/*check*/
<<if canPenetrate($slaves[_BG])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Ride "+$him|FDick][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
<<if canDoAnal($slaves[_BG])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | [["Fuck "+$his+" ass"|FAnus][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
<</if>>
- | <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
+ | [["Abuse "+$him|Gameover][$gameover = _GO]]
<</if>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index e2abc1481b820bda1baea94650d1fac43c1ac5ac..2d3e9c1c5825fc742f0f3a0e772736d24ef7b3cd 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -134,20 +134,20 @@
<</if>>
<<if $Concubine.prestigeDesc == "She is remembered for winning best in show as a dairy cow.">>
<<if $Concubine.lactation > 1 || $Concubine.lactationAdaptation > 90>>
- $He does her best to prevent herself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of her excessive milk to entertain you.
+ $He does $his best to prevent $himself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of $his excessive milk to entertain you.
<<elseif $Concubine.lactation > 0>>
- $He does her best to prevent herself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of her breast milk to entertain you.
+ $He does $his best to prevent $himself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of $his breast milk to entertain you.
<<else>>
- $He wishes $he could lactate for you, but $he has dried up since her glory days.
+ $He wishes $he could lactate for you, but $he has dried up since $his glory days.
<</if>>
<</if>>
<<if $Concubine.prestigeDesc == "She is remembered for winning best in show as a breeder.">>
<<if $Concubine.bellyPreg >= 5000>>
- When $he has a free moment, $he refines her flexibility so that $he can perform any sexual position possible for her in her motherly state. $He takes the time to look up new positions to work around her growing pregnancy.
+ When $he has a free moment, $he refines $his flexibility so that $he can perform any sexual position possible for $him in $his motherly state. $He takes the time to look up new positions to work around $his growing pregnancy.
<<elseif isFertile($Concubine) || $Concubine.preg > 0>>
- When $he has a free moment, $he refines her flexibility so that $he is prepared for any sexual position you can think of, no matter how heavy $he becomes with children.
+ When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, no matter how heavy $he becomes with children.
<<else>>
- When $he has a free moment, $he researches ways to restore her fertility; $he dreams of the day $he can carry <<if $PC.dick ==1>>your children<<else>>children for you<</if>>.
+ When $he has a free moment, $he researches ways to restore $his fertility; $he dreams of the day $he can carry <<if $PC.dick ==1>>your children<<else>>children for you<</if>>.
<</if>>
<</if>>
<</if>>
@@ -160,7 +160,7 @@
Having a rising porn star as your personal bed warmer @@.green;reflects on your standing.@@
<</if>>
<<if ($Concubine.oralCount + $Concubine.analCount + $Concubine.vaginalCount + $Concubine.mammaryCount + $Concubine.penetrativeCount > 1000)>>
- <<if $verboseDescriptions == 1>>Many citizens <<if $Concubine.publicCount > 10>>remember having had her themselves, and <</if>>@@.green;respectfully@@ envy you her exclusive company.<</if>>
+ <<if $verboseDescriptions == 1>>Many citizens <<if $Concubine.publicCount > 10>>remember having had $him themselves, and <</if>>@@.green;respectfully@@ envy you $his exclusive company.<</if>>
<<set $repGain += 25>>
<</if>>
<<if $masterSuiteUpgradeLuxury > 0>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index ca84a4d0375e62094e9b0e2c76861e24096be456..8abe9487d4146053e1a883915b8d7c30879fe2cf 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -273,7 +273,7 @@
People in your arcology are supposed to keep a myriad of slaves as their personal harem, and failure to do so is considered to be highly dishonorable. This opens up some opportunities for smuggling, as people are ready to go to great length to get an edge against their competitors. Becoming a part for this business has made you @@.yellowgreen;<<print cashFormat(_income)>>@@.
<<case "edo law">>
<<set _income += random(2000,3000)>>
- Outside culture is banned in your arcology. Your citizens do not need anything other than what you have inside. But this doesn't help with their curiosity - they always want to discover what the outside world is like. So you let some news and a few books from other cultures slip in, but not before you made sure they would disgust your citizens and reinforce their love for the Edo culture. The sales brought you @@.yellowgreen;<<print cashFormat(_income)>>.
+ Outside culture is banned in your arcology. Your citizens do not need anything other than what you have inside. But this doesn't help with their curiosity - they always want to discover what the outside world is like. So you let some news and a few books from other cultures slip in, but not before you made sure they would disgust your citizens and reinforce their love for the Edo culture. The sales brought you @@.yellowgreen;<<print cashFormat(_income)>>@@.
<<case "edo">>
<<set _income += random(1500,2500)>>
During important meetings with higher society, it is wise to have a lot of slaves to put at the disposition of others. But some slaveowners grow really attached to their slaves, and so they'd much rather rent out unknown slaves from an anonymous owner's stock than use their own. This is a good opportunity to make some money, as shown by the @@.yellowgreen;<<print cashFormat(_income)>>@@ you managed to make.
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 36370fc42fa0997514d973214bb7468075c12a7d..0880b62046e5e2b2d08ee850ccdb3e6b560c9d31 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -555,7 +555,7 @@
<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $FSAnnounced>>
- <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if $FSCredits > 0>>@@.yellow;[!]@@<</if>>
+ <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>>
<</if>>
<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@