diff --git a/script/events.js b/script/events.js index 6fee7b0..7ee53b2 100644 --- a/script/events.js +++ b/script/events.js @@ -74,7 +74,7 @@ var Events = { Events.createFighterDiv('@', World.health, World.getMaxHealth()).attr('id', 'wanderer').appendTo(desc); // Draw the enemy - Events.createFighterDiv(scene.char, scene.health, scene.health).attr('id', 'enemy').appendTo(desc); + Events.createFighterDiv(scene.chara, scene.health, scene.health).attr('id', 'enemy').appendTo(desc); // Draw the action buttons var btns = $('#buttons', Events.eventPanel()); @@ -592,8 +592,8 @@ var Events = { } }, - createFighterDiv: function(char, hp, maxhp) { - var fighter = $('
').addClass('fighter').text(char).data('hp', hp).data('maxHp', maxhp); + createFighterDiv: function(chara, hp, maxhp) { + var fighter = $('
').addClass('fighter').text(chara).data('hp', hp).data('maxHp', maxhp); $('
').addClass('hp').text(hp+'/'+maxhp).appendTo(fighter); return fighter; }, @@ -804,4 +804,4 @@ var Events = { $('body').focus(); }); } -}; \ No newline at end of file +}; diff --git a/script/events/encounters.js b/script/events/encounters.js index bcaf26c..adcf892 100644 --- a/script/events/encounters.js +++ b/script/events/encounters.js @@ -12,7 +12,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'snarling beast', - char: 'B', + chara: 'B', damage: 1, hit: 0.8, attackDelay: 1, @@ -47,7 +47,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'gaunt man', - char: 'G', + chara: 'G', damage: 2, hit: 0.8, attackDelay: 2, @@ -82,7 +82,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'strange bird', - char: 'B', + chara: 'B', damage: 3, hit: 0.8, attackDelay: 2, @@ -118,7 +118,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'shivering man', - char: 'S', + chara: 'S', damage: 5, hit: 0.5, attackDelay: 1, @@ -158,7 +158,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'man-eater', - char: 'E', + chara: 'E', damage: 3, hit: 0.8, attackDelay: 1, @@ -193,7 +193,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'scavenger', - char: 'S', + chara: 'S', damage: 4, hit: 0.8, attackDelay: 2, @@ -233,7 +233,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'lizard', - char: 'L', + chara: 'L', damage: 5, hit: 0.8, attackDelay: 2, @@ -269,7 +269,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'feral terror', - char: 'F', + chara: 'F', damage: 6, hit: 0.8, attackDelay: 1, @@ -305,7 +305,7 @@ Events.Encounters = [ combat: true, enemy: 'soldier', ranged: true, - char: 'D', + chara: 'D', damage: 8, hit: 0.8, attackDelay: 2, @@ -345,7 +345,7 @@ Events.Encounters = [ 'start': { combat: true, enemy: 'sniper', - char: 'S', + chara: 'S', damage: 15, hit: 0.8, attackDelay: 4, @@ -376,5 +376,5 @@ Events.Encounters = [ notification: 'a shot rings out, from somewhere in the long grass' } } - }, -]; \ No newline at end of file + } +]; diff --git a/script/events/room.js b/script/events/room.js index 246ff06..cb9ea1c 100644 --- a/script/events/room.js +++ b/script/events/room.js @@ -285,7 +285,7 @@ Events.Room = [ }, '100wood': { text: [ - 'the wanderer leaves, cart loaded with wood', + 'the wanderer leaves, cart loaded with wood' ], onLoad: function() { if(Math.random() < 0.5) { @@ -304,7 +304,7 @@ Events.Room = [ }, '500wood': { text: [ - 'the wanderer leaves, cart loaded with wood', + 'the wanderer leaves, cart loaded with wood' ], onLoad: function() { if(Math.random() < 0.3) { @@ -355,7 +355,7 @@ Events.Room = [ }, '100fur': { text: [ - 'the wanderer leaves, cart loaded with furs', + 'the wanderer leaves, cart loaded with furs' ], onLoad: function() { if(Math.random() < 0.5) { @@ -374,7 +374,7 @@ Events.Room = [ }, '500fur': { text: [ - 'the wanderer leaves, cart loaded with furs', + 'the wanderer leaves, cart loaded with furs' ], onLoad: function() { if(Math.random() < 0.3) { @@ -590,4 +590,4 @@ Events.Room = [ } } } -]; \ No newline at end of file +]; diff --git a/script/events/setpieces.js b/script/events/setpieces.js index 41cff66..9ba8a83 100644 --- a/script/events/setpieces.js +++ b/script/events/setpieces.js @@ -111,7 +111,7 @@ Events.Setpieces = { 'a1': { combat: true, enemy: 'beast', - char: 'B', + chara: 'B', damage: 1, hit: 0.8, attackDelay: 1, @@ -249,7 +249,7 @@ Events.Setpieces = { 'b3': { combat: true, enemy: 'beast', - char: 'B', + chara: 'B', damage: 1, hit: 0.8, attackDelay: 1, @@ -281,7 +281,7 @@ Events.Setpieces = { 'b4': { combat: true, enemy: 'cave lizard', - char: 'L', + chara: 'L', damage: 3, hit: 0.8, attackDelay: 2, @@ -313,7 +313,7 @@ Events.Setpieces = { 'c1': { combat: true, enemy: 'beast', - char: 'B', + chara: 'B', damage: 3, hit: 0.8, attackDelay: 2, @@ -345,7 +345,7 @@ Events.Setpieces = { 'c2': { combat: true, enemy: 'lizard', - char: 'L', + chara: 'L', damage: 4, hit: 0.8, attackDelay: 2, @@ -541,7 +541,7 @@ Events.Setpieces = { 'a2': { combat: true, enemy: 'thug', - char: 'T', + chara: 'T', damage: 4, hit: 0.8, attackDelay: 2, @@ -632,7 +632,7 @@ Events.Setpieces = { 'b2': { combat: true, enemy: 'scavenger', - char: 'S', + chara: 'S', damage: 4, hit: 0.8, attackDelay: 2, @@ -669,7 +669,7 @@ Events.Setpieces = { 'b3': { combat: true, enemy: 'beast', - char: 'B', + chara: 'B', damage: 3, hit: 0.8, attackDelay: 1, @@ -739,7 +739,7 @@ Events.Setpieces = { 'b5': { combat: true, enemy: 'madman', - char: 'M', + chara: 'M', damage: 6, hit: 0.3, attackDelay: 1, @@ -776,7 +776,7 @@ Events.Setpieces = { 'c1': { combat: true, enemy: 'thug', - char: 'T', + chara: 'T', damage: 4, hit: 0.8, attackDelay: 2, @@ -813,7 +813,7 @@ Events.Setpieces = { 'c2': { combat: true, enemy: 'beast', - char: 'B', + chara: 'B', damage: 3, hit: 0.8, attackDelay: 1, @@ -862,7 +862,7 @@ Events.Setpieces = { 'c4': { combat: true, enemy: 'beast', - char: 'B', + chara: 'B', damage: 4, hit: 0.8, attackDelay: 1, @@ -933,7 +933,7 @@ Events.Setpieces = { 'd1': { combat: true, enemy: 'scavenger', - char: 'S', + chara: 'S', damage: 5, hit: 0.8, attackDelay: 2, @@ -970,7 +970,7 @@ Events.Setpieces = { 'd2': { combat: true, enemy: 'vigilante', - char: 'V', + chara: 'V', damage: 6, hit: 0.8, attackDelay: 2, @@ -1242,7 +1242,7 @@ Events.Setpieces = { 'a3': { text: [ 'a large shanty town sprawls across the streets.', - 'faces, darkened by soot and blood, stare out from crooked huts.', + 'faces, darkened by soot and blood, stare out from crooked huts.' ], buttons: { 'continue': { @@ -1292,7 +1292,7 @@ Events.Setpieces = { combat: true, notification: 'a huge lizard scrambles up out of the darkness of an old metro station.', enemy: 'lizard', - char: 'L', + chara: 'L', damage: 5, hit: 0.8, attackDelay: 2, @@ -1329,7 +1329,7 @@ Events.Setpieces = { notification: 'the shot echoes in the empty street.', combat: true, enemy: 'sniper', - char: 'S', + chara: 'S', damage: 15, hit: 0.8, attackDelay: 4, @@ -1368,7 +1368,7 @@ Events.Setpieces = { combat: true, enemy: 'soldier', ranged: true, - char: 'D', + chara: 'D', damage: 8, hit: 0.8, attackDelay: 2, @@ -1405,7 +1405,7 @@ Events.Setpieces = { notification: 'a frail man stands defiantly, blocking the path.', combat: true, enemy: 'frail man', - char: 'M', + chara: 'M', damage: 1, hit: 0.8, attackDelay: 2, @@ -1479,7 +1479,7 @@ Events.Setpieces = { notification: 'an old man bursts through a door, wielding a scalpel.', combat: true, enemy: 'old man', - char: 'M', + chara: 'M', damage: 3, hit: 0.5, attackDelay: 2, @@ -1516,7 +1516,7 @@ Events.Setpieces = { notification: 'a thug is waiting on the other side of the wall.', combat: true, enemy: 'thug', - char: 'T', + chara: 'T', damage: 3, hit: 0.8, attackDelay: 2, @@ -1554,7 +1554,7 @@ Events.Setpieces = { notification: 'a snarling beast jumps out from behind a car.', combat: true, enemy: 'beast', - char: 'B', + chara: 'B', damage: 2, hit: 0.8, attackDelay: 1, @@ -1765,7 +1765,7 @@ Events.Setpieces = { combat: true, enemy: 'squatters', plural: true, - char: 'SSS', + chara: 'SSS', damage: 2, hit: 0.7, attackDelay: 0.5, @@ -1804,7 +1804,7 @@ Events.Setpieces = { combat: true, enemy: 'lizards', plural: true, - char: 'LLL', + chara: 'LLL', damage: 4, hit: 0.7, attackDelay: 0.7, @@ -1865,7 +1865,7 @@ Events.Setpieces = { notification: 'a large bird nests at the top of the stairs.', combat: true, enemy: 'bird', - char: 'B', + chara: 'B', damage: 5, hit: 0.7, attackDelay: 1, @@ -1933,7 +1933,7 @@ Events.Setpieces = { combat: true, enemy: 'rats', plural: true, - char: 'RRR', + chara: 'RRR', damage: 1, hit: 0.8, attackDelay: 0.25, @@ -1966,7 +1966,7 @@ Events.Setpieces = { notification: 'a large man attacks, waving a bayonet.', combat: true, enemy: 'veteran', - char: 'V', + chara: 'V', damage: 3, hit: 0.8, attackDelay: 2, @@ -2000,7 +2000,7 @@ Events.Setpieces = { combat: true, enemy: 'soldier', ranged: true, - char: 'D', + chara: 'D', damage: 8, hit: 0.8, attackDelay: 2, @@ -2038,7 +2038,7 @@ Events.Setpieces = { notification: 'a masked soldier rounds the corner, gun drawn', combat: true, enemy: 'commando', - char: 'C', + chara: 'C', ranged: true, damage: 3, hit: 0.9, @@ -2078,7 +2078,7 @@ Events.Setpieces = { combat: true, enemy: 'squatters', plural: true, - char: 'SSS', + chara: 'SSS', damage: 2, hit: 0.7, attackDelay: 0.5, @@ -2111,7 +2111,7 @@ Events.Setpieces = { notification: 'a youth lashes out with a tree branch.', combat: true, enemy: 'youth', - char: 'Y', + chara: 'Y', damage: 2, hit: 0.7, attackDelay: 1, @@ -2144,7 +2144,7 @@ Events.Setpieces = { notification: 'a squatter stands firmly in the doorway of a small hut.', combat: true, enemy: 'squatter', - char: 'S', + chara: 'S', damage: 3, hit: 0.8, attackDelay: 2, @@ -2177,7 +2177,7 @@ Events.Setpieces = { notification: 'behind the door, a deformed figure awakes and attacks.', combat: true, enemy: 'deformed', - char: 'D', + chara: 'D', damage: 8, hit: 0.6, attackDelay: 2, @@ -2217,7 +2217,7 @@ Events.Setpieces = { combat: true, enemy: 'tentacles', plural: true, - char: 'TTT', + chara: 'TTT', damage: 2, hit: 0.6, attackDelay: 0.5, @@ -2817,7 +2817,7 @@ Events.Setpieces = { nextScene: 'end' } } - }, + } } }, "house": { /* Abandoned House */ @@ -2838,7 +2838,7 @@ Events.Setpieces = { text: 'leave', nextScene: 'end' } - }, + } }, 'supplies': { text: [ @@ -2899,7 +2899,7 @@ Events.Setpieces = { 'occupied': { combat: true, enemy: 'squatter', - char: 'S', + chara: 'S', damage: 3, hit: 0.8, attackDelay: 2, @@ -3061,7 +3061,7 @@ Events.Setpieces = { combat: true, enemy: 'soldier', ranged: true, - char: 'D', + chara: 'D', damage: 8, hit: 0.8, attackDelay: 2, @@ -3099,7 +3099,7 @@ Events.Setpieces = { combat: true, enemy: 'soldier', ranged: true, - char: 'D', + chara: 'D', damage: 8, hit: 0.8, attackDelay: 2, @@ -3136,7 +3136,7 @@ Events.Setpieces = { 'a3': { combat: true, enemy: 'veteran', - char: 'V', + chara: 'V', damage: 10, hit: 0.8, attackDelay: 2, @@ -3204,7 +3204,7 @@ Events.Setpieces = { 'a1': { combat: true, enemy: 'man', - char: 'M', + chara: 'M', damage: 3, hit: 0.8, attackDelay: 2, @@ -3236,7 +3236,7 @@ Events.Setpieces = { 'a2': { combat: true, enemy: 'man', - char: 'M', + chara: 'M', damage: 3, hit: 0.8, attackDelay: 2, @@ -3268,7 +3268,7 @@ Events.Setpieces = { 'a3': { combat: true, enemy: 'chief', - char: 'C', + chara: 'C', damage: 5, hit: 0.8, attackDelay: 2, @@ -3343,7 +3343,7 @@ Events.Setpieces = { 'enter': { combat: true, enemy: 'beastly matriarch', - char: 'M', + chara: 'M', damage: 4, hit: 0.8, attackDelay: 2, diff --git a/script/space.js b/script/space.js index 488de1c..bd9dc3c 100644 --- a/script/space.js +++ b/script/space.js @@ -216,7 +216,7 @@ var Space = { Space.ship.css({ left: x + 'px', - top: y + 'px', + top: y + 'px' }); Space.lastMove = Date.now(); @@ -446,4 +446,4 @@ var Space = { break; } } -}; \ No newline at end of file +};