GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-05-28 08:11:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed whitespace conformity in events.js

Browse Source
This commit is contained in:
Travis Weston
2014-07-13 00:49:38 -04:00
parent 8cf3ab3dc9
commit 4b079a22f1
1 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/events.js
+58 -59
View File
@@ -109,8 +109,8 @@ var Events = {
Events.createEatMeatButton().appendTo(btns); Events.createEatMeatButton().appendTo(btns);
if((Path.outfit['medicine'] || 0) != 0) { if((Path.outfit['medicine'] || 0) != 0) {
Events.createUseMedsButton().appendTo(btns); Events.createUseMedsButton().appendTo(btns);
} }
// Set up the enemy attack timer // Set up the enemy attack timer
Events._enemyAttackTimer = setTimeout(Events.enemyAttack, scene.attackDelay * 1000); Events._enemyAttackTimer = setTimeout(Events.enemyAttack, scene.attackDelay * 1000);
@@ -438,8 +438,7 @@ var Events = {
}); });
} }
Events._enemyAttackTimer = Events._enemyAttackTimer = setTimeout(Events.enemyAttack, scene.attackDelay * 1000);
setTimeout(Events.enemyAttack, scene.attackDelay * 1000);
}, },
winFight: function() { winFight: function() {
@@ -476,8 +475,8 @@ var Events = {
Events.createEatMeatButton(0).appendTo(btns); Events.createEatMeatButton(0).appendTo(btns);
if((Path.outfit['medicine'] || 0) != 0) { if((Path.outfit['medicine'] || 0) != 0) {
Events.createUseMedsButton(0).appendTo(btns); 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.
@@ -728,41 +727,41 @@ var Events = {
} }
}, },
// Makes an event happen! // Makes an event happen!
triggerEvent: function() { triggerEvent: function() {
if(Events.activeEvent() == null) { if(Events.activeEvent() == null) {
var possibleEvents = []; var possibleEvents = [];
for(var i in Events.EventPool) { for(var i in Events.EventPool) {
var event = Events.EventPool[i]; var event = Events.EventPool[i];
if(event.isAvailable()) { if(event.isAvailable()) {
possibleEvents.push(event); possibleEvents.push(event);
} }
} }
if(possibleEvents.length == 0) { if(possibleEvents.length == 0) {
Events.scheduleNextEvent(0.5); Events.scheduleNextEvent(0.5);
return; return;
} else { } else {
var r = Math.floor(Math.random()*(possibleEvents.length)); var r = Math.floor(Math.random()*(possibleEvents.length));
Events.startEvent(possibleEvents[r]); Events.startEvent(possibleEvents[r]);
} }
} }
Events.scheduleNextEvent(); Events.scheduleNextEvent();
}, },
triggerFight: function() { triggerFight: function() {
var possibleFights = []; var possibleFights = [];
for(var i in Events.Encounters) { for(var i in Events.Encounters) {
var fight = Events.Encounters[i]; var fight = Events.Encounters[i];
if(fight.isAvailable()) { if(fight.isAvailable()) {
possibleFights.push(fight); possibleFights.push(fight);
} }
} }
var r = Math.floor(Math.random()*(possibleFights.length)); var r = Math.floor(Math.random()*(possibleFights.length));
Events.startEvent(possibleFights[r]); Events.startEvent(possibleFights[r]);
}, },
activeEvent: function() { activeEvent: function() {
if(Events.eventStack && Events.eventStack.length > 0) { if(Events.eventStack && Events.eventStack.length > 0) {
@@ -774,8 +773,8 @@ var Events = {
eventPanel: function() { eventPanel: function() {
return Events.activeEvent().eventPanel; return Events.activeEvent().eventPanel;
}, },
startEvent: function(event, options) { startEvent: function(event, options) {
if(event) { if(event) {
Engine.event('game event', 'event'); Engine.event('game event', 'event');
Engine.keyLock = true; Engine.keyLock = true;
@@ -791,30 +790,30 @@ var Events = {
$('div#wrapper').append(Events.eventPanel()); $('div#wrapper').append(Events.eventPanel());
Events.eventPanel().animate({opacity: 1}, Events._PANEL_FADE, 'linear'); Events.eventPanel().animate({opacity: 1}, Events._PANEL_FADE, 'linear');
} }
}, },
scheduleNextEvent: function(scale) { scheduleNextEvent: function(scale) {
var nextEvent = Math.floor(Math.random()*(Events._EVENT_TIME_RANGE[1] - Events._EVENT_TIME_RANGE[0])) + Events._EVENT_TIME_RANGE[0]; var nextEvent = Math.floor(Math.random()*(Events._EVENT_TIME_RANGE[1] - Events._EVENT_TIME_RANGE[0])) + Events._EVENT_TIME_RANGE[0];
if(scale > 0) { nextEvent *= scale; } if(scale > 0) { nextEvent *= scale; }
Engine.log('next event scheduled in ' + nextEvent + ' minutes'); Engine.log('next event scheduled in ' + nextEvent + ' minutes');
Events._eventTimeout = setTimeout(Events.triggerEvent, nextEvent * 60 * 1000); Events._eventTimeout = setTimeout(Events.triggerEvent, nextEvent * 60 * 1000);
}, },
endEvent: function() { endEvent: function() {
Events.eventPanel().animate({opacity:0}, Events._PANEL_FADE, 'linear', function() { Events.eventPanel().animate({opacity:0}, Events._PANEL_FADE, 'linear', function() {
Events.eventPanel().remove(); Events.eventPanel().remove();
Events.activeEvent().eventPanel = null; Events.activeEvent().eventPanel = null;
Events.eventStack.shift(); Events.eventStack.shift();
Engine.log(Events.eventStack.length + ' events remaining'); Engine.log(Events.eventStack.length + ' events remaining');
Engine.keyLock = false; Engine.keyLock = false;
// Force refocus on the body. I hate you, IE. // Force refocus on the body. I hate you, IE.
$('body').focus(); $('body').focus();
}); });
}, },
handleStateUpdates: function(e){ handleStateUpdates: function(e){
if(e.category == 'stores' && Events.activeEvent() != null){ if(e.category == 'stores' && Events.activeEvent() != null){
Events.updateButtons(); Events.updateButtons();
} }
} }
}; };