diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 2f10255dcafa6d457530082a49f5fa0b2c6576d9..129fbd4ac78e014c85a400c8e6877dcec1fa3fde 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -35393,8 +35393,8 @@ window.progress = function(x,max) {
window.SFInit = function() {
const V = State.variables;
- V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
- V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+ V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
@@ -35553,8 +35553,12 @@ window.SFBC = function() {
V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
}
if (V.SF.UC == undefined) {
- V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}; delete V.SF.SpecOps;
- delete V.SF.SpecOpsLock;
+ if (V.SF.SpecOps != undefined && V.SF.SpecOpsLock != undefined) {
+ V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}; delete V.SF.SpecOps;
+ delete V.SF.SpecOpsLock;
+ } else if (V.SF.UC == {}) {
+ V.SF.UC = {Assign:0, Lock:0};
+ }
}
if (V.SF.U != undefined) {
V.SF.Upgrade = V.SF.U; delete V.SF.U;
@@ -35588,6 +35592,12 @@ window.SFBC = function() {
if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units();
if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = "";
+ if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) {
+ delete V.SFUnit;
+ V.SF.Squad.Sat = {lv:0, InOrbit:0};
+ delete V.SatLaunched;
+ V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
+ }
}
};
diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js
index c4703d40e87199558115c26242cd62e71a830375..8ade2dc3d1666a3a1bf874bdfa660eb25887c187 100644
--- a/src/SpecialForce/JS.js
+++ b/src/SpecialForce/JS.js
@@ -451,8 +451,8 @@ window.progress = function(x,max) {
window.SFInit = function() {
const V = State.variables;
- V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
- V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+ V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
@@ -611,8 +611,12 @@ window.SFBC = function() {
V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
}
if (V.SF.UC == undefined) {
- V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}; delete V.SF.SpecOps;
- delete V.SF.SpecOpsLock;
+ if (V.SF.SpecOps != undefined && V.SF.SpecOpsLock != undefined) {
+ V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}; delete V.SF.SpecOps;
+ delete V.SF.SpecOpsLock;
+ } else if (V.SF.UC == {}) {
+ V.SF.UC = {Assign:0, Lock:0};
+ }
}
if (V.SF.U != undefined) {
V.SF.Upgrade = V.SF.U; delete V.SF.U;
@@ -646,6 +650,12 @@ window.SFBC = function() {
if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units();
if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = "";
+ if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) {
+ delete V.SFUnit;
+ V.SF.Squad.Sat = {lv:0, InOrbit:0};
+ delete V.SatLaunched;
+ V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
+ }
}
};
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 637a938028a6979d8974d807439460e2f0576cde..42983e333985ebfa29f3a93d28ba84633d806fad 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -3748,7 +3748,7 @@ As another long week draws to a close, <<EventNameLink $activeSlave>> happens to
<<if $PC.mother == $activeSlave.ID>>
I gave birth to you, I ju<<s>>t can't compete,
<<else>>
- you're mother gave birth to you, I ju<<s>>t can't compete, and I don't even come clo<<s>>e to her look<<s>>,
+ your mother gave birth to you, I ju<<s>>t can't compete, and I don't even come clo<<s>>e to her look<<s>>,
<</if>>
<<Master>>. It'<<s>> a little weird, i<<s>>n't it, for <<s>>uch an old woman to be with graced with such a lovely <<Master>>?"
<</if>>
@@ -12053,7 +12053,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<= knockMeUp($PC, 20, 0, $activeSlave.ID)>>
<</if>>
<<elseif $PC.belly >= 1500>>
- "Plea<<s>>e, could I play with your pregnan<<c>>y while I fuck you, <<Master>>?" $His eyes are glued to your gravid middle. You could let $her play with your pregnancy, and you do, enjoying her fondling as $he fucks your pussy.
+ "Plea<<s>>e, could I play with your pregnan<<c>>y while I fuck you, <<Master>>?" $His eyes are glued to your gravid middle. You could let $him play with your pregnancy, and you do, enjoying her fondling as $he fucks your pussy.
<<else>>
"Plea<<s>>e, would you pretend to be pregnant with my baby, <<Master>>?" $His eyes are glued to your middle. You could play pretend with $him, and you do,
<<if isItemAccessible("a small empathy belly")>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 43e3d91aca89ed16ccbb839f1ee14d856ef7f321..d39996755c3453cab53aabb53afc1ccfac57bf5c 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -215,9 +215,9 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<else>>
<<set _soldierMod = 2>>
<</if>>
+ <<set _milTotal = 0, _slaveTotal = 0, _mercTotal = 0>>
<<if $militiaUnits.length > 0>>
<br>__Militia platoon(s) upkeep__:
- <<set _milTotal = 0>>
<<for _i = 0; _i < $militiaUnits.length; _i++>>
<i> <<print ordinalSuffix($militiaUnits.length-[_i])>>:</i> <<print cashFormat($militiaUnits[_i].troops*$soldierUpkeep * _soldierMod)>>
<<set _milTotal += $militiaUnits[_i].troops*$soldierUpkeep * _soldierMod>>
@@ -226,7 +226,6 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<</if>>
<<if $slaveUnits.length > 0>>
<br>__Slave platoon(s) upkeep__:
- <<set _slaveTotal = 0>>
<<for _i = 0; _i < $slaveUnits.length; _i++>>
<i> <<print ordinalSuffix($slaveUnits.length-[_i])>>:</i> <<print cashFormat($slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod)>>
<<set _slaveTotal += $slaveUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod>>
@@ -235,14 +234,15 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<</if>>
<<if $mercUnits.length > 0>>
<br>__Merc platoon(s) upkeep__:
- <<set _mercTotal = 0>>
<<for _i = 0; _i < $mercUnits.length; _i++>>
<i> <<print ordinalSuffix($mercUnits.length-[_i])>>:</i> <<print cashFormat($mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod)>>
<<set _mercTotal += $mercUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod>>
<</for>>
<br> __Total__: @@.yellowgreen;<<print cashFormat(_mercTotal)>>@@
- <br>__Total defense force__ upkeep: @@.yellowgreen;<<print cashFormat(_milTotal+_slaveTotal+_mercTotal)>>@@
- <<set _archologyCosts += (_milTotal+_slaveTotal+_mercTotal)>>
+ <<if (_milTotal+_slaveTotal+_mercTotal) > 0>>
+ <br>__Total defense force__ upkeep: @@.yellowgreen;<<print cashFormat(_milTotal+_slaveTotal+_mercTotal)>>@@
+ <<set _archologyCosts += (_milTotal+_slaveTotal+_mercTotal)>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/pCollaborationChoice.tw b/src/uncategorized/pCollaborationChoice.tw
index 2e1fc5ca1743e088f73739b64952aeb35f3fd33d..9619494daba13c5eacfa4f6f846ec76a273abc08 100644
--- a/src/uncategorized/pCollaborationChoice.tw
+++ b/src/uncategorized/pCollaborationChoice.tw
@@ -10,7 +10,7 @@ Your next communication from the Daughters of Liberty is a request for a live vi
<br><br>
-"Hello, <<Master>>," $he says simply. "It's happening soon. The Daughters a<<s>>ked me to call you to ask you for your help. All they need i<<s the a<<cc>>e<<ss>> code<<s>> to your <<s>>ecurity <<s>>y<<s>>tem<<s>>. They'll let you live, <<Master>>, they'll even let you take your money. But the arcology and the slaves, those will have to go free." $He hesitates a little. "<<Master>> I like being free. But I don't want to see you killed. Please, please agree."
+"Hello, <<Master>>," $he says simply. "It'<<s>> happening soon. The Daughter<<s>> have a<<s>>ked me to call you to a<<s>>k you for your help. All they need i<<s>> the a<<cc>>e<<ss>> code<<s>> to your <<s>>ecurity <<s>>y<<s>>tem<<s>>. They'll let you live, <<Master>>, they'll even let you take your money. But the arcology and the <<s>>lave<<s>>, those will have to go free." $He hesitates a little. "<<Master>> I like being free. But I don't want to see you killed. Please, please agree."
<br><br>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 68b78c27d7ff39455fd18cbaed74cf0f2fa2be6d..eac06dc83ba3cef22e75c300848383f7c0454b21 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -133,6 +133,11 @@ When you return to your desk you realize something.
The ring $he wore when $he was your slave wife is nowhere to be seen; $he's either taken it with $him as a souvenir, or left it back in $his sleeping area. If it's the former, no matter: you can always get more.
<</if>>
<</if>>
+
+<br><br>
+Your arcology has gained a well-off citizen.
+<<set $upperClass += 1>>
+
<br><br>
<<if $activeSlave.energy > 50>>
@@ -194,6 +199,8 @@ When you return to your desk you realize something.
Though it is not ordinarily paternalistic, even your society thinks this is @@.green;pretty romantic.@@
<<set $rep += 5*$FSSingleSlaveRep>>
<</if>>
+ <br><br>You have gained an additional well-off citizen.
+ <<set $upperClass += 1>>
<</replace>>
<</link>>
<</if>>
@@ -201,10 +208,6 @@ When you return to your desk you realize something.
<</if>>
<</if>>
-<br><br>
-Your arcology has gained a well-off citizen.
-<<set $upperClass += 1>>
-
<<elseif $BioreactorRetirement == 1>>
in a way that will inevitably fill the rest of your property with @@.gold;fear.@@