diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt index 53c2eebea669ad3cd5ee50776dfdb72b007527a6..f0e1e92a9e73e1da7cba0f26865d7308bb427605 100644 --- a/devNotes/Useful JS Function Documentation.txt +++ b/devNotes/Useful JS Function Documentation.txt @@ -346,4 +346,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 dee3622d2a2adab4311a77932b81fd652a553f38..5c4560015aa57c1081b8a9a10ab78fadf14a0fc5 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 dac9a124aee0e42d73ee7097fc2b1e6a47535fed..d3ca71e1102e64befa2ff5703bdd82bce14087bb 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 9ae9eb02443c0ae955fe9077f7df6ea852cfc3ef..144bbe80a68815ab91d62097edf1adb1ef496bf1 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 f98250df90e7c2fd9f16c6688726e66b4ee8ed6c..752971d503bb5094c9839831dcd348fd34cbda57 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -1512,7 +1512,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/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 a2c96644e0b15235a7646b6eb9e0e1af1bfa8de8..185fb225230df2fcd68868a629001b3605034bf3 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 292057afd60e7cee4303d3bbea13b86c0ebc6247..755f3ae730b60212efec12788c39065972d0665b 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>>