diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index a8dd2d623f347357f9d84f468f866316a265878f..7bd55f0a814523f743472d578e9ce80598b870e5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,7 +1,44 @@
Pregmod
0.10.7.0/1
+
+12/22/17
+
+ 223
+ -SFanon's stuff (mostly comma'd numbers)
+
+ 222
+ -SFanon's stuff
+
+ 221
+ -fixed servants quarters bugs
+
+12/21/17
+
+ 220
+ -saRules now applies to the servants quarters
+ -fixes
+ Fixed an issue with reMalefactor displaying the wrong text block.
+
+ 219
+ -fixes
+ More cache clearing, fixes to reBoomerang preg setters and a typo in raWidgets causing trouble.
+
+12/20/17
+
+ 218
+ -SFanon's tweaks
+ 217
+ -fixed sex count NaN in saRules-schoolroom
+ -tweaked childgen to use current father name
+
+12/19/17
+
+ 216
+ -saRules now applies to the schoolroom
+ -fixes
+
12/18/17
215
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 15e834a71c400e764adda9a0aff88403dbc0ccfe..c30fffa475f0254cda20aaa4f3875f6812ea9fed 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -1083,6 +1083,86 @@ window.cumAmount = function(slave) {
}
};
+window.nameReplace = function(name)
+{
+ name = name.replace("Sh", "Th");
+ name = name.replace("SS", "Th");
+ name = name.replace("Ss", "Th");
+ name = name.replace("sS", "Th");
+ name = name.replace("S", "Th");
+ name = name.replace("aX", "aKTH");
+ name = name.replace("eX", "eKTH");
+ name = name.replace("iX", "iKTH");
+ name = name.replace("oX", "oKTH");
+ name = name.replace("uX", "uKTH");
+ name = name.replace("yX", "yKTH");
+ name = name.replace("AX", "AKTH");
+ name = name.replace("EX", "EKTH");
+ name = name.replace("IX", "IKTH");
+ name = name.replace("OX", "OKTH");
+ name = name.replace("UX", "UKTH");
+ name = name.replace("YX", "YKTH");
+ name = name.replace("Xa", "Tha");
+ name = name.replace("Xe", "The");
+ name = name.replace("Xi", "Thi");
+ name = name.replace("Xo", "Tho");
+ name = name.replace("Xu", "Thu");
+ name = name.replace("Xy", "Thy");
+ name = name.replace("XA", "THA");
+ name = name.replace("XE", "THE");
+ name = name.replace("XI", "THI");
+ name = name.replace("XO", "THO");
+ name = name.replace("XU", "THU");
+ name = name.replace("XY", "THY");
+ name = name.replace("X", "EKTH");
+ name = name.replace("zZ", "Th");
+ name = name.replace("Zz", "Th");
+ name = name.replace("ZZ", "TH");
+ name = name.replace("Z", "Th");
+ name = name.replace("Ci", "Thi");
+ name = name.replace("Ce", "The");
+ name = name.replace("Cy", "Thy");
+ name = name.replace("CI", "THI");
+ name = name.replace("CE", "THE");
+ name = name.replace("CY", "THY");
+ name = name.replace("ss", "th");
+ name = name.replace("sh", "th");
+ name = name.replace("s", "th");
+ name = name.replace("zz", "th");
+ name = name.replace("z", "th");
+ name = name.replace("ax", "akth");
+ name = name.replace("ex", "ekth");
+ name = name.replace("ix", "ikth");
+ name = name.replace("ox", "okth");
+ name = name.replace("ux", "ukth");
+ name = name.replace("yx", "ykth");
+ name = name.replace("Ax", "Akth");
+ name = name.replace("Ex", "Ekth");
+ name = name.replace("Ix", "Ikth");
+ name = name.replace("Ox", "Okth");
+ name = name.replace("Ux", "Ukth");
+ name = name.replace("Yx", "Ykth");
+ name = name.replace("xa", "tha");
+ name = name.replace("xe", "the");
+ name = name.replace("xi", "thi");
+ name = name.replace("xo", "tho");
+ name = name.replace("xu", "thu");
+ name = name.replace("xy", "thy");
+ name = name.replace("xA", "thA");
+ name = name.replace("xE", "thE");
+ name = name.replace("xI", "thI");
+ name = name.replace("xO", "thO");
+ name = name.replace("xU", "thU");
+ name = name.replace("xY", "thY");
+ name = name.replace("x", "ekth");
+ name = name.replace("ci", "thi");
+ name = name.replace("ce", "the");
+ name = name.replace("cy", "thy");
+ name = name.replace("cI", "thI");
+ name = name.replace("cE", "thE");
+ name = name.replace("cY", "thY");
+ return name;
+}
window.mergeRules = function(rules) {
var combinedRule = {};
@@ -2178,6 +2258,22 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.STEWARD) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SERVER) {
+ if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ if(State.variables.servantsQuartersDecoration === 'Degradationist') {
+ cost += rulesCost * .90;
+ } else {
+ cost += rulesCost;
+ }
+ }
+ } else if(s.assignment === Job.TEACHER) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SCHOOL) {
+ cost += rulesCost * 1.5;
} else {
if(s.livingRules === LivingRule.LUXURIOUS) {
cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
diff --git a/readme.txt b/readme.txt
index fc8aec2b2649643223cd29284fc7b6f37ab89215..e99451bff0a1a6bc46d925470c57cfa152c3c3c1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,3 +1,11 @@
+Common problems:
+
+I get a error on gamestart.
+-clear cookies
+
+I can't save more than once or twice.
+-Known issue caused by sugarcube level changes. Save to file doesn't have this problem and will likely avoid the first problem as well.
+
How to mod (basic doc):
1. All sources now in the src subdir, in separate files. 1 passage = 1 file.
diff --git a/src/SecExp/SpecialForceUpgradeOptions.tw b/src/SecExp/SpecialForceUpgradeOptions.tw
deleted file mode 100644
index d2f4f96b3b687a871d6cfa8c69585fdfbaf6bda0..0000000000000000000000000000000000000000
--- a/src/SecExp/SpecialForceUpgradeOptions.tw
+++ /dev/null
@@ -1,552 +0,0 @@
-:: SpecialForceUpgradeOptions
-
-<<nobr>>
-<<if ( $SFAO < _max) && $securityForceUpgradeToken == 0>>
-<span id="resultX">
- <br><br>Which facility or equipment do you wish _Name to upgrade this week?
-
- <<if $securityForceUpgradeToken == 0 && _Barracks < 5>>
- <br><<link "Barracks">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= 100000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(100000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < _BarracksMax && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>>
- <<if $securityForceArcologyUpgrades == 5>>
- <<set _arcCost = 15000000>>
- <<elseif $securityForceArcologyUpgrades == 6>>
- <<set _arcCost = 20000000>>
- <<elseif $securityForceArcologyUpgrades == 7>>
- <<set _arcCost = 35000000>>
- <<elseif $securityForceArcologyUpgrades == 8>>
- <<set _arcCost = 55000000>>
- <<elseif $securityForceArcologyUpgrades == 9>>
- <<set _arcCost = 125000000>>
- <<elseif $securityForceArcologyUpgrades == 10>>
- <<set _arcCost = 350000000>>
- <<elseif $securityForceArcologyUpgrades == 11>>
- <<set _arcCost = 600000000>>
- <<elseif $securityForceArcologyUpgrades == 12>>
- <<set _arcCost = 2500000000>>
- <<elseif $securityForceArcologyUpgrades == 13>>
- <<set _arcCost = 5000000000>>
- <<elseif $securityForceArcologyUpgrades == 14>>
- <<set _arcCost = 6000000000>>
- <<elseif $securityForceArcologyUpgrades == 15>>
- <<set _arcCost = 16000000000>>
- <</if>>
- <br><<link "Barracks">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_arcCost*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 12 && _Armoury >= 11 && _StimulantLab >= 7 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatellitePower >= 16>>
- <br><<link "Barracks">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_arcCost*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>>
- <br><<link "Barracks">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_arcCost*$Env)>> //
- <</if>>
- <<if _Barracks == 5 || _Barracks == _BarracksMax>>
- <br>//$securityForceName has fully upgraded the barracks to support it's activities//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>>
- <br><<link "Facility Support">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "Creating a specialised area for any slaves you send to assist us will benefical to everyone."
- <<set $securityForceUpgradeToken = 1, $FacilitySupport++, $cash -= Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env)>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env))>> //
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && _Armoury < 5>>
- <br><<link "Armoury">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "The boys'll like having some new guns and armour to help them out there." She laughs. "Don't think the poor bastards they'll be shooting will thank you though." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 40000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(40000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && _Armoury >= 5 && _Armoury < _ArmouryMax && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>>
- <br><<link "Armoury">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "The boys'll like having some new guns and armour to help them out there." She laughs. "Don't think the poor bastards they'll be shooting will thank you though." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 4500000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(4500000*$Env)>> //
- <</if>>
- <<if _Armoury == 5 || _Armoury == _ArmouryMax>>
- <br>//$securityForceName has fully upgraded the armoury to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>>
- <br><<link "Stimulant Lab">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= 40000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(40000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && _StimulantLab > 5 && _StimulantLab < _StimulantLabMax && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>>
- <<if _StimulantLab == 6>>
- <<set _drugCost = 2265000>>
- <<elseif _StimulantLab == 7>>
- <<set _drugCost = 200000000000>>
- <<elseif _StimulantLab == 8>>
- <<set _drugCost = 250000000000>>
- <</if>>
- <br><<link "Stimulant Lab">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_drugCost*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && _StimulantLab == 7 && _Armoury >= 11 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatellitePower >= 16 && _Barracks >= 13>>
- <br><<link "Stimulant Lab">>
- <<replace "#resultX">><br><br>
- "Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_drugCost*$Env)>> //
- <</if>>
- <<if _StimulantLab == 5 || _StimulantLab == _StimulantLabMax>>
- <br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>>
- <br><<link "Garage">>
- <<replace "#resultX">>
- <span id="resultB">
- <br><br>"Which unit do you wish to upgrade or 'borrow'?"
- <<link "Go back">>
- <<goto "SFM Barracks">>
- <</link>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 5>>
- <br><<link "Light and medium vehicles">>
- <<replace "#resultB">><br><br>
- "Sure, boss." she says, nodding. "Some new wheels should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceVehiclePower++, $cash -= 60000*$Env>>
- <</replace>>
- <</link>>// Costs <<print cashFormat(60000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceVehiclePower < _LightAndMediumVehiclesMax && _Barracks >= 5 && $securityForceAircraftPower >= 5 && _DroneBay >= 5 && _StimulantLab >= 5 && _Armoury >= 5>>
- <<if $securityForceVehiclePower < 6>>
- <<set _vehCost = 2500000>>
- <<elseif $securityForceVehiclePower == 6>>
- <<set _vehCost = 3000000>>
- <</if>>
- <br><<link "Light and medium vehicles">>
- <<replace "#resultB">><br><br>
- "Sure, boss." she says, nodding. "Some new wheels should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceVehiclePower++, $cash -= _vehCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_vehCost*$Env)>> //
- <</if>>
- <<if $securityForceVehiclePower == 5 || $securityForceVehiclePower == _LightAndMediumVehiclesMax >>
- <br>//$securityForceName has fully upgraded the vehicle fleet to support it's activities.//
- <<else>>
- <br>//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>>
- <br><<link "A heavy battle tank">>
- <<replace "#resultB">><br><br>
- "Sure, boss." she says, nodding. "A heavy battle tank should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= 60000000*$Env>>
- <</replace>>
- <</link>>// Costs <<print cashFormat(60000000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank >= 1 && $securityForceHeavyBattleTank < _HeavyBattleTankMax>>
- <<if $securityForceHeavyBattleTank < 2>>
- <<set _hbtCost = 75000000>>
- <<elseif $securityForceHeavyBattleTank == 2>>
- <<set _hbtCost = 8500000>>
- <</if>>
- <br><<link "heavy battle tank">>
- <<replace "#resultB">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the heavy battle tank should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= _hbtCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_hbtCost*$Env)>> //
- <</if>>
- <<if $securityForceHeavyBattleTank == _HeavyBattleTankMax>>
- <br>//$securityForceName has fully upgraded the heavy battle tank to support it's activities.//
- <</if>>
-
- </span>
- <</replace>>
- <</link>>
- <</if>>
- <<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>>
-
- <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax>>
- <br><<link "Hangar">>
- <<replace "#resultX">>
- <span id="resultY">
- <br><br>"Which unit do you wish to upgrade or 'borrow'?"
- <<link "Go back">>
- <<goto "SFM Barracks">>
- <</link>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 5>>
- <br><<link "Light and medium aircraft">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= 70000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(70000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < _AircraftMax && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>>
- <<if $securityForceAircraftPower == 5>>
- <<set _airCost = 2750000>>
- <<elseif $securityForceAircraftPower == 6>>
- <<set _airCost = 3250000>>
- <<elseif $securityForceAircraftPower == 7>>
- <<set _airCost = 5750000>>
- <<elseif $securityForceAircraftPower == 8>>
- <<set _airCost = 6750000>>
- <<elseif $securityForceAircraftPower == 9>>
- <<set _airCost = 7750000>>
- <</if>>
- <br><<link "Light and medium aircraft">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= _airCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat( _airCost*$Env)>> //
- <</if>>
- <<if $securityForceAircraftPower == 5 || $securityForceAircraftPower == _AircraftMax>>
- <br>//$securityForceName has fully upgraded the air fleet to support it's activities.//
- <<else>>
- <br>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>>
- <br><<link "A space plane">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "A orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(4750000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < _SpacePlaneMax>>
- <<if $securityForceSpacePlanePower < 4>>
- <<set _spCost = 50000000>>
- <<elseif $securityForceSpacePlanePower == 4>>
- <<set _spCost = 75000000>>
- <<elseif $securityForceSpacePlanePower == 5>>
- <<set _spCost = 85000000>>
- <<elseif $securityForceSpacePlanePower == 6>>
- <<set _spCost = 95000000>>
- <<elseif $securityForceSpacePlanePower == 7>>
- <<set _spCost = 125000000>>
- <<elseif $securityForceSpacePlanePower == 8>>
- <<set _spCost = 175000000>>
- <<elseif $securityForceSpacePlanePower == 9 && $securityForceInfantryPower >= 10>>
- <<set _spCost = 250000000>>
- <<elseif $securityForceSpacePlanePower == 10>>
- <<set _spCost = 350000000>>
- <</if>>
- <br><<link "Space plane">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat( _spCost*$Env)>> //
- <</if>>
- <<if $securityForceSpacePlanePower == _SpacePlaneMax>>
- <br>//$securityForceName has fully upgraded the space plane to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceFortressZeppelin < 1>>
- <br><<link "A fortress zeppelin">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "A fortress zeppelin would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 30000000*$Env>>
- <</replace>><</link>> // Costs <<print cashFormat(30000000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < _FortressZeppelinMax>>
- <<link "Fortress zeppelin">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the Fortress Zeppelin, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 20000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat( 20000000*$Env)>> //
- <</if>>
- <<if $securityForceFortressZeppelin == _FortressZeppelinMax>>
- <br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceAC130 < 1>>
- <br><<link "An AC-130">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "An AC-130 would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(35000000*$Env)>> //
- <<elseif $securityForceAC130 > 1 && $securityForceAC130 < _AC130Max>>
- <br><<link "AC-130">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the AC-130, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(25000000*$Env)>> //
- <</if>>
- <<if $securityForceAC130 == _AC130Max>>
- <br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceHeavyTransport < 1>>
- <br><<link "A heavy transport">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "A heavy transport would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 40000000*$Env>>
- <</replace>><</link>> // Costs <<print cashFormat(40000000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyTransport >= 1 && $securityForceHeavyTransport < _heavyTransportMax>>
- <br><<link "Heavy transport">>
- <<replace "#resultY">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the heavy transport, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 30000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat( 30000000*$Env)>> //
- <</if>>
- <<if $securityForceHeavyTransport == _heavyTransportMax>>
- <br>//$securityForceName has fully upgraded the heavy transport to support it's activities.//
- <</if>>
-
- </span>
- <</replace>>
- <</link>>
- <</if>>
- <<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support it's activities.//<</if>>
-
- <<if $securityForceUpgradeToken == 0 && _DroneBay < 5 && _Barracks >= 2>>
- <br><<link "Drone bay">>
- <<replace "#resultX">>
- "Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(45000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && _DroneBay < _DroneBayMax && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>>
- <br><<link "Drone bay">>
- <<replace "#resultX">>
- "Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat( 2000000*$Env)>> //
- <</if>>
- <<if _DroneBay == 5 || _DroneBay == _DroneBayMax>>
- <br>//$securityForceName has fully upgraded the drone bay to support it's activities.//
- <<else>>
- <br>//More barracks infrastructure upgrades are needed before the drone bay can be expanded.//
- <</if>>
-
- <<if _Barracks >= 4>>
- <<if $securityForceUpgradeToken == 0 && _LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax>>
- <br><<link "Launch Bay">>
- <<replace "#resultX">>
- <span id="resultZ">
- <br><br>"Which unit do you wish to upgrade or 'borrow'?"
- <<link "Go back">>
- <<goto "SFM Barracks">>
- <</link>>
-
- <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSatellitePower < 1>>
- <br><<link "A Satellite">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "A Satellite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(3750000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>>
- <<if $securityForceSatellitePower < 11>>
- <<set _satCost = 2350000>>
- <<elseif $securityForceSatellitePower == 11>>
- <<set _satCost = 150000000>>
- <<elseif $securityForceSatellitePower == 12>>
- <<set _satCost = 160000000>>
- <<elseif $securityForceSatellitePower == 13>>
- <<set _satCost = 170000000>>
- <<elseif $securityForceSatellitePower == 14>>
- <<set _satCost = 180000000>>
- <<elseif $securityForceSatellitePower == 15>>
- <<set _satCost = 190000000>>
- <<elseif $securityForceSatellitePower == 16>>
- <<set _satCost = 250000000000>>
- <<elseif $securityForceSatellitePower == 17>>
- <<set _satCost = 250000000000>>
- <<elseif $securityForceSatellitePower == 18>>
- <<set _satCost = 300000000000>>
- <</if>>
- <br><<link "Satellite">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the Satellite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_satCost*$Env)>> //
- <</if>>
- <<if $securityForceSatellitePower == _SatelliteMax>>
- <br>//$securityForceName has fully upgraded the Satellite to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
- <br><<link "A giant robot">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "A giant robot would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(50000000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
- <<if $securityForceGiantRobot < 3>>
- <<set _robCost = 25000000>>
- <<elseif $securityForceGiantRobot == 3>>
- <<set _robCost = 45000000>>
- <<elseif $securityForceGiantRobot == 4>>
- <<set _robCost = 45000000>>
- <<elseif $securityForceGiantRobot == 5>>
- <<set _robCost = 65000000>>
- <<elseif $securityForceGiantRobot == 6>>
- <<set _robCost = 85000000>>
- <<elseif $securityForceGiantRobot == 7>>
- <<set _robCost = 95000000>>
- <<elseif $securityForceGiantRobot == 8>>
- <<set _robCost = 105000000>>
- <<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>>
- <<set _robCost = 2750000000>>
- <<elseif $securityForceGiantRobot == 10>>
- <<set _robCost = 3150000000>>
- <<elseif $securityForceGiantRobot == 11>>
- <<set _robCost = 3200000000>>
- <</if>>
- <br><<link "Giant robot">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the giant robot, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_robCost*$Env)>> //
- <</if>>
- <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
- <br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceMissileSilo < 1 && ($terrain != "oceanic" && $terrain != "marine")>>
- <br><<link "A missile silo">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "A missile silo would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(200000000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < _MissileSiloMax>>
- <<if $securityForceMissileSilo == 1>>
- <<set _msCost = 250000000>>
- <<elseif $securityForceMissileSilo == 2>>
- <<set _msCost = 295000000>>
- <</if>>
- <br><<link "Missile silo">>
- <<replace "#resultZ">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the missile silo, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= _msCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_msCost*$Env)>> //
- <</if>>
- <<if $securityForceMissileSilo == _MissileSiloMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>>
-
- </span>
- <</replace>>
- <</link>>
- <</if>>
- <</if>>
- <<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>>
-
- <<if $securityForceUpgradeToken == 0 && ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard < _NavalYardMax)>>
- <br><<link "Naval Yard">>
- <<replace "#resultX">>
- <span id="resultA">
- <br><br>"Which unit do you wish to upgrade or 'borrow'?"
- <<link "Go back">>
- <<goto "SFM Barracks">>
- <</link>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier < 1>>
- <br><<link "An aircraft carrier">>
- <<replace "#resultA">><br><br>
- "Sure, boss." she says, nodding. "An aircraft carrier would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(1500000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _AircraftCarrierMax>>
- <br><<link "Aircraft carrier">>
- <<replace "#resultA">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the aircraft carrier should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(25000000*$Env)>> //
- <</if>>
- <<if $securityForceAircraftCarrier == _AircraftCarrierMax && ($terrain == "oceanic" || $terrain == "marine")>>
- <br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
- <</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceSubmarine < 1>>
- <br><<link "A submarine">>
- <<replace "#resultA">><br><br>
- "Sure, boss." she says, nodding. "A submarine would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(1500000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < _SubmarineMax>>
- <<if $securityForceSubmarine < 4>>
- <<set _subCost = 25000000>>
- <<elseif $securityForceSubmarine == 4>>
- <<set _subCost = 85000000>>
- <</if>>
- <br><<link "Submarine">>
- <<replace "#resultA">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the submarine, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_subCost*$Env)>> //
- <</if>>
- <<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>>
-
- <<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>>
- <br><<link "A heavy amphibious transport">>
- <<replace "#resultA">><br><br>
- "Sure, boss." she says, nodding. "A heavy amphibious transport would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyAmphibiousTransport++, $cash -= 1500000*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(1500000*$Env)>> //
- <<elseif $securityForceUpgradeToken == 0&& $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < _HeavyAmphibiousTransportMax>>
- <<if $securityForceHeavyAmphibiousTransport == 1>>
- <<set _hatCost = 150000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 2>>
- <<set _hatCost = 250000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 3>>
- <<set _hatCost = 300000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 4>>
- <<set _hatCost = 350000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 5>>
- <<set _hatCost = 400000000>>
- <</if>>
- <br><<link "Heavy amphibious transport">>
- <<replace "#resultA">><br><br>
- "Sure, boss." she says, nodding. "Upgrading the heavy amphibious transport, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyAmphibiousTransport++, $cash -= _hatCost*$Env>>
- <</replace>>
- <</link>> // Costs <<print cashFormat(_hatCost*$Env)>> //
- <</if>>
- <<if $securityForceHeavyAmphibiousTransport == _HeavyAmphibiousTransportMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>>
-
- </span>
- <</replace>>
- <</link>>
- <</if>>
- <<if ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>>
-
-</span>
-<</if>>
-<</nobr>>
diff --git a/src/SecExp/widgets/unitsWidgets.tw b/src/SecExp/widgets/unitsWidgets.tw
index 46293097f2f38788e6e97976538c7ac3a03c6100..deb3a61134fd4f42de044155d247e9dbe7f6fb3d 100644
--- a/src/SecExp/widgets/unitsWidgets.tw
+++ b/src/SecExp/widgets/unitsWidgets.tw
@@ -10,7 +10,7 @@
<<elseif $args[0].equip == 1>>
They are issued with good, modern equipment: firearms, explosives and a few specialized weapons like sniper rifles and machine guns. They also carry simple body armor.
<<elseif $args[0].equip == 2>>
- They are issued with excellent, high tech equipment: modern firearms, explosives, specialized weaponry and modern body armor. They are also issued with modern instruments like might visions and portable radars.
+ They are issued with excellent, high tech equipment: modern firearms, explosives, specialized weaponry and modern body armor. They are also issued with modern instruments like night vision and portable radars.
<<else>>
They are equipped with the best the modern world has to offer: modern firearms, explosives, specialized weaponry, experimental railguns, adaptive body armor and high tech recon equipment.
<</if>>
@@ -102,7 +102,7 @@
<<elseif $args[0].equip == 1>>
They are issued with good, modern equipment: firearms, explosives and a few specialized weapons like sniper rifles and machine guns. They also carry simple body armor.
<<elseif $args[0].equip == 2>>
- They are issued with excellent, high tech equipment: modern firearms, explosives, specialized weaponry and modern body armor. They are also issued with modern instruments like might visions and portable radars.
+ They are issued with excellent, high tech equipment: modern firearms, explosives, specialized weaponry and modern body armor. They are also issued with modern instruments like night vision and portable radars.
<<else>>
They are equipped with the best the modern world has to offer: modern firearms, explosives, specialized weaponry, experimental railguns, adaptive body armor and high tech recon equipment.
<</if>>
diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw
index 49918d3a407df84e94352a589b9e7b789eb1ef75..035748cdcb79ae40e880aad231d51ad4c319737d 100644
--- a/src/cheats/mod_EditFSCheat.tw
+++ b/src/cheats/mod_EditFSCheat.tw
@@ -1,8 +1,6 @@
-:: MOD_Edit FS Cheat
+:: MOD_Edit FS Cheat [nobr]
-<<nobr>>
- <<set $nextButton = "Continue">>
- <<set $nextLink = "MOD_Edit FS Cheat Datatype Cleanup">>
+<<set $nextButton = "Continue", $nextLink = "MOD_Edit FS Cheat Datatype Cleanup">>
''Cheating Edit Future Society''
<br>
@@ -38,9 +36,9 @@
<<radiobutton "$arcologies[0].FSSupremacistRace" mixed race>> Mixed Race
<br>[[Apply and reset Racial Subjugationism|MOD_Edit FS Cheat][$arcologies[0].FSSubjugationist = "unset", $arcologies[0].FSSubjugationistRace = 0, $arcologies[0].FSSubjugationistDecoration = 20, $arcologies[0].FSSubjugationistLawME = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace != 0>>
<br>''You are pursuing'' $arcologies[0].FSSubjugationistRace Inferiority.
<<else>>
@@ -74,9 +72,9 @@
<<radiobutton "$arcologies[0].FSSubjugationistRace" mixed race>> Mixed Race
<br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][$arcologies[0].FSSupremacist = "unset",$arcologies[0].FSSupremacistRace = 0, $arcologies[0].FSSupremacistDecoration = 20, $arcologies[0].FSSupremacistLawME = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSGenderRadicalist != "unset">>
<br>You are ''pursuing'' Gender Radicalism.
<<else>>
@@ -104,9 +102,9 @@
| <<radiobutton "$arcologies[0].FSGenderRadicalistLawFuta" 4>> 4 (Trap pref.)
<br>[[Apply and reset Gender Traditionalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderFundamentalist = "unset",$arcologies[0].FSGenderFundamentalistDecoration = 20,$arcologies[0].FSGenderFundamentalistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSGenderFundamentalist != "unset">>
<br>You are ''pursuing'' Gender Traditionalism.
<<else>>
@@ -127,9 +125,9 @@
| <<radiobutton "$arcologies[0].FSGenderFundamentalistSMR" 1>> 1 (Passed.)
<br>[[Apply and reset Gender Radicalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderRadicalist = "unset",$arcologies[0].FSGenderRadicalistDecoration = 20,$arcologies[0].FSGenderRadicalistLawBeauty = 0, $arcologies[0].FSGenderRadicalistLawFuta = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSRepopulationFocus != "unset">>
<br>You are ''pursuing'' Repopulation Efforts.
<<else>>
@@ -154,9 +152,9 @@
| <<radiobutton "$arcologies[0].FSRepopulationFocusLaw" 1>> 1 (Passed.)
<br>[[Apply and reset Eugenics|MOD_Edit FS Cheat][$arcologies[0].FSRestart = "unset",$arcologies[0].FSRestartDecoration = 20,$arcologies[0].FSRestartLaw = 0, $arcologies[0].FSRestartSMR = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSRestart != "unset">>
<br>You are ''pursuing'' Eugenics.
<<else>>
@@ -177,9 +175,9 @@
| <<radiobutton "$arcologies[0].FSRestartSMR" 1>> 1 (Passed.)
<br>[[Apply and reset Repopulation Efforts|MOD_Edit FS Cheat][$arcologies[0].FSRepopulationFocus = "unset",$arcologies[0].FSRepopulationFocusDecoration = 20,$arcologies[0].FSRepopulationFocusLaw = 0, $arcologies[0].FSRepopulationFocusSMR = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSPaternalist != "unset">>
<br>You are ''pursuing'' Paternalism.
<<else>>
@@ -200,9 +198,9 @@
| <<radiobutton "$arcologies[0].FSPaternalistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset Degradationism|MOD_Edit FS Cheat][$arcologies[0].FSDegradationist = "unset",$arcologies[0].FSDegradationistDecoration = 20,$arcologies[0].FSDegradationistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSDegradationist != "unset">>
<br>You are ''pursuing'' Degradationism.
<<else>>
@@ -223,9 +221,9 @@
| <<radiobutton "$arcologies[0].FSDegradationistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset Paternalism|MOD_Edit FS Cheat][$arcologies[0].FSPaternalist = "unset",$arcologies[0].FSPaternalistDecoration = 20,$arcologies[0].FSPaternalistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSBodyPurist != "unset">>
<br>You are ''pursuing'' Body Purism.
<<else>>
@@ -246,9 +244,9 @@
| <<radiobutton "$arcologies[0].FSBodyPuristLaw" 1>> 1 (Passed.)
<br>[[Apply and reset Body Transformationism|MOD_Edit FS Cheat][$arcologies[0].FSTransformationFetishist = "unset",$arcologies[0].FSTransformationFetishistDecoration = 20,$arcologies[0].FSTransformationFetishistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSTransformationFetishist != "unset">>
<br>You are ''pursuing'' Body Transformationism.
<<else>>
@@ -269,9 +267,9 @@
| <<radiobutton "$arcologies[0].FSTransformationFetishistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset Body Purism|MOD_Edit FS Cheat][$arcologies[0].FSBodyPurist = "unset",$arcologies[0].FSBodyPuristDecoration = 20,$arcologies[0].FSBodyPuristLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSYouthPreferentialist != "unset">>
<br>You are ''pursuing'' Youth Preferentialism.
<<else>>
@@ -293,9 +291,9 @@
| <<radiobutton "$arcologies[0].FSYouthPreferentialistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset Maturity Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSMaturityPreferentialist = "unset",$arcologies[0].FSMaturityPreferentialistDecoration = 20,$arcologies[0].FSMaturityPreferentialistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
<br>You are ''pursuing'' Maturity Preferentialism.
<<else>>
@@ -317,9 +315,9 @@
| <<radiobutton "$arcologies[0].FSMaturityPreferentialistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset Youth Preferentialism|MOD_Edit FS Cheat][$arcologies[0].FSYouthPreferentialist = "unset",$arcologies[0].FSYouthPreferentialistDecoration = 20,$arcologies[0].FSYouthPreferentialistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
<br>You are ''supporting'' Slimness Enthusiasm.
<<else>>
@@ -340,9 +338,9 @@
| <<radiobutton "$arcologies[0].FSSlimnessEnthusiastSMR" 1>> 1 (Passed.)
<br>[[Apply and reset Asset Expansionism|MOD_Edit FS Cheat][$arcologies[0].FSAssetExpansionist = "unset",$arcologies[0].FSAssetExpansionistDecoration = 20,$arcologies[0].FSAssetExpansionistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSAssetExpansionist != "unset">>
<br>You are ''pursuing'' Asset Expansionism.
<<else>>
@@ -364,9 +362,9 @@
| <<radiobutton "$arcologies[0].FSAssetExpansionistSMR" 1>> 1 (Passed.)
<br>[[Apply and reset Slimness Enthusiasm|MOD_Edit FS Cheat][$arcologies[0].FSSlimnessEnthusiast = "unset",$arcologies[0].FSSlimnessEnthusiastDecoration = 20,$arcologies[0].FSSlimnessEnthusiastLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSPastoralist != "unset">>
<br>You are ''pursuing'' Pastoralism.
<<else>>
@@ -387,9 +385,9 @@
| <<radiobutton "$arcologies[0].FSPastoralistLaw" 1>> 1 (Passed.)
<br>[[Apply|MOD_Edit FS Cheat]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<br>You are ''pursuing'' Physical Idealism.
<<else>>
@@ -410,9 +408,9 @@
| <<radiobutton "$arcologies[0].FSPhysicalIdealistSMR" 1>> 1 (Passed.)
<br>[[Apply and reset Hedonistic Decadence|MOD_Edit FS Cheat][$arcologies[0].FSHedonisticDecadence = "unset",$arcologies[0].FSHedonisticDecadenceDecoration = 20,$arcologies[0].FSHedonisticDecadenceLaw = 0,$arcologies[0].FSHedonisticDecadenceLaw2 = 0, $arcologies[0].FSHedonisticDecadenceSMR = 0, $arcologies[0].FSPhysicalIdealistStrongFat = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
<br>You are ''pursuing'' Hedonistic Decadence.
<<else>>
@@ -441,9 +439,8 @@
| <<radiobutton "$arcologies[0].FSHedonisticDecadenceLaw2" 1>> 1 (Passed.)
<br>[[Apply and reset Physical Idealist|MOD_Edit FS Cheat][$arcologies[0].FSPhysicalIdealist = "unset",$arcologies[0].FSPhysicalIdealistDecoration = 20,$arcologies[0].FSPhysicalIdealistLaw = 0, $arcologies[0].FSPhysicalIdealistSMR = 0, $arcologies[0].FSHedonisticDecadenceStrongFat = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
<<if $arcologies[0].FSChattelReligionist != "unset">>
<br>You are ''pursuing'' Chattel Religionism.
@@ -465,9 +462,8 @@
| <<radiobutton "$arcologies[0].FSChattelReligionistLaw" 1>> 1 (Passed.)
<br>[[Apply|MOD_Edit FS Cheat]]
-<</nobr>>
-<<nobr>>
+<br><br>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<br>You are ''pursuing'' Roman Revivalism.
@@ -489,9 +485,8 @@
| <<radiobutton "$arcologies[0].FSRomanRevivalistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
- <</nobr>>
- <<nobr>>
+<br><br>
<<if $arcologies[0].FSAztecRevivalist != "unset">>
<br>You are ''pursuing'' Aztec Revivalism.
@@ -513,9 +508,9 @@
| <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<br>You are ''pursuing'' Egyptian Revivalism.
<<else>>
@@ -536,9 +531,9 @@
| <<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSEdoRevivalist != "unset">>
<br>You are ''pursuing'' Edo Revivalism.
<<else>>
@@ -559,9 +554,9 @@
| <<radiobutton "$arcologies[0].FSEdoRevivalistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSArabianRevivalist != "unset">>
<br>You are ''pursuing'' Arabian Revivalism.
<<else>>
@@ -582,9 +577,9 @@
| <<radiobutton "$arcologies[0].FSArabianRevivalistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
-<</nobr>>
-<<nobr>>
+<br><br>
+
<<if $arcologies[0].FSChineseRevivalist != "unset">>
<br>You are ''pursuing'' Chinese Revivalism.
<<else>>
@@ -605,4 +600,4 @@
| <<radiobutton "$arcologies[0].FSChineseRevivalistLaw" 1>> 1 (Passed.)
<br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0]]
-<</nobr>>\
+
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 922283b1bddb15e26efd7ef67f92a0e47ec24dad..1e6ac1beec3d2dac13877b7285b878af522718e4 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -364,6 +364,22 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.STEWARD) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SERVER) {
+ if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ if(State.variables.servantsQuartersDecoration === 'Degradationist') {
+ cost += rulesCost * .90;
+ } else {
+ cost += rulesCost;
+ }
+ }
+ } else if(s.assignment === Job.TEACHER) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SCHOOL) {
+ cost += rulesCost * 1.5;
} else {
if(s.livingRules === LivingRule.LUXURIOUS) {
cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index d2f4f96b3b687a871d6cfa8c69585fdfbaf6bda0..f93707e5ba371365acdcc5eb78b70fe372854eef 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -13,29 +13,30 @@
<</replace>>
<</link>> // Costs <<print cashFormat(100000*$Env)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < _BarracksMax && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>>
- <<if $securityForceArcologyUpgrades == 5>>
+ <<switch _Barracks>>
+ <<case 5>>
<<set _arcCost = 15000000>>
- <<elseif $securityForceArcologyUpgrades == 6>>
+ <<case 6>>
<<set _arcCost = 20000000>>
- <<elseif $securityForceArcologyUpgrades == 7>>
+ <<case 7>>
<<set _arcCost = 35000000>>
- <<elseif $securityForceArcologyUpgrades == 8>>
+ <<case 8>>
<<set _arcCost = 55000000>>
- <<elseif $securityForceArcologyUpgrades == 9>>
+ <<case 9>>
<<set _arcCost = 125000000>>
- <<elseif $securityForceArcologyUpgrades == 10>>
+ <<case 10>>
<<set _arcCost = 350000000>>
- <<elseif $securityForceArcologyUpgrades == 11>>
+ <<case 11>>
<<set _arcCost = 600000000>>
- <<elseif $securityForceArcologyUpgrades == 12>>
+ <<case 12>>
<<set _arcCost = 2500000000>>
- <<elseif $securityForceArcologyUpgrades == 13>>
+ <<case 13>>
<<set _arcCost = 5000000000>>
- <<elseif $securityForceArcologyUpgrades == 14>>
+ <<case 14>>
<<set _arcCost = 6000000000>>
- <<elseif $securityForceArcologyUpgrades == 15>>
+ <<case 15>>
<<set _arcCost = 16000000000>>
- <</if>>
+ <</switch>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
@@ -61,6 +62,7 @@
<br>//$securityForceName has fully upgraded the barracks to support it's activities//
<</if>>
+ /*
<<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>>
<br><<link "Facility Support">>
<<replace "#resultX">><br><br>
@@ -69,6 +71,7 @@
<</replace>>
<</link>> // Costs <<print cashFormat(Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env))>> //
<</if>>
+ */
<<if $securityForceUpgradeToken == 0 && _Armoury < 5>>
<br><<link "Armoury">>
@@ -97,13 +100,14 @@
<</replace>>
<</link>> // Costs <<print cashFormat(40000*$Env)>> //
<<elseif $securityForceUpgradeToken == 0 && _StimulantLab > 5 && _StimulantLab < _StimulantLabMax && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>>
- <<if _StimulantLab == 6>>
+ <<switch _StimulantLab>>
+ <<case 6>>
<<set _drugCost = 2265000>>
- <<elseif _StimulantLab == 7>>
+ <<case 7>>
<<set _drugCost = 200000000000>>
- <<elseif _StimulantLab == 8>>
+ <<case 8>>
<<set _drugCost = 250000000000>>
- <</if>>
+ <</switch>>
<br><<link "Stimulant Lab">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -143,6 +147,8 @@
<<set _vehCost = 2500000>>
<<elseif $securityForceVehiclePower == 6>>
<<set _vehCost = 3000000>>
+ <<elseif $securityForceVehiclePower == 7>>
+ <<set _vehCost = 4900000>>
<</if>>
<br><<link "Light and medium vehicles">>
<<replace "#resultB">><br><br>
@@ -204,17 +210,18 @@
<</replace>>
<</link>> // Costs <<print cashFormat(70000*$Env)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < _AircraftMax && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>>
- <<if $securityForceAircraftPower == 5>>
+ <<switch $securityForceAircraftPower>>
+ <<case 5>>
<<set _airCost = 2750000>>
- <<elseif $securityForceAircraftPower == 6>>
+ <<case 6>>
<<set _airCost = 3250000>>
- <<elseif $securityForceAircraftPower == 7>>
+ <<case 7>>
<<set _airCost = 5750000>>
- <<elseif $securityForceAircraftPower == 8>>
+ <<case 8>>
<<set _airCost = 6750000>>
- <<elseif $securityForceAircraftPower == 9>>
+ <<case 9>>
<<set _airCost = 7750000>>
- <</if>>
+ <</switch>>
<br><<link "Light and medium aircraft">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -364,25 +371,28 @@
<</replace>>
<</link>> // Costs <<print cashFormat(3750000*$Env)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>>
- <<if $securityForceSatellitePower < 11>>
- <<set _satCost = 2350000>>
- <<elseif $securityForceSatellitePower == 11>>
+ <<switch $securityForceSatellitePower>>
+ <<case 11>>
<<set _satCost = 150000000>>
- <<elseif $securityForceSatellitePower == 12>>
+ <<case 12>>
<<set _satCost = 160000000>>
- <<elseif $securityForceSatellitePower == 13>>
+ <<case 13>>
<<set _satCost = 170000000>>
- <<elseif $securityForceSatellitePower == 14>>
+ <<case 14>>
<<set _satCost = 180000000>>
- <<elseif $securityForceSatellitePower == 15>>
+ <<case 15>>
<<set _satCost = 190000000>>
- <<elseif $securityForceSatellitePower == 16>>
+ <<case 16>>
<<set _satCost = 250000000000>>
- <<elseif $securityForceSatellitePower == 17>>
+ <<case 17>>
<<set _satCost = 250000000000>>
- <<elseif $securityForceSatellitePower == 18>>
+ <<case 18>>
<<set _satCost = 300000000000>>
- <</if>>
+ <<case 19>>
+ <<set _satCost = 450000000000>>
+ <<default>>
+ <<set _satCost = 2350000>>
+ <</switch>>
<br><<link "Satellite">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "Upgrading the Satellite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
@@ -521,17 +531,18 @@
<</replace>>
<</link>> // Costs <<print cashFormat(1500000*$Env)>> //
<<elseif $securityForceUpgradeToken == 0&& $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < _HeavyAmphibiousTransportMax>>
- <<if $securityForceHeavyAmphibiousTransport == 1>>
+ <<switch $securityForceHeavyAmphibiousTransport>>
+ <<case 1>>
<<set _hatCost = 150000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 2>>
+ <<case 2>>
<<set _hatCost = 250000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 3>>
+ <<case 3>>
<<set _hatCost = 300000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 4>>
+ <<case 4>>
<<set _hatCost = 350000000>>
- <<elseif $securityForceHeavyAmphibiousTransport == 5>>
+ <<case 5>>
<<set _hatCost = 400000000>>
- <</if>>
+ <</switch>>
<br><<link "Heavy amphibious transport">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "Upgrading the heavy amphibious transport, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
index a0265b29fe18f93beaef97b832460e39649093b7..924bf21bde6b1c39686f964cea7ea3edf9a9296f 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
@@ -8,21 +8,21 @@
<<set _FacilitySupportMax = 1>>
<<set _Armoury = $securityForceInfantryPower>>
- <<set _ArmouryMax = 11>>
+ <<set _ArmouryMax = 12>>
<<set _StimulantLab = $securityForceStimulantPower>>
- <<set _StimulantLabMax = 9>>
+ <<set _StimulantLabMax = 10>>
<<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
-<<set _GarageMax = 10>>
- <<set _LightAndMediumVehiclesMax = 7>>
+<<set _GarageMax = 11>>
+ <<set _LightAndMediumVehiclesMax = 8>>
<<set _HeavyBattleTankMax = 3>>
<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
-<<set _HangarMax = 33>>
+<<set _HangarMax = 34>>
<<set _AircraftMax = 10>>
<<set _SpacePlaneMax = 11>>
- <<set _ForceFortressZeppelinMax = 3>>
+ <<set _ForceFortressZeppelinMax = 4>>
<<set _AC10Max = 5>>
<<set _heavyTransportMax = 4>>
@@ -30,17 +30,17 @@
<<set _DroneBayMax = 8>>
<<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
-<<set _LaunchBayNOMax = 34>>
- <<set _SatelliteMax = 19>>
+<<set _LaunchBayNOMax = 35>>
+ <<set _SatelliteMax = 20>>
<<set _GiantRobotMax = 12>>
<<set _MissileSiloMax = 3>>
<<set _LaunchBayO = $securityForceSatellitePower>>
- <<set _LaunchBayOMax = 19>>
- <<set _SatelliteMax = 19>>
+ <<set _LaunchBayOMax = 20>>
+ <<set _SatelliteMax = 20>>
-<<set _NavalYardMax = 17>>
- <<set _AircraftCarrierMax = 5>>
+<<set _NavalYardMax = 18>>
+ <<set _AircraftCarrierMax = 6>>
<<set _SubmarineMax = 6>>
<<set _HeavyAmphibiousTransportMax = 6>>
@@ -51,8 +51,6 @@
<<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>>
<<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>>
<<set $SFO = 0>>
- <<set _NavalYard = 0>>
- <<set _NavalYardMax = 0>>
<<elseif $terrain == "oceanic" || $terrain == "marine">>
<<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>>
<<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>>
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index 884c14309a7528f46728937fb24826496efa62f2..249a49a9761b58db458381794744e2563f0b861f 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -298,9 +298,10 @@
<</if>>
<<set $activeSlave.mother = $mergeMom.ID>>
<<if $mom.pregSource > 0>>
+ <<set _currentFather = $slaves.find(function(s) { return s.ID == $mom.pregSource; })>>
<<set $activeSlave.father = $mergeDad.ID>>
- <<set $activeSlave.slaveName = String($mom.slaveName + " and " + $mergeDad.slaveName + "'s child")>>
- <<if def $mom.slaveSurname && $mom.slaveSurname != "">><<set $activeSlave.slaveSurname = $mom.slaveSurname>><<elseif def $mergeDad.slaveSurname && $mergeDad.slaveSurname != "">><<set $activeSlave.slaveSurname = $mergeDad.slaveSurname>><<else>><<set $activeSlave.slaveSurname = 0>><</if>>
+ <<set $activeSlave.slaveName = String($mom.slaveName + " and " + _currentFather.slaveName + "'s child")>>
+ <<if def $mom.slaveSurname && $mom.slaveSurname != "">><<set $activeSlave.slaveSurname = $mom.slaveSurname>><<elseif def _currentFather.slaveSurname && _currentFather.slaveSurname != "">><<set $activeSlave.slaveSurname = _currentFather.slaveSurname>><<else>><<set $activeSlave.slaveSurname = 0>><</if>>
<<elseif $mom.pregSource == -1>>
<<set $activeSlave.father = -1>>
<<set $activeSlave.slaveName = String($mom.slaveName + " and my child")>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 3dd08aadb9e03c481051eaf4df96cfd007986f33..cb3954220c9ae8b0997f4f15e96889ee2057525d 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -392,7 +392,7 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
<br>
<span id="nameResult">
-<<link "Rename yourself">> //Will cost you some reputation//
+<<link "Rename yourself">>
<<replace "#nameResult">>
New name: <<textbox "_PCNamet" $PC.name>>
<<link "Apply">>
@@ -403,7 +403,7 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
<</replace>>
<</link>>
<</replace>>
-<</link>>
+<</link>>//Will cost you some reputation//
</span>
<<if $PC.degeneracy > 0>>
@@ -494,17 +494,17 @@ In total, you have given birth to:
<<if $PC.slavesKnockedUp > 0>>
<br>
<<if $PC.dick == 1>>
- You've knocked up $PC.slavesKnockedUp fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
+ You've knocked up commaNum($PC.slavesKnockedUp) fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
<<else>>
- Before your sex change, you knocked up $PC.slavesKnockedUp fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>>.
+ Before your sex change, you knocked up commaNum($PC.slavesKnockedUp) fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>>.
<</if>>
<<else>>
<<if $PC.slavesFathered > 0>>
<br>
<<if $PC.dick == 1>>
- You've fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
+ You've fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
<<else>>
- Before your sex change, you fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>>.
+ Before your sex change, you fathered commaNum($PC.slavesFathered) new slave<<if $PC.slavesFathered > 1>>s<</if>>.
<</if>>
<</if>>
<</if>>
@@ -584,37 +584,37 @@ In total, you have given birth to:
<br><br>
Before your sex change, you had given birth to:
<<if $PC.birthElite > 0>>
- <br><<print $PC.birthElite>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
+ <br><<print commaNum($PC.birthElite)>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
<</if>>
<<if $PC.birthMaster > 0>>
- <br><<print $PC.birthMaster>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
+ <br><<print commaNum($PC.birthMaster)>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
<</if>>
<<if $PC.birthClient > 0>>
- <br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
+ <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
<</if>>
<<if $PC.birthDegenerate > 0>>
- <br><<print $PC.birthDegenerate>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
+ <br><<print commaNum($PC.birthDegenerate)>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
<</if>>
<<if $PC.birthArcOwner > 0>>
- <br><<print $PC.birthArcOwner>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
+ <br><<print commaNum($PC.birthArcOwner)>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
<</if>>
<<if $PC.birthCitizen > 0>>
- <br><<print $PC.birthCitizen>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
+ <br><<print commaNum($PC.birthCitizen)>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
<</if>>
<<if $PC.birthOther > 0>>
- <br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
+ <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
<</if>>
<<if $PC.birthSelf > 0>>
- <br><<print $PC.birthSelf>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you.
+ <br><<print commaNum($PC.birthSelf)>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you.
<</if>>
<</if>>
<<if $PC.slavesKnockedUp > 0>>
<br><br>
- You've knocked up $PC.slavesKnockedUp fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
+ You've knocked up <<print commaNum($PC.slavesKnockedUp)>> fertile slave girl<<if $PC.slavesKnockedUp > 1>>s<</if>><<if $PC.slavesFathered > 0>> and fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
<<else>>
<<if $PC.slavesFathered > 0>>
<br><br>
- You've fathered $PC.slavesFathered new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
+ You've fathered <<print commaNum($PC.slavesFathered)>> new slave<<if $PC.slavesFathered > 1>>s<</if>> as an arcology owner so far.
<</if>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 21bddb2aa49d3006f655d950746a9834a7c90fed..65d68ee0af35f787ae19ffdf743face22efed7d8 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -746,7 +746,7 @@ An escape attempt occurs and is stopped almost before you are informed of it. <<
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
<<set _name = $activeSlave.birthName>>
- <set _name = nameReplace(_name)>>
+ <<set _name = nameReplace(_name)>>
<<set _slavename = $activeSlave.slaveName>>
<<set _slavename = nameReplace(_slavename)>>
<<else>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index ef6f50363a3a610ee36226fe92b86cfc941dda82..f70df6ba41ed6054830ca19e27903b7d0c3e35a3 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -3,7 +3,7 @@
<<set _N1 = 2>>
<<set _N2 = 2>>
<<set _N3 = 2>>
-<<set _Name = "<<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>">>
+<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
<<if $economy == .5>>
<<set $Env = _N1, $EnvCash2 = 450, $EnvCash3 = 200, $EnvCash4 = 100, $EnvProsp = 3, _BaseDiscount = _BaseDiscount-.005>>
@@ -41,13 +41,12 @@
<<include "SpecialForceBarracksFlavourText">>
-<br>
<<if $securityForceGiftToken == 0>>
<br>
<span id="result">
- <<link "Ask _Name for some extra cash">><br>
+ <<link "Ask _Name for some extra cash">>
<<replace "#result">>
- <<set $CashGift = (Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SFAO))))*$Env>>
+ <<set $CashGift = ((Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SFAO))))*($arcologies[0].prosperity/100))*$Env>>
<<if random(1,100) > 50>>
<<if random(1,100) > 50>>
_Name nods. "Sure boss," she says, "we had a bit of a haul this week. One of my sergeants convinced a woman to tell us where she had hidden her shit. Cut her up pretty bad, but she told us. Bunch of nice jewelry, I kept a nice piece for myself." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There's your cut,@@ <<print cashFormat($CashGift)>>."
@@ -59,10 +58,11 @@
<</if>>
<<set $securityForceGiftToken = 1>>
<<set $cash += $CashGift>>
+ <br>
<</replace>>
<</link>>
- <<if $rep < 15000 && $CurrentTradeShowAttendance == 0>>
- <br><<link "Ask The Colonel to put in a good word for you with her contacts">><br>
+ <<if $rep < 20000 && $CurrentTradeShowAttendance == 0>>
+ <br><<link "Ask The Colonel to put in a good word for you with her contacts">>
<<replace "#result">>
<<set $GoodWords1 += 250+(Math.ceil(Math.max(0.99,$SFAO))*$Env)>>
<<if random(1,100) > 50>>
@@ -76,11 +76,12 @@
<</if>>
<<set $securityForceGiftToken = 1>>
<<set $rep += $GoodWords1>>
+ <br>
<</replace>>
<</link>>
<</if>>
- <<if $arcologies[0].prosperity < 30 && $CurrentTradeShowAttendance == 0>>
- <br><<link "Ask The Colonel to use her contacts to help the arcology's business community">><br>
+ <<if $arcologies[0].prosperity < $AProsperityCap && $CurrentTradeShowAttendance == 0>>
+ <br><<link "Ask The Colonel to use her contacts to help the arcology's business community">>
<<replace "#result">>
<<set $GoodWords2 = $EnvProsp+(Math.max(0.99,$SFAO)/100)*$Env>>
<<if random(1,100) > 50>>
@@ -94,6 +95,7 @@
<</if>>
<<set $securityForceGiftToken = 1>>
<<set $arcologies[0].prosperity += $GoodWords2>>
+ <br>
<</replace>>
<</link>>
<</if>>
@@ -101,9 +103,9 @@
<</if>>
<<if $securityForceUpgradeToken == 1 && ( $SFAO < _max)>>
-//_Name is working to improve $securityForceName this week.//
+<br>//_Name is working to improve $securityForceName this week.//
<<elseif $SFAO >= _max>>
-//$securityForceName is fully equipped and upgraded - nothing else can be done.//
+<br>//$securityForceName is fully equipped and upgraded - nothing else can be done.//
<</if>>
<<if $securityForceGiftToken == 1>>
@@ -125,7 +127,7 @@
<</link>> <br>It will cost 5% of your currently displayed cash, which is <<print cashFormat(Math.trunc(_securityForceUpgradeResetTokenCurrentCost))>>.
<</if>>
<<if $securityForceUpgradeTokenReset >= 1>>
- <br><br>"In total, you have asked _Name about upgrading $securityForceName $securityForceUpgradeTokenReset times."
+ <br>Total multi week $securityForceName upgrades: $securityForceUpgradeTokenReset
<</if>>
<<include "SpecialForceUpgradeOptions">>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 1cdef4784b6601004e0a82e9e2df615f24ff0cca..3756341201d65f5005b44d3aa0e2517667829b51 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -178,7 +178,7 @@ This week, <<if _flux > 0>>few to none<<else>>many<</if>> of $arcologies[0].name
<br>@@.red;Error: ASlaves is outside accepted range, please report this issue@@
<</if>>
-$ACitizens citizens and <<print $ASlaves+$helots+$slaves.length>> slaves now live in your arcology.
+<<print commaNum($ACitizens)>> citizens and <<print commaNum($ASlaves+$helots+$slaves.length)>> slaves now live in your arcology.
<<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>The citizens take pride in their martial duties, preferring to wear utilitarian clothing even when off duty.<</if>>
<<if $arcologies[0].FSGenderRadicalistDecoration == 100>>Every single one of the slaves is female by virtue of her fuckable asshole.
@@ -312,18 +312,18 @@ You own
<<set _earnings += $helots*10>>
<</if>>
<</if>>
- <<if $helots > 1>>$helots menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
+ <<if $helots > 1>> <<print commaNum($helots)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
<</if>>
<<if $menialBioreactors > 0>>
<<set _earnings += $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>>
<<if $dairy>><<if $dairyUpgradeMenials>><<set _earnings += $menialBioreactors*5>><</if>><</if>>
- <<if $menialBioreactors > 1>>$menialBioreactors standard bioreactors,<<else>>one standard bioreactor,<</if>>
+ <<if $menialBioreactors > 1>> <<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
<<if $fuckdolls > 0>>and<</if>>
<</if>>
<<if $fuckdolls > 0>>
<<set _earnings += $fuckdolls*(15+(10*$arcologies[0].FSDegradationistLaw))>>
<<if $arcade>><<if $arcadeUpgradeMenials>><<set _earnings += $fuckdolls*5>><</if>><</if>>
- <<if $fuckdolls > 1>>$fuckdolls standard fuckdolls,<<else>>one fuckdoll,<</if>>
+ <<if $fuckdolls > 1>> <<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>>
<</if>>
<<set _earnings += random(1,10)>>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index fbef38bc0206f32886de206f6607fe34cef8f290..f75351cbdc71f8b2b2a059ba4d5ea40a1937c019 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -629,7 +629,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
The noise in the thriving open space is almost oppressive, with the sounds of drunken merriment, traditional music, and distant intercourse forming an omnipresent hum.
<</if>>
-$ACitizens citizens and <<print $ASlaves+$helots+$slaves.length>> slaves live in $arcologies[0].name.
+<<print commaNum($ACitizens)>> citizens and <<print commaNum($ASlaves+$helots+$slaves.length)>> slaves live in $arcologies[0].name.
<<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>Every citizen has military responsibilities, which are a point of pride to many, with most opting to wear utilitarian clothing even when off duty.<</if>>
<<if $arcologies[0].FSAztecRevivalistLaw == 1>>Most citizens wear satin loincloths and cloaks, distinguished from those of slaves by the richness of their adornments.<</if>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index f77103848d6f41dc99fda6654ab844eb3097aa04..7665153f4abd59ba17a0a671069aa2d28d5da4fd 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -136,6 +136,22 @@
<<else>>
<<set $costs += $rulesCost>>
<</if>>
+<<elseif ($slaves[$i].assignment == "be the Schoolteacher")>>
+ <<set $costs += ($rulesCost*2)>>
+<<elseif ($slaves[$i].assignment == "learn in the schoolroom")>>
+ <<set $costs += ($rulesCost*1.5)>>
+<<elseif ($slaves[$i].assignment == "be the Stewardess")>>
+ <<set $costs += ($rulesCost*2)>>
+<<elseif ($slaves[$i].assignment == "be a servant")>>
+ <<if $slaves[$i].livingRules == "normal">>
+ <<set $costs += ($rulesCost*1.5)>>
+ <<else>>
+ <<if $servantsQuartersDecoration == "Degradationist">>
+ <<set $costs += ($rulesCost*.9)>>
+ <<else>>
+ <<set $costs += $rulesCost>>
+ <</if>>
+ <</if>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].relationship >= 4>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 93f9324a8b8ea93b12612a77d2e817630266badb..66d0307b8d2aadfeb5214437fb931cb1a1dc72f3 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -244,9 +244,15 @@
<<elseif ($slaves[$i].assignment == "be the Attendant")>>
<br> Living expenses: ¤<<print ($rulesCost*2)>>
<<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "be the Schoolteacher")>>
+ <br> Living expenses: ¤<<print ($rulesCost*2)>>
+ <<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "be the Stewardess")>>
+ <br> Living expenses: ¤<<print ($rulesCost*2)>>
+ <<set $individualCosts += ($rulesCost*2)>>
<<elseif ($slaves[$i].assignment == "serve in the club")>>
<br> Living expenses: <<print cashFormat(($rulesCost*1.5))>>
- <<set $individualCosts += ($rulesCost*2)>>
+ <<set $individualCosts += ($rulesCost*1.5)>>
<<elseif ($slaves[$i].assignment == "work in the brothel")>>
<<if $slaves[$i].livingRules == "normal">>
<br> Living expenses: <<print cashFormat(($rulesCost*1.5))>>
@@ -285,6 +291,22 @@
<br> Living expenses: ¤<<print $rulesCost>>
<<set $individualCosts += $rulesCost>>
<</if>>
+ <<elseif ($slaves[$i].assignment == "learn in the schoolroom")>>
+ <br> Living expenses: <<print cashFormat(($rulesCost*1.5))>>
+ <<set $individualCosts += ($rulesCost*1.5)>>
+ <<elseif ($slaves[$i].assignment == "be a servant")>>
+ <<if $slaves[$i].livingRules == "normal">>
+ <br> Living expenses: <<print cashFormat(($rulesCost*1.5))>>
+ <<set $individualCosts += ($rulesCost*1.5)>>
+ <<else>>
+ <<if $servantsQuartersDecoration == "Degradationist">>
+ <br> Living expenses: <<print cashFormat($rulesCost*.90)>>
+ <<set $individualCosts += ($rulesCost*.90)>>
+ <<else>>
+ <br> Living expenses: <<print cashFormat($rulesCost)>>
+ <<set $individualCosts += $rulesCost>>
+ <</if>>
+ <</if>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].relationship >= 4>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 871bbe2372527f1b31c995c93e28fd98c32d17bc..d104f8dddc6270ca2eb241308627dd502988855c 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -182,10 +182,11 @@ She also has charge of all smart piercings in the arcology, and is using her ada
<br><br>
-Your slaves have participated in approximately <<if $FormattedWithCommas == 0>> <<print $oralTotal+$vaginalTotal+$analTotal>> <<else>> <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> <</if>> sexual encounters: <<if $FormattedWithCommas == 0>> $oralTotal <<else>> <<print commaNum($oralTotal)>> <</if>> primarily oral, <<if $FormattedWithCommas == 0>> $vaginalTotal <<else>> <<print commaNum($vaginalTotal)>> <</if>> vanilla, <<if $FormattedWithCommas == 0>> $mammaryTotal <<else>> <<print commaNum($mammaryTotal)>> <</if>> mammary, <<if $FormattedWithCommas == 0>> $analTotal <<else>> <<print commaNum($analTotal)>> <</if>> anal, and <<if $FormattedWithCommas == 0>> $penetrativeTotal <<else>> <<print commaNum($penetrativeTotal)>> <</if>> with the slave penetrating another. They have produced about <<if $FormattedWithCommas == 0>> $milkTotal <<else>> <<print commaNum($milkTotal)>> <</if>> liters of marketable milk, <<if $seeDicks != 0>>about <<if $FormattedWithCommas == 0>> $cumTotal <<else>> <<print commaNum($cumTotal)>> <</if>> deciliters of marketable cum, <</if>>and have given birth <<if $FormattedWithCommas == 0>> $birthsTotal <<else>> <<print commaNum($birthsTotal)>> <</if>> times.
-<<if $pitKillsTotal > 0>> <<if $FormattedWithCommas == 0>> $pitKillsTotal <<else>> <<print commaNum($pitKillsTotal)>> <</if>> slaves have died in your fighting pit.<</if>>
-<<if $fuckdollsSold > 0>> <<if $FormattedWithCommas == 0>> $fuckdollsSold <<else>> <<print commaNum($fuckdollsSold)>> <</if>> mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
+Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
+
+<<if $pitKillsTotal > 0>> <<print commaNum($pitKillsTotal)>> <</if>> slaves have died in your fighting pit.<</if>>
+<<if $fuckdollsSold > 0>> <<print commaNum($fuckdollsSold)>> <</if>> mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
<<if $secExp == 1 && $battlesEnabled == 1>>
<br><br>
@@ -193,16 +194,19 @@ Your slaves have participated in approximately <<if $FormattedWithCommas == 0>>
Your army counts <<if $FormattedWithCommas == 0>> <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower>> <<else>> <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> <</if>>total soldiers.
<<else>>
Your army counts <<if $FormattedWithCommas == 0>> <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel>> <<else>> <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel)>> <</if>> total soldiers of which <<if $FormattedWithCommas == 0>> $securityForcePersonnel <<else>> <<print commaNum($securityForcePersonnel)>> <</if>> fall under the security force command with the rest under your direct control.
+ Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
+<<else>>
+ Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel)>> total soldiers of which <<print commaNum($securityForcePersonnel)>> under the security force command and the rest under your direct control.
<</if>>
<<if $hasFoughtOnce == 1>>
- Your troops were involved in <<print $battlesCount>> battles of which <<print $majorBattlesCount>> major engagements. You won <<print $PCvictories>> of them, while the enemy managed to gain the upper hand in the other <<print $PClosses>>.
+ Your troops were involved in <<print commaNum($battlesCount)>> battles of which <<print commaNum($majorBattlesCount)>> major engagements. You won <<print commaNum($PCvictories)>> of them, while the enemy managed to gain the upper hand in the other <<print commaNum($PClosses)>>.
<</if>>
<<if $rebellionsCount >= 1>>
- Your arcology was involved in <<print $rebellionsCount>> rebellions. You won <<print $PCrebWon>> of them, while the rebels defeated your forces in <<print $PCrebLoss>>.
+ Your arcology was involved in <<print commaNum($rebellionsCount)>> rebellions. You won <<print commaNum($PCrebWon)>> of them, while the rebels defeated your forces in <<print commaNum($PCrebLoss)>>.
<</if>>
-During all battles you lost a total of <<print $militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties>> men, while scoring a total of <<print $totalKills>> kills.
+During all battles you lost a total of <<print commaNum($militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties)>> men, while scoring a total of <<print commaNum($totalKills)>> kills.
<</if>>
<br><br>
diff --git a/src/uncategorized/nextSlaveInLine.tw b/src/uncategorized/nextSlaveInLine.tw
index bffe611df774b4ceb2490ce9c35419dbc96f8e79..26d49052a6ec35ce55485ec3c5ac51e9180731d8 100644
--- a/src/uncategorized/nextSlaveInLine.tw
+++ b/src/uncategorized/nextSlaveInLine.tw
@@ -2,13 +2,9 @@
<<silently>>
-<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $activeSlave.ID == $slaves[$i].ID>>
- <<set $slaves[$i] = $activeSlave>>
- <<set $activeSlave = {}>>
- <<break>>
- <</if>>
-<</for>>
+<<set $i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
+<<ClearSummaryCache $activeSlave>>
+<<set $slaves[$i] = $activeSlave>> /* save changes before switching */
<<if $place == $slavesInLine.length-1>>
<<set $activeSlave = $slavesInLine[0]>>
diff --git a/src/uncategorized/previousSlaveInLine.tw b/src/uncategorized/previousSlaveInLine.tw
index d33f3a3e9568827e6c00d2a65c28ba974212eecd..d8c858a33473f87f912b1b0221cd05dd9b0bc7a7 100644
--- a/src/uncategorized/previousSlaveInLine.tw
+++ b/src/uncategorized/previousSlaveInLine.tw
@@ -3,6 +3,7 @@
<<silently>>
<<set $i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
+<<ClearSummaryCache $activeSlave>>
<<set $slaves[$i] = $activeSlave>> /* save changes before switching */
<<if $place == 0>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 8105b9fb66f1a492cb2fadbeeb2de79b9a8d5564..0c8a3c2c7e17518f70b0792bc40c6ac4de03b408 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
-<<set $activeSlave = $boomerangSlave, $boomerangSlave = 0, _weeks = $boomerangWeeks, $boomerangWeeks = 0, _buyer = $boomerangBuyer, $boomerangBuyer = 0>>
+<<set $activeSlave = $boomerangSlave, $boomerangSlave = 0, _weeks = $boomerangWeeks, _pregWeeks = $boomerangWeeks, $boomerangWeeks = 0, _buyer = $boomerangBuyer, $boomerangBuyer = 0>>
Your work is interrupted by $assistantName with an alert from the entrance to the penthouse.
<<if $assistant>>
@@ -72,7 +72,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.lactation = 2, $activeSlave.lactationAdaptation = 100>>
<<set $activeSlave.boobs = Math.clamp($activeSlave.boobs+2000+50*random(-20,20),0,10000)>>
<<set $activeSlave.boobShape = "saggy">>
- <<if $activeSlave.ovaries>><<set $activeSlave.preg = random(5,_week-1), $activeSlave.pregtype = random(2,4), $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>><<SetBellySize $activeSlave>><</if>>
+ <<if $activeSlave.ovaries>><<set $activeSlave.preg = random(5,_pregWeek-1), $activeSlave.pregtype = random(2,4), $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>><<SetBellySize $activeSlave>><</if>>
<<if $activeSlave.balls>>
<<set $activeSlave.balls = Math.clamp($activeSlave.balls+random(1,2),0,10)>>
<<if $activeSlave.dick>><<set $activeSlave.dick = Math.clamp($activeSlave.dick+random(1,2),0,10)>><</if>>
@@ -86,7 +86,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
She tearfully describes life at a volume breeder like the one you sold her to.
<</switch>>
"They ran an IV line into me and then put me in a cage with a male <<s>>lave who raped me for a week. Then they <<s>>witched me into a <<s>>maller cage and forgot about me. I can feel my belly <<s>>welling. It'<<s>> horrible."
- <<set $activeSlave.preg = _week-1, $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>>
+ <<set $activeSlave.preg = _pregWeek-1, $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>>
<<if $seeHyperPreg == 1>>
<<set $activeSlave.pregtype = random(10,40)>>
<<else>>
@@ -113,7 +113,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "hates men">>
<<case "subjugationist arcology">>
"They were breeding me with idiot<<s>>." You sold her to a Subjugationist arcology; it's nothing short of incredible that she managed to get back here. She must have sold and traded herself without hesitation. "I d-don't want thi<<s>> pregnan<<c>>y."
- <<set $activeSlave.preg = _week-1, $activeSlave.pregtype = random(2,4), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>>
+ <<set $activeSlave.preg = _pregWeek-1, $activeSlave.pregtype = random(2,4), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>>
<<SetBellySize $activeSlave>>
<<case "gender radicalist arcology">>
"They <<if $activeSlave.balls>> cut my ball<<s>> off and then<</if>> j-ju<<s>>t kind of t-turned me loo<<s>>e in the corridor<<s>>," she moans. You sold her to a Gender Radicalist arcology. "Naked, <<s>>o everyone could u<<s>>e my a<<ss>>. Plea<<s>>e, I don't want to be an entire arcology'<<s>> bitch."
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 22ebce10f267d1de673bb6cc28d84113e07f858e..b8ae2f19515fa3ac92e88146e2226b35e2ef4743 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -356,7 +356,7 @@
You complete the legalities and biometric scanning quickly. The condemned is too far gone to resist as she is installed in $dairyName. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the escapee's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<elseif ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction<<else>>breasts as they are roughly milked<</if>>.
<<elseif $malefactor == "orphanloli">>
You complete the legalities and biometric scanning quickly. The condemned is too weak to resist as she is installed in $dairyName but she weeps the entire time. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the escapee's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<elseif ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>agony as her once tight pussy adapts to industrial reproduction<<else>>budding breasts as they are roughly milked<</if>>.
- <<elseif $malefactor == "businesswoman">>
+ <<elseif $malefactor == "anchorBaby">>
You complete the legalities and biometric scanning quickly and cautiously before having her children taken away. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction, along with a prospectus detailing the scheduled sale of her next batch of slave product in eighteen years and nine months<<elseif $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>.
<<elseif $malefactor == "businesswoman">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction, along with a prospectus detailing the scheduled sale of her first slave product in eighteen years and nine months<<elseif $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>.
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 1eba1062ed400b0c72263b80ba220d6d2366d5fe..356857c16a14e5675088295b594bb7f6ac8a1513 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -95,9 +95,9 @@
<<if ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $BrothiIDs.length > 2>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for leaving plentiful outlets for her nymphomania under her care.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for leaving plentiful outlets for her nymphomania under her care.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -368,9 +368,9 @@
<<elseif ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $BrothiIDs.length > 2>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName to get her off.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName to get her off.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -562,9 +562,9 @@
<<if ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $ClubiIDs.length > 2>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for leaving plentiful, tantilizing, outlets for her nymphomania under her care.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for leaving plentiful, tantilizing, outlets for her nymphomania under her care.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $clubName.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $clubName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -807,9 +807,9 @@
<<elseif ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $ClubiIDs.length > 2>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $clubName to get her off.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $clubName to get her off.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -1002,9 +1002,9 @@
<<if ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $slaves.length > 5>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;happily avails@@ herself to any slaves visiting the patients under her care.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;happily avails@@ herself to any slaves visiting the patients under her care.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day traffic in $clinicName picks up.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day traffic in $clinicName picks up.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -1226,7 +1226,7 @@
<</if>>
<<elseif ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly takes the opportunity@@ whenever visiting slaves are present.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly takes the opportunity@@ whenever visiting slaves are present.
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
@@ -1629,9 +1629,9 @@
<<if ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $SpaiIDs.length > 2>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for all the warm, moist bodies lounging around $spaName.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for all the warm, moist bodies lounging around $spaName.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day more vulnerable girls enter $spaName.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day more vulnerable girls enter $spaName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -1918,9 +1918,9 @@
<<elseif ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $SpaiIDs.length > 2>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join her in the pool<<else>>you assign more girls to $spaName to help her relieve her <<if $slaves[$i].balls > 0>>swollen balls<<else>>tension<</if>><</if>>.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join her in the pool<<else>>you assign more girls to $spaName to help her relieve her <<if $slaves[$i].balls > 0>>swollen balls<<else>>tension<</if>><</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -2050,6 +2050,953 @@
<<set $slaves[$i].trust -= _punishments>>
<</switch>>
<</if>>
+ <<case "be the Schoolteacher">>
+ <<set $slaves[$i].need -= $schoolroom*10>>
+ <<set _sexLessons = $schoolroom*2>>
+ <<if canDoVaginal($slaves[$i])>>
+ <<set $slaves[$i].vaginalCount += _sexLessons, $vaginalTotal += _sexLessons>>
+ <</if>>
+ <<if canDoAnal($slaves[$i])>>
+ <<set $slaves[$i].analCount += _sexLessons, $analTotal += _sexLessons>>
+ <</if>>
+ <<if canPenetrate($slaves[$i])>>
+ <<set $slaves[$i].penetrativeCount += _sexLessons, $penetrativeTotal += _sexLessons>>
+ <</if>>
+ <<set $slaves[$i].oralCount += _sexLessons, $oralTotal += _sexLessons>>
+ <<if $slaves[$i].energy <= 20>>
+ is frigid and has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+ <<if ($slaves[$i].releaseRules != "permissive") && ($slaves[$i].releaseRules != "masturbation")>>
+ gets off with her students, so being forbidden from masturbation doesn't really bother her.
+ <<set $slaves[$i].need -= 20>>
+ <<else>>
+ gets off with her students, so she doesn't feel the need for release that often.
+ <<set $slaves[$i].need -= 20>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].releaseRules == "restrictive")>>
+ willingly begs you to
+ <<saRulesPlayerFetishPlay>>
+ in front of her class when ever she crosses paths with you.
+ <<saRulesPlayerEnergy>>
+ <<saRulesPlayerDiscoversFetish>>
+ <<saRulesPlayerDrugEffects>>
+ <<elseif ($slaves[$i].releaseRules == "masturbation")>>
+ <<if ($slaves[$i].devotion < 80)>>
+ is a little disappointed that she's limited to her hands and toys outside of class, but @@.mediumaquamarine;trusts you know what's best for her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;trusts your judgement@@ that only she really knows how to pleasure herself, though she @@.mediumorchid;often wonders why you won't make an example out of her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 2, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ When she does play with herself, she
+ <<saRulesMasturbationFetishPlay>>
+ <<saRulesMasturbationDiscoversFetish>>
+ <</if>>
+ <<saRulesMasturbationDrugEffects>>
+ <<else>> /* releaseRules not restrictive */
+ <<if ($universalRulesConsent == 0)>>
+ happily @@.mediumaquamarine;takes advantage@@ of your permission to demand that other slaves have sex with her for her lesson plan.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <<else>> /* universalRulesConsent is not zero */
+ @@.mediumaquamarine;relies@@ on your other slaves for mutual satisfaction,
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesConsentFetish>>
+ <<saRulesConsentDiscoversFetish>>
+ <</if>> /* closes universalRulesConsent */
+ <<saRulesPermissiveDrugEffects>>
+ <</if>> /* closes releaseRules not restrictive */
+ <</if>>
+
+ She is @@.hotpink;very happy@@ with her private room in the back of $schoolroomName and @@.mediumaquamarine;trusts@@ you a bit more for placing the future education of your slaves in her hands.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].releaseRules != "restrictive")>>
+ <<if ($slaves[$i].energy > 95)>>
+ <<if $SchlRiIDs.length > 2>>
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for giving her plentiful teacher's assistants for her nymphomania.
+ <<else>>
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day more of your slaves enroll in $schoolroomName.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
+ <<if ($slaves[$i].fetish == "sadist")>>
+ <<if $SchlRiIDs.length > 2>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing a whole class of girls for her to rape lessons into.
+ <<else>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;eagerly awaits@@ the day more of your slaves enroll in $schoolroomName.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetish == "dom")>>
+ <<if $SchlRiIDs.length > 2>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;adores@@ you for providing a whole class of girls to demonstrate proper submission with.
+ <<else>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;eagerly awaits@@ the day more of your slaves enroll in $schoolroomName.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+
+ <<if ($slaves[$i].attrKnown == 0)>>
+ <<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
+ <<set $slaves[$i].attrKnown = 1>>
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring her as she teaches students, analyzing her preferences. It seems she is
+ <<saRulesAttractionDiscovery>>
+ <</if>>
+ <</if>>
+
+ She does her best for you, so she frequently deserves a reward and never needs to be punished.
+ <<set _punishments = 0>>
+ <<set _rewards = 3>>
+
+ <<if _rewards > 0>>
+ <<switch $slaves[$i].standardReward>>
+ <<case "relaxation">>
+ She's given free time, which she
+ <<if $spa != 0>>
+ usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
+ <<else>>
+ usually spends relaxing in her room<<if $SchlRiIDs.length > 1>> giving private lessons to a student<</if>>.
+ <</if>>
+ <<if $slaves[$i].relationship > 0>>
+ She often asks to save these breaks so she can spend them with her <<if $slaves[$i].relationship == 1>>friend<<elseif $slaves[$i].relationship == 2>>best friend<<elseif $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>>.
+ <</if>>
+ These breaks are @@.green;good for her.@@
+ <<set $slaves[$i].health += _rewards>>
+ <<case "drugs">>
+ She's @@.hotpink;rewarded@@ with hits of mild recreational drugs, which @@.red;isn't healthy,@@ but helps bind her to you strongly.
+ <<set $slaves[$i].health -= _rewards>>
+ <<set $slaves[$i].devotion += _rewards*2>>
+ <<case "orgasm">>
+ She's @@.hotpink;rewarded@@ with
+ <<if $slaves[$i].clitPiercing >= 3>>
+ sustained orgasm from her <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
+ <<elseif $activeSlave.releaseRules == "sapphic">>
+ immediate sex with any nearby slave,
+ <<else>>
+ a quick climax from a vibrator,
+ <</if>>
+ @@.green;boosting her libido.@@
+ <<if $slaves[$i].energy < 98>><<set $slaves[$i].energy += _rewards>><</if>>
+ <<set $slaves[$i].devotion += _rewards>>
+ <<default>>
+ She's @@.hotpink;rewarded@@
+ <<if (_punishments > 0) && ($slaves[$i].standardReward == "situational")>>
+ and @@.gold;punished@@
+ <</if>>
+ situationally, letting her develop normally.
+ <<set $slaves[$i].devotion += _rewards>>
+ <</switch>>
+ <</if>>
+ <<case "learn in the schoolroom">>
+ <<if $Schoolteacher != 0>>
+ <<set $slaves[$i].need -= 30>>
+ <<set $slaves[$i].oralCount += 7, $slaves[$i].mammaryCount += 7, $oralTotal += 7, $mammaryTotal += 7>>
+ <<if canDoVaginal($slaves[$i])>>
+ <<set $slaves[$i].vaginalCount += 7, $vaginalTotal += 7>>
+ <<set $slaves[$i].need -= 10>>
+ <<if canImpreg($slaves[$i], $Schoolteacher) && $slaves[$i].breedingMark == 0 && $slaves[$i].vagina != 0>>
+ <<KnockMeUp $slaves[$i] 5 0 $Schoolteacher.ID 1>>
+ <</if>>
+ <</if>>
+ <<if canDoAnal($slaves[$i])>>
+ <<set $slaves[$i].analCount += 7, $analTotal += 7>>
+ <<set $slaves[$i].need -= 10>>
+ <<if canImpreg($slaves[$i], $Schoolteacher) && $slaves[$i].breedingMark == 0 && $slaves[$i].anus != 0>>
+ <<KnockMeUp $slaves[$i] 5 1 $Schoolteacher.ID 1>>
+ <</if>>
+ <</if>>
+ <<if canPenetrate($slaves[$i])>>
+ <<set $slaves[$i].penetrativeCount += 7, $penetrativeTotal += 7>>
+ <<set $slaves[$i].need -= 10>>
+ <<if canImpreg($Schoolteacher, $slaves[$i]) && $Schoolteacher.breedingMark == 0 && $Schoolteacher.vagina != 0 && $Schoolteacher.auns != 0>>
+ <<KnockMeUp $slaves[_FLs] 5 0 $slaves[$i].ID 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $slaves[$i].devotion < -50>>
+ is so unhappy that she has little interest in getting off, making the rule restricting her sexual outlets superfluous.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].energy <= 20>>
+ is frigid and has little interest in getting off, making the rule restricting her sexual outlets superfluous.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+ <<if ($slaves[$i].devotion <= 20)>>
+ gets off during class despite her reluctance, @@.hotpink;habituating her to sexual slavery.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ She hates herself for climaxing, and knows the mild aphrodisiacs in the food are forcing her arousal, @@.gold;frightening her.@@
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <<set $slaves[$i].need -= 20>>
+ <<elseif ($slaves[$i].releaseRules != "permissive") && ($slaves[$i].releaseRules != "masturbation")>>
+ gets off during class, so being forbidden to masturbate doesn't affect her seriously.
+ <<set $slaves[$i].need -= 20>>
+ <<else>>
+ gets off during class, so she doesn't feel the need to masturbate frequently.
+ <<set $slaves[$i].need -= 20>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].releaseRules == "restrictive")>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ refuses to come to you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation.
+ <<set $slaves[$i].trust -= 2>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ <<if $slaves[$i].devotion <= 20>>
+ occasionally comes to you to beg for sexual release.
+ <<else>>
+ doesn't mind having to come to you to beg for sexual release.
+ <</if>>
+ <<saRulesPlayerEnergy>>
+ <<else>> /* $slaves[$i].devotion >= 50 */
+ willingly begs you to
+ <<saRulesPlayerFetishPlay>>
+ every chance she gets.
+ <<saRulesPlayerEnergy>>
+ <</if>> /* closes $slaves[$i].devotion >= 50 */
+ <<saRulesPlayerDiscoversFetish>>
+ <<saRulesPlayerDrugEffects>>
+ <<elseif ($slaves[$i].releaseRules == "masturbation")>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ takes solace in her permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you but @@.mediumorchid;allowing her to remain in control of her sexuality.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ accepts having to relieve herself solely through masturbation.
+ <<set $slaves[$i].need = 0>>
+ <<elseif ($slaves[$i].devotion < 80)>>
+ is a little disappointed that she's limited to her hands and toys, but @@.mediumaquamarine;trusts you know what's best for her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;trusts your judgement@@ that only she really knows how to pleasure herself, though she @@.mediumorchid;often wonders why you don't use her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 2, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ When she does play with herself, she
+ <<saRulesMasturbationFetishPlay>>
+ <<saRulesMasturbationDiscoversFetish>>
+ <</if>>
+ <<saRulesMasturbationDrugEffects>>
+ <<else>> /* releaseRules not restrictive */
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ masturbates whenever she can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ refuses to use other slaves to get off, and is @@.gold;severely punished@@ for illicit masturbation.
+ <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ prefers to masturbate rather than demanding sex from other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ is forced to demand sex from other slaves by the urges induced by the food, and @@.hotpink;hates herself@@ for it.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ @@.hotpink;accepts the need@@ to
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
+ <<else>>
+ happily @@.mediumaquamarine;avails herself@@ of your permission to
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <</if>>
+ <<else>> /* universalRulesConsent is not zero */
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ prefers to masturbate rather than asking other slaves for sex, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ refuses to ask other slaves for sex, and is @@.gold;severely punished@@ for illicit masturbation.
+ <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ prefers to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ is forced to swap sex with other slaves by the urges induced by the food, and @@.hotpink;hates herself@@ for it.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ @@.hotpink;accepts having to ask@@ other slaves for sex,
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;relies@@ on your other slaves for mutual satisfaction,
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ <<saRulesConsentFetish>>
+ <<saRulesConsentDiscoversFetish>>
+ <</if>>
+ <</if>> /* closes universalRulesConsent */
+ <<saRulesPermissiveDrugEffects>>
+ <</if>> /* closes releaseRules not restrictive */
+ <</if>>
+
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<if $slaves[$i].voice == 0>>
+ Living as a mute @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].lips > 95>>
+ Being unable to speak through her facepussy @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].speechRules == "restrictive">>
+ Living under enforced silence @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+
+ <<if ($slaves[$i].devotion <= 20)>>
+ The reasonable living conditions allow her to @@.mediumaquamarine;feel self-reliant.@@
+ <<set $slaves[$i].trust += 1>>
+ <<else>>
+ She likes her personal space in the dormitory even if the other students sometimes bother her.
+ <</if>>
+
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust > -10)>>
+ <<if $SchlRiIDs.length > 2 || $Schoolteacher != 0>>
+ Under the rules, she finds herself constantly molested by other slaves, and lives her life constantly @@.gold;afraid.@@
+ <<else>>
+ Under the rules, she is free game for other slaves to molest, and lives her life constantly @@.gold;afraid@@ of the day more girls enroll in $schoolroomName.
+ <</if>>
+ <<set $slaves[$i].trust -= 2>>
+ <<else>>
+ <<if $SchlRiIDs.length > 2 || $Schoolteacher != 0>>
+ Under the rules, she finds herself constantly molested by other slaves, but she's already in such constant terror it doesn't seriously affect her.
+ <<else>>
+ Under the rules, she will someday find herself constantly molested by other slaves, but she's already in such constant terror it that it doesn't cross her mind.
+ <</if>>
+ <</if>>
+ <<elseif ($slaves[$i].releaseRules != "restrictive")>>
+ <<if ($slaves[$i].energy > 95)>>
+ <<if $SchlRiIDs.length > 2>>
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
+ <<else>>
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day more girls enroll in $schoolroomName to get her off.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
+ <<if ($slaves[$i].fetish == "sadist")>>
+ <<if $SchlRiIDs.length > 2>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing a whole class of girls for her to rape.
+ <<else>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;eagerly awaits@@ the day more girls enroll in $schoolroomName for her to rape.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetish == "dom")>>
+ <<if $SchlRiIDs.length > 2>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;adores@@ you for providing a whole class of girls for her to dominate.
+ <<else>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;eagerly awaits@@ the day more girls enroll in $schoolroomName for her to dominate.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>>
+ <<if $SchlRiIDs.length > 2 || $Schoolteacher != 0>>
+ Since she's low in the slave hierarchy, @@.mediumaquamarine;she knows@@ that the rule that slaves must get consent before having sex with her are all that protect her from abuse.
+ <<else>>
+ Since she's low in the slave hierarchy, @@.mediumaquamarine;she knows@@ that the rule that slaves must get consent before having sex with her are all that protect her from abuse. Well, that and the fact $schoolroomName is rather empty.
+ <</if>>
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <</if>>
+
+ <<if ($slaves[$i].attrKnown == 0)>>
+ <<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
+ <<set $slaves[$i].attrKnown = 1>>
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring her as she services customers, analyzing her sexuality. It seems she is
+ <<saRulesAttractionDiscovery>>
+ <</if>>
+ <</if>>
+
+ <<if $slaves[$i].devotion > 50>>
+ She does her best for you, so she frequently deserves a reward and never needs to be punished.
+ <<set _punishments = 0>>
+ <<set _rewards = 3>>
+ <<elseif $slaves[$i].devotion > 20>>
+ She's obedient out of acceptance of her place, so she often deserves a reward and rarely needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 2>>
+ <<elseif $slaves[$i].devotion >= -20>>
+ <<if $slaves[$i].trust < -20>>
+ She's obedient out of fear, so she only rarely deserves a reward and sometimes needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 1>>
+ <<else>>
+ She's too trusting for obedience and often needs to be punished.
+ <<set _punishments = 2>>
+ <<set _rewards = 0>>
+ <</if>>
+ <<else>>
+ <<if $slaves[$i].trust < -50>>
+ She's only obedient out of terror, so she sometimes needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 0>>
+ <<else>>
+ She hates you too much to obey, so she needs constant punishment.
+ <<set _punishments = 3>>
+ <<set _rewards = 0>>
+ <</if>>
+ <</if>>
+
+ <<if _rewards > 0>>
+ <<switch $slaves[$i].standardReward>>
+ <<case "relaxation">>
+ She's given free time, which she
+ <<if $spa != 0>>
+ usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
+ <<else>>
+ usually spends relaxing in her dorm room.
+ <</if>>
+ <<if $slaves[$i].relationship > 0>>
+ She often asks to save these breaks so she can spend them with her <<if $slaves[$i].relationship == 1>>friend<<elseif $slaves[$i].relationship == 2>>best friend<<elseif $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>>.
+ <</if>>
+ These breaks are @@.green;good for her.@@
+ <<set $slaves[$i].health += _rewards>>
+ <<case "drugs">>
+ She's @@.hotpink;rewarded@@ with hits of mild recreational drugs, which @@.red;isn't healthy,@@ but helps bind her to you strongly.
+ <<set $slaves[$i].health -= _rewards>>
+ <<set $slaves[$i].devotion += _rewards*2>>
+ <<case "orgasm">>
+ She's @@.hotpink;rewarded@@ with
+ <<if $slaves[$i].clitPiercing >= 3>>
+ sustained orgasm from her <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
+ <<elseif $activeSlave.releaseRules == "sapphic">>
+ immediate sex with any nearby slave,
+ <<else>>
+ a quick climax from a vibrator,
+ <</if>>
+ @@.green;boosting her libido.@@
+ <<if $slaves[$i].energy < 98>><<set $slaves[$i].energy += _rewards>><</if>>
+ <<set $slaves[$i].devotion += _rewards>>
+ <<default>>
+ She's @@.hotpink;rewarded@@
+ <<if (_punishments > 0) && ($slaves[$i].standardReward == "situational")>>
+ and @@.gold;punished@@
+ <</if>>
+ situationally, letting her develop normally.
+ <<set $slaves[$i].devotion += _rewards>>
+ <</switch>>
+ <</if>>
+ <<if _punishments > 0>>
+ <<switch $slaves[$i].standardPunishment>>
+ <<case "confinement">>
+ When she disobeys, she
+ <<if $cellblock != 0>>
+ @@.gold;spends after class in $cellblockName@@<<if $Wardeness != 0>>, where she can experience $Wardeness.slaveName's method of teaching<</if>>.
+ <<else>>
+ spends her off hours @@.gold;shut up in a box@@ until she behaves.
+ <</if>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <<case "whipping">>
+ When she disobeys, she's @@.gold;whipped,@@ not hard enough to mark her, but hard enough to @@.red;hurt,@@ breaking her quickly.
+ <<set $slaves[$i].health -= _punishments>>
+ <<set $slaves[$i].trust -= 2*_punishments>>
+ <<case "chastity">>
+ When she disobeys, she finds her next client is into @@.gold;orgasm denial,@@ @@.red;reducing her libido@@ but breaking her to @@.hotpink;sexual obedience.@@
+ <<if $slaves[$i].energy > 2>><<set $slaves[$i].energy -= 2*_punishments>><</if>>
+ <<set $slaves[$i].devotion += _punishments>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <<default>>
+ <<if (_rewards == 0) || ($slaves[$i].standardReward != "situational")>>
+ When she disobeys, she's @@.gold;punished@@ situationally, letting her develop normally.
+ <</if>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <</switch>>
+ <</if>>
+ <<case "be the Stewardess">>
+ <<set $slaves[$i].need -= $ServQiIDs.length*10>>
+ <<if $slaves[$i].energy <= 20>>
+ is frigid and has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+ <<if ($slaves[$i].releaseRules != "permissive") && ($slaves[$i].releaseRules != "masturbation")>>
+ gets off while performing her duties, so being forbidden from masturbation doesn't really bother her.
+ <<set $slaves[$i].need -= 20>>
+ <<else>>
+ gets off while performing her duties, so she doesn't feel the need for release that often.
+ <<set $slaves[$i].need -= 20>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].releaseRules == "restrictive")>>
+ willingly begs you to
+ <<saRulesPlayerFetishPlay>>
+ whenever she crosses paths with you.
+ <<saRulesPlayerEnergy>>
+ <<saRulesPlayerDiscoversFetish>>
+ <<saRulesPlayerDrugEffects>>
+ <<elseif ($slaves[$i].releaseRules == "masturbation")>>
+ <<if ($slaves[$i].devotion < 80)>>
+ is a little disappointed that she's limited to her hands and toys, but @@.mediumaquamarine;trusts you know what's best for her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;trusts your judgement@@ that only she really knows how to pleasure herself, though she @@.mediumorchid;often wonders why you don't use her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 2, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ When she does play with herself, she
+ <<saRulesMasturbationFetishPlay>>
+ <<saRulesMasturbationDiscoversFetish>>
+ <</if>>
+ <<saRulesMasturbationDrugEffects>>
+ <<else>> /* releaseRules not restrictive */
+ <<if ($universalRulesConsent == 0)>>
+ happily @@.mediumaquamarine;avails herself@@ of your permission to demand that other slaves have sex with her.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <<else>> /* universalRulesConsent is not zero */
+ @@.mediumaquamarine;relies@@ on your other slaves for mutual satisfaction,
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesConsentFetish>>
+ <<saRulesConsentDiscoversFetish>>
+ <</if>> /* closes universalRulesConsent */
+ <<saRulesPermissiveDrugEffects>>
+ <</if>> /* closes releaseRules not restrictive */
+ <</if>>
+
+ She is @@.hotpink;very happy@@ with her private room off of $servantsQuartersName and @@.mediumaquamarine;trusts@@ you a bit more for placing her in charge of it.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].releaseRules != "restrictive")>>
+ <<if ($slaves[$i].energy > 95)>>
+ <<if $ServQiIDs.length > 2>>
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for leaving plentiful outlets for her nymphomania under her charge.
+ <<else>>
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $servantsQuartersName.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
+ <<if ($slaves[$i].fetish == "sadist")>>
+ <<if $ServQiIDs.length > 2>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing so many maids for her to rape.
+ <<else>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $servantsQuartersName for her to rape.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetish == "dom")>>
+ <<if $ServQiIDs.length > 2>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;adores@@ you for allowing her so many maids to dominate.
+ <<else>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to her domain.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+
+ <<if ($slaves[$i].attrKnown == 0)>>
+ <<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
+ <<set $slaves[$i].attrKnown = 1>>
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring her as she manages the servants, analyzing her preferences. It seems she is
+ <<saRulesAttractionDiscovery>>
+ <</if>>
+ <</if>>
+
+ She does her best for you, so she frequently deserves a reward and never needs to be punished.
+ <<set _punishments = 0>>
+ <<set _rewards = 3>>
+
+ <<if _rewards > 0>>
+ <<switch $slaves[$i].standardReward>>
+ <<case "relaxation">>
+ She's given free time, which she
+ <<if $spa != 0>>
+ usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
+ <<else>>
+ usually spends relaxing in her room<<if $ServQiIDs.length > 1>> with enjoying some service from her underlings<</if>>.
+ <</if>>
+ <<if $slaves[$i].relationship > 0>>
+ She often asks to save these breaks so she can spend them with her <<if $slaves[$i].relationship == 1>>friend<<elseif $slaves[$i].relationship == 2>>best friend<<elseif $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>>.
+ <</if>>
+ These breaks are @@.green;good for her.@@
+ <<set $slaves[$i].health += _rewards>>
+ <<case "drugs">>
+ She's @@.hotpink;rewarded@@ with hits of mild recreational drugs, which @@.red;isn't healthy,@@ but helps bind her to you strongly.
+ <<set $slaves[$i].health -= _rewards>>
+ <<set $slaves[$i].devotion += _rewards*2>>
+ <<case "orgasm">>
+ She's @@.hotpink;rewarded@@ with
+ <<if $slaves[$i].clitPiercing >= 3>>
+ sustained orgasm from her <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
+ <<elseif $activeSlave.releaseRules == "sapphic">>
+ immediate sex with any nearby slave,
+ <<else>>
+ a quick climax from a vibrator,
+ <</if>>
+ @@.green;boosting her libido.@@
+ <<if $slaves[$i].energy < 98>><<set $slaves[$i].energy += _rewards>><</if>>
+ <<set $slaves[$i].devotion += _rewards>>
+ <<default>>
+ She's @@.hotpink;rewarded@@
+ <<if (_punishments > 0) && ($slaves[$i].standardReward == "situational")>>
+ and @@.gold;punished@@
+ <</if>>
+ situationally, letting her develop normally.
+ <<set $slaves[$i].devotion += _rewards>>
+ <</switch>>
+ <</if>>
+ <<case "be a servant">>
+ <<set $slaves[$i].need -= $slaves.length*5>>
+ <<if $slaves[$i].devotion < -50>>
+ is so unhappy that she has little interest in getting off.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].energy <= 20>>
+ is frigid and has little interest in getting off.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+ <<if ($slaves[$i].devotion <= 20)>>
+ gets off at work despite her reluctance, @@.hotpink;habituating her to sexual slavery.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ She hates herself for climaxing, and knows the mild aphrodisiacs in the food are forcing her arousal, @@.gold;frightening her.@@
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <<set $slaves[$i].need -= 20>>
+ <<elseif ($slaves[$i].releaseRules != "permissive") && ($slaves[$i].releaseRules != "masturbation")>>
+ gets off at work, so being forbidden to masturbate doesn't affect her seriously.
+ <<set $slaves[$i].need -= 20>>
+ <<else>>
+ gets off at work, so she doesn't feel the need to masturbate frequently.
+ <<set $slaves[$i].need -= 20>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].releaseRules == "restrictive")>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ refuses to offer herself to you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation.
+ <<set $slaves[$i].trust -= 2>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ <<if $slaves[$i].devotion <= 20>>
+ occasionally stops by your office to offer herself to you.
+ <<else>>
+ doesn't mind stopping by your office to beg for sexual release.
+ <</if>>
+ <<saRulesPlayerEnergy>>
+ <<else>> /* $slaves[$i].devotion >= 50 */
+ willingly stops by your office and begs you to
+ <<saRulesPlayerFetishPlay>>
+ every break she gets.
+ <<saRulesPlayerEnergy>>
+ <</if>> /* closes $slaves[$i].devotion >= 50 */
+ <<saRulesPlayerDiscoversFetish>>
+ <<saRulesPlayerDrugEffects>>
+ <<elseif ($slaves[$i].releaseRules == "masturbation")>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ takes solace in her permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you but @@.mediumorchid;allowing her to remain in control of her sexuality.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ accepts having to relieve herself solely through masturbation.
+ <<set $slaves[$i].need = 0>>
+ <<elseif ($slaves[$i].devotion < 80)>>
+ is a little disappointed that she's limited to her hands and toys, but @@.mediumaquamarine;trusts you know what's best for her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;trusts your judgement@@ that only she really knows how to pleasure herself, though she @@.mediumorchid;often wonders why you don't use her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 2, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ When she does play with herself, she
+ <<saRulesMasturbationFetishPlay>>
+ <<saRulesMasturbationDiscoversFetish>>
+ <</if>>
+ <<saRulesMasturbationDrugEffects>>
+ <<else>> /* releaseRules not restrictive */
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ masturbates whenever she can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ refuses to use other slaves to get off, and is @@.gold;severely punished@@ for illicit masturbation.
+ <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ prefers to masturbate rather than demanding sex from other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ is forced to demand sex from other slaves by the urges induced by the food, and @@.hotpink;hates herself@@ for it.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ @@.hotpink;accepts the need@@ to
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
+ <<else>>
+ happily @@.mediumaquamarine;avails herself@@ of your permission to
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <</if>>
+ <<else>> /* universalRulesConsent is not zero */
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ prefers to masturbate rather than asking other slaves for sex, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ refuses to ask other slaves for sex, and is @@.gold;severely punished@@ for illicit masturbation.
+ <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ prefers to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ is forced to swap sex with other slaves by the urges induced by the food, and @@.hotpink;hates herself@@ for it.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ @@.hotpink;accepts having to ask@@ other slaves for sex,
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;relies@@ on your other slaves for mutual satisfaction,
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ <<saRulesConsentFetish>>
+ <<saRulesConsentDiscoversFetish>>
+ <</if>>
+ <</if>> /* closes universalRulesConsent */
+ <<saRulesPermissiveDrugEffects>>
+ <</if>> /* closes releaseRules not restrictive */
+ <</if>>
+
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<if $slaves[$i].voice == 0>>
+ Living as a mute @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].lips > 95>>
+ Being unable to speak through her facepussy @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].speechRules == "restrictive">>
+ Living under enforced silence @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<switch $servantsQuartersDecoration>>
+ <<case "Degradationist">>
+ The abysmal living conditions @@.hotpink;force her to get used@@ to the routine of
+ <<if ($slaves[$i].trust > 20)>>
+ slavery and @@.gold;keep her aware of her meaningless she is.@@
+ <<set $slaves[$i].trust -= 3>>
+ <<else>>
+ slavery and @@.gold;reminds her that her is meaningless.@@
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <<case "Supremacist" "Subjugationist">>
+ The spare living conditions @@.hotpink;get her used@@ to the routine of
+ <<if ($slaves[$i].trust > 20)>>
+ slavery and @@.gold;keep her aware of her lowly place.@@
+ <<set $slaves[$i].trust -= 1>>
+ <<else>>
+ slavery.
+ <</if>>
+ Every time she has to watch another slave get beaten @@.gold;solidifies her fears.@@
+ <<set $slaves[$i].trust -= 1>>
+ <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist">>
+ The spare living conditions @@.hotpink;get her used@@ to the routine of slavery.
+ <<case "Arabian Revivalist" "Egyptian Revivalist">>
+ The spare living conditions @@.hotpink;get her used@@ to the routine of
+ <<if ($slaves[$i].trust > 20)>>
+ slavery, but the small luxuries @@.mediumaquamarine;afford her some dignity.@@
+ <<set $slaves[$i].trust += 1>>
+ <<else>>
+ slavery.
+ <</if>>
+ <<default>>
+ The reasonable living conditions allow her to @@.mediumaquamarine;feel some dignity@@ after @@.hotpink;cleaning up sexual fluids and servicing slaves all day.@@
+ <<set $slaves[$i].trust += 1>>
+ <</switch>>
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ <<switch $servantsQuartersDecoration>>
+ <<case "Degradationist">>
+ <<if ($slaves[$i].trust > 40)>>
+ The abysmal living conditions of $servantsQuartersName @@.gold;remind her that her life is absolutely meaningless to you.@@
+ <<set $slaves[$i].trust -= 3>>
+ <<elseif ($slaves[$i].trust > 10)>>
+ The abysmal living conditions of $servantsQuartersName @@.gold;remind her that she is worthless as a person to you.@@
+ <<set $slaves[$i].trust -= 2>>
+ <</if>>
+ <<case "Supremacist" "Subjugationist">>
+ <<if ($slaves[$i].trust > 40)>>
+ The spare living conditions of $servantsQuartersName @@.gold;remind her not to get too comfortable@@ with her life.
+ <<set $slaves[$i].trust -= 2>>
+ <<elseif ($slaves[$i].trust > 10)>>
+ The spare living conditions of $servantsQuartersName @@.gold;keep her aware of her place.@@
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist">>
+ The living conditions of $servantsQuartersName might be spare, but they are no means uncomfortable.
+ <<case "Arabian Revivalist" "Egyptian Revivalist">>
+ The living conditions of $servantsQuartersName might be spare, but she loves the little luxuries that come with them.
+ <<default>>
+ She likes her personal space in $servantsQuartersName's dormitory.
+ <</switch>>
+ <</if>>
+
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust > -10)>>
+ <<if $slaves.length > 2 || $helots > 0>>
+ Under the rules and her job, she finds herself constantly molested by other slaves, and lives her life constantly @@.gold;afraid.@@
+ <<else>>
+ Under the rules and her job, she is free game for other slaves to molest, and lives her life constantly @@.gold;afraid@@ of the day you bring home more girls.
+ <</if>>
+ <<set $slaves[$i].trust -= 2>>
+ <<else>>
+ <<if $slaves.length > 2 || $helots > 0>>
+ Under the rules and her job, she finds herself constantly molested by other slaves, but she's already in such constant terror it doesn't seriously affect her.
+ <<else>>
+ Under the rules and her job, she will someday find herself constantly molested by other slaves, but she's already in such constant terror it that it doesn't cross her mind.
+ <</if>>
+ <</if>>
+ <<elseif ($slaves[$i].releaseRules != "restrictive")>>
+ Under the rules, she's allowed to demand that other slaves to get her off, but only when she's finished her shift. She still @@.hotpink;adores@@ having the option.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>>
+ <<if $slaves.length > 2 || $helots > 0>>
+ Since she's low in the slave hierarchy, @@.mediumaquamarine;she knows@@ that the rule that slaves must get consent before having sex with her are all that protect her from abuse, though it does nothing to stop them from using her.
+ <<else>>
+ Since she's low in the slave hierarchy, @@.mediumaquamarine;she knows@@ that the rule that slaves must get consent before having sex with her are all that protect her from abuse. Well, that and the fact your penthouse is rather empty.
+ <</if>>
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <</if>>
+
+ <<if ($slaves[$i].attrKnown == 0)>>
+ <<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
+ <<set $slaves[$i].attrKnown = 1>>
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring her as she sees to your other slaves, analyzing her sexuality. It seems she is
+ <<saRulesAttractionDiscovery>>
+ <</if>>
+ <</if>>
+
+ <<if $slaves[$i].devotion > 50>>
+ She does her best for you, so she frequently deserves a reward and never needs to be punished.
+ <<set _punishments = 0>>
+ <<set _rewards = 3>>
+ <<elseif $slaves[$i].devotion > 20>>
+ She's obedient out of acceptance of her place, so she often deserves a reward and rarely needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 2>>
+ <<elseif $slaves[$i].devotion >= -20>>
+ <<if $slaves[$i].trust < -20>>
+ She's obedient out of fear, so she only rarely deserves a reward and sometimes needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 1>>
+ <<else>>
+ She's too trusting for obedience and often needs to be punished.
+ <<set _punishments = 2>>
+ <<set _rewards = 0>>
+ <</if>>
+ <<else>>
+ <<if $slaves[$i].trust < -50>>
+ She's only obedient out of terror, so she sometimes needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 0>>
+ <<else>>
+ She hates you too much to obey, so she needs constant punishment.
+ <<set _punishments = 3>>
+ <<set _rewards = 0>>
+ <</if>>
+ <</if>>
+
+ <<if _rewards > 0>>
+ <<switch $slaves[$i].standardReward>>
+ <<case "relaxation">>
+ She's given free time, which she
+ <<if $spa != 0>>
+ usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
+ <<else>>
+ usually spends relaxing in the penthouse slave quarters.
+ <</if>>
+ <<if $slaves[$i].relationship > 0>>
+ She often asks to save these breaks so she can spend them with her <<if $slaves[$i].relationship == 1>>friend<<elseif $slaves[$i].relationship == 2>>best friend<<elseif $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>>.
+ <</if>>
+ These breaks are @@.green;good for her.@@
+ <<set $slaves[$i].health += _rewards>>
+ <<case "drugs">>
+ She's @@.hotpink;rewarded@@ with hits of mild recreational drugs, which @@.red;isn't healthy,@@ but helps bind her to you strongly.
+ <<set $slaves[$i].health -= _rewards>>
+ <<set $slaves[$i].devotion += _rewards*2>>
+ <<case "orgasm">>
+ She's @@.hotpink;rewarded@@ with
+ <<if $slaves[$i].clitPiercing >= 3>>
+ sustained orgasm from her <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
+ <<elseif $activeSlave.releaseRules == "sapphic">>
+ immediate sex with any nearby slave,
+ <<else>>
+ a quick climax from a vibrator,
+ <</if>>
+ @@.green;boosting her libido.@@
+ <<if $slaves[$i].energy < 98>><<set $slaves[$i].energy += _rewards>><</if>>
+ <<set $slaves[$i].devotion += _rewards>>
+ <<default>>
+ She's @@.hotpink;rewarded@@
+ <<if (_punishments > 0) && ($slaves[$i].standardReward == "situational")>>
+ and @@.gold;punished@@
+ <</if>>
+ situationally, letting her develop normally.
+ <<set $slaves[$i].devotion += _rewards>>
+ <</switch>>
+ <</if>>
+ <<if _punishments > 0>>
+ <<switch $slaves[$i].standardPunishment>>
+ <<case "confinement">>
+ When she disobeys, she
+ <<if $cellblock != 0>>
+ @@.gold;spends her day (and night) cleaning the cells in $cellblockName@@<<if $Wardeness != 0>>, where she can experience $Wardeness.slaveName's tender mercies<</if>>.
+ <<else>>
+ spends her day @@.gold;shut up in a dirty bathroom@@ until its spotless.
+ <</if>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <<case "whipping">>
+ When she disobeys, she's @@.gold;whipped,@@ not hard enough to mark her, but hard enough to @@.red;hurt,@@ breaking her quickly.
+ <<set $slaves[$i].health -= _punishments>>
+ <<set $slaves[$i].trust -= 2*_punishments>>
+ <<case "chastity">>
+ When she disobeys, she finds herself cleaning up aroudn an on going orgy, yet @@.gold;forbidden from getting off,@@ @@.red;reducing her libido@@ but breaking her to @@.hotpink;sexual obedience.@@
+ <<if $slaves[$i].energy > 2>><<set $slaves[$i].energy -= 2*_punishments>><</if>>
+ <<set $slaves[$i].devotion += _punishments>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <<default>>
+ <<if (_rewards == 0) || ($slaves[$i].standardReward != "situational")>>
+ When she disobeys, she's @@.gold;punished@@ situationally, letting her develop normally.
+ <</if>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <</switch>>
+ <</if>>
<<default>>
<<if $slaves[$i].devotion < -50>>
is so unhappy that she has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>.
@@ -2293,9 +3240,9 @@
<<elseif ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
<<if $slaves.length > 2 || $helots > 0>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day you bring home more girls to get her off.
+ Under the rules, she's allowed to demand that other slaves get her off, and she @@.hotpink;eagerly awaits@@ the day you bring home more girls to get her off.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 5597d8f3a0869192db30f9a7b99628422c0d0b66..8206fd69a0bcc55644714be02a578c27ffba08fb 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -19,20 +19,45 @@
<<if (random(1,100) < 20+(_seed*20))>>
<<set _learning += 1>>
<</if>>
+ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $Schoolteacher.slaveName's supervision;
+ <<if ($slaves[$i].devotion > 20)>>
+ $pronoun is such an obedient slave that she @@.hotpink;encourages $object@@ to be the best slave $pronoun can.
+ <<set $slaves[$i].devotion += 2>>
+ <<elseif ($slaves[$i].trust < -20)>>
+ $pronoun obeys out of fear, so she @@.hotpink;encourages $object@@ to be a better slave.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ $pronoun is resistant, so she ends up mostly @@.gold;punishing $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@
+ <<set $slaves[$i].devotion -= 2>>
+ <<set $slaves[$i].trust -= 4>>
+ <</if>>
+ <<else>>
+ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $assistantName's supervision;
+ <<if ($slaves[$i].devotion > 20)>>
+ $pronoun is such an obedient slave that your assistant mostly @@.hotpink;encourages $object.@@
+ <<set $slaves[$i].devotion += 2>>
+ <<elseif ($slaves[$i].trust < -20)>>
+ $pronoun obeys out of fear, so your assistant mostly @@.hotpink;encourages $object.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ $pronoun is resistant, so your assistant mostly @@.gold;punishes $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@
+ <<set $slaves[$i].devotion -= 2>>
+ <<set $slaves[$i].trust -= 4>>
+ <</if>>
<</if>>
-<</if>>
-
-takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $assistantName's supervision;
-<<if ($slaves[$i].devotion > 20)>>
- $pronoun is such an obedient slave that your assistant mostly @@.hotpink;encourages $object.@@
- <<set $slaves[$i].devotion += 2>>
-<<elseif ($slaves[$i].trust < -20)>>
- $pronoun obeys out of fear, so your assistant mostly @@.hotpink;encourages $object.@@
- <<set $slaves[$i].devotion += 1>>
<<else>>
- $pronoun is resistant, so your assistant mostly @@.gold;punishes $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@
- <<set $slaves[$i].devotion -= 2>>
- <<set $slaves[$i].trust -= 4>>
+ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $assistantName's supervision;
+ <<if ($slaves[$i].devotion > 20)>>
+ $pronoun is such an obedient slave that your assistant mostly @@.hotpink;encourages $object.@@
+ <<set $slaves[$i].devotion += 2>>
+ <<elseif ($slaves[$i].trust < -20)>>
+ $pronoun obeys out of fear, so your assistant mostly @@.hotpink;encourages $object.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ $pronoun is resistant, so your assistant mostly @@.gold;punishes $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@
+ <<set $slaves[$i].devotion -= 2>>
+ <<set $slaves[$i].trust -= 4>>
+ <</if>>
<</if>>
<<if ($slaves[$i].intelligence >= 3)>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 05c801dc5526b2723f4b9d898a5f94ce60a22f2d..515eb1a17919766ea3c3ddbd4048a1bdef2c91a8 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -28,6 +28,9 @@
<<set $slaves[_FLs].trust++>>
<</if>>
<<set $slaves[_FLs].devotion += _devBonus>>
+ <<if $slaves[_FLs].livingRules != "luxurious">>
+ <<set $slaves[_FLs].livingRules = "luxurious">>
+ <</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "dom">>
<<fetishChangeChance $slaves[_FLs]>>
@@ -134,6 +137,7 @@
''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your Schoolteacher.
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -143,6 +147,7 @@
<<else>>
<<silently>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -167,6 +172,9 @@
<<elseif ($slaves[$i].health < 90)>>
<<set $slaves[$i].health += 3>>
<</if>>
+ <<if $slaves[$i].livingRules != "normal">>
+ <<set $slaves[$i].livingRules = "normal">>
+ <</if>>
/% Education done? Has to be here before we run the SA's or there will be double entries for slave %/
<<if ($slaves[$i].intelligenceImplant == 1)>>
<<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>>
@@ -204,6 +212,7 @@
<br> She <<include "SA take classes">>
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -215,6 +224,7 @@
<<include "SA chooses own job">>
<<include "SA take classes">>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index e42f4a8027043f4a3a57a6b3586cb9d001580b76..c3d0389ba3978df6dace7e5dee3e8a0732864cb1 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -380,14 +380,16 @@
<<if $securityForceStimulantPower == 8 && random(0,100) >_OverdoseSurvivalChance>>
<<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,10)">>
+<<elseif $securityForceStimulantPower == 10 && random(0,100) >_OverdoseSurvivalChance>>
+ <<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,20)">>
<</if>>
/* Take all the above and display the EOW text and control panel. */
<</silently>>
<<nobr>>
__Status and Activities of the $securityForceName __:
- <br>This week, $securityForceName, $securityForcePersonnel strong, focused on <<if $securityForceFocus == "recruit">>recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.<<elseif $securityForceFocus == "secure">>securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.
- <<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8>> _OverdoseDeaths soldiers fatly overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
+ <br>This week, $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, focused on <<if $securityForceFocus == "recruit">>recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.<<elseif $securityForceFocus == "secure">>securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits.
+ <<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10>> _OverdoseDeaths soldiers fatally overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
<</nobr>>
<br> //Your instructions to <<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>://
@@ -395,7 +397,7 @@
Rules of Engagement: <span id="roe"><<if $securityForceRulesOfEngagement == "hold">>''Hold Fire''<<elseif $securityForceRulesOfEngagement == "limited">>''Limited Fire''<<else>>''Free Fire''<</if>></span>. <<link "Hold Fire">><<set $securityForceRulesOfEngagement = "hold">><<replace "#roe">>''Hold Fire''<</replace>><</link>> | <<link "Limited Fire">><<set $securityForceRulesOfEngagement = "limited">><<replace "#roe">>''Limited Fire''<</replace>><</link>> | <<link "Free Fire">><<set $securityForceRulesOfEngagement = "free">><<replace "#roe">>''Free Fire''<</replace>><</link>>
Accountability: <span id="accountability"><<if $securityForceAccountability == "strict">>''Strict Accountability''<<elseif $securityForceAccountability == "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>. <<link "Strict Accountability">><<set $securityForceAccountability = "strict">><<replace "#accountability">>''Strict Accountability''<</replace>><</link>> | <<link "Some Accountability">><<set $securityForceAccountability = "some">><<replace "#accountability">>''Some Accountability''<</replace>><</link>> | <<link "No Accountability">><<set $securityForceAccountability = "none">><<replace "#accountability">>''No Accountability''<</replace>><</link>>
<<if $OverallTradeShowAttendance == 1>>
- <br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job. There was some interest in our developements, I could probably sell generic scematics next time I go if you want?
+ <br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully <<if $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job <<else>> that nothing serious happened while I was away. There was some interest in our developements, I could probably sell generic scematics next time I go if you want?
<<elseif $OverallTradeShowAttendance >= 2>>
While at the recent TradeShow, <<print cashFormat($TradeShowIncome)>> was made selling generic scematics and $TradeShowHelots menial slaves were sent as a bonus.
Overal <<print cashFormat($TotalTradeShowIncome)>> has been made and $TotalTradeShowHelots menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended.
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index da7c2fe0a23790ae33ad36b91e36d76291e1c7a6..2a3beac3e641b32fc950797dd13b3821b38aab0a 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -40,6 +40,9 @@
<<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
<</if>>
+ <<if $slaves[_FLs].livingRules != "luxurious">>
+ <<set $slaves[_FLs].livingRules = "luxurious">>
+ <</if>>
<<set $Stewardess = $slaves[_FLs]>>
<<SlaveFullName $Stewardess>> is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $Stewardess.devotion > 50>> She does her best to be your perfect lovely housewife.<</if>>
<<if ($stewardessImpregnates == 1) && (_DL > 0) && (canPenetrate($Stewardess)) && $Stewardess.pubertyXY == 1>>
@@ -50,6 +53,7 @@
<<KnockMeUp $slaves[$i] 100 2 $Stewardess.ID>>
<<set $slaves[$i].preg = 1, $slaves[$i].pregKnown = 1, $slaves[$i].pregWeek = 1, $slaves[$i].pregSource = $Stewardess.ID>><<SetPregType $slaves[$i]>>
<<set $slaves[$i].vagina = Math.clamp($slaves[$i].vagina,1,10), _stewardessImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>>
+ <<set $slaves[$i].need = 0>>
<</if>>
<</for>>
<<if _stewardessImpregnated > 0>>
@@ -64,6 +68,7 @@
<<set $slaves[_FLs].devotion++>>
<</if>>
<<set _Tmult = (_stewardessImpregnated * 10), $slaves[_FLs].penetrativeCount += _Tmult, $Stewardess.penetrativeCount += _Tmult, $penetrativeTotal += _Tmult>>
+ <<set $slaves[_FLs].need = 0>>
<</if>>
<</if>>
<<if _FLsFetish == 1>>
@@ -125,15 +130,18 @@
<<elseif $slaves[$i].ID == $Stewardess.father>>
She pays special attention to her father, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[$i].trust++>>
- <<elseif areSisters($slaves[$i], $Stewardess) == 1>>
- She pays special attention to her twin sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<elseif areSisters($slaves[$i], $Stewardess) == 2>>
- She pays special attention to her sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<elseif areSisters($slaves[$i], $Stewardess) == 3>>
- She pays special attention to her half-sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
+ <<else>>
+ <<switch areSisters($slaves[$i], $Stewardess)>>
+ <<case 1>>
+ She pays special attention to her twin sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[$i].trust++>>
+ <<case 2>>
+ She pays special attention to her sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[$i].trust++>>
+ <<case 3>>
+ She pays special attention to her half-sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[$i].trust++>>
+ <</switch>>
<</if>>
<<elseif $Stewardess.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
@@ -203,6 +211,7 @@
''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as your Stewardess.
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -212,6 +221,7 @@
<<else>>
<<silently>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -248,6 +258,12 @@
<<elseif ($slaves[$i].health < 90)>>
<<set $slaves[$i].health += 3>>
<</if>>
+ <<switch $servantsQuartersDecoration>>
+ <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Supremacist" "Subjugationist" "Degradationist" "Arabian Revivalist" "Egyptian Revivalist">>
+ <<set $slaves[$i].livingRules = "spare">>
+ <<default>>
+ <<set $slaves[$i].livingRules = "normal">>
+ <</switch>>
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -270,6 +286,7 @@
<</if>>
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -285,6 +302,7 @@
<<set _SQMilk += $milk, _SQMilkSale += $milkSale>>
<</if>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 7f27220382002924b09d311214b55f8e13363a1a..b45e694ef2c0681a0c812d4f5498cb09ca09eae1 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -128,7 +128,7 @@
<<else>>
<br>Upkeep |
<</if>><<print cashFormat($costs)>>
-<br>@@.pink;Total Sex Slaves@@ | _SL
+<br>@@.pink;Total Sex Slaves@@ | <<print commaNum(_SL)>>
<br>@@.pink;Penthouse Beds@@ |
<<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>>
<br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>>
@@ -194,7 +194,7 @@
<<else>>
@@color:rgb(0,255,0);unknown@@
<</if>>
-($rep)
+(<<print commaNum($rep)>>)
</span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
@@ -300,7 +300,7 @@
<<else>>
@@color:rgb(211,0,204);harmless@@
<</if>>
-(<<print $authority>>)
+(<<print commaNum($authority)>>)
</span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index af0d519412fd65e153803395b17ee5b8a62fcf46..0d56ef8d48a0c1151e4d70ffedd3848159947b9a 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -54,8 +54,15 @@
<<set $args[0].assignment = "serve in the master suite", $args[0].assignmentVisible = 0, $masterSuiteSlaves++, $MastSiIDs.push(_wID)>>
<<case "learn in the schoolroom" "schoolroom">>
<<set $args[0].assignment = "learn in the schoolroom", $args[0].assignmentVisible = 0, $schoolroomSlaves++, $SchlRiIDs.push(_wID)>>
+ <<set $args[0].livingRules = "normal">>
<<case "work as a servant" "servants' quarters" "servantsquarters">>
<<set $args[0].assignment = "work as a servant", $args[0].assignmentVisible = 0, $servantsQuartersSlaves++, $ServQiIDs.push(_wID)>>
+ <<switch $servantsQuartersDecoration>>
+ <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Supremacist" "Subjugationist" "Degradationist" "Arabian Revivalist" "Egyptian Revivalist">>
+ <<set $args[0].livingRules = "spare">>
+ <<default>>
+ <<set $args[0].livingRules = "normal">>
+ <</switch>>
<<case "rest in the spa" "spa">>
<<set $args[0].assignment = "rest in the spa", $args[0].assignmentVisible = 0, $spaSlaves++, $SpaiIDs.push(_wID)>>
<<switch $spaDecoration>>
@@ -66,8 +73,9 @@
<<default>>
<<set $args[0].livingRules = "luxurious">>
<</switch>>
- <<case "be the attendant" "be your concubine" "be the dj" "be the madam" "be the milkmaid" "be the nurse" "be the schoolteacher" "be the stewardess" "be the wardeness">>
+ <<case "be the Attendant" "be your Concubine" "be the DJ" "be the Madam" "be the Milkmaid" "be the Nurse" "be the Schoolteacher" "be the Stewardess" "be the Wardeness">>
<<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0>> /* non-visible leadership roles */
+ <<set $args[0].livingRules = "luxurious">>
<<case "be your agent" "live with your agent">>
<<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0, $args[0].useRulesAssistant = 0>> /* non-visible roles exempt from Rules Assistant */
<<case "choose her own job">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 662fd0c5d787d7e3ef6553d64c5ea58e2cf66ee2..c9bf22f5b379565983ee19000e5bba2730054da7 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -2743,7 +2743,7 @@ $pronounCap's got a
<<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
Judging by how hard $pronoun is<<if $activeSlave.prostate > 1>> and the constant flow of precum leaking from the tip of $possessive dick<<elseif $activeSlave.prostate > 0>> and the little bead of precum forming at the tip of $possessive dick<</if>>, $pronoun's probably fantasizing about boobs.
<<elseif ($activeSlave.devotion > 50)>>
- As a devoted sex slave, $pronoun has no trouble keeping herself hard for $possessive <<WrittenMaster>>.
+ As a devoted sex slave, $pronoun has no trouble keeping herself hard for $possessive <<WrittenMaster $activeSlave>>.
<<if ($activeSlave.prostate > 2)>>
The area above $possessive crotch has a slight swell to it from $possessive prostate implant. A constant dribble of precum drips from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way.
<<elseif ($activeSlave.prostate > 1)>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 2299ad06d43cec9992ff8eeac4493f8db373a92f..432f59f6ef6c077aeed3ef95438b4af90043bf19 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4173,7 +4173,7 @@ Your brand design is ''$brandDesign.''
<<if $args[0].fuckdoll == 0>>
<<if (def _combinedRule.livingRules) && (_combinedRule.livingRules !== "no default setting")>>
-<<if setup.facilityCareers.includes($args[0].assignemnt)>>
+<<if setup.facilityCareers.includes($args[0].assignment)>>
<br>$args[0].slaveName's living standards are controlled by her assignment.
<<elseif ($args[0].fetish == "mindbroken")>>
<<if ($args[0].livingRules !== "spare")>>