gitlord
/
isleward
kopia lustrzana https://gitlab.com/Isleward/isleward.git
1
0
Forkuj 0
Kod Zgłoszenia 0 Wydania 203 Wiki Aktywność
Przeglądaj źródła

objects with different client and server names were never hooked up to their blueprints

tags/v0.1.4^2
Big Bad Waffle 7 lat temu
rodzic
dd1fddd43a
commit
166f7a92c9
8 zmienionych plików z 76 dodań i 74 usunięć
Widok podzielony
Opcje porównania
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania
  1. +0
    -1
      src/client/js/objects/objects.js
  2. +0
    -7
      src/server/combat/combat.js
  3. +4
    -1
      src/server/config/maps/cave/dialogues.js
  4. +62
    -62
      src/server/config/maps/cave/map.json
  5. +1
    -1
      src/server/config/maps/cave/zone.js
  6. +5
    -1
      src/server/config/maps/mapList.js
  7. +3
    -0
      src/server/world/map.js
  8. +1
    -1
      src/server/world/spawners.js

+ 0
- 1
src/client/js/objects/objects.js Wyświetl plik

@@ -245,7 +245,6 @@ define([
}
}


if ((template.x != 0) || (template.y != 0)) {
if (obj.stats)
obj.stats.updateHpSprite();


+ 0
- 7
src/server/combat/combat.js Wyświetl plik

@@ -65,13 +65,6 @@ define([
}
}

isCrit = Math.random() < 0.4;

if (config.target.player)
amount = 0;
else
amount = 99999;

return {
amount: amount,
crit: isCrit,


+ 4
- 1
src/server/config/maps/cave/dialogues.js Wyświetl plik

@@ -1,5 +1,5 @@
module.exports = {
'cult leader': {
'thaumaturge yala': {
'1': {
msg: [{
msg: `Is there anything I can help you with today?`,
@@ -56,7 +56,10 @@ module.exports = {
}],
method: function(obj) {
var inventory = obj.inventory;

var crystals = inventory.items.find(i => (i.name == 'Digested Crystal'));
obj.reputation.getReputation('akarei', crystals.quantity * 15);

inventory.destroyItem(crystals.id);
}
}


+ 62
- 62
src/server/config/maps/cave/map.json Wyświetl plik

@@ -1612,7 +1612,7 @@
"gid":382,
"height":8,
"id":712,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1624,7 +1624,7 @@
"gid":382,
"height":8,
"id":714,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1636,7 +1636,7 @@
"gid":382,
"height":8,
"id":716,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1648,7 +1648,7 @@
"gid":382,
"height":8,
"id":717,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1660,7 +1660,7 @@
"gid":382,
"height":8,
"id":718,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1672,7 +1672,7 @@
"gid":382,
"height":8,
"id":720,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1684,7 +1684,7 @@
"gid":382,
"height":8,
"id":721,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1696,7 +1696,7 @@
"gid":382,
"height":8,
"id":722,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1708,7 +1708,7 @@
"gid":382,
"height":8,
"id":723,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1720,7 +1720,7 @@
"gid":382,
"height":8,
"id":724,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1732,7 +1732,7 @@
"gid":382,
"height":8,
"id":725,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1744,7 +1744,7 @@
"gid":382,
"height":8,
"id":726,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1756,7 +1756,7 @@
"gid":382,
"height":8,
"id":727,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1768,7 +1768,7 @@
"gid":382,
"height":8,
"id":728,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1780,7 +1780,7 @@
"gid":382,
"height":8,
"id":729,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1792,7 +1792,7 @@
"gid":382,
"height":8,
"id":730,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1804,7 +1804,7 @@
"gid":382,
"height":8,
"id":743,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1816,7 +1816,7 @@
"gid":382,
"height":8,
"id":744,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1828,7 +1828,7 @@
"gid":382,
"height":8,
"id":745,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1840,7 +1840,7 @@
"gid":382,
"height":8,
"id":746,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1852,7 +1852,7 @@
"gid":382,
"height":8,
"id":747,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1864,7 +1864,7 @@
"gid":382,
"height":8,
"id":748,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1876,7 +1876,7 @@
"gid":382,
"height":8,
"id":749,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1888,7 +1888,7 @@
"gid":382,
"height":8,
"id":750,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1900,7 +1900,7 @@
"gid":382,
"height":8,
"id":751,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1912,7 +1912,7 @@
"gid":382,
"height":8,
"id":752,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -1924,7 +1924,7 @@
"gid":382,
"height":8,
"id":753,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1936,7 +1936,7 @@
"gid":382,
"height":8,
"id":754,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1948,7 +1948,7 @@
"gid":382,
"height":8,
"id":755,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1960,7 +1960,7 @@
"gid":382,
"height":8,
"id":756,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1972,7 +1972,7 @@
"gid":382,
"height":8,
"id":757,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1984,7 +1984,7 @@
"gid":382,
"height":8,
"id":758,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -1996,7 +1996,7 @@
"gid":382,
"height":8,
"id":759,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -2008,7 +2008,7 @@
"gid":382,
"height":8,
"id":760,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -2020,7 +2020,7 @@
"gid":382,
"height":8,
"id":778,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -2032,7 +2032,7 @@
"gid":382,
"height":8,
"id":782,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -2044,7 +2044,7 @@
"gid":382,
"height":8,
"id":783,
"name":"gas",
"name":"|gas",
"rotation":0,
"type":"",
"visible":true,
@@ -2056,7 +2056,7 @@
"gid":382,
"height":8,
"id":792,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -2068,7 +2068,7 @@
"gid":382,
"height":8,
"id":793,
"name":"bubbles",
"name":"|bubbles",
"rotation":0,
"type":"",
"visible":true,
@@ -2080,7 +2080,7 @@
"gid":505,
"height":8,
"id":868,
"name":"pinkTile",
"name":"|pinkTile",
"rotation":0,
"type":"",
"visible":true,
@@ -2092,7 +2092,7 @@
"gid":505,
"height":8,
"id":869,
"name":"pinkTile",
"name":"|pinkTile",
"rotation":0,
"type":"",
"visible":true,
@@ -2104,7 +2104,7 @@
"gid":777,
"height":24,
"id":870,
"name":"bigPortal",
"name":"|bigPortal",
"rotation":0,
"type":"",
"visible":true,
@@ -2116,7 +2116,7 @@
"gid":505,
"height":8,
"id":871,
"name":"pinkTile",
"name":"|pinkTile",
"rotation":0,
"type":"",
"visible":true,
@@ -2128,7 +2128,7 @@
"gid":505,
"height":8,
"id":872,
"name":"pinkTile",
"name":"|pinkTile",
"rotation":0,
"type":"",
"visible":true,
@@ -2140,7 +2140,7 @@
"gid":458,
"height":8,
"id":873,
"name":"wallTrigger",
"name":"|wallTrigger",
"properties":
{
"message":"the wall breaks",
@@ -2162,7 +2162,7 @@
"gid":458,
"height":8,
"id":874,
"name":"wallTrigger",
"name":"|wallTrigger",
"properties":
{
"message":"the earth rumbles",
@@ -2184,7 +2184,7 @@
"gid":458,
"height":8,
"id":875,
"name":"wallTrigger",
"name":"|wallTrigger",
"properties":
{
"message":"the roof shakes",
@@ -2206,7 +2206,7 @@
"gid":458,
"height":8,
"id":876,
"name":"wallTrigger",
"name":"|wallTrigger",
"properties":
{
"message":"the water boils",
@@ -2217,7 +2217,7 @@
"message":"string",
"order":"string"
},
"rotation":0,
"rotation":90,
"type":"",
"visible":true,
"width":8,
@@ -2228,7 +2228,7 @@
"gid":107,
"height":8,
"id":879,
"name":"redwall",
"name":"|redWall",
"rotation":0,
"type":"",
"visible":true,
@@ -2240,7 +2240,7 @@
"gid":107,
"height":8,
"id":880,
"name":"redwall",
"name":"|redWall",
"rotation":0,
"type":"",
"visible":true,
@@ -2252,7 +2252,7 @@
"gid":107,
"height":8,
"id":881,
"name":"redwall",
"name":"|redWall",
"rotation":0,
"type":"",
"visible":true,
@@ -2264,7 +2264,7 @@
"gid":107,
"height":8,
"id":882,
"name":"redwall",
"name":"|redWall",
"rotation":0,
"type":"",
"visible":true,
@@ -2276,7 +2276,7 @@
"gid":107,
"height":8,
"id":883,
"name":"redwall",
"name":"|redWall",
"rotation":0,
"type":"",
"visible":true,
@@ -2288,7 +2288,7 @@
"gid":107,
"height":8,
"id":884,
"name":"redwall",
"name":"|redWall",
"rotation":0,
"type":"",
"visible":true,
@@ -2300,7 +2300,7 @@
"gid":107,
"height":8,
"id":885,
"name":"redwall",
"name":"|redWall",
"rotation":0,
"type":"",
"visible":true,
@@ -2312,7 +2312,7 @@
"gid":697,
"height":24,
"id":886,
"name":"",
"name":"|bigGem",
"rotation":0,
"type":"",
"visible":true,
@@ -2324,7 +2324,7 @@
"gid":698,
"height":24,
"id":889,
"name":"",
"name":"|bigGem",
"rotation":0,
"type":"",
"visible":true,
@@ -2336,7 +2336,7 @@
"gid":700,
"height":24,
"id":890,
"name":"",
"name":"|bigGem",
"rotation":0,
"type":"",
"visible":true,
@@ -2348,7 +2348,7 @@
"gid":701,
"height":24,
"id":896,
"name":"",
"name":"|bigGem",
"rotation":0,
"type":"",
"visible":true,
@@ -2360,7 +2360,7 @@
"gid":377,
"height":8,
"id":897,
"name":"",
"name":"|portalEntry",
"properties":
{
"cpnPortal":"{\"zone\":\"tutorial\",\"pos\":{\"x\":82,\"y\":66}}"
@@ -2380,7 +2380,7 @@
"gid":458,
"height":8,
"id":900,
"name":"wallTrigger",
"name":"|wallTrigger",
"properties":
{
"forceOpen":"1"


+ 1
- 1
src/server/config/maps/cave/zone.js Wyświetl plik

@@ -642,7 +642,7 @@ module.exports = {
cpn: 'dialogue',
method: 'talk',
args: [{
targetName: 'cult leader'
targetName: 'thaumaturge yala'
}]
},
exit: {


+ 5
- 1
src/server/config/maps/mapList.js Wyświetl plik

@@ -4,6 +4,10 @@ define([

) {
return [
'cave'
'cave',
'city',
'estuary',
'sewer',
'tutorial'
];
});

+ 3
- 0
src/server/world/map.js Wyświetl plik

@@ -316,6 +316,9 @@ define([
properties: cell.properties || {}
};

if (objZoneName != name)
blueprint.objZoneName = objZoneName;

if ((this.zone) && (this.zone.objects) && (this.zone.objects[objZoneName.toLowerCase()]))
extend(true, blueprint, this.zone.objects[objZoneName.toLowerCase()]);



+ 1
- 1
src/server/world/spawners.js Wyświetl plik

@@ -116,7 +116,7 @@ define([
if (!mob)
continue;

var name = l.blueprint.name.toLowerCase();
var name = (l.blueprint.objZoneName || l.blueprint.name).toLowerCase();

if ((l.blueprint.sheetName == 'mobs') || (l.blueprint.sheetName == 'bosses'))
this.setupMob(mob, l.zonePrint, l.blueprint.scaleDrops);


Napisz Podgląd
Ładowanie…
Anuluj
Zapisz