Browse Source

lint errors and prophecy require error

tags/v0.2.1^2
big bad waffle 5 years ago
parent
commit
dd9778e77a
23 changed files with 778 additions and 794 deletions
  1. +2
    -2
      .eslintrc
  2. +1
    -1
      src/server/components/prophecies.js
  3. +1
    -1
      src/server/components/workbench.js
  4. +751
    -751
      src/server/config/maps/fjolarok/zone.js
  5. +1
    -3
      src/server/config/spells.js
  6. +2
    -2
      src/server/config/spells/spellAura.js
  7. +1
    -1
      src/server/config/spells/spellCharge.js
  8. +1
    -1
      src/server/config/spells/spellFireblast.js
  9. +1
    -1
      src/server/config/spells/spellTemplate.js
  10. +1
    -1
      src/server/config/spells/spellTrailDash.js
  11. +0
    -2
      src/server/config/spells/spellWarnBlast.js
  12. +0
    -1
      src/server/fixes/fixes.js
  13. +3
    -1
      src/server/items/enchanter.js
  14. +1
    -1
      src/server/items/generator.js
  15. +1
    -1
      src/server/items/generators/names.js
  16. +0
    -6
      src/server/items/generators/stats.js
  17. +1
    -1
      src/server/items/itemEffects.js
  18. +0
    -2
      src/server/leaderboard/leaderboard.js
  19. +0
    -2
      src/server/misc/mail.js
  20. +1
    -1
      src/server/misc/scheduler.js
  21. +5
    -5
      src/server/mods/event-xmas/index.js
  22. +2
    -5
      src/server/mods/event-xmas/maps/fjolarok/events/xmas.js
  23. +2
    -2
      src/server/mods/feature-cards/cards.js

+ 2
- 2
.eslintrc View File

@@ -92,9 +92,9 @@
"no-alert": 2,
"no-caller": 2,
"no-else-return": 2,
"no-eq-null": 2,
"no-eq-null": 1,
"no-eval": 2,
"no-extend-native": 2,
"no-extend-native": 1,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implied-eval": 2,


+ 1
- 1
src/server/components/prophecies.js View File

@@ -7,7 +7,7 @@ module.exports = {
(blueprint.list || []).forEach(function (p) {
let template = null;
try {
let template = require('config/prophecies/' + p);
let template = require('../config/prophecies/' + p);
} catch (e) {
console.log(e);
}


+ 1
- 1
src/server/components/workbench.js View File

@@ -124,7 +124,7 @@ module.exports = {
if (!canCraft)
return;

recipe.materials.forEach(m => obj.inventory.removeItem(m.name, m.quantity));
recipe.materials.forEach(m => obj.inventory.destroyItem(m.name, m.quantity));

let item = extend(true, {}, recipe.item);
item.description += `<br /><br />(Crafted by ${obj.name})`;


+ 751
- 751
src/server/config/maps/fjolarok/zone.js
File diff suppressed because it is too large
View File


+ 1
- 3
src/server/config/spells.js View File

@@ -230,14 +230,12 @@ let spells = [{
name: 'Charge',
type: 'charge',
description: 'Charges at a foe, dealing damage and stunning them for a short period.',
type: 'charge',
icon: [3, 1],
animation: 'raiseShield'
}, {
name: 'Reflect Damage',
type: 'reflectdamage',
description: 'Gain an ethereal shield that reflects damage until the buff wears off.',
type: 'reflectDamage',
icon: [3, 2],
animation: 'raiseShield'
}, {
@@ -325,7 +323,7 @@ let spells = [{
chance: 0.4
}
}*/
{
{
name: 'Crystal Spikes',
description: 'Jagged crystals break through the ground at your target destination',
type: 'warnBlast',


+ 2
- 2
src/server/config/spells/spellAura.js View File

@@ -57,7 +57,7 @@ module.exports = {
members.forEach(function (m) {
let effect = effects[m];

let obj = objects.find(o => (o.serverId === m));
let obj = objects.find(f => (f.serverId === m));
if (!obj) {
if (effect)
delete effects[m];
@@ -103,7 +103,7 @@ module.exports = {
if (!effect)
return;

let obj = objects.find(o => (o.serverId === m));
let obj = objects.find(f => (f.serverId === m));
if (!obj) {
delete effects[m];
return;


+ 1
- 1
src/server/config/spells/spellCharge.js View File

@@ -40,7 +40,7 @@ module.exports = {
if (!this.isTileValid(physics, x, y, targetPos.x - offsetX, targetPos.y - offsetY)) {
if (!this.isTileValid(physics, x, y, targetPos.x - offsetX, targetPos.y))
targetPos.y -= offsetY;
else
else
targetPos.x -= offsetX;
} else {
targetPos.x -= offsetX;


+ 1
- 1
src/server/config/spells/spellFireblast.js View File

@@ -78,7 +78,7 @@ module.exports = {
if (physics.isTileBlocking(targetPos.x + dx, targetPos.y)) {
if (physics.isTileBlocking(targetPos.x, targetPos.y + dy))
break;
else {
else {
dx = 0;
targetPos.y += dy;
}


+ 1
- 1
src/server/config/spells/spellTemplate.js View File

@@ -85,7 +85,7 @@ module.exports = {

if (this.damage)
this.values.dmg = ~~(dmg * 100) / 100 + '/tick';
else
else
this.values.heal = ~~(dmg * 100) / 100 + '/tick';

if (!noSync)


+ 1
- 1
src/server/config/spells/spellTrailDash.js View File

@@ -83,7 +83,7 @@ module.exports = {

if (this.obj.instance.physics.isTileBlocking(x, y))
this.distance = 7;
else if ((x !== this.obj.x) || (y !== this.obj.y)) {
else if ((x !== this.obj.x) || (y !== this.obj.y)) {
//if ((x !== this.targetX) || (y !== this.targetY)) {
let particles = this.particles;



+ 0
- 2
src/server/config/spells/spellWarnBlast.js View File

@@ -1,8 +1,6 @@
module.exports = {
type: 'warnBlast',

needLos: false,

range: 100,

castingEffect: null,


+ 0
- 1
src/server/fixes/fixes.js View File

@@ -1,4 +1,3 @@
let io = require('../security/io');
let configSkins = require('../config/skins');

module.exports = {


+ 3
- 1
src/server/items/enchanter.js View File

@@ -201,7 +201,9 @@ module.exports = {
return;

result = salvager.salvage(item, true);
result.forEach(r => r.quantity = Math.max(1, ~~(r.quantity * mult)));
result.forEach(r => {
r.quantity = Math.max(1, ~~(r.quantity * mult));
});
}

return {


+ 1
- 1
src/server/items/generator.js View File

@@ -50,7 +50,7 @@ module.exports = {
spellGenerators.forEach(g => g.generate(item, blueprint));
else if (isCurrency)
currencyGenerators.forEach(g => g.generate(item, blueprint));
else if (blueprint.material) {
else if (blueprint.material) {
item.material = true;
item.sprite = blueprint.sprite;
item.noDrop = blueprint.noDrop;


+ 1
- 1
src/server/items/generators/names.js View File

@@ -50,7 +50,7 @@ module.exports = {

if (item.slot === 'tool')
list = suffixes.slots.tool;
else {
else {
list = suffixes.generic.concat(suffixes.slots[item.slot] || []);

if (item.stats.armor)


+ 0
- 6
src/server/items/generators/stats.js View File

@@ -148,12 +148,6 @@ module.exports = {
generator: 'mainStat'
},

elementAllResist: {
level: {
min: 25
},
generator: 'elementResist'
},
elementArcaneResist: {
level: {
min: 15


+ 1
- 1
src/server/items/itemEffects.js View File

@@ -3,7 +3,7 @@ let events = require('../misc/events');
let list = {

};
module.exports = {
init: function () {
events.emit('onBeforeGetItemEffectList', list);


+ 0
- 2
src/server/leaderboard/leaderboard.js View File

@@ -1,5 +1,3 @@
let io = require('../security/io');

module.exports = {
list: [],
waiting: [],


+ 0
- 2
src/server/misc/mail.js View File

@@ -1,5 +1,3 @@
let io = require('../security/io');

module.exports = {
queue: {},
busy: {},


+ 1
- 1
src/server/misc/scheduler.js View File

@@ -47,7 +47,7 @@ module.exports = {

return Array
.apply(null, Array(1 + timeT - lastTimeT))
.map((i, j) => (j + lastTimeT))
.map((j, k) => (k + lastTimeT))
.some(function (s) {
let useTime = (s >= overflow) ? (s - overflow) : s;



+ 5
- 5
src/server/mods/event-xmas/index.js View File

@@ -62,7 +62,7 @@ module.exports = {

onBeforeUseItem: function (obj, item, result) {
let handler = {
'Merrywinter Play Script': function (obj, item, result) {
'Merrywinter Play Script': function () {
let lines = [
'A catch, a catch, our lines are taut, somebody grab the wheel',
'And when the catch was on the ship, all three stood \'round in awe',
@@ -99,7 +99,7 @@ module.exports = {

obj.syncer.set(false, 'chatter', 'msg', lines[pick] + '\r\n' + lines[pick + 1]);
},
'Sprig of Mistletoe': function (obj, item, result) {
'Sprig of Mistletoe': function () {
let ox = obj.x;
let oy = obj.y;

@@ -183,13 +183,13 @@ module.exports = {
}
}]);
},
'Bottomless Eggnog': function (obj, item, result) {
'Bottomless Eggnog': function () {
obj.effects.addEffect({
type: 'merry',
ttl: 514
});
},
'Scented Beard Oil': function (obj, item, result) {
'Scented Beard Oil': function () {
obj.syncer.set(false, 'chatter', 'color', 0xfc66f7);
obj.syncer.set(false, 'chatter', 'msg', '...Rubs his beard throughtfully...');
}
@@ -198,7 +198,7 @@ module.exports = {
if (!handler)
return;

handler(obj, item, result);
handler();
},

onBeforeGetFactions: function (mappings) {


+ 2
- 5
src/server/mods/event-xmas/maps/fjolarok/events/xmas.js View File

@@ -92,11 +92,8 @@ module.exports = {
if ((!snowflakes) || (snowflakes.quantity < 15))
return 'Sorry, please come back when you have at least fifteen.';

while (true) {
snowflakes = inventory.items.find(i => (i.name === 'Snowflake'));
if ((!snowflakes) || (snowflakes.quantity < 15))
return;
else if ((!inventory.hasSpace()) && (snowflakes.quantity !== 15))
while (snowflakes.quantity >= 15) {
if ((!inventory.hasSpace()) && (snowflakes.quantity !== 15))
return 'Sorry, it seems you don\'t have enough space to accept my gifts.';

obj.reputation.getReputation('theWinterMan', 100);


+ 2
- 2
src/server/mods/feature-cards/cards.js View File

@@ -94,7 +94,7 @@ module.exports = {
let pickName = pool[~~(Math.random() * pool.length)];
let pick = configs[pickName];

let card = {
let builtCard = {
name: pickName,
spritesheet: pick.spritesheet || `${this.folderName}/images/items.png`,
type: 'Reward Card',
@@ -106,7 +106,7 @@ module.exports = {
setSize: pick.setSize
};

return card;
return builtCard;
},

getReward: function (looter, set) {


Loading…
Cancel
Save