From dcbd416970a2bcb74c3bc04c55c581f111a93c09 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 31 Dec 2018 14:06:28 -0500
Subject: [PATCH] Removed changes to SF
---
src/SpecialForce/Firebase.tw | 4 ++--
src/SpecialForce/JS.js | 24 ++++++++++++------------
src/SpecialForce/Report.tw | 6 +++---
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index 4700349e9cb..3eac4577a33 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -76,9 +76,9 @@
<<if $SF.MercCon.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>>
- While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
+ While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Helots)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
- <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
+ <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalHelots)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</if>>
diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js
index 70b00913f9a..0e6aa955ba9 100644
--- a/src/SpecialForce/JS.js
+++ b/src/SpecialForce/JS.js
@@ -454,7 +454,7 @@ window.SFInit = function() {
V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
+ V.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;
V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
};
@@ -499,8 +499,8 @@ window.SFBC = function() {
delete V.CurrentTradeShowAttendance;
delete V.TradeShowIncome;
delete V.TotalTradeShowIncome;
- delete V.TradeShowMenials;
- delete V.TotalTradeShowMenials;
+ delete V.TradeShowHelots;
+ delete V.TotalTradeShowHelots;
}
function Units() {
delete V.securityForcePersonnel;
@@ -552,15 +552,15 @@ window.SFBC = function() {
if (V.TradeShowIncome === undefined) V.TradeShowIncome = 0;
if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0;
- if (V.TradeShowMenials === undefined) V.TradeShowMenials = 0;
- if (V.TotalTradeShowMenials === undefined) V.TotalTradeShowMenials = 0;
+ if (V.TradeShowHelots === undefined) V.TradeShowHelots = 0;
+ if (V.TotalTradeShowHelots === undefined) V.TotalTradeShowHelots = 0;
V.SF.MercCon = {
History:V.OverallTradeShowAttendance,
CanAttend:V.CurrentTradeShowAttendance,
Income:V.TradeShowIncome,
Revenue:V.TotalTradeShowIncome,
- Menials:V.TradeShowMenials,
- TotalMenials:V.TotalTradeShowMenials,
+ Helots:V.TradeShowHelots,
+ TotalHelots:V.TotalTradeShowHelots,
Mercs:0,
TotalMercs:0}; TradeShow();
if (V.SF.MercCon.History > 0) V.SF.MercCon.View = 1;
@@ -598,7 +598,7 @@ window.SFBC = function() {
V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
if (V.securityForceName) {
Init(); Main(); Colonel(); TradeShow(); Units();
}
@@ -677,7 +677,7 @@ window.BadOutcome = function() {
case "Cruel":
V.SF.BadOutcome = "Revolt",V.trinkets.push("${t} dog tags"),V.Rep = 0,
V.cash -= 10000,V,arcologies[0].prosperity -= 50,V.ASlaves = 49,
- V.ACitizens = 751,V.menials = 0, V.researchLab.menials = 0,
+ V.ACitizens = 751,V.helots = 0, V.researchLab.helots = 0,
V.researchLab.hired = 0, V.fuckdolls = 0,V.menialBioreactors = 0,
V.activeUnits = 0,V.secBots.troops = 0, V.createdSlavesUnits = 0,
V.createdMilitiaUnits = 0, V.createdMercUnits = 0;
@@ -700,12 +700,12 @@ window.BadOutcome = function() {
break;
case "Kind":
V.SF.BadOutcome = "Exodus",V.trinkets.push("${t} gift card"),
- V.Cash += 55000,V.menials += 73;
+ V.Cash += 55000,V.helots += 73;
r += `Your Colonel has had enough of your meddling. In her eyes, you've broken faith with her. She asked one thing of you in return for her full support, and you could not even give her that.`;
r += `<br>At Midnight, a great mechanized convoy, the biggest you've seen in a long while, streams out of your Arcology. Troop Carriers, Aircraft, Heavy Trucks, and other war machines of varying sizes pour out of the Firebase in tight formation. The Colonel is refusing your calls, and you know it would be ill advised to go out there yourself or to try to stop them with force. The many bandits and mercenary groups that the convoy will inevitably pass by will probably feel this way as well. You have no idea where they are going or how they will end up, but with their wealth and weaponry, you are not worried.`;
- r += `<br>Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about 55,000# of miscellaneous supplies and 73 menials have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavillion, you see a white gift card standing upright.`;
+ r += `<br>Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about 55,000# of miscellaneous supplies and 73 helots have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavillion, you see a white gift card standing upright.`;
r += `<br>When you climb the crates to take it and read it, you see The Colonel's handwritten sentiments about the way things turned out; her gratitude for taking her in when you did, her dissappointment in your actions, a detailed account of your failings, her regrets that things had to end this way, and finally, her well wishes for your future endeavours.`;
- r += `<br>Disgusted, you pocket the gift card and leave your employees and menials to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`;
+ r += `<br>Disgusted, you pocket the gift card and leave your employees and helots to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`;
break;
}
}
\ No newline at end of file
diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw
index 1929f0d5181..b99ddedb303 100644
--- a/src/SpecialForce/Report.tw
+++ b/src/SpecialForce/Report.tw
@@ -186,13 +186,13 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week
| <<link "No Accountability">> <<set $SF.Regs = "none">>
<<replace "#accountability">> ''No Accountability'' <</replace>> <</link>>
<<if $SF.MercCon.View > 0 && $SF.MercCon.CanAttend === 1>> <br>''TradeShow'':
- <<set $SF.MercCon.Income = 0,$SF.MercCon.Menials = 0>>
+ <<set $SF.MercCon.Income = 0,$SF.MercCon.Helots = 0>>
<<set _TradeShowAttendes = 200,_MenialSlavesPerAttendee = 5>>
<<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>>
<<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>>
During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendes, some decided to also give her some menial slaves as a bonus.<br>
- <<set $menials += _MenialSlaves>>
- <<set $SF.MercCon.Menials += _MenialSlaves,$SF.MercCon.TotalMenials += _MenialSlaves>>
+ <<set $helots += _MenialSlaves>>
+ <<set $SF.MercCon.Helots += _MenialSlaves,$SF.MercCon.TotalHelots += _MenialSlaves>>
<<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>>
<<set $SF.MercCon.Revenue += _TSProfit>>
<<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>>
--
GitLab