diff --git a/Changelog.txt b/Changelog.txt index 0e64f1a8ede95835fb6b5a4e983f9b4005281a0a..5a1fdc08837c457ecfbaea7c004d46ecd70f97f8 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -3,7 +3,7 @@ Pregmod 0.10.7.1-3.4.x 0 - -arcoglogy layout overhauled + -arcology layout overhauled -fixes 0.10.7.1-3.3.x diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index ea7d245e56ac7793222999eacaf138e8468ce264..c1a2c6c96677674d68cad6edbc9781f5c3705008 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -521,7 +521,6 @@ App.Data.resetOnNGPlus = { seeBuilding: 0, slaveOneTimeMinAge: 0, slaveOneTimeMaxAge: 0, - FCTVenable: 0, purchasedSagBGone: 0, eliteFail: 0, eliteFailTimer: 0, @@ -1083,6 +1082,8 @@ App.Data.resetOnNGPlus = { PShoot: 0, PSnatch: 0, PRaid: 0, + PRaidTarget: 0, + PAidTarget: "", PAid: 0, PPit: 0, diff --git a/src/Corporation/corporate.js b/src/Corporation/corporate.js index ef172bbb480b83e538b9d941a56128e9e2f2cb69..9f1696350dad37d8b1583d7a7feed444131d5f1c 100644 --- a/src/Corporation/corporate.js +++ b/src/Corporation/corporate.js @@ -927,7 +927,7 @@ window.corpSharePrice = function(q = 0, personalShares = null, publicShares = nu // Corporation race blacklisting/whitelisting // race is the lowercase string representing the race, 'blacklist' is either 1 or 0. 1 means we are blacklisting and 0 means we are whitelisting said race window.corpBlacklistRace = function(race, blacklist) { - let raceArray = State.variables.corpSpecRaces; + let raceArray = V.corp.SpecRaces; if (raceArray.length > 0 && blacklist === 1) { raceArray.delete(race); } else if (blacklist === 1) { diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js index fe2869e1bfc97d0d62e244642cb106fef160608b..14ff02217e899363736465aff1cb110fbcade21c 100644 --- a/src/endWeek/saDrugs.js +++ b/src/endWeek/saDrugs.js @@ -1391,7 +1391,7 @@ window.saDrugs = (function saDrugs() { case "breast redistributors": r += ` ${He} receives <span class="lime">direct injections of fat redistributors right into ${his}`; if (gigantomastiaMod !== 3) { - r += ` breasts</span>, causing ${his} body to begin moving fatty tissue from them to ${his} core`; + r += ` breasts,</span> causing ${his} body to begin moving fatty tissue from them to ${his} core`; if (slave.geneMods.NCS === 1) { r += `; ${his} <span class="orange">NCS</span> amplifies the effectiveness`; } diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js index be2302f4907a478eb9e170c674844e5a82f2cddf..9de37f261ef58085f90892c72ac36474bf93dbfb 100644 --- a/src/js/eventSelectionJS.js +++ b/src/js/eventSelectionJS.js @@ -1342,7 +1342,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) { if (eventSlave.trust >= -20) { if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) { if ((eventSlave.chastityPenis !== 1) || (eventSlave.dick === 0)) { - if (State.variables.corpIncorporated !== 0) { + if (State.variables.corp.Incorporated !== 0) { State.variables.RESSevent.push("shift sleep"); } if (canWalk(eventSlave)) { diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw index b48cf068bfdeda57057691d02f25ad8def55c8a4..595f5eb3ab60e9bb7cc5247d37fd6dfa48946947 100644 --- a/src/uncategorized/manageArcology.tw +++ b/src/uncategorized/manageArcology.tw @@ -114,7 +114,7 @@ </div> <div> - <<if ($receiverAvailable == 1) && ($FCTVenable != 0) && ($FCTVreceiver == 0)>> + <<if ($receiverAvailable == 1) && ($FCTVreceiver == 0)>> You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>. diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index 385b76fac44777b8d8008b248dc6ed0b5b7b3806..f11a253982349eef9e0a675e3c48f0042de67f3c 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -360,7 +360,7 @@ <<set $beforeGingering = null>> /% Strings Memory varies. %/ -<<set $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "", $oldName = "", $oldSurname = "", $k = "">> +<<set $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "", $oldName = "", $oldSurname = "">> /% Done with zeroing out, what should be for the most part Temps %/ <<if $autosave != 0>>