From 46fb84a14eef267a01cd12a20f19cea02f2b6435 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Thu, 6 Feb 2020 00:26:20 -0800
Subject: [PATCH] Clean up
---
src/cheats/PCCheatMenuCheatDatatypeCleanup.tw | 8 +-
src/events/intro/initNationalities.tw | 8 +-
src/js/utilsFC.js | 112 +++---------------
src/uncategorized/BackwardsCompatibility.tw | 8 +-
src/uncategorized/nextWeek.tw | 8 +-
src/utility/miscWidgets.tw | 2 +-
6 files changed, 31 insertions(+), 115 deletions(-)
diff --git a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
index 6ac3800fae7..5f78ca87af8 100644
--- a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
+++ b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
@@ -72,8 +72,8 @@ You perform the dark rituals, pray to the dark gods, and sell your soul for the
<<set $PC = clone($tempSlave)>>
<<run PCDatatypeCleanup()>>
-<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
-<<set $upgradeMultiplierMedicine = upgradeMultiplierMedicine()>>
-<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
-<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
+<<set $upgradeMultiplierArcology = upgradeMultiplier('engineering')>>
+<<set $upgradeMultiplierMedicine = upgradeMultiplier('medicine')>>
+<<set $upgradeMultiplierTrade = upgradeMultiplier('trading')>>
+<<set $HackingSkillMultiplier = upgradeMultiplier('hacking')>>
<<unset $tempSlave>>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index d2b55a7126f..6a44b94d1e5 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -273,10 +273,10 @@
<<set $arcologies[0].childhoodFertilityInducedNCSResearch = 0>>
-<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
-<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
-<<set $upgradeMultiplierMedicine = upgradeMultiplierMedicine()>>
-<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
+<<set $HackingSkillMultiplier = upgradeMultiplier('hacking')>>
+<<set $upgradeMultiplierArcology = upgradeMultiplier('engineering')>>
+<<set $upgradeMultiplierMedicine = upgradeMultiplier('medicine')>>
+<<set $upgradeMultiplierTrade = upgradeMultiplier('trading')>>
/*Nationalities Setup*/
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index 0a0a688aaa2..76c26c01c61 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -2326,116 +2326,32 @@ window.SkillIncrease = (function() {
}
})();
-window.HackingSkillMultiplier = function() {
- if (V.PC.skill.hacking <= -100) {
- return 1.5;
- } else if (V.PC.skill.hacking <= -75) {
- return 1.35;
- } else if (V.PC.skill.hacking <= -50) {
- return 1.25;
- } else if (V.PC.skill.hacking <= -25) {
- return 1.15;
- } else if (V.PC.skill.hacking < 0) {
- return 1.10;
- } else if (V.PC.skill.hacking === 0) {
- return 1;
- } else if (V.PC.skill.hacking <= 10) {
- return 0.97;
- } else if (V.PC.skill.hacking <= 25) {
- return 0.95;
- } else if (V.PC.skill.hacking <= 50) {
- return 0.90;
- } else if (V.PC.skill.hacking <= 75) {
- return 0.85;
- } else if (V.PC.skill.hacking <= 100) {
- return 0.80;
- } else {
- return 0.75;
- }
-};
-
-window.upgradeMultiplierArcology = function() {
- if (V.PC.career === "engineer" || (V.arcologies[0].FSRestartDecoration >= 100 && V.eugenicsFullControl === 0)) {
- return 0.6;
- } else if (V.PC.skill.engineering <= -100) {
- return 1.5;
- } else if (V.PC.skill.engineering <= -75) {
- return 1.35;
- } else if (V.PC.skill.engineering <= -50) {
- return 1.25;
- } else if (V.PC.skill.engineering <= -25) {
- return 1.15;
- } else if (V.PC.skill.engineering < 0) {
- return 1.10;
- } else if (V.PC.skill.engineering === 0) {
- return 1;
- } else if (V.PC.skill.engineering <= 10) {
- return 0.97;
- } else if (V.PC.skill.engineering <= 25) {
- return 0.95;
- } else if (V.PC.skill.engineering <= 50) {
- return 0.90;
- } else if (V.PC.skill.engineering <= 75) {
- return 0.85;
- } else if (V.PC.skill.engineering <= 100) {
- return 0.80;
- } else {
- return 0.75;
- }
-};
-
-window.upgradeMultiplierMedicine = function() {
- if (V.PC.career === "medicine" || (V.arcologies[0].FSRestartDecoration >= 100 && V.eugenicsFullControl === 0)) {
+window.upgradeMultiplier = function(skill) {
+ if (skill === 'medicine' && V.PC.career === "medicine" || skill === 'engineering' && V.PC.career === "engineer"
+ || ((skill === 'medicine' || skill === 'engineering') && V.arcologies[0].FSRestartDecoration >= 100 && V.eugenicsFullControl === 0)) {
return 0.6;
- } else if (V.PC.skill.medicine <= -100) {
- return 1.5;
- } else if (V.PC.skill.medicine <= -75) {
- return 1.35;
- } else if (V.PC.skill.medicine <= -50) {
- return 1.25;
- } else if (V.PC.skill.medicine <= -25) {
- return 1.15;
- } else if (V.PC.skill.medicine < 0) {
- return 1.10;
- } else if (V.PC.skill.medicine === 0) {
- return 1;
- } else if (V.PC.skill.medicine <= 10) {
- return 0.97;
- } else if (V.PC.skill.medicine <= 25) {
- return 0.95;
- } else if (V.PC.skill.medicine <= 50) {
- return 0.90;
- } else if (V.PC.skill.medicine <= 75) {
- return 0.85;
- } else if (V.PC.skill.medicine <= 100) {
- return 0.80;
- } else {
- return 0.75;
}
-};
-
-window.upgradeMultiplierTrade = function() {
- if (V.PC.skill.trading <= -100) {
+ if (V.PC.skill[skill] <= -100) {
return 1.5;
- } else if (V.PC.skill.trading <= -75) {
+ } else if (V.PC.skill[skill] <= -75) {
return 1.35;
- } else if (V.PC.skill.trading <= -50) {
+ } else if (V.PC.skill[skill] <= -50) {
return 1.25;
- } else if (V.PC.skill.trading <= -25) {
+ } else if (V.PC.skill[skill] <= -25) {
return 1.15;
- } else if (V.PC.skill.trading < 0) {
+ } else if (V.PC.skill[skill] < 0) {
return 1.10;
- } else if (V.PC.skill.trading === 0) {
+ } else if (V.PC.skill[skill] === 0) {
return 1;
- } else if (V.PC.skill.trading <= 10) {
+ } else if (V.PC.skill[skill] <= 10) {
return 0.97;
- } else if (V.PC.skill.trading <= 25) {
+ } else if (V.PC.skill[skill] <= 25) {
return 0.95;
- } else if (V.PC.skill.trading <= 50) {
+ } else if (V.PC.skill[skill] <= 50) {
return 0.90;
- } else if (V.PC.skill.trading <= 75) {
+ } else if (V.PC.skill[skill] <= 75) {
return 0.85;
- } else if (V.PC.skill.trading <= 100) {
+ } else if (V.PC.skill[skill] <= 100) {
return 0.80;
} else {
return 0.75;
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index eaeb570ef8f..41734be924e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3632,10 +3632,10 @@ Done<br>
<<unset $activeArcology>>
<</if>>
-<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
-<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
-<<set $upgradeMultiplierMedicine = upgradeMultiplierMedicine()>>
-<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
+<<set $HackingSkillMultiplier = upgradeMultiplier('hacking')>>
+<<set $upgradeMultiplierArcology = upgradeMultiplier('engineering')>>
+<<set $upgradeMultiplierMedicine = upgradeMultiplier('medicine')>>
+<<set $upgradeMultiplierTrade = upgradeMultiplier('trading')>>
<<if ndef $sideBarOptions>>
<<set $sideBarOptions = {compact:1, Cash:1, Upkeep:1, SexSlaveCount:1, roomPop:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index c949842f664..361063197d1 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -1,9 +1,9 @@
:: Next Week [nobr]
-<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
-<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
-<<set $upgradeMultiplierMedicine = upgradeMultiplierMedicine()>>
-<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
+<<set $HackingSkillMultiplier = upgradeMultiplier('hacking')>>
+<<set $upgradeMultiplierArcology = upgradeMultiplier('engineering')>>
+<<set $upgradeMultiplierMedicine = upgradeMultiplier('medicine')>>
+<<set $upgradeMultiplierTrade = upgradeMultiplier('trading')>>
<<if $rivalOwner != 0>>
<<set _rival = $arcologies.find(function(s) { return s.rival == 1; })>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index eeae14a71d1..91a9c8c21be 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -674,7 +674,7 @@ $args[0]: array to sort
<<elseif def $args[1]>>
[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, State.variables[$args[1]] = 1, cashX(-20000, "capEx")]] //Costs <<print cashFormat(20000)>>//
<<elseif $args[0] == "FSRestart">>
- [[Customize the exterior of the arcology to support this goal and fully establish the Societal Elite|Future Society][$arcologies[0].FSRestartDecoration = 100, $upgradeMultiplierArcology = upgradeMultiplierArcology(), $upgradeMultiplierMedicine = upgradeMultiplierMedicine(), cashX(-75000, "capEx")]] //Costs <<print cashFormat(75000)>> and may dilute your control over the arcology//
+ [[Customize the exterior of the arcology to support this goal and fully establish the Societal Elite|Future Society][$arcologies[0].FSRestartDecoration = 100, $upgradeMultiplierArcology = upgradeMultiplier('engineering'), $upgradeMultiplierMedicine = upgradeMultiplier('medicine'), cashX(-75000, "capEx")]] //Costs <<print cashFormat(75000)>> and may dilute your control over the arcology//
<<else>>
[[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, cashX(-20000, "capEx")]] //Costs <<print cashFormat(20000)>>//
<</if>>
--
GitLab