From 7cbeafca6a06b3a459007860f52e519f5a74331d Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Sun, 21 Jan 2018 18:18:25 +1300
Subject: [PATCH] Bug fixes and more changes.
---
src/SecExp/securityHQ.tw | 28 ++++++++++----------
src/events/intro/initNationalities.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 3 +++
src/uncategorized/pRivalryActions.tw | 2 +-
src/uncategorized/personalAttentionSelect.tw | 2 +-
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index c93a9b4a53a..4995a1982f3 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -163,14 +163,14 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<br>
<<if $crimeUpgrades.advForensic == 0>>
- [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed advanced forensic equipment, able to extract every bit of precious information from any clue.
<</if>>
<br>
<<if $crimeUpgrades.autoArchive == 0>>
- [[Install auto-curating archiver|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ [[Install auto-curating archiver|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed auto-curating archiver software, which will update in real time your data archives with any new relevant information on criminals residing in your arcology.
@@ -178,14 +178,14 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<br>
<<if $rep > 10000>>
<<if $crimeUpgrades.autoTrial == 0>>
- [[Install automated trials software|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Install automated trials software|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed advanced legal algorithms that allows the handling of legal matters much quicker and much more accurately.
<</if>>
<br>
<<if $crimeUpgrades.worldProfiler == 0>>
- [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed advanced profiler software, which will constantly scour every known data archive on the globe (legally or not) to gather as much information as possible on dangerous criminals.
@@ -213,14 +213,14 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<br>
<<if $intelUpgrades.sensors == 0>>
- [[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ [[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will increase recon capabilites, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed perimeter seismic sensors able to detect movement with high accuracy.
<</if>>
<br>
<<if $intelUpgrades.signalIntercept == 0>>
- [[Create signal interception hub|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ [[Create signal interception hub|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed advanced signal interception equipment.
@@ -228,7 +228,7 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<br>
<<if $rep > 10000>>
<<if $intelUpgrades.radar == 0>>
- [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed sophisticated radar equipment.
@@ -295,35 +295,35 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<<if $secUpgrades.coldstorage == 6 && $rep >= 19500 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of two years.
<br>
- [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage == 5 && $rep >= 19500 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one year.
<br>
- [[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage == 4 && $rep >= 19500 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of nine months.
<br>
- [[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage == 3 && $rep > 18000 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of six months.
<br>
- [[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage == 2 && $rep > 16000 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three months.
<br>
- [[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage == 1 && $rep > 14000 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one month.
<br>
- [[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage == 0 && $rep > 12000 && $reqHelots > 10>>
- [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
<br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage > 6>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three years.
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 8b6aa47e480..37a48a98872 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -41,7 +41,7 @@
<<elseif $PC.career == "gang">>
<<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
<<set $minimumSlaveCost -= 1000>>
-<<elseif $PC.career = "head techncian">>
+<<elseif $PC.career == "head techncian">>
<<set $upgradeMultiplierTechncian = .8, $trinkets.push("your first sucesfuly overclocked CPU in a clear case.")>>
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 68ddf0d03ab..f60ae47aa85 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -235,6 +235,9 @@
<<if ndef $PC.degeneracy>>
<<set $PC.degeneracy = 0>>
<</if>>
+<<if ndef $PC.techncian>>
+ <<set $PC.techncian = 0>>
+<</if>>
<<if ndef $universalRulesImmobileSlavesMaintainMuscles>>
<<set $universalRulesImmobileSlavesMaintainMuscles = 0>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 2afc9fa683d..05f8e503601 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3957,7 +3957,7 @@ geany events/intro/pcExperienceIntro.tw events/intro/introSummary.tw uncategoriz
<<default>>Target One
<</switch>>
- <<if _Sucess = 1>>
+ <<if _Sucess == 1>>
Bag and taged. Confirm, bag and taged.
No
<<set $rivalOwner = -1>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 12a6c38e23e..f274546b9e9 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -75,7 +75,7 @@
<</if>>
<<if $personalAttention == "techncian">>
<br>You are training in techncian.
- <<elseif $PC.warfare < 100 && $PC.actualAge < $IsPastPrimePC>>
+ <<elseif $PC.techncian < 100 && $PC.actualAge < $IsPastPrimePC>>
<br>[[Hire a techncian to train you in technology|Main][$personalAttention = "techncian", $personalAttentionChanged = 1]]
<</if>>
<</if>>
--
GitLab