Bugfixes.

This commit is contained in:
Zarkonnen
2013-07-08 21:39:28 +02:00
parent 4641b0b145
commit 4334f36e57
2 changed files with 13 additions and 9 deletions
+7 -3
View File
@@ -104,7 +104,9 @@ var Events = {
Events.createAttackButton('fists').prependTo(btns); Events.createAttackButton('fists').prependTo(btns);
} }
Events.createUseMedsButton().prependTo(btns); if((Path.outfit['medicine'] || 0) != 0) {
Events.createUseMedsButton().prependTo(btns);
}
Events.createEatMeatButton().prependTo(btns); Events.createEatMeatButton().prependTo(btns);
// Set up the enemy attack timer // Set up the enemy attack timer
@@ -144,7 +146,7 @@ var Events = {
cost: { 'medicine': 1 } cost: { 'medicine': 1 }
}); });
if(Path.outfit['medicine'] == 0) { if((Path.outfit['medicine'] || 0) == 0) {
Button.setDisabled(btn, true); Button.setDisabled(btn, true);
} }
@@ -470,7 +472,9 @@ var Events = {
}).appendTo(btns); }).appendTo(btns);
Events.createEatMeatButton(0).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) { } catch(e) {
// It is possible to die and win if the timing is perfect. Just let it fail. // It is possible to die and win if the timing is perfect. Just let it fail.
+6 -6
View File
@@ -736,7 +736,7 @@ Events.Setpieces = {
} }
} }
}, },
'b2': { 'b5': {
combat: true, combat: true,
enemy: 'madman', enemy: 'madman',
char: 'M', char: 'M',
@@ -1255,11 +1255,11 @@ Events.Setpieces = {
'the shell of an abandoned hospital looms ahead.' 'the shell of an abandoned hospital looms ahead.'
], ],
buttons: { buttons: {
'enter' { 'enter': {
text: 'enter', text: 'enter',
cost: { 'torch': 1 }, cost: { 'torch': 1 },
nextScene: {0.5: 'b7', 1: 'b8'} nextScene: {0.5: 'b7', 1: 'b8'}
} },
'leave': { 'leave': {
text: 'leave city', text: 'leave city',
nextScene: 'end' nextScene: 'end'
@@ -2871,10 +2871,10 @@ Events.Setpieces = {
} }
} }
}, },
'supplies': { 'medicine': {
text: [ text: [
'the house has been ransacked.' 'the house has been ransacked.',
'but there is a cache of medicine under the floorboards.', 'but there is a cache of medicine under the floorboards.'
], ],
onLoad: function() { onLoad: function() {
World.markVisited(World.curPos[0], World.curPos[1]); World.markVisited(World.curPos[0], World.curPos[1]);