cave balance

src/server/components/aggro.js

@@ -129,7 +129,7 @@ define([
 				return false;
 			else if (obj.player)
 				return true;
-			else 
+			else if (target.faction != obj.faction)
 				return true;
 		},
 

src/server/components/player.js

@@ -26,6 +26,7 @@ define([
 		spawn: function(character) {
 			var obj = this.obj;
 			extend(true, obj, {
+				faction: 'players',
 				sheetName: classes.getSpritesheet(character.class),
 				layerName: 'mobs',
 				cell: character.cell,

src/server/config/maps/cave/zone.js

@@ -1,5 +1,5 @@
 module.exports = {
-	name: 'estuary',
+	name: 'cave',
 	level: 20,
 	addLevel: 0,
 	resources: {},
@@ -13,7 +13,7 @@ module.exports = {
 			}
 		},
 
-		'crystal slug': {
+		'crystal snail': {
 			level: 14,
 
 			regular: {
@@ -86,7 +86,7 @@ module.exports = {
 			}]
 		},
 
-		'overloaded slug': {
+		'crystal whelk': {
 			level: 16,
 			spells: [{
 				type: 'melee'
@@ -167,8 +167,8 @@ module.exports = {
 			level: 18,
 
 			regular: {
-				hpMult: 1000,
-				dmgMult: 0.000000001
+				hpMult: 100,
+				dmgMult: 2
 			},
 
 			mobile: false,
@@ -278,8 +278,8 @@ module.exports = {
 			deathRep: -15,
 
 			regular: {
-				hpMult: 1000,
-				dmgMult: 10
+				hpMult: 100,
+				dmgMult: 2
 			},
 
 			rare: {

src/server/config/maps/tutorial/map.json

@@ -617,6 +617,26 @@
                  "width":8,
                  "x":616,
                  "y":808
+                }, 
+                {
+                 "gid":694,
+                 "height":24,
+                 "id":637,
+                 "name":"",
+                 "properties":
+                    {
+                     "cpnPortal":"{\"zone\":\"cave\",\"pos\":{\"x\":269,\"y\":27}}"
+                    },
+                 "propertytypes":
+                    {
+                     "cpnPortal":"string"
+                    },
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":24,
+                 "x":272,
+                 "y":296
                 }],
          "opacity":1,
          "properties":
@@ -701,26 +721,6 @@
                  "width":8,
                  "x":592,
                  "y":456
-                }, 
-                {
-                 "gid":692,
-                 "height":24,
-                 "id":636,
-                 "name":"City Entrance",
-                 "properties":
-                    {
-                     "cpnPortal":"{\"zone\":\"cave\",\"pos\":{\"x\":269,\"y\":27}}"
-                    },
-                 "propertytypes":
-                    {
-                     "cpnPortal":"string"
-                    },
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":24,
-                 "x":648,
-                 "y":528
                 }],
          "opacity":1,
          "properties":
@@ -1376,7 +1376,7 @@
          "x":0,
          "y":0
         }],
- "nextobjectid":637,
+ "nextobjectid":638,
  "orientation":"orthogonal",
  "properties":
     {