Bladeren bron

fixes #1021

tags/v0.3.1
BigBadWaffle 5 jaren geleden
committed by Big Bad Waffle
bovenliggende
commit
a882e938fe
8 gewijzigde bestanden met toevoegingen van 38 en 55 verwijderingen
  1. +1
    -1
      src/client/js/components/quests.js
  2. +1
    -1
      src/client/js/components/spellbook.js
  3. +32
    -23
      src/client/js/misc/helpers.js
  4. +1
    -1
      src/client/js/objects/objects.js
  5. +1
    -1
      src/client/ui/templates/equipment/equipment.js
  6. +1
    -1
      src/client/ui/templates/leaderboard/leaderboard.js
  7. +0
    -26
      src/server/misc/helpers.js
  8. +1
    -1
      src/server/world/randomMap.js

+ 1
- 1
src/client/js/components/quests.js Bestand weergeven

@@ -15,7 +15,7 @@ define([
if (blueprint.updateQuests) {
blueprint.updateQuests.forEach(function (q) {
events.emit('onUpdateQuest', q);
let index = this.quests.firstIndex(f => f.id === q.id);
let index = this.quests.findIndex(f => f.id === q.id);
this.quests.splice(index, 1, q);
}, this);
}


+ 1
- 1
src/client/js/components/spellbook.js Bestand weergeven

@@ -61,7 +61,7 @@ define([

if (blueprint.getSpells) {
blueprint.getSpells.forEach(function (s) {
let existIndex = this.spells.firstIndex(f => f.id === s.id);
let existIndex = this.spells.findIndex(f => f.id === s.id);

if (existIndex > -1) {
this.spells.splice(existIndex, 1, s);


+ 32
- 23
src/client/js/misc/helpers.js Bestand weergeven

@@ -4,29 +4,6 @@ window.isMobile = /Mobi|Android/i.test(navigator.userAgent);
window.scale = isMobile ? 32 : 40;
window.scaleMult = isMobile ? 4 : 5;

//eslint-disable-next-line no-extend-native
Array.prototype.firstIndex = function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;

let k = 0;

while (k < len) {
let kValue;

if (k in O) {
kValue = O[k];

if (callback.call(T, kValue, k, O))
return k;
}
k++;
}

return -1;
};

//eslint-disable-next-line no-extend-native
Array.prototype.spliceWhere = function (callback, thisArg) {
let T = thisArg;
@@ -82,6 +59,38 @@ Object.defineProperty(Object.prototype, 'has', {
}
});

//eslint-disable-next-line no-extend-native
if (!String.prototype.padStart) {
String.prototype.padStart = function padStart (targetLength, padString) {
targetLength = targetLength >> 0;
padString = String(typeof padString !== 'undefined' ? padString : ' ');
if (this.length >= targetLength)
return String(this);
targetLength = targetLength - this.length;
if (targetLength > padString.length)
padString += padString.repeat(targetLength / padString.length);
return padString.slice(0, targetLength) + String(this);
};
}

//eslint-disable-next-line no-extend-native
if (!String.prototype.padStart) {
String.prototype.padStart = function padStart (targetLength, padString) {
targetLength = targetLength >> 0; //truncate if number, or convert non-number to 0;
padString = String(typeof padString !== 'undefined' ? padString : ' ');
if (this.length >= targetLength)
return String(this);
targetLength = targetLength - this.length;
if (targetLength > padString.length)
padString += padString.repeat(targetLength / padString.length); //append to original to ensure we are longer than needed
return padString.slice(0, targetLength) + String(this);
};
}

window._ = {
get2dArray: function (w, h, def) {
def = def || 0;


+ 1
- 1
src/client/js/objects/objects.js Bestand weergeven

@@ -84,7 +84,7 @@ define([
if (!fromMob)
return list[0];

let fromIndex = list.firstIndex(function (l) {
let fromIndex = list.findIndex(function (l) {
return (l.id === fromMob.id);
});



+ 1
- 1
src/client/ui/templates/equipment/equipment.js Bestand weergeven

@@ -193,7 +193,7 @@ define([
});

if (isConsumable)
items = items.filter((item, i) => items.firstIndex(f => f.name === item.name) === i);
items = items.filter((item, i) => items.findIndex(f => f.name === item.name) === i);

items.splice(0, 0, {
name: 'None',


+ 1
- 1
src/client/ui/templates/leaderboard/leaderboard.js Bestand weergeven

@@ -120,7 +120,7 @@ define([
if (!keepOffset) {
this.offset = 0;

let foundIndex = this.records.list.firstIndex(function (r) {
let foundIndex = this.records.list.findIndex(function (r) {
return (r.name === window.player.name);
}, this);
if (foundIndex !== -1)


+ 0
- 26
src/server/misc/helpers.js Bestand weergeven

@@ -1,29 +1,3 @@
//eslint-disable-next-line no-extend-native
Object.defineProperty(Array.prototype, 'firstIndex', {
enumerable: false,
value: function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;

let k = 0;

while (k < len) {
let kValue;

if (k in O) {
kValue = O[k];

if (callback.call(T, kValue, k, O))
return k;
}
k++;
}

return -1;
}
});

//eslint-disable-next-line no-extend-native
Object.defineProperty(Array.prototype, 'spliceWhere', {
enumerable: false,


+ 1
- 1
src/server/world/randomMap.js Bestand weergeven

@@ -446,7 +446,7 @@ module.exports = {
return ((direction[0] === -exitDirection[0]) && (direction[1] === -exitDirection[1]));
});
templateExit = templateExit[this.randInt(0, templateExit.length)];
let exitIndex = template.exits.firstIndex(e => e === templateExit);
let exitIndex = template.exits.findIndex(e => e === templateExit);

template.exits.splice(exitIndex, 1);



Laden…
Annuleren
Opslaan