Browse Source

Fixes #146

tags/v0.1.3^2
Big Bad Waffle 7 years ago
parent
commit
5161468693
4 changed files with 35 additions and 11 deletions
  1. +2
    -2
      src/client/ui/templates/inventory/inventory.js
  2. +1
    -0
      src/server/combat/combat.js
  3. +26
    -8
      src/server/components/inventory.js
  4. +6
    -1
      src/server/config/factions/gaekatla.js

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

@@ -418,9 +418,9 @@ define([
performItemAction: function(item, action) {
if (!item)
return;
else if ((action == 'equip') && ((item.material) || (item.quast) || (item.level > window.player.stats.values.level)))
else if ((action == 'equip') && ((item.material) || (item.quest) || (item.level > window.player.stats.values.level)))
return;
if (item.factions) {
if ((item.factions) && (action == 'equip')) {
if (item.factions.some(function(f) {
return f.noEquip;
}))


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

@@ -47,6 +47,7 @@ define([
var cd = config.source.mob ? 1 : config.cd;

var amount = dps * cd * 0.3;
amount *= 999999999;

var isCrit = false;
if (!config.noCrit) {


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

@@ -41,17 +41,11 @@ define([
item.spell.properties.range = item.range;
}

if (item.effects) {
item.effects.forEach(function(e) {
var faction = require('config/factions/' + e.factionId);
var statGenerator = faction.uniqueStat;
statGenerator.generate(item);
});
}

this.getItem(items[i], true);
}

this.hookItemEvents();

if ((this.obj.player) && (!isTransfer)) {
this.getDefaultAbilities();

@@ -77,6 +71,27 @@ define([
this.blueprint = blueprint;
},

transfer: function() {
this.hookItemEvents();
},

hookItemEvents: function() {
var items = this.items;
var iLen = items.length;
for (var i = 0; i < iLen; i++) {
var item = items[i];

if (item.effects) {
item.effects.forEach(function(e) {
var faction = require('config/factions/' + e.factionId);
var statGenerator = faction.uniqueStat;
statGenerator.generate(item);
});
}
}

},

//Client Actions

enchantItem: function(msg) {
@@ -683,6 +698,9 @@ define([
var iLen = items.length;
for (var i = 0; i < iLen; i++) {
var item = items[i];
if (!item.eq)
continue;

var effects = item.effects;
if (!effects)
continue;


+ 6
- 1
src/server/config/factions/gaekatla.js View File

@@ -37,6 +37,11 @@ define([

item.effects.push(result);
}
//This is a hack for items that were never generated properly
else if (!result.chance) {
result.chance = chanceRoll;
result.text = chanceRoll + '% chance on kill to summon a critter to assist you in battle';
}

if (!result.events)
result.events = {};
@@ -53,7 +58,7 @@ define([
var effect = item.effects.find(e => (e.factionId == 'gaekatla'));

var roll = Math.random() * 100;
if (roll >= this.chance)
if (roll >= effect.chance)
return;

//Spawn a mob


Loading…
Cancel
Save