diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index ddba478313f878a34156642f672dbe3aa85599a8..1c1ee8cad1c66e6d02e56cc293e06ecd1bb0e259 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -347,4 +347,4 @@ UtilJS [script]
removeDuplicates() - Takes an array and returns a new array without duplicate entries
- HSM() - outputs a value based off of the PC's hacking skill.
\ No newline at end of file
+ HackingSkillMultiplier() - outputs a value based off of the PC's hacking skill.
\ No newline at end of file
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index a0f2487059408cf4d92a763e951e2df1bc646c1d..3da4c9800781444d952c97ed85f88c9dc38d8b82 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -1,6 +1,5 @@
:: propagandaHub [nobr]
-<<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 0dcf4088a51252f1644e2872e7d2724058a55c2c..77c4d39aac530da445045d8bbc2ee0d233c5cfc7 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -1,6 +1,5 @@
:: riotControlCenter [nobr]
-<<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 c0f4bac243d921253612f4d582cf21d6fa93220e..e8708cea7264481a29d7cf255271031e1565d851 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -1,6 +1,5 @@
:: securityHQ [nobr]
-<<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 7c1a2c3ebf01da3c50accfe38c41b23aad6e3b18..c48d2e98a1771251addde53762037d43c9ade0ed 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -1,6 +1,5 @@
:: weaponsManufacturing [nobr]
-<<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/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index ade88dc7ef101c0f73536bd4448c51e29606a378..cd5710a72e4a5f855325cf9a23e8120090d597b8 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -441,9 +441,8 @@ window.SFNameCapsCheck = function() {
window.SFUpgradeCost = function(cost,unit) {
const V=State.variables,T=State.temporary,S=V.SF.Squad; var value=0;
- //return Math.ceil(cost*T.Env*(1.15+(V.SF.Size/10))*(1.15+(unit/100))*HSM());
value=cost*T.Env*(1.15+(V.SF.Size/10))*(1.15+(unit/100));
- if ([S.Sub,S.AircraftCarrier,S.MissileSilo,S.GiantRobot,S.Satellite.lv,S.GunS,S.SpacePlane,S.Drones].includes(unit)) value *= HSM();
+ if ([S.Sub,S.AircraftCarrier,S.MissileSilo,S.GiantRobot,S.Satellite.lv,S.GunS,S.SpacePlane,S.Drones].includes(unit)) value *= V.HackingSkillMultiplier;
return Math.ceil(value);
};
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 8a479047dd888f5f88c455f1f61e3e1018aa68ac..e4c1f257698a4d5a2336fbaac72fbb311d6b78c5 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -9,6 +9,7 @@
<<run generatePlayerPronouns($PC)>>
+<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
<<set $upgradeMultiplierArcology = 1>>
<<set $upgradeMultiplierMedicine = 1>>
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 59545bff9b1066ce0a8cc2bdd5508b8fc0d50a32..fb37b0f678f51116b9193d30ecdf386659d18035 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1514,7 +1514,7 @@ window.originPronounReplace = /** @param {App.Entity.SlaveState} slave */ functi
}
};
-window.HSM = function() {
+window.HackingSkillMultiplier = function() {
const V = State.variables;
if (V.PC.hacking <= -100) {
return 1.5;
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 3e2248e5ef79c055a384d78654710ed7c306181d..39f6a270a8365e934fe81ae83ab847d4714516e9 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -2250,7 +2250,7 @@ window.boobWatch = function(slave) {
// ends needs work block
case "no clothing":
- if (slave.chastityAnus == 1 || slave.chastityVagina == 1 || $activeSlave.chastityPenis == 1) {
+ if (slave.chastityAnus == 1 || slave.chastityVagina == 1 || slave.chastityPenis == 1) {
t += `Since ${he}'s wearing nothing but a chastity belt, ${his} ${(slave.boobs < 300) ? 'non-existent ' : ''}breasts are delightfully naked.`;
} else {
t += `${His} naked `;
diff --git a/src/pregmod/geneLab.tw b/src/pregmod/geneLab.tw
index f0aecc162280b73dc8f70493770727e4cfd3bc98..632badb17e82f15d11e9d90234a32444cbbae02f 100644
--- a/src/pregmod/geneLab.tw
+++ b/src/pregmod/geneLab.tw
@@ -1,6 +1,5 @@
:: Gene Lab [nobr]
-<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
<br>
diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw
index 24817e64022c1a0ceee36303b391e4011f4cd72f..17ed3d1d45238e965b29c66a632839cea615bbb1 100644
--- a/src/pregmod/implantManufactory.tw
+++ b/src/pregmod/implantManufactory.tw
@@ -1,6 +1,5 @@
:: Implant Manufactory [nobr]
-<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
<br>
diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw
index cbb057752a4c7006985509b7e1e32c125e22b04f..cb6e1bee501426e7c32e403181730e37ae93d06d 100644
--- a/src/pregmod/organFarm.tw
+++ b/src/pregmod/organFarm.tw
@@ -1,6 +1,5 @@
:: Organ Farm [nobr]
-<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
<br>
diff --git a/src/pregmod/saPorn.tw b/src/pregmod/saPorn.tw
index 495b08e64bc7969871c4ac5fe5fcdb2313817023..d42bce6793666b0cbc889cef21b06fd6416af378 100644
--- a/src/pregmod/saPorn.tw
+++ b/src/pregmod/saPorn.tw
@@ -1,7 +1,6 @@
:: SA Porn [nobr]
<<if $studio == 1 && $slaves[$i].pornFeed == 1>> /* content is being produced */
- <<set $HackingSkillMultiplier = HSM()>>
/* rate of decay*/
<<if $slaves[$i].pornPrestige > 1>> /* 50k */
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 479305fc95e946cf6fe7f9383a27f11f1f88751b..df7d1e9163e1d5ecd2bc26e8e8944caf2838b5ac 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3562,5 +3562,7 @@ Done!
<<set $releaseID = 1036>>
<</if>>
+<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
+
/* reset NaNArray after BC is run */
<<set $NaNArray = findNaN()>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 3e99655d894a21c15ef206da6486969aae3e98c4..ac03858e2cdb25fc0f30ba76665eb38e51785a5d 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -1,6 +1,5 @@
:: Dispensary [nobr]
-<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
<br>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 41679dad5a07b246f332637e783277640a7f2fcd..a863735b3640ce8ea7cc750f5c82ac0291630e83 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -1,6 +1,5 @@
:: Manage Arcology [nobr]
-<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Main">>
<<if $cheatMode == 1>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index d4049ab430b51aabb67bc1034c96df44403f76b5..d06276e702c343585f0fc3d51b3fd0497595d5c3 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -1,5 +1,7 @@
:: Next Week [nobr]
+<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
+
<<if $rivalOwner != 0>>
<<set _rival = $arcologies.find(function(s) { return s.rival == 1; })>>
<<if def _rival>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 0cefcdfb85c736356d2ae717195e1f0f9861f89b..fc0dce0614f86abddcb02a958ff2fafe00285e00 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -1,6 +1,5 @@
:: Personal assistant options [nobr]
-<<set $HackingSkillMultiplier = HSM()>>
<<set $nextButton = "Back", $nextLink = "Main">>
<<if $marketAssistantLimit>><<set $marketAssistantLimit to Math.clamp($marketAssistantLimit, 10000, 10000000)>><</if>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 4756b401a804d921d52cec28a18058c7e7aa720f..c6184084657ab2545f0d93d3ca319f2a6a6af44c 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -1896,7 +1896,7 @@ __Bids Received__
<</if>>
<br><br>
-<<link "Re-list $him" "Sell Slave">><<run cashX(-500, "slaveTransfer")>><</link>>
+<<link "Re-list $him" "Sell Slave">><<run cashX(-500, "personalBusiness")>><</link>>
//This will cost <<print cashFormat(500)>>//
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 02d759e70d4a64504b10a1d9b753d3042903e02f..16b1e2f094bed6c7ae128ce576efee17dc025a05 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1845,7 +1845,7 @@ __Financial__:
<<elseif $activeSlave.accent > 3>>
//$His lack of language and basic life skills is a red sign to most slave appraisers. $He must not act like a child to be sold without raising suspicion.// |
<<else>>
- <<link "Sell $him" "Sell Slave">><<run cashX(-500, "slaveTransfer", $activeSlave)>><</link>> //Listing $him for sale will cost <<print cashFormat(500)>>// |
+ <<link "Sell $him" "Sell Slave">><<run cashX(-500, "personalBusiness", $activeSlave)>><</link>> //Listing $him for sale will cost <<print cashFormat(500)>>// |
<<if ($seeAge != 0) && ($activeSlave.indenture < 1)>>
<<link "Retire $him" "SE retirement">><<set $retiree = $activeSlave.ID, $retired = 1>><</link>> |
<</if>>
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index 3bd3bf7762125cd4b79864401011205e30186699..20239971e6c72fae8605ad1ae9f59b9f24d7463a 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -97,7 +97,7 @@
<br><br>
- [[Pay to access complete catalog of slaves|Complete Catalog][cashX(-1000, "slaveTransfer")]] //Costs <<print cashFormat(1000)>>.//
+ [[Pay to access complete catalog of slaves|Complete Catalog][cashX(-1000, "personalBusiness")]] //Costs <<print cashFormat(1000)>>.//
<br><br>