From 694f9504d80bd5f78e79e4647735d4d8f564f262 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Mon, 17 Dec 2018 17:59:36 +0100 Subject: [PATCH] Fixes --- src/uncategorized/BackwardsCompatibility.tw | 11 +++++++++-- src/uncategorized/arcmgmt.tw | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 7b207f73035..169e3443b5c 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -2529,6 +2529,9 @@ Setting missing global variables: <<if ndef $customRetirementAge>> <<set $customRetirementAge = 45>> <</if>> +<<if ndef $customMenialRetirementAge>> + <<set $customMenialRetirementAge = 65>> +<</if>> <<if ndef $retirementCum>> <<set $retirementCum = 500000>> <</if>> @@ -2553,8 +2556,12 @@ Setting missing global variables: <<if ndef $citizenRetirementMenials>> <<set $citizenRetirementMenials = 0>> <</if>> -<<if ndef $CitizenRetirementTrigger>> -<<set $CitizenRetirementTrigger = 0>> +<<if ndef $citizenRetirementTrigger>> + <<set $citizenRetirementTrigger = 0>> +<</if>> +<<if def $CitizenRetirementTrigger>> + <<set $citizenRetirementTrigger = $CitizenRetirementTrigger, + unset $CitizenRetirementTrigger>> <</if>> <<if ndef $FSSupLawTrigger>> <<set $FSSupLawTrigger = 0>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index ad7a90801d2..64888013b15 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -703,9 +703,9 @@ $menialBioreactors -= _expirationBR>> <<if _weeklyRetiredHelots > 1>> <<set _weeklyRetiredHelots = Math.trunc(_weeklyRetiredHelots)>> <<if _weeklyRetiredHelots > 1>> - <br>@@.red;<<print _weeklyRetiredHelots>> of your menial slaves@@ retired as free citizens this week. + <br>@@.red;<<print _weeklyRetiredHelots>> of your menial slaves@@ retired as free citizens this week. <<else>> - <br>@@.red;One of your menial slaves@@ retired as free citizens this week. + <br>@@.red;One of your menial slaves@@ retired as a free citizen this week. <</if>> <<else>> <<set _weeklyRetiredHelots *= 100, -- GitLab