From 4b476aae2049510cd68e27ff61b938ae8bb06293 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Sat, 3 Feb 2018 16:59:08 +1300 Subject: [PATCH] Bracket and spell checking. --- src/SecExp/securityHQ.tw | 18 +++++++++--------- src/init/storyInit.tw | 4 ++-- src/uncategorized/BackwardsCompatibility.tw | 3 +++ src/uncategorized/clinic.tw | 2 +- src/uncategorized/persBusiness.tw | 2 +- src/uncategorized/personalAttentionSelect.tw | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw index c96fbd4444b..7c37c709c88 100644 --- a/src/SecExp/securityHQ.tw +++ b/src/SecExp/securityHQ.tw @@ -113,14 +113,14 @@ Considering the current upgrades the resting level for security is <<print $secR <br> <<if $secUpgrades.nanoCams == 0>> - [[Install a nano-camera system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck)), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] - <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// + [[Install a nano-camera system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed all across the arcology closed circuit nano-cameras to keep the arcology under your watchful eye. <</if>> <br> <<if $secUpgrades.cyberBots == 0>> - [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck)), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought advanced cybersecurity algorithms that will defend your arcology against hack attempts or cyber frauds. @@ -128,14 +128,14 @@ Considering the current upgrades the resting level for security is <<print $secR <br> <<if $rep > 10000>> <<if $secUpgrades.eyeScan == 0>> - [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck)), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] + [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed numerous hidden eye scanners that accurately register the movements of everyone inside the arcology. <</if>> <br> <<if $secUpgrades.cryptoAnalyzer == 0>> - [[Buy and install crypto analyzers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck)), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] + [[Buy and install crypto analyzers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought and employed sophisticated crypto analyzing software to accurately track and archive every financial movement or transaction made inside the walls of your arcology. @@ -165,7 +165,7 @@ 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*$TechnicianSkillCheck)), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. 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. @@ -215,14 +215,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*$TechnicianSkillCheck)), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + [[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. 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*$TechnicianSkillCheck)), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + [[Create signal interception hub|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced signal interception equipment. @@ -230,7 +230,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*$TechnicianSkillCheck)), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillCheck))>>. Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed sophisticated radar equipment. diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index b8f63a50133..be3d0f6a086 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -241,7 +241,7 @@ You should have received a copy of the GNU General Public License along with thi <<if $saveImported == 0>> <<set $cheater = 0>> -<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, TechnicianSkill: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>> +<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, technician: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>> <<set $cash = 10000>> <<set $normalizedEvents = 0>> <<set $autosave = 1>> @@ -357,7 +357,7 @@ You should have received a copy of the GNU General Public License along with thi <<else>> <<set $cheater = 0>> <<set $cash = 10000>> - <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, TechnicianSkill: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>> + <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, technician: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>> <</if>> <</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 0e7152007fe..5a0eb991c9b 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.technician>> + <<set $PC.technician = 0>> +<</if>> <<if ndef $universalRulesImmobileSlavesMaintainMuscles>> <<set $universalRulesImmobileSlavesMaintainMuscles = 0>> diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw index 51bfb4521d6..22bf14e3540 100644 --- a/src/uncategorized/clinic.tw +++ b/src/uncategorized/clinic.tw @@ -84,10 +84,10 @@ $clinicNameCaps <br> <<if $clinicUpgradeFilters == 1>> -<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$TechnicianSkillCheck)>> <<if $clinicUpgradePurge == 1>> The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatibility. Patients will likely be ill for the duration of the treatment. <<else>> + <<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$TechnicianSkillCheck)>> The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1, $PC.technician += 1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves// <</if>> <<if $Nurse == 0>> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index de6462ca1ec..7c81e5c4d91 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -458,7 +458,7 @@ <</if>> <</if>> -<<case "techical accidents">> +<<case "technical accidents">> <<set $cash += 25000*$PC.technician*$arcologies[0].prosperity, $crime += random(10,25)>> This week you gained <<print cashFormat(25000*$PC.technician*$arcologies[0].prosperity)>> cash <<if random > 50 && $PC.technician < 100>> however as you were traced your authority and rep have taken a hit <<set $authority -= random(100,500), $rep -= random (100,500)>> and crime has @@.red;increased,@@. diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw index 29824d10d8b..a056f2271f9 100644 --- a/src/uncategorized/personalAttentionSelect.tw +++ b/src/uncategorized/personalAttentionSelect.tw @@ -11,7 +11,7 @@ | [[Help people "pass" things around|Main][$personalAttention = "smuggling", $personalAttentionChanged = 1]] <</if>> <<if $PC.technician > 0>> - | [[create techical accidents in $arcologies[0].name for the highest bidder|Main][$personalAttention = "techical accidents", $personalAttentionChanged = 1]] + | [[create technical accidents in $arcologies[0].name for the highest bidder|Main][$personalAttention = "technical accidents", $personalAttentionChanged = 1]] <</if>> <</if>> <<if $HeadGirl != 0>> -- GitLab