Browse Source

fixes #423

tags/v0.1.9^2
big bad waffle 6 years ago
parent
commit
4211cd6a99
6 changed files with 19 additions and 25 deletions
  1. +2
    -1
      src/client/js/misc/statTranslations.js
  2. +2
    -1
      src/client/ui/templates/equipment/equipment.js
  3. +1
    -0
      src/client/ui/templates/tooltipItem/tooltipItem.js
  4. +8
    -23
      src/server/components/inventory.js
  5. +1
    -0
      src/server/components/stats.js
  6. +5
    -0
      src/server/items/generators/stats.js

+ 2
- 1
src/client/js/misc/statTranslations.js View File

@@ -15,7 +15,8 @@ define([
'armor': 'armor',
'addCritChance': 'increased crit chance',
'addCritMultiplier': 'increased crit multiplier',
'magicFind': 'magic find',
'magicFind': 'increased item quality',
'itemQuantity': 'increased item quantity',
'sprintChance': 'sprint chance',
'dmgPercent': 'to all damage',
'allAttributes': 'to all attributes',


+ 2
- 1
src/client/ui/templates/equipment/equipment.js View File

@@ -359,7 +359,8 @@ define([
'all resist': stats.elementAllResist
},
misc: {
'magic find': stats.magicFind,
'item quality': stats.magicFind,
'item quantity': stats.itemQuantity + '%',
gap1: '',
'sprint chance': (stats.sprintChance || 0) + '%',
gap2: '',


+ 1
- 0
src/client/ui/templates/tooltipItem/tooltipItem.js View File

@@ -19,6 +19,7 @@ define([
'xpIncrease',
'attackSpeed',
'castSpeed',
'itemQuantity',
'catchChance',
'catchSpeed',
'fishRarity',


+ 8
- 23
src/server/components/inventory.js View File

@@ -833,31 +833,16 @@ define([
if ((!blueprint.noRandom) || (blueprint.alsoRandom)) {
var magicFind = (blueprint.magicFind || 0);
var bonusMagicFind = killSource.stats.values.magicFind;
for (var i = 0; i < blueprint.rolls; i++) {
if (Math.random() * 100 >= (blueprint.chance || 35))
continue;

/*var useItem = null;
if (Math.random() < generator.spellChance) {
useItem = instancedItems
.filter(item => item.ability);
if (useItem.length > 0)
useItem = useItem[~~(Math.random() * useItem.length)];
}

if (!useItem) {
var slot = generator.pickRandomSlot();
var useItem = instancedItems.find(item => item.slot == slot);
}
var rolls = blueprint.rolls;
var itemQuantity = killSource.stats.values.itemQuantity;
rolls += ~~(itemQuantity / 100);
if ((Math.random() * 100) < (itemQuantity * 100))
rolls++;

if (!useItem)
useItem = instancedItems[~~(Math.random() * iLen)];
iLen--;
instancedItems.spliceWhere(item => item == useItem);

//Spells don't have stats
if (useItem.stats)
delete useItem.stats.armor;*/
for (var i = 0; i < rolls; i++) {
if (Math.random() * 100 >= (blueprint.chance || 35))
continue;

var itemBlueprint = {
level: this.obj.stats.values.level,


+ 1
- 0
src/server/components/stats.js View File

@@ -24,6 +24,7 @@ define([
int: 0,
dex: 0,
magicFind: 0,
itemQuantity: 0,
regenHp: 0,
regenMana: 10,
addCritChance: 0,


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

@@ -188,6 +188,11 @@ define([
max: 15
},

itemQuantity: {
min: 2,
max: 27
},

xpIncrease: {
min: 1,
max: 6


Loading…
Cancel
Save