Bläddra i källkod

tons of small bug fixes

tags/v0.1.4^2
Big Bad Waffle 7 år sedan
förälder
incheckning
083f1798c8
9 ändrade filer med 38 tillägg och 21 borttagningar
  1. +3
    -0
      src/client/js/rendering/renderer.js
  2. +2
    -1
      src/client/ui/templates/login/login.js
  3. +0
    -2
      src/server/components/inventory.js
  4. +2
    -0
      src/server/components/spellbook.js
  5. +15
    -3
      src/server/components/stats.js
  6. +1
    -1
      src/server/items/generators/level.js
  7. +7
    -7
      src/server/mods/class-necromancer/index.js
  8. +6
    -3
      src/server/mods/class-necromancer/spells/spellSummonSkeleton.js
  9. +2
    -4
      src/server/world/instancer.js

+ 3
- 0
src/client/js/rendering/renderer.js Visa fil

@@ -474,6 +474,9 @@ define([
},

updateSprites: function() {
if (this.titleScreen)
return;

var player = window.player;
if (!player)
return;


+ 2
- 1
src/client/ui/templates/login/login.js Visa fil

@@ -23,7 +23,8 @@ define([
this.on('.btnRegister', 'click', this.onRegisterClick.bind(this));

this.find('.extra, .version')
.appendTo($('<div class="uiLoginExtra"></div>>').appendTo('.ui-container'));
.appendTo($('<div class="uiLoginExtra"></div>')
.appendTo('.ui-container'));

$('.uiLoginExtra').find('.button').on('click', this.redirect.bind(this));



+ 0
- 2
src/server/components/inventory.js Visa fil

@@ -419,8 +419,6 @@ define([
existItem.quantity = 1;
existItem.quantity += (item.quantity || 1);
item = existItem;

console.log(existItem.quantity);
}
}



+ 2
- 0
src/server/components/spellbook.js Visa fil

@@ -108,6 +108,8 @@ define([
animation = animations.mobs;
else if (sheetName == 'bosses')
animation = animations.bosses;
else if (sheetName.indexOf('/') > -1)
animation = animations.mobs[sheetName];
else
animation = animations.classes[this.obj.class];



+ 15
- 3
src/server/components/stats.js Visa fil

@@ -1,7 +1,7 @@
define([
'config/animations'
], function(
animations
) {
return {
type: 'stats',
@@ -366,6 +366,15 @@ define([
this.obj.spellbook.die();
this.obj.destroyed = true;

var deathAnimation = _.getDeepProperty(animations, ['mobs', this.obj.sheetName, this.obj.cell, 'death']);
if (deathAnimation) {
this.obj.instance.syncer.queue('onGetObject', {
x: this.obj.x,
y: this.obj.y,
components: [deathAnimation]
});
}

if (this.obj.inventory) {
var aggroList = this.obj.aggro.list;
var aLen = aggroList.length;
@@ -403,13 +412,16 @@ define([
},

getHp: function(heal, source) {
var amount = heal.amount;
if (amount == 0)
return;

var values = this.values;
var hpMax = values.hpMax;

if (values.hp >= hpMax)
return;

var amount = heal.amount;
if (hpMax - values.hp < amount)
amount = hpMax - values.hp;



+ 1
- 1
src/server/items/generators/level.js Visa fil

@@ -5,7 +5,7 @@ define([
) {
return {
generate: function(item, blueprint) {
item.level = blueprint.level || 1;
item.level = ~~(blueprint.level || 1);
}
};
});

+ 7
- 7
src/server/mods/class-necromancer/index.js Visa fil

@@ -26,7 +26,7 @@ define([
beforeGetAnimations: function(animations) {
var spritesheet = `${this.folderName}/images/inGameSprite.png`;

animations.classes.necromancer = {
animations.mobs[spritesheet] = {
'0': {
magic: {
spritesheet: spritesheet,
@@ -56,7 +56,7 @@ define([
row: 1,
col: 0,
frames: 2,
frameDelay: 4
frameDelay: 5
},
spawn: {
spritesheet: mobsheet,
@@ -72,7 +72,7 @@ define([
row: 3,
col: 0,
frames: 4,
frameDelay: 3,
frameDelay: 4,
type: 'attackAnimation'
}
};
@@ -137,7 +137,7 @@ define([
element: 'physical',
auto: true,
cdMax: 7,
manaCost: 1,
manaCost: 0,
range: 1,
random: {
damage: [2, 4],
@@ -150,11 +150,11 @@ define([
statMult: 0.1,
element: 'physical',
cdMax: 7,
manaCost: 6,
manaCost: 5,
range: 9,
random: {
damage: [2, 4],
life: [100, 200]
damagePercent: [80, 120],
hpPercent: [80, 120]
}
};



+ 6
- 3
src/server/mods/class-necromancer/spells/spellSummonSkeleton.js Visa fil

@@ -76,15 +76,18 @@ define([
walkDistance: 2,
regular: {
drops: 0,
hpMult: 0.5,
dmgMult: 2
hpMult: this.hpPercent / 100,
dmgMult: this.damagePercent / 100
},
spells: [{
type: 'melee',
damage: 1,
statMult: 0.2
statMult: 0.2,
animation: 'melee'
}]
}, false, 'regular');
mob.stats.values.hpMax = obj.stats.values.hpMax * (this.hpPercent / 100);
mob.stats.values.hp = mob.stats.values.hpMax;
mob.stats.values.regenHp = mob.stats.values.hpMax / 100;

var spell = mob.spellbook.spells[0];


+ 2
- 4
src/server/world/instancer.js Visa fil

@@ -368,10 +368,8 @@ define([
return;

var obj = exists.objects.find(o => o.serverId == id);
if (!obj) {
console.log('OBJECT NOT FOUND!!!!!!!!!!!!!!!!!!!!!!!!!!!');
console.log(msg);
}
if (!obj)
return;

var msgObj = msg.obj;



Laddar…
Avbryt
Spara