diff --git a/script/events.js b/script/events.js index c47ca4b..ca84240 100644 --- a/script/events.js +++ b/script/events.js @@ -104,7 +104,9 @@ var Events = { Events.createAttackButton('fists').prependTo(btns); } - Events.createUseMedsButton().prependTo(btns); + if((Path.outfit['medicine'] || 0) != 0) { + Events.createUseMedsButton().prependTo(btns); + } Events.createEatMeatButton().prependTo(btns); // Set up the enemy attack timer @@ -144,7 +146,7 @@ var Events = { cost: { 'medicine': 1 } }); - if(Path.outfit['medicine'] == 0) { + if((Path.outfit['medicine'] || 0) == 0) { Button.setDisabled(btn, true); } @@ -470,7 +472,9 @@ var Events = { }).appendTo(btns); Events.createEatMeatButton(0).appendTo(btns); - Events.createUseMedsButton(0).appendTo(btns); + if((Path.outfit['medicine'] || 0) != 0) { + Events.createUseMedsButton(0).appendTo(btns); + } } } catch(e) { // It is possible to die and win if the timing is perfect. Just let it fail. diff --git a/script/events/setpieces.js b/script/events/setpieces.js index 5759b02..cd675bd 100644 --- a/script/events/setpieces.js +++ b/script/events/setpieces.js @@ -736,7 +736,7 @@ Events.Setpieces = { } } }, - 'b2': { + 'b5': { combat: true, enemy: 'madman', char: 'M', @@ -1255,11 +1255,11 @@ Events.Setpieces = { 'the shell of an abandoned hospital looms ahead.' ], buttons: { - 'enter' { + 'enter': { text: 'enter', cost: { 'torch': 1 }, nextScene: {0.5: 'b7', 1: 'b8'} - } + }, 'leave': { text: 'leave city', nextScene: 'end' @@ -2871,10 +2871,10 @@ Events.Setpieces = { } } }, - 'supplies': { + 'medicine': { text: [ - 'the house has been ransacked.' - 'but there is a cache of medicine under the floorboards.', + 'the house has been ransacked.', + 'but there is a cache of medicine under the floorboards.' ], onLoad: function() { World.markVisited(World.curPos[0], World.curPos[1]);