From 811641bc1ca14f6f35c413b9974ddf5ac9b9b3d6 Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Wed, 28 Mar 2018 18:48:42 +1300
Subject: [PATCH] Inital conversion.
---
src/SecExp/propagandaHub.tw | 2 +-
src/SecExp/riotControlCenter.tw | 2 +-
src/SecExp/securityHQ.tw | 2 +-
src/SecExp/weaponsManufacturing.tw | 2 +-
src/js/SFJS.tw | 26 ++++++++++++++++
.../SecForceEX/SpecialForceUpgradeOptions.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 31 -------------------
src/uncategorized/SFMBarracks.tw | 1 -
src/uncategorized/dispensary.tw | 2 +-
src/uncategorized/endWeek.tw | 1 -
src/uncategorized/manageArcology.tw | 2 +-
src/uncategorized/personalAssistantOptions.tw | 2 +-
12 files changed, 34 insertions(+), 41 deletions(-)
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 831964839f9..474231ed311 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -1,6 +1,6 @@
:: propagandaHub [nobr]
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<if $career == "capitalist" || $career == "celebrity" || $career == "wealth">>
<<set _HistoryDiscount = .5>>
<<else>>
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index eba811b40b1..f342a3c03a1 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -1,6 +1,6 @@
:: riotControlCenter [nobr]
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
Riot Control Center
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index a69371aa234..5a8f3bdbe36 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -1,6 +1,6 @@
:: securityHQ [nobr]
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<if $career == "mercenary" || $career == "gang" || $career == "slaver">>
<<set _HistoryDiscount = .5>>
<<else>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 2d9e4321ab6..9a73e7c277e 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -1,6 +1,6 @@
:: weaponsManufacturing [nobr]
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Main">>
This sector of the arcology has been dedicated to weapons manufacturing. These factories supply
diff --git a/src/js/SFJS.tw b/src/js/SFJS.tw
index d016e96b98e..cd39e0634a7 100644
--- a/src/js/SFJS.tw
+++ b/src/js/SFJS.tw
@@ -13,3 +13,29 @@ window.simpleWorldEconomyCheck = function() {
}
}
+window.HSM = function() {
+ if (State.variables.PC.hacking <= -100)
+ return 1.5;
+ else if (State.variables.PC.hacking <= -75)
+ return 1.35;
+ else if (State.variables.PC.hacking <= -50)
+ return 1.25;
+ else if (State.variables.PC.hacking <= -25)
+ return 1.15;
+ else if (State.variables.PC.hacking < 0)
+ return 1.10;
+ else if (State.variables.PC.hacking === 0)
+ return 1;
+ else if (State.variables.PC.hacking <= 10)
+ return .97;
+ else if (State.variables.PC.hacking <= 25)
+ return .95;
+ else if (State.variables.PC.hacking <= 50)
+ return .90;
+ else if (State.variables.PC.hacking <= 75)
+ return .85;
+ else if (State.variables.PC.hacking < 100)
+ return .80;
+ else if (State.variables.PC.hacking >= 100)
+ return .75;
+ }
\ No newline at end of file
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index c6b18ddafd3..7bafd37b3ec 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -1,6 +1,6 @@
:: SpecialForceUpgradeOptions [nobr]
<<set _costDebuff = 1>>
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<if ($SFAO < _max) && $securityForceUpgradeToken == 0>>
<span id="resultX">
<br>Which facility or equipment do you wish _Name to upgrade this week?
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 2daeabc9e1f..1117289abcb 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1911,34 +1911,3 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
}
})>>
<</widget>>
-
-/%
-Call as <<HSM>>
-%/
-<<widget "HSM">>
- <<if ndef $PC.hacking>>
- <<set $PC.hacking = 1, $HackingSkillMultiplier = 1>>
- <<elseif $PC.hacking <= -100>>
- <<set $HackingSkillMultiplier = 1.5>>
- <<elseif $PC.hacking <= -75>>
- <<set $HackingSkillMultiplier = 1.35>>
- <<elseif $PC.hacking <= -50>>
- <<set $HackingSkillMultiplier = 1.25>>
- <<elseif $PC.hacking <= -25>>
- <<set $HackingSkillMultiplier = 1.15>>
- <<elseif $PC.hacking < 0>>
- <<set $HackingSkillMultiplier = 1.10>>
- <<elseif $PC.hacking <= 10>>
- <<set $HackingSkillMultiplier = 1>>
- <<elseif $PC.hacking <= 25>>
- <<set $HackingSkillMultiplier = .95>>
- <<elseif $PC.hacking <= 50>>
- <<set $HackingSkillMultiplier = .90>>
- <<elseif $PC.hacking <= 75>>
- <<set $HackingSkillMultiplier = .85>>
- <<elseif $PC.hacking < 100>>
- <<set $HackingSkillMultiplier = .80>>
- <<elseif $PC.hacking >= 100>>
- <<set $HackingSkillMultiplier = .75>>
- <</if>>
-<</widget>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index a1d01bd4690..1d7a41a0084 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -1,6 +1,5 @@
:: SFM Barracks [nobr]
-<<HSM>>
<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
<<if ndef $ColonelRelationship>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 6152e672196..8f35a778876 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -1,6 +1,6 @@
:: Dispensary [nobr]
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.max($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
<br>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index aa72244016f..66772dfc1ae 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -21,7 +21,6 @@
<<if $sexualOpeness == 1>>
<<set $penetrativeUseWeight++>>
<</if>>
-<<HSM>>
<<for _i = 0; _i < $slaves.length; _i++>>
<<if $slaves[_i].inflationMethod == 1 || $slaves[_i].inflationMethod == 2>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 2d244592731..feca9e882d8 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -1,6 +1,6 @@
:: Manage Arcology [nobr]
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Main">>
<<if $cheatMode == 1>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 779757d38ec..18670cfb1b1 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -1,6 +1,6 @@
:: Personal assistant options [nobr]
-<<HSM>>
+<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Main">>
<<if $marketAssistantLimit>><<set $marketAssistantLimit to Math.clamp($marketAssistantLimit, 10000, 10000000)>><</if>>
--
GitLab