GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-06-10 06:27:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

- put alien allow in the outfitting options

Browse Source 
- prevent queueing up multiple explosions from the unstable automaton
This commit is contained in:
Michael Townsend
2023-06-15 16:08:38 -04:00
parent 68c5e2dfca
commit d6059af2b1
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/events.js
+3
View File
@@ -83,6 +83,7 @@ var Events = {
startCombat: function(scene) { startCombat: function(scene) {
Engine.event('game event', 'combat'); Engine.event('game event', 'combat');
Events.fought = false; Events.fought = false;
Events.won = false;
var desc = $('#description', Events.eventPanel()); var desc = $('#description', Events.eventPanel());
$('<div>').text(scene.notification).appendTo(desc); $('<div>').text(scene.notification).appendTo(desc);
@@ -567,6 +568,7 @@ var Events = {
if(enemyHp <= 0 && !Events.won) { if(enemyHp <= 0 && !Events.won) {
// Success! // Success!
Events.won = true;
if (explosion) { if (explosion) {
Events.explode(enemy, $('#wanderer'), explosion); Events.explode(enemy, $('#wanderer'), explosion);
} }
@@ -601,6 +603,7 @@ var Events = {
Events.checkPlayerDeath(); Events.checkPlayerDeath();
} }
else if(hp <= 0 && !Events.won) { else if(hp <= 0 && !Events.won) {
Events.won = true;
Events.winFight(); Events.winFight();
} }
Events.updateFighterDiv(target); Events.updateFighterDiv(target);
script/path.js
+1
View File
@@ -173,6 +173,7 @@ var Path = {
'energy cell': {type: 'tool', desc: _('emits a soft red glow') }, 'energy cell': {type: 'tool', desc: _('emits a soft red glow') },
'bayonet': {type: 'weapon' }, 'bayonet': {type: 'weapon' },
'charm': {type: 'tool'}, 'charm': {type: 'tool'},
'alien alloy': { type: 'tool' },
'medicine': {type: 'tool', desc: _('restores') + ' ' + World.MEDS_HEAL + ' ' + _('hp') } 'medicine': {type: 'tool', desc: _('restores') + ' ' + World.MEDS_HEAL + ' ' + _('hp') }
}, Room.Craftables, Fabricator.Craftables); }, Room.Craftables, Fabricator.Craftables);