From ea9c433dd82ae32c5f67e5feef652050df5fe377 Mon Sep 17 00:00:00 2001
From: x <okp57855@psoxs.com>
Date: Tue, 1 Jan 2019 15:05:00 +1300
Subject: [PATCH] Reduced changes from
https://gitgud.io/pregmodfan/fc-pregmod/merge_requests/3196
---
src/SpecialForce/JS.js | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js
index ca18e384ec5..987d4b1f7ce 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, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
};
@@ -559,8 +559,8 @@ window.SFBC = function() {
CanAttend:V.CurrentTradeShowAttendance,
Income:V.TradeShowIncome,
Revenue:V.TotalTradeShowIncome,
- Helots:V.TradeShowHelots,
- TotalHelots:V.TotalTradeShowHelots,
+ Menials:V.TradeShowHelots,
+ TotalMenials: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, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
if (V.securityForceName) {
Init(); Main(); Colonel(); TradeShow(); Units();
}
@@ -626,6 +626,11 @@ window.SFBC = function() {
if (V.SF.WG != undefined) {
V.SF.Gift = V.SF.WG; delete V.SF.WG;
}
+ if (V.SF.MercCon.Helots != undefined) {
+ V.SF.MercCon.Menials = V.SF.MercCon.Helots;
+ V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots;
+ delete V.SF.MercCon.Helots;delete V.SF.MercCon.TotalHelots;
+ }
if (V.SF.Facility == undefined) {
V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
}
@@ -677,7 +682,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.helots = 0, V.researchLab.menials = 0,
+ V.ACitizens = 751,V.menials = 0, V.researchLab.menials = 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,7 +705,7 @@ window.BadOutcome = function() {
break;
case "Kind":
V.SF.BadOutcome = "Exodus",V.trinkets.push("${t} gift card"),
- V.Cash += 55000,V.helots += 73;
+ V.Cash += 55000,V.menials += 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.`;
--
GitLab