diff --git a/src/SecExp/js/secExp.js b/src/SecExp/js/secExp.js index ba09c63b768a7855443382aab7da976ce1184ed2..e656e4f042c08cdedfcdabe9ce7ded14e7f1fa46 100644 --- a/src/SecExp/js/secExp.js +++ b/src/SecExp/js/secExp.js @@ -456,11 +456,6 @@ App.SecExp.Check = (function() { delete V.difficulty; } - if (V.PCWounded === 1 && V.PCWoundCooldown > 0) { - V.SecExp.pcWounded = V.PCWoundCooldown; - delete V.PCWoundCooldown; - } - V.SecExp.settings.battle = V.SecExp.settings.battle || {}; V.SecExp.settings.battle.enabled = V.SecExp.settings.battle.enabled || 1; if (jsDef(V.battlesEnabled)) { diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 9d372873dea58f2389c0d6de5a61814743df1ef5..dd729bd8ab4313a0b4a310bf0197f18099c1ae03 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1492,7 +1492,7 @@ You should have received a copy of the GNU General Public License along with thi /* Security Expansion */ <<set $wasToggledBefore = 0>> -<<set $PCWounded = 0>> +<<set $PC.majorInjury = 0>> /* moved first build to post toggle */ <<set $secExpEnabled = $secExpEnabled || 0>> diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js index ba03d63c83c30c13e7a52778f37fe8cdfc0c46eb..c375f7ab6605d3831d8c0decea516e59361e127e 100644 --- a/src/interaction/main/mainLinks.js +++ b/src/interaction/main/mainLinks.js @@ -4,7 +4,7 @@ App.UI.View.MainLinks = function() { const PA = Array.isArray(V.personalAttention) ? V.personalAttention.map(x => getSlave(x.ID)) : []; let r = ''; - if (V.PCWounded === 1) { + if (V.PC.majorInjury === 1) { r += `The injuries received in the recent battle prevent you from undertaking tiring efforts.`; } else { switch (V.personalAttention) { @@ -75,7 +75,7 @@ App.UI.View.MainLinks = function() { } } - if (V.PCWounded !== 1) { + if (V.PC.majorInjury !== 1) { r += ` <span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> <span class="cyan">[A]</span>`; } diff --git a/src/js/storyJS.js b/src/js/storyJS.js index 32e041e252231fdcdae3a8fb8b84bbc7138c26b6..b9ee7848a2e7fe82b9ba05a42898ac0262412fc6 100644 --- a/src/js/storyJS.js +++ b/src/js/storyJS.js @@ -446,7 +446,7 @@ window.overpowerCheck = function(slave, PC) { strength += (185-slave.height); strength -= (PC.belly/1000); strength += (PC.skill.warfare/3); - strength -= (State.variables.PCWounded * 15); + strength -= (State.variables.PC.majorInjury * 15); return strength; };