mirror of
https://github.com/doublespeakgames/adarkroom.git
synced 2026-05-28 00:01:54 +08:00
- put alien allow in the outfitting options
- prevent queueing up multiple explosions from the unstable automaton
This commit is contained in:
@@ -83,6 +83,7 @@ var Events = {
|
||||
startCombat: function(scene) {
|
||||
Engine.event('game event', 'combat');
|
||||
Events.fought = false;
|
||||
Events.won = false;
|
||||
var desc = $('#description', Events.eventPanel());
|
||||
|
||||
$('<div>').text(scene.notification).appendTo(desc);
|
||||
@@ -567,6 +568,7 @@ var Events = {
|
||||
|
||||
if(enemyHp <= 0 && !Events.won) {
|
||||
// Success!
|
||||
Events.won = true;
|
||||
if (explosion) {
|
||||
Events.explode(enemy, $('#wanderer'), explosion);
|
||||
}
|
||||
@@ -601,6 +603,7 @@ var Events = {
|
||||
Events.checkPlayerDeath();
|
||||
}
|
||||
else if(hp <= 0 && !Events.won) {
|
||||
Events.won = true;
|
||||
Events.winFight();
|
||||
}
|
||||
Events.updateFighterDiv(target);
|
||||
|
||||
@@ -173,6 +173,7 @@ var Path = {
|
||||
'energy cell': {type: 'tool', desc: _('emits a soft red glow') },
|
||||
'bayonet': {type: 'weapon' },
|
||||
'charm': {type: 'tool'},
|
||||
'alien alloy': { type: 'tool' },
|
||||
'medicine': {type: 'tool', desc: _('restores') + ' ' + World.MEDS_HEAL + ' ' + _('hp') }
|
||||
}, Room.Craftables, Fabricator.Craftables);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user