Merge branch 'master' of gitlab.com:Isleward/isleward

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

@@ -675,7 +675,19 @@ module.exports = {
 				}
 			},
 			rare: {
-				name: 'Fleshripper'
+				name: 'Fleshripper',
+				drops: {
+					rolls: 1,
+					noRandom: true,
+					alsoRandom: true,
+					blueprints: [{
+						chance: 80,
+						name: 'Eagle Feather',
+						material: true,
+						sprite: [0, 0],
+						spritesheet: 'images/questItems.png'
+					}]
+				}
 			}
 		},
 		hermit: {

src/server/config/maps/sewer/events/plagueOfRats.js

@@ -278,7 +278,7 @@ module.exports = {
 	}, {
 		type: 'setDescription',
 		desc: descriptionStrings.success,
-		ttl: 50
+		ttl: 100
 	}, {
 		type: 'giveRewards'
 	}, {
@@ -286,6 +286,6 @@ module.exports = {
 	}, {
 		type: 'setDescription',
 		desc: descriptionStrings.failure,
-		ttl: 50
+		ttl: 100
 	}]
 };

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

@@ -5,6 +5,9 @@ const balance = {
 	giantRat: {
 		clawChance: 5
 	},
+	enragedRat: {
+		clawChance: 80
+	},
 	stinktooth: {
 		runestoneChance: 10,
 		recipeChance: 3,
@@ -63,7 +66,20 @@ module.exports = {
 
 			rare: {
 				name: 'Enraged Rat',
-				cell: 24
+				cell: 24,
+
+				drops: {
+					rolls: 1,
+					noRandom: true,
+					alsoRandom: true,
+					blueprints: [{
+						chance: balance.enragedRat.clawChance,
+						name: 'Rat Claw',
+						material: true,
+						sprite: [3, 0],
+						spritesheet: 'images/materials.png'
+					}]
+				}
 			}
 		},
 

src/server/world/map/canPathFromPos.js

@@ -5,13 +5,13 @@ const canPath = (pos, positions, maxDistance = 0) => {
 	return positions.some(p => {
 		const path = physics.getPath(pos, p);
 		//Are we on the position?
-		if (!path.length)
-			return true;
+		if (!path.length) 
+			return (p.x === pos.x && p.y === pos.y);
 
 		const { x, y } = path[path.length - 1];
 		//Can we get close enough to the position?
 		const isCloseEnough = Math.max(Math.abs(p.x - x), Math.abs(p.y - y)) <= maxDistance;
-		if (isCloseEnough)
+		if (isCloseEnough) 
 			return true;
 
 		return false;