diff --git a/src/server/config/maps/cave/map.json b/src/server/config/maps/cave/map.json index 7519ef01..de8f1e27 100644 --- a/src/server/config/maps/cave/map.json +++ b/src/server/config/maps/cave/map.json @@ -791,10 +791,21 @@ "width":8, "x":824, "y":240 - }, + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":9, + "name":"notices", + "objects":[ { "height":24, - "id":912, + "id":922, "name":"shopYala", "rotation":0, "type":"", @@ -2435,8 +2446,8 @@ "x":0, "y":0 }], - "nextlayerid":9, - "nextobjectid":922, + "nextlayerid":10, + "nextobjectid":923, "orientation":"orthogonal", "properties":[ { diff --git a/src/server/config/maps/fjolarok/map.json b/src/server/config/maps/fjolarok/map.json index bafad0cb..76e291d8 100644 --- a/src/server/config/maps/fjolarok/map.json +++ b/src/server/config/maps/fjolarok/map.json @@ -511,24 +511,6 @@ "x":936, "y":1368 }, - { - "gid":726, - "height":24, - "id":659, - "name":"crystal caves", - "properties":[ - { - "name":"cpnPortal", - "type":"string", - "value":"{\"zone\":\"cave\",\"pos\":{\"x\":269,\"y\":27}}" - }], - "rotation":0, - "type":"", - "visible":true, - "width":24, - "x":560, - "y":688 - }, { "gid":297, "height":8, @@ -1533,6 +1515,24 @@ "width":24, "x":1384, "y":632 + }, + { + "gid":726, + "height":24, + "id":881, + "name":"crystal caves", + "properties":[ + { + "name":"cpnPortal", + "type":"string", + "value":"{\"zone\":\"cave\",\"pos\":{\"x\":269,\"y\":27}}" + }], + "rotation":0, + "type":"", + "visible":true, + "width":24, + "x":560, + "y":688 }], "opacity":1, "properties":[ @@ -3815,7 +3815,7 @@ "y":0 }], "nextlayerid":10, - "nextobjectid":881, + "nextobjectid":882, "orientation":"orthogonal", "properties":[ { diff --git a/src/server/world/map.js b/src/server/world/map.js index 3f632261..f0ce5c17 100644 --- a/src/server/world/map.js +++ b/src/server/world/map.js @@ -346,7 +346,8 @@ module.exports = { x: cell.x / mapScale, y: (cell.y / mapScale) - 1, name: name, - properties: cell.properties || {} + properties: cell.properties || {}, + layerName: layerName }; if (objZoneName !== name) diff --git a/src/server/world/spawners.js b/src/server/world/spawners.js index a433ea7f..157ed4ad 100644 --- a/src/server/world/spawners.js +++ b/src/server/world/spawners.js @@ -31,7 +31,7 @@ module.exports = { this.list.push(spawner); - if ((blueprint.sheetName !== 'mobs') && (blueprint.sheetName !== 'bosses')) + if (blueprint.layerName !== 'mobs') return; let name = blueprint.name.toLowerCase(); @@ -159,7 +159,7 @@ module.exports = { let name = (l.blueprint.objZoneName || l.blueprint.name).toLowerCase(); - if ((l.blueprint.sheetName === 'mobs') || (l.blueprint.sheetName === 'bosses')) + if (l.blueprint.layerName === 'mobs') this.setupMob(mob, l.zonePrint); else { let blueprint = extend({}, this.zone.objects.default, this.zone.objects[name] || {});