Browse Source

lots of bugs

tags/v0.1.5^2
Big Bad Waffle 6 years ago
parent
commit
aa4f351837
8 changed files with 30 additions and 16 deletions
  1. +1
    -1
      src/server/components/dialogue.js
  2. +3
    -1
      src/server/components/events.js
  3. +1
    -1
      src/server/components/gatherer.js
  4. +3
    -1
      src/server/config/maps/tutorial/events/fishingTournament.js
  5. +4
    -1
      src/server/config/quests/templates/questGatherResource.js
  6. +12
    -8
      src/server/misc/mail.js
  7. +1
    -1
      src/server/world/instancer.js
  8. +5
    -2
      src/server/world/resourceSpawner.js

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

@@ -210,7 +210,7 @@ define([
var exists = inventory.items.find(i => (i.name == msg.item.name));
if (!exists) {
inventory.getItem(msg.item);
return true;
return msg.successMsg || false;
}
else
return msg.existsMsg || false;


+ 3
- 1
src/server/components/events.js View File

@@ -28,7 +28,9 @@ define([
},

save: function() {
return null;
return {
type: 'events'
};
},

unregisterEvent: function(event) {


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

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

this.obj.stats.getXp(gatherResult.xp);

this.obj.fireEvent('afterGatherResource');
this.obj.fireEvent('afterGatherResource', gatherResult);

if (gathering.destroyed) {
if (isFish) {


+ 3
- 1
src/server/config/maps/tutorial/events/fishingTournament.js View File

@@ -250,6 +250,7 @@ module.exports = {
catchChance: 25
}
},
successMsg: 'May it cast true.',
existsMsg: 'Oh, it seems that you already have one.'
}]
},
@@ -331,10 +332,11 @@ module.exports = {
}
}, {
type: 'hookEvents',
endMark: 3428,
auto: true,
events: {
beforeGatherResource: function(gatherResult, gatherer) {
if (!gatherResult.nodeType == 'fish')
if (gatherResult.nodeType != 'fish')
return;

var hasCompRod = gatherer.inventory.items.some(i => ((i.name == 'Competition Rod') && (i.eq)));


+ 4
- 1
src/server/config/quests/templates/questGatherResource.js View File

@@ -20,7 +20,10 @@ define([
},

events: {
afterGatherResource: function(item) {
afterGatherResource: function(gatherResult) {
if (gatherResult.nodeType != 'herb')
return;
if ((this.obj.zoneName != this.zoneName) || (this.have >= this.need))
return;



+ 12
- 8
src/server/misc/mail.js View File

@@ -28,17 +28,21 @@ define([

result.forEach(function(r) {
if (r.removeAll) {
inventory.items.forEach(function(i) {
if ((r.nameLike) && (i.name.indexOf(r.nameLike) > -1)) {
inventory.destroyItem(i.id, i.quantity ? i.quantity : null);
for (var i = 0; i < inventory.items.length; i++) {
var item = inventory.items[i];
if ((r.nameLike) && (item.name.indexOf(r.nameLike) > -1)) {
inventory.destroyItem(item.id, item.quantity ? item.quantity : null);
i--;
}
});
}

stash.items.forEach(function(i) {
if ((r.nameLike) && (i.name.indexOf(r.nameLike) > -1)) {
stash.destroy(i.id);
for (var i = 0; i < stash.items.length; i++) {
var item = stash.items[i];
if ((r.nameLike) && (item.name.indexOf(r.nameLike) > -1)) {
stash.destroy(item.id);
i--;
}
});
}
} else
inventory.getItem(r);
});


+ 1
- 1
src/server/world/instancer.js View File

@@ -30,7 +30,7 @@ define([
return {
instances: [],
zoneId: -1,
speed: 350,
speed: 10,

lastTime: 0,



+ 5
- 2
src/server/world/resourceSpawner.js View File

@@ -65,12 +65,15 @@ define([
var w = this.physics.width;
var h = this.physics.height;

var x = blueprint.x || ~~(Math.random() * w);
var y = blueprint.y || ~~(Math.random() * h);
var x = blueprint.x;
var y = blueprint.y;

var position = null;

if (blueprint.type == 'herb') {
x = ~~(Math.random() * w)
y = ~~(Math.random() * h)

if (this.physics.isTileBlocking(x, y))
return false;



Loading…
Cancel
Save