From ab99cb24b99d07c00d396c290779eb16d15c3223 Mon Sep 17 00:00:00 2001
From: Alexsis <alexsis987@gmail.com>
Date: Sun, 2 Jun 2024 09:43:32 +0000
Subject: [PATCH 1/3] Fix rebellion typos
---
src/Mods/SecExp/events/conflictOptions.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Mods/SecExp/events/conflictOptions.js b/src/Mods/SecExp/events/conflictOptions.js
index cab611a60f8..ab0249226f3 100644
--- a/src/Mods/SecExp/events/conflictOptions.js
+++ b/src/Mods/SecExp/events/conflictOptions.js
@@ -313,7 +313,7 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
} else {
const isSlaveRebellion = V.SecExp.war.type.includes("Slave");
r.push(`In the end it happened, the ${isSlaveRebellion ? "slaves" : "citizens"}`);
- r.push(`of your arcology dared took up arms and rose up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting slaves and the security forces. It appears <strong>${num(Math.trunc(V.SecExp.war.attacker.troops))}</strong> rebels are in the streets right now, building barricades and`);
+ r.push(`of your arcology dared take up arms and rise up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting ${isSlaveRebellion ? "slaves" : "citizens"} and the security forces. It appears <strong>${num(Math.trunc(V.SecExp.war.attacker.troops))}</strong> rebels are in the streets right now, building barricades and`);
r.push(`${isSlaveRebellion ? 'freeing their peers' : 'destroying your property'}.`);
if (V.SecExp.war.attacker.equip <= 0) {
r.push(`They are <strong>poorly armed</strong>.`);
--
GitLab
From 4f80ea7b26794ecc3879c125f34e3ab368fe3009 Mon Sep 17 00:00:00 2001
From: Alexsis <alexsis987@gmail.com>
Date: Sun, 2 Jun 2024 09:53:29 +0000
Subject: [PATCH 2/3] Fix Arcology Starvation Game Over
---
src/endWeek/economics/persBusiness.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/endWeek/economics/persBusiness.js b/src/endWeek/economics/persBusiness.js
index 6d6a08d9d88..a297872a54f 100644
--- a/src/endWeek/economics/persBusiness.js
+++ b/src/endWeek/economics/persBusiness.js
@@ -49,7 +49,7 @@ App.EndWeek.personalBusiness = function() {
}
}
if (V.mods.food.enabled && V.mods.food.market) {
- if (App.Facilities.Farmyard.foodAvailable() < App.Facilities.Farmyard.foodConsumption() && V.cash < App.Facilities.Farmyard.foodBuyCost(App.Facilities.Farmyard.foodConsumption())) {
+ if (App.Facilities.Farmyard.foodAvailable() + App.Facilities.Farmyard.foodProduction() < App.Facilities.Farmyard.foodConsumption() && V.cash < App.Facilities.Farmyard.foodBuyCost(App.Facilities.Farmyard.foodConsumption())) {
r.push(`<span class="red">WARNING: your arcology will starve in the coming week unless action is taken.</span>`);
if (V.mods.food.warned === true) {
V.gameover = "starving citizens";
--
GitLab
From 2bfbbb65963dc37847160c8a5910edeae9b9eed3 Mon Sep 17 00:00:00 2001
From: Alexsis <alexsis987@gmail.com>
Date: Sun, 2 Jun 2024 09:55:26 +0000
Subject: [PATCH 3/3] Revert "Fix Arcology Starvation Game Over"
This reverts commit 4f80ea7b26794ecc3879c125f34e3ab368fe3009
---
src/endWeek/economics/persBusiness.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/endWeek/economics/persBusiness.js b/src/endWeek/economics/persBusiness.js
index a297872a54f..6d6a08d9d88 100644
--- a/src/endWeek/economics/persBusiness.js
+++ b/src/endWeek/economics/persBusiness.js
@@ -49,7 +49,7 @@ App.EndWeek.personalBusiness = function() {
}
}
if (V.mods.food.enabled && V.mods.food.market) {
- if (App.Facilities.Farmyard.foodAvailable() + App.Facilities.Farmyard.foodProduction() < App.Facilities.Farmyard.foodConsumption() && V.cash < App.Facilities.Farmyard.foodBuyCost(App.Facilities.Farmyard.foodConsumption())) {
+ if (App.Facilities.Farmyard.foodAvailable() < App.Facilities.Farmyard.foodConsumption() && V.cash < App.Facilities.Farmyard.foodBuyCost(App.Facilities.Farmyard.foodConsumption())) {
r.push(`<span class="red">WARNING: your arcology will starve in the coming week unless action is taken.</span>`);
if (V.mods.food.warned === true) {
V.gameover = "starving citizens";
--
GitLab