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

Some general code cleanup.

Browse Source
This commit is contained in:
Michael
2013-10-10 20:49:19 -04:00
parent fbdc84dcf1
commit dde477aade
10 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/events.js
+5 -6
View File
@@ -298,7 +298,7 @@ var Events = {
dmg = weapon.damage;
if(typeof dmg == 'number') {
if(weapon.type == 'unarmed' && $SM.hasPerk('boxer')) {
dmg *= 2
dmg *= 2;
}
if(weapon.type == 'unarmed' && $SM.hasPerk('martial artist')) {
dmg *= 3;
@@ -336,7 +336,7 @@ var Events = {
fighter.stop(true, true).animate(start, Events._FIGHT_SPEED, function() {
var enemyHp = enemy.data('hp');
var msg;
var msg = "";
if(typeof dmg == 'number') {
if(dmg < 0) {
msg = 'miss';
@@ -381,7 +381,7 @@ var Events = {
$('<div>').css(start).addClass('bullet').text('o').appendTo('#description')
.animate(end, Events._FIGHT_SPEED * 2, 'linear', function() {
var enemyHp = enemy.data('hp');
var msg;
var msg = "";
if(typeof dmg == 'number') {
if(dmg < 0) {
msg = 'miss';
@@ -508,7 +508,7 @@ var Events = {
dropStuff: function(e) {
e.stopPropagation();
var btn = $(this)
var btn = $(this);
var thing = btn.data('thing');
var num = btn.data('num');
var lootButtons = $('#lootButtons');
@@ -537,7 +537,6 @@ var Events = {
var weight = Path.getWeight(name);
var freeSpace = Path.getFreeSpace();
if(weight <= freeSpace) {
var loot = Events.activeEvent().scenes[Events.activeScene].loot[name];
var num = btn.data('numLeft');
num--;
btn.data('numLeft', num);
@@ -791,7 +790,7 @@ var Events = {
scheduleNextEvent: function(scale) {
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');
Events._eventTimeout = setTimeout(Events.triggerEvent, nextEvent * 60 * 1000);
},