From 46a97055f9c3edd68ec0429b1c88655f89f0bb3f Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 2 Dec 2015 05:14:06 +0000
Subject: [PATCH] Custom scarecrows.

---
 .../data/scripts/ai/npc/Scarecrow/Scarecrow.java     |  6 ++++--
 trunk/dist/game/data/stats/npcs/33700-33799.xml      | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java b/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java
index 81673a8e89..e835bd2e53 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java
@@ -29,13 +29,15 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 public final class Scarecrow extends AbstractNpcAI
 {
 	// NPCs
-	private static final int SCARECROW = 27457;
 	private static final int TRAINING_DUMMY = 19546;
+	private static final int SCARECROW = 27457;
+	private static final int PHYSICAL_PUNCH_MACHINE = 33752;
+	private static final int MAGICAL_PUNCH_MACHINE = 33753;
 	
 	private Scarecrow()
 	{
 		super(Scarecrow.class.getSimpleName(), "ai");
-		addSpawnId(SCARECROW, TRAINING_DUMMY);
+		addSpawnId(TRAINING_DUMMY, SCARECROW, PHYSICAL_PUNCH_MACHINE, MAGICAL_PUNCH_MACHINE);
 	}
 	
 	@Override
diff --git a/trunk/dist/game/data/stats/npcs/33700-33799.xml b/trunk/dist/game/data/stats/npcs/33700-33799.xml
index 0f8784c1d2..a1c70a54dc 100644
--- a/trunk/dist/game/data/stats/npcs/33700-33799.xml
+++ b/trunk/dist/game/data/stats/npcs/33700-33799.xml
@@ -1351,10 +1351,10 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="33752" level="85" type="L2Npc" name="Physical Punch Machine">
+	<npc id="33752" level="85" type="L2Monster" name="Physical Punch Machine">
 		<!-- Source http://l2i-god.gaikotsu.ru/ (Lindvior) -->
 		<race>ETC</race>
-		<stats> <!-- str="88" int="79" dex="55" wit="78" con="82" men="78" -->
+		<stats>
 			<vitals hp="1730000000" hpRegen="7.5" mp="1730000000" mpRegen="2.7" />
 			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3840" magical="825" />
@@ -1367,16 +1367,16 @@
 			</speed>
 			<hitTime>500</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" targetable="true" talkable="false" undying="true" /> <!-- Custom -->
 		<collision>
 			<radius normal="13" />
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="33753" level="85" type="L2Npc" name="Magical Punch Machine">
+	<npc id="33753" level="85" type="L2Monster" name="Magical Punch Machine">
 		<!-- Source http://l2i-god.gaikotsu.ru/ (Lindvior) -->
 		<race>ETC</race>
-		<stats> <!-- str="88" int="79" dex="55" wit="78" con="82" men="78" -->
+		<stats>
 			<vitals hp="1730000000" hpRegen="7.5" mp="1730000000" mpRegen="2.7" />
 			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3840" magical="825" />
@@ -1389,7 +1389,7 @@
 			</speed>
 			<hitTime>500</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" targetable="true" talkable="false" undying="true" /> <!-- Custom -->
 		<collision>
 			<radius normal="13" />
 			<height normal="30" />