diff --git a/trunk/dist/game/data/html/default/33996.htm b/trunk/dist/game/data/html/default/33996.htm
new file mode 100644
index 0000000000..b1e1349b8b
--- /dev/null
+++ b/trunk/dist/game/data/html/default/33996.htm
@@ -0,0 +1,8 @@
+<html><head><body>Vorbos:<br>
+Even wind reminds me of her.<br>
+Even clouds remind me of her.<br>
+Even the sun reminds me of her.<br>
+I'm not going back to Orc Barracks. I hate my kin. I miss her. Just thinking of her makes my heart beat. But... they are harassing her and her friends.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 3396601">"I want to use some Steel Door Guild Coins."</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data/multisell/3396601.xml b/trunk/dist/game/data/multisell/3396601.xml
new file mode 100644
index 0000000000..858a970179
--- /dev/null
+++ b/trunk/dist/game/data/multisell/3396601.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
+	<npcs>
+		<npc>33858</npc> <!-- Eli -->
+	</npcs>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Alligator Island -->
+		<production count="1" id="37025" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Outlaw Forest -->
+		<production count="1" id="37026" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Sea of Spores -->
+		<production count="1" id="37027" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Forsaken Plains -->
+		<production count="1" id="37028" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Fields Of Massacre -->
+		<production count="1" id="37029" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Swamp Of Screams -->
+		<production count="1" id="37030" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Forest Of Dead -->
+		<production count="1" id="37031" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Wall of Argos -->
+		<production count="1" id="37032" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Varka Sillenos Barracks -->
+		<production count="1" id="37034" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Ketra Orc Outpost -->
+		<production count="1" id="37035" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Den Of Evil -->
+		<production count="1" id="37036" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Sel Mahum Training Grounds -->
+		<production count="1" id="37037" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Plains of the Lizardmen -->
+		<production count="1" id="37038" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Field Of Silence -->
+		<production count="1" id="37039" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="50" id="37045" />
+		<!-- Scroll Escape: Field Of Whispers -->
+		<production count="1" id="37040" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Soulshot D-Grade -->
+		<production count="252" id="1463" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Soulshot C-Grade -->
+		<production count="160" id="21847" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Soulshot B-Grade -->
+		<production count="71" id="21848" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Soulshot A-Grade -->
+		<production count="44" id="21849" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Soulshot S-Grade -->
+		<production count="35" id="21850" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Blessed Spiritshot D-Grade -->
+		<production count="162" id="21852" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Blessed Spiritshot C-Grade -->
+		<production count="108" id="21853" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Blessed Spiritshot B-Grade -->
+		<production count="19" id="21854" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Blessed Spiritshot A-Grade -->
+		<production count="16" id="21855" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Mysterious Blessed Spiritshot S-Grade -->
+		<production count="13" id="21856" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Grain Kain's Firecracker -->
+		<production count="10" id="13268" />
+	</item>
+	<item>
+		<!-- Steel Door Guild Coins -->
+		<ingredient count="1" id="37045" />
+		<!-- Grain Kain's Large Firecracker -->
+		<production count="5" id="13269" />
+	</item>
+</list>
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/npcs/20000-20099.xml b/trunk/dist/game/data/stats/npcs/20000-20099.xml
index d04a81a88a..6c353445d6 100644
--- a/trunk/dist/game/data/stats/npcs/20000-20099.xml
+++ b/trunk/dist/game/data/stats/npcs/20000-20099.xml
@@ -5422,9 +5422,9 @@
 		</parameters>
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
-		<acquire exp="1507" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="690" hpRegen="3.5" mp="329.4" mpRegen="1.5" />
+		<acquire exp="1507" sp="0" />
+		<stats>
+			<vitals hp="436" hpRegen="3.5" mp="245" mpRegen="1.5" />
 			<attack physical="92.64226" magical="63.26266" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="78.8748547991048" />
 			<attribute>
@@ -5439,8 +5439,6 @@
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4046" level="3" /> <!-- Sleep -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -5458,26 +5456,10 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="224" max="448" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.7972000241279602">
-					<item id="433" min="1" max="1" chance="1.1833" /> <!-- Elven Tunic -->
-					<item id="434" min="1" max="1" chance="1.1833" /> <!-- White Tunic -->
-					<item id="1936" min="1" max="1" chance="37.2337" /> <!-- White Tunic Pattern -->
-					<item id="435" min="1" max="1" chance="1.1833" /> <!-- Mystic's Tunic -->
-					<item id="466" min="1" max="1" chance="1.8958" /> <!-- Elven Stockings -->
-					<item id="467" min="1" max="1" chance="1.8958" /> <!-- Dark Stockings -->
-					<item id="1933" min="1" max="1" chance="53.5289" /> <!-- Dark Stockings Fabric -->
-					<item id="468" min="1" max="1" chance="1.8959" /> <!-- Mystic's Stockings -->
-				</group>
-				<group chance="17.79640007019043">
-					<item id="1868" min="1" max="1" chance="65.2174" /> <!-- Thread -->
-					<item id="1873" min="1" max="1" chance="13.0435" /> <!-- Silver Nugget -->
-					<item id="5549" min="1" max="1" chance="3.2609" /> <!-- Metallic Thread -->
-					<item id="1889" min="1" max="1" chance="2.1739" /> <!-- Compound Braid -->
-					<item id="736" min="1" max="1" chance="16.3043" /> <!-- Scroll of Escape -->
-				</group>
+					<item id="57" min="7" max="16" chance="70" /> <!-- Adena -->
+					<item id="36556" min="1" max="1" chance="1.555" /> <!-- Accessory Gem (Low-grade) -->
+					<item id="36932" min="1" max="1" chance="0.0009" /> <!-- Recipe: Accessory Gem - Upgrade -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -5511,9 +5493,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="2024" min="1" max="1" chance="0.7564" /> <!-- Elven Bow Shaft -->
-				<item id="2023" min="1" max="1" chance="0.658" /> <!-- Conjuror's Staff Head -->
-				<item id="1900" min="1" max="1" chance="5.8094" /> <!-- Enchanted Necklace Chain -->
+					<item id="36556" min="1" max="1" chance="3.378" /> <!-- Accessory Gem (Low-grade) -->
 			</corpse>
 		</dropLists>
 		<collision>
diff --git a/trunk/dist/game/data/stats/npcs/20400-20499.xml b/trunk/dist/game/data/stats/npcs/20400-20499.xml
index 4f8ec8eed2..558d817f57 100644
--- a/trunk/dist/game/data/stats/npcs/20400-20499.xml
+++ b/trunk/dist/game/data/stats/npcs/20400-20499.xml
@@ -4023,8 +4023,8 @@
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<acquire exp="5225" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2015" hpRegen="3.5" mp="245.52" mpRegen="1.5" />
+		<stats>
+			<vitals hp="1272" hpRegen="4.5" mp="343" mpRegen="1.8" />
 			<attack physical="60.19687" magical="41.10666" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="98.70919" magical="65.7216907961494" />
 			<attribute>
@@ -4038,8 +4038,6 @@
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
 			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
 			<skill id="4412" level="10" /> <!-- Slightly Weak P. Def. -->
@@ -4058,19 +4056,10 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="330" max="609" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.04670000076293945">
-					<item id="257" min="1" max="1" chance="100" /> <!-- Viper Fang -->
-				</group>
-				<group chance="15.925800323486328">
-					<item id="1871" min="1" max="1" chance="55.1131" /> <!-- Charcoal -->
-					<item id="1866" min="1" max="1" chance="36.7421" /> <!-- Suede -->
-					<item id="2258" min="1" max="1" chance="1.3475" /> <!-- Recipe: Temptation of Abyss -->
-					<item id="5268" min="1" max="1" chance="2.2045" /> <!-- Recipe: Greater Soulshot (D) Compressed Package (100%) -->
-					<item id="735" min="1" max="1" chance="4.5928" /> <!-- Alacrity Potion -->
-				</group>
+					<item id="40" min="1" max="1" chance="1.627" /> <!-- Leather Boots -->
+					<item id="57" min="21" max="49" chance="70" /> <!-- Adena -->
+					<item id="735" min="1" max="1" chance="0.75" /> <!-- Haste Potion -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -4104,9 +4093,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="1881" min="1" max="1" chance="9.9048" /> <!-- Coarse Bone Powder -->
-				<item id="2179" min="1" max="1" chance="35.5437" /> <!-- Recipe: Crafted Leather Gloves -->
-				<item id="1804" min="1" max="1" chance="2.9714" /> <!-- Recipe: Soulshot (D-Grade) -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -4130,8 +4117,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="127" /> <!-- rhand: Crimson Sword -->
 		<acquire exp="8460" sp="2" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2934" hpRegen="3.5" mp="329.4" mpRegen="1.5" />
+		<stats>
+			<vitals hp="1852" hpRegen="4.5" mp="463" mpRegen="1.8" />
 			<attack physical="92.64226" magical="63.26266" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="78.8748547991048" />
 			<attribute>
@@ -4146,8 +4133,6 @@
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4318" level="1" /> <!-- Ultimate Buff -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -4166,27 +4151,9 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="476" max="952" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.17560000717639923">
-					<item id="69" min="1" max="1" chance="2.8343" /> <!-- Bastard Sword -->
-					<item id="125" min="1" max="1" chance="2.8343" /> <!-- Spinebone Sword -->
-					<item id="2021" min="1" max="1" chance="88.6626" /> <!-- Spinebone Sword Blade -->
-					<item id="126" min="1" max="1" chance="2.8343" /> <!-- Artisan's Sword -->
-					<item id="128" min="1" max="1" chance="2.8345" /> <!-- Knight's Sword -->
-				</group>
-				<group chance="7.915200233459473">
-					<item id="1875" min="1" max="1" chance="5.7699" /> <!-- Stone of Purity -->
-					<item id="1879" min="1" max="1" chance="14.4247" /> <!-- Cokes -->
-					<item id="1885" min="1" max="1" chance="7.2123" /> <!-- High-Grade Suede -->
-					<item id="5550" min="1" max="1" chance="1.154" /> <!-- Durable Metal Plate -->
-					<item id="5549" min="1" max="1" chance="8.6548" /> <!-- Metallic Thread -->
-					<item id="955" min="1" max="1" chance="0.3462" /> <!-- Scroll: Enchant Weapon (D-Grade) -->
-					<item id="2274" min="1" max="1" chance="0.6182" /> <!-- Recipe: Skull Breaker -->
-					<item id="2975" min="1" max="1" chance="7.7275" /> <!-- Recipe: Brigandine Helmet -->
-					<item id="6667" min="1" max="1" chance="54.0924" /> <!-- Deluxe Chest Key - Grade 3 -->
-				</group>
+					<item id="45" min="1" max="1" chance="2.417" /> <!-- Bone Helmet -->
+					<item id="57" min="38" max="87" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -4220,9 +4187,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="2267" min="1" max="1" chance="1.1668" /> <!-- Recipe: Gastraphetes -->
-				<item id="1936" min="1" max="1" chance="9.2328" /> <!-- White Tunic Pattern -->
-				<item id="1900" min="1" max="1" chance="12.3441" /> <!-- Enchanted Necklace Chain -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -4244,8 +4209,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="14" /> <!-- rhand: Bow -->
 		<acquire exp="6892" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2566" hpRegen="3.5" mp="286.92" mpRegen="1.5" />
+		<stats>
+			<vitals hp="1620" hpRegen="4.5" mp="417" mpRegen="1.8" />
 			<attack physical="74.99121" magical="51.20928" random="10" critical="8" accuracy="0" attackSpeed="253" reuseDelay="1500" type="BOW" range="1100" distance="10" width="0" />
 			<defence physical="108.28767" magical="72.0991544841329" />
 			<attribute>
@@ -4259,8 +4224,6 @@
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
@@ -4279,21 +4242,9 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="386" max="743" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.03180000185966492">
-					<item id="274" min="1" max="1" chance="100" /> <!-- Reinforced Bow -->
-				</group>
-				<group chance="12.251299858093262">
-					<item id="1876" min="1" max="1" chance="11.6885" /> <!-- Mithril Ore -->
-					<item id="1880" min="1" max="1" chance="5.8443" /> <!-- Steel -->
-					<item id="1877" min="1" max="1" chance="2.3377" /> <!-- Adamantite Nugget -->
-					<item id="1881" min="1" max="1" chance="7.7923" /> <!-- Coarse Bone Powder -->
-					<item id="1882" min="1" max="1" chance="12.9872" /> <!-- Leather -->
-					<item id="2260" min="1" max="1" chance="0.9075" /> <!-- Recipe: Mace of Judgment -->
-					<item id="6666" min="1" max="1" chance="58.4425" /> <!-- Deluxe Chest Key - Grade 2 -->
-				</group>
+					<item id="604" min="1" max="1" chance="2.84" /> <!-- Quality Leather Gloves -->
+					<item id="57" min="29" max="68" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -4327,9 +4278,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="1885" min="1" max="1" chance="7.442" /> <!-- High-Grade Suede -->
-				<item id="465" min="1" max="1" chance="0.5934" /> <!-- Cursed Stockings -->
-				<item id="2152" min="1" max="1" chance="15.7224" /> <!-- Recipe: Enchanted Necklace -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -4352,7 +4301,7 @@
 		<sex>MALE</sex>
 		<equipment rhand="121" /> <!-- rhand: Sword of Watershadow -->
 		<acquire exp="7026" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+		<stats>
 			<vitals hp="2685" hpRegen="3.5" mp="300.96" mpRegen="1.5" />
 			<attack physical="80.54056" magical="54.99876" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="111.61368" magical="74.3136496629463" />
@@ -4367,8 +4316,6 @@
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -4380,28 +4327,16 @@
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
 		<sNpcPropHpRate>2</sNpcPropHpRate>
-		<ai aggroRange="500" clanHelpRange="300">
+		<ai aggroRange="500" clanHelpRange="300" isAggressive="true">
 			<clanList>
 				<clan>ORC</clan>
 			</clanList>
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="395" max="773" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.27880001068115234">
-					<item id="391" min="1" max="1" chance="38.4419" /> <!-- Puma Skin Shirt -->
-					<item id="413" min="1" max="1" chance="61.5581" /> <!-- Puma Skin Gaiters -->
-				</group>
-				<group chance="10.368599891662598">
-					<item id="1874" min="1" max="1" chance="5.536" /> <!-- Oriharukon Ore -->
-					<item id="1878" min="1" max="1" chance="33.2158" /> <!-- Braided Hemp -->
-					<item id="1884" min="1" max="1" chance="51.1012" /> <!-- Cord -->
-					<item id="1889" min="1" max="1" chance="5.536" /> <!-- Compound Braid -->
-					<item id="5220" min="1" max="1" chance="3.3216" /> <!-- Metal Hardener -->
-					<item id="2261" min="1" max="1" chance="1.2894" /> <!-- Recipe: Conjuror's Staff -->
-				</group>
+					<item id="123" min="1" max="1" chance="0.3" /> <!-- Saber -->
+					<item id="57" min="30" max="70" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -4435,9 +4370,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="2259" min="1" max="1" chance="1.4293" /> <!-- Recipe: Spinebone Sword -->
-				<item id="2018" min="1" max="1" chance="1.2232" /> <!-- Assassin Knife Edge -->
-				<item id="1899" min="1" max="1" chance="14.3825" /> <!-- Necklace of Devotion Chain -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -4460,8 +4393,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="11" /> <!-- rhand: Bone Dagger -->
 		<acquire exp="5910" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2336" hpRegen="3.5" mp="286.92" mpRegen="1.5" />
+		<stats>
+			<vitals hp="1474" hpRegen="4.5" mp="387" mpRegen="1.8" />
 			<attack physical="74.99121" magical="51.20928" random="10" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="108.28767" magical="72.0991544841329" />
 			<attribute>
@@ -4475,8 +4408,6 @@
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -4495,22 +4426,9 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="371" max="714" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="2.8726999759674072">
-					<item id="626" min="1" max="1" chance="6.6164" /> <!-- Bronze Shield -->
-					<item id="45" min="1" max="1" chance="4.6397" /> <!-- Bone Helmet -->
-					<item id="1932" min="1" max="1" chance="88.7439" /> <!-- Bone Helmet Design -->
-				</group>
-				<group chance="3.5778000354766846">
-					<item id="1875" min="1" max="1" chance="14.9635" /> <!-- Stone of Purity -->
-					<item id="1879" min="1" max="1" chance="37.4088" /> <!-- Cokes -->
-					<item id="1885" min="1" max="1" chance="18.7044" /> <!-- High-Grade Suede -->
-					<item id="5550" min="1" max="1" chance="2.9927" /> <!-- Durable Metal Plate -->
-					<item id="5549" min="1" max="1" chance="22.4453" /> <!-- Metallic Thread -->
-					<item id="2261" min="1" max="1" chance="3.4853" /> <!-- Recipe: Conjuror's Staff -->
-				</group>
+					<item id="221" min="1" max="1" chance="0.3" /> <!-- Assassin Knife -->
+					<item id="57" min="25" max="58" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -4544,9 +4462,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="2262" min="1" max="1" chance="1.3331" /> <!-- Recipe: Elven Bow -->
-				<item id="3953" min="1" max="1" chance="3.4341" /> <!-- Recipe: Blessed Spiritshot D -->
-				<item id="1885" min="1" max="1" chance="7.1544" /> <!-- High-Grade Suede -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -4569,8 +4485,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="2" /> <!-- rhand: Long Sword -->
 		<acquire exp="5360" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2119" hpRegen="3.5" mp="273.0" mpRegen="1.5" />
+		<stats>
+			<vitals hp="1338" hpRegen="4.5" mp="358" mpRegen="1.8" />
 			<attack physical="69.75926" magical="47.63653" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="105.02818" magical="69.9289432036824" />
 			<attribute>
@@ -4584,8 +4500,6 @@
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
@@ -4604,23 +4518,9 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="357" max="682" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="3.302799940109253">
-					<item id="40" min="1" max="1" chance="4.3392" /> <!-- Leather Boots -->
-					<item id="1931" min="1" max="1" chance="45.6608" /> <!-- Leather Boots Lining -->
-					<item id="604" min="1" max="1" chance="4.3392" /> <!-- Crafted Leather Gloves -->
-					<item id="1934" min="1" max="1" chance="45.6608" /> <!-- Crafted Leather Gloves Lining -->
-				</group>
-				<group chance="6.2729997634887695">
-					<item id="1876" min="1" max="1" chance="24.5217" /> <!-- Mithril Ore -->
-					<item id="1880" min="1" max="1" chance="12.2609" /> <!-- Steel -->
-					<item id="1877" min="1" max="1" chance="4.9043" /> <!-- Adamantite Nugget -->
-					<item id="1881" min="1" max="1" chance="16.3478" /> <!-- Coarse Bone Powder -->
-					<item id="1882" min="1" max="1" chance="27.2464" /> <!-- Leather -->
-					<item id="2182" min="1" max="1" chance="14.7189" /> <!-- Recipe: Scale Gaiters -->
-				</group>
+					<item id="291" min="1" max="1" chance="0.3" /> <!-- Trident -->
+					<item id="57" min="22" max="52" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -4654,9 +4554,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="1870" min="1" max="1" chance="82.2258" /> <!-- Coal -->
-				<item id="2017" min="1" max="1" chance="1.0927" /> <!-- Saber Blade -->
-				<item id="1880" min="1" max="1" chance="8.2226" /> <!-- Steel -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
diff --git a/trunk/dist/game/data/stats/npcs/20500-20599.xml b/trunk/dist/game/data/stats/npcs/20500-20599.xml
index d801c008bd..6cc78792f5 100644
--- a/trunk/dist/game/data/stats/npcs/20500-20599.xml
+++ b/trunk/dist/game/data/stats/npcs/20500-20599.xml
@@ -14,8 +14,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="3" /> <!-- rhand: Broadsword -->
 		<acquire exp="5788" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2225" hpRegen="3.5" mp="259.2" mpRegen="1.5" />
+		<stats>
+			<vitals hp="1406" hpRegen="4.5" mp="372" mpRegen="1.8" />
 			<attack physical="64.83203" magical="44.27187" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="101.83533" magical="67.8031159084826" />
 			<attribute>
@@ -29,8 +29,6 @@
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
@@ -49,21 +47,9 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="344" max="644" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="2.055299997329712">
-					<item id="847" min="1" max="1" chance="5.1488" /> <!-- Red Crescent Earring -->
-					<item id="910" min="1" max="1" chance="3.8616" /> <!-- Necklace of Devotion -->
-					<item id="1899" min="1" max="1" chance="83.2663" /> <!-- Necklace of Devotion Chain -->
-					<item id="890" min="1" max="1" chance="7.7233" /> <!-- Ring of Devotion -->
-				</group>
-				<group chance="5.719399929046631">
-					<item id="1874" min="1" max="1" chance="12.7666" /> <!-- Oriharukon Ore -->
-					<item id="1878" min="1" max="1" chance="76.5998" /> <!-- Braided Hemp -->
-					<item id="5220" min="1" max="1" chance="7.66" /> <!-- Metal Hardener -->
-					<item id="2262" min="1" max="1" chance="2.9736" /> <!-- Recipe: Elven Bow -->
-				</group>
+					<item id="5285" min="1" max="1" chance="0.3" /> <!-- Heavy Sword -->
+					<item id="57" min="24" max="56" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -97,9 +83,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="1867" min="1" max="3" chance="52.0412" /> <!-- Animal Skin -->
-				<item id="1932" min="1" max="1" chance="12.3908" /> <!-- Bone Helmet Design -->
-				<item id="1931" min="1" max="1" chance="10.2042" /> <!-- Leather Boots Lining -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -123,8 +107,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="7" /> <!-- rhand: Apprentice's Rod -->
 		<acquire exp="7148" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2808" hpRegen="3.5" mp="315.12" mpRegen="1.5" />
+		<stats>
+			<vitals hp="1774" hpRegen="4.5" mp="447" mpRegen="1.8" />
 			<attack physical="86.42002" magical="59.01367" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="115.00598" magical="76.5722740603874" />
 			<attribute>
@@ -139,8 +123,6 @@
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4002" level="2" /> <!-- NPC HP Drain -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -159,28 +141,9 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="400" max="793" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="1.4179999828338623">
-					<item id="433" min="1" max="1" chance="1.1833" /> <!-- Elven Tunic -->
-					<item id="434" min="1" max="1" chance="1.1833" /> <!-- White Tunic -->
-					<item id="1936" min="1" max="1" chance="37.2337" /> <!-- White Tunic Pattern -->
-					<item id="435" min="1" max="1" chance="1.1833" /> <!-- Mystic's Tunic -->
-					<item id="466" min="1" max="1" chance="1.8958" /> <!-- Elven Stockings -->
-					<item id="467" min="1" max="1" chance="1.8958" /> <!-- Dark Stockings -->
-					<item id="1933" min="1" max="1" chance="53.5289" /> <!-- Dark Stockings Fabric -->
-					<item id="468" min="1" max="1" chance="1.8959" /> <!-- Mystic's Stockings -->
-				</group>
-				<group chance="3.2994000911712646">
-					<item id="1875" min="1" max="1" chance="14.8981" /> <!-- Stone of Purity -->
-					<item id="1879" min="1" max="1" chance="37.2453" /> <!-- Cokes -->
-					<item id="1885" min="1" max="1" chance="18.6226" /> <!-- High-Grade Suede -->
-					<item id="5550" min="1" max="1" chance="2.9796" /> <!-- Durable Metal Plate -->
-					<item id="5549" min="1" max="1" chance="22.3472" /> <!-- Metallic Thread -->
-					<item id="2264" min="1" max="1" chance="2.311" /> <!-- Recipe: Two-handed Sword -->
-					<item id="2274" min="1" max="1" chance="1.5962" /> <!-- Recipe: Skull Breaker -->
-				</group>
+					<item id="7880" min="1" max="1" chance="0.3" /> <!-- Steel Sword -->
+					<item id="57" min="31" max="73" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -214,9 +177,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="1870" min="1" max="1" chance="94.4489" /> <!-- Coal -->
-				<item id="1933" min="1" max="1" chance="11.1116" /> <!-- Dark Stockings Fabric -->
-				<item id="2153" min="1" max="1" chance="14.6888" /> <!-- Recipe: Tiger's Eye Earring -->
+					<item id="36532" min="1" max="1" chance="0.75" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -2390,8 +2351,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="7" /> <!-- rhand: Apprentice's Rod -->
 		<acquire exp="4272" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1532" hpRegen="4.5" mp="387.72" mpRegen="1.8" />
+		<stats>
+			<vitals hp="967" hpRegen="4.5" mp="478" mpRegen="1.8" />
 			<attack physical="121.20802" magical="82.76936" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="132.9486" magical="88.5186722618248" />
 			<attribute>
@@ -2406,8 +2367,6 @@
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4002" level="3" /> <!-- NPC HP Drain -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -2418,32 +2377,16 @@
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai type="BALANCED" aggroRange="500" clanHelpRange="300">
+		<ai type="BALANCED" aggroRange="500" clanHelpRange="300" isAggressive="true">
 			<clanList>
 				<clan>ORC</clan>
 			</clanList>
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="288" max="574" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="1.3701000213623047">
-					<item id="849" min="1" max="1" chance="2.6765" /> <!-- Tiger's Eye Earring -->
-					<item id="1901" min="1" max="1" chance="91.3106" /> <!-- Tiger's Eye Earring Stone -->
-					<item id="912" min="1" max="1" chance="2.0063" /> <!-- Near Forest Necklace -->
-					<item id="880" min="1" max="1" chance="4.0066" /> <!-- Black Pearl Ring -->
-				</group>
-				<group chance="3.821000099182129">
-					<item id="1876" min="1" max="1" chance="23.7048" /> <!-- Mithril Ore -->
-					<item id="1880" min="1" max="1" chance="11.8524" /> <!-- Steel -->
-					<item id="1877" min="1" max="1" chance="4.741" /> <!-- Adamantite Nugget -->
-					<item id="1881" min="1" max="1" chance="15.8032" /> <!-- Coarse Bone Powder -->
-					<item id="1882" min="1" max="1" chance="26.3387" /> <!-- Leather -->
-					<item id="2276" min="1" max="1" chance="0.8466" /> <!-- Recipe: Maingauche -->
-					<item id="2274" min="1" max="1" chance="0.8466" /> <!-- Recipe: Skull Breaker -->
-					<item id="2976" min="1" max="1" chance="15.8667" /> <!-- Recipe: Manticore Skin Boots -->
-				</group>
+					<item id="7885" min="1" max="1" chance="0.075" /> <!-- Priest Sword -->
+					<item id="57" min="19" max="44" chance="70" /> <!-- Adena -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -2477,9 +2420,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="2279" min="1" max="1" chance="0.4867" /> <!-- Recipe: War Pick -->
-				<item id="2979" min="1" max="1" chance="9.122" /> <!-- Recipe: Manticore Skin Gloves -->
-				<item id="1877" min="1" max="1" chance="2.7257" /> <!-- Adamantite Nugget -->
+					<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 		<collision>
diff --git a/trunk/dist/game/data/stats/npcs/21000-21099.xml b/trunk/dist/game/data/stats/npcs/21000-21099.xml
index 566bd13e76..a48f38552c 100644
--- a/trunk/dist/game/data/stats/npcs/21000-21099.xml
+++ b/trunk/dist/game/data/stats/npcs/21000-21099.xml
@@ -2564,8 +2564,8 @@
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
 		<acquire exp="1362" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="613" hpRegen="3.5" mp="273.0" mpRegen="1.5" />
+		<stats>
+			<vitals hp="388" hpRegen="3.5" mp="218" mpRegen="1.5" />
 			<attack physical="69.75926" magical="47.63653" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="105.02818" magical="69.9289432036824" />
 			<attribute>
@@ -2581,8 +2581,6 @@
 		<skillList>
 			<skill id="4046" level="2" /> <!-- Sleep -->
 			<skill id="4276" level="1" /> <!-- Weak Point against Bow/Crossbow Weapons -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -2600,22 +2598,10 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="192" max="367" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.015799999237060547">
-					<item id="156" min="1" max="1" chance="33.3333" /> <!-- Hand Axe -->
-					<item id="167" min="1" max="1" chance="33.3333" /> <!-- Scalpel -->
-					<item id="178" min="1" max="1" chance="33.3334" /> <!-- Bone Staff -->
-				</group>
-				<group chance="25.150400161743164">
-					<item id="1864" min="1" max="1" chance="32.8829" /> <!-- Stem -->
-					<item id="1865" min="1" max="1" chance="16.4414" /> <!-- Varnish -->
-					<item id="1866" min="1" max="1" chance="10.961" /> <!-- Suede -->
-					<item id="1873" min="1" max="1" chance="6.5766" /> <!-- Silver Nugget -->
-					<item id="1868" min="1" max="1" chance="32.8829" /> <!-- Thread -->
-					<item id="2260" min="1" max="1" chance="0.2552" /> <!-- Recipe: Mace of Judgment -->
-				</group>
+					<item id="57" min="6" max="14" chance="70" /> <!-- Adena -->
+					<item id="36556" min="1" max="1" chance="1.443" /> <!-- Accessory Gem (Low-grade) -->
+					<item id="36932" min="1" max="1" chance="0.0009" /> <!-- Recipe: Accessory Gem - Upgrade -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -2649,9 +2635,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="2019" min="1" max="1" chance="0.9507" /> <!-- Trident Edge -->
-				<item id="2263" min="1" max="1" chance="0.6865" /> <!-- Recipe: Dwarven Trident -->
-				<item id="1866" min="1" max="1" chance="29.4716" /> <!-- Suede -->
+					<item id="36556" min="1" max="1" chance="3.115" /> <!-- Accessory Gem (Low-grade) -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -2714,10 +2698,10 @@
 		</collision>
 		<dropLists>
 			<death>
-				<item id="57" min="8" max="18" chance="70" /> <!-- Adena -->
-				<item id="36556" min="1" max="1" chance="1.875" /> <!-- Accessory Gem (Low-grade) -->
-				<item id="36932" min="1" max="1" chance="0.0009" /> <!-- Recipe: Accessory Gem - Upgrade -->
-				<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+					<item id="57" min="8" max="18" chance="70" /> <!-- Adena -->
+					<item id="36556" min="1" max="1" chance="1.875" /> <!-- Accessory Gem (Low-grade) -->
+					<item id="36932" min="1" max="1" chance="0.0009" /> <!-- Recipe: Accessory Gem - Upgrade -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -2772,8 +2756,8 @@
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
 		<acquire exp="2120" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="543.79576" hpRegen="3.5" mp="300.96" mpRegen="1.5" />
+		<stats>
+			<vitals hp="544" hpRegen="3.5" mp="300" mpRegen="1.5" />
 			<attack physical="80.54056" magical="54.99876" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="111.61368" magical="74.3136496629463" />
 			<attribute>
@@ -2791,8 +2775,6 @@
 			<skill id="4047" level="2" /> <!-- Hold -->
 			<skill id="4098" level="2" /> <!-- Silence -->
 			<skill id="4276" level="1" /> <!-- Weak Point against Bow/Crossbow Weapons -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -2810,21 +2792,10 @@
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="208" max="407" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.30140000581741333">
-					<item id="291" min="1" max="1" chance="2.8677" /> <!-- Trident -->
-					<item id="2019" min="1" max="1" chance="97.1323" /> <!-- Trident Edge -->
-				</group>
-				<group chance="27.87350082397461">
-					<item id="1864" min="1" max="1" chance="32.5635" /> <!-- Stem -->
-					<item id="1865" min="1" max="1" chance="16.2817" /> <!-- Varnish -->
-					<item id="1866" min="1" max="1" chance="10.8545" /> <!-- Suede -->
-					<item id="1873" min="1" max="1" chance="6.5127" /> <!-- Silver Nugget -->
-					<item id="1868" min="1" max="1" chance="32.5635" /> <!-- Thread -->
-					<item id="2180" min="1" max="1" chance="1.2241" /> <!-- Recipe: Scale Mail -->
-				</group>
+					<item id="57" min="8" max="19" chance="70" /> <!-- Adena -->
+					<item id="36556" min="1" max="1" chance="2.001" /> <!-- Accessory Gem (Low-grade) -->
+					<item id="36932" min="1" max="1" chance="0.0009" /> <!-- Recipe: Accessory Gem - Upgrade -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -2858,9 +2829,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="1871" min="1" max="1" chance="48.518" /> <!-- Charcoal -->
-				<item id="1868" min="1" max="3" chance="48.518" /> <!-- Thread -->
-				<item id="2152" min="1" max="1" chance="8.5419" /> <!-- Recipe: Enchanted Necklace -->
+					<item id="36556" min="1" max="1" chance="4.145" /> <!-- Accessory Gem (Low-grade) -->
 			</corpse>
 		</dropLists>
 		<collision>
@@ -2885,8 +2854,8 @@
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
 		<acquire exp="2283" sp="1" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="573.42917" hpRegen="3.5" mp="315.12" mpRegen="1.5" />
+		<stats>
+			<vitals hp="574" hpRegen="3.5" mp="315" mpRegen="1.5" />
 			<attack physical="86.42002" magical="59.01367" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="115.00598" magical="76.5722740603874" />
 			<attribute>
@@ -2904,8 +2873,6 @@
 			<skill id="4038" level="3" /> <!-- Decrease Atk. Spd. -->
 			<skill id="4066" level="2" /> <!-- NPC Twister -->
 			<skill id="4276" level="1" /> <!-- Weak Point against Bow/Crossbow Weapons -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="10" /> <!-- Slightly Weak P. Atk. -->
 			<skill id="4411" level="10" /> <!-- Slightly Weak M. Atk. -->
 			<skill id="4412" level="12" /> <!-- Slightly Strong P. Def. -->
@@ -2916,30 +2883,18 @@
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai aggroRange="500" clanHelpRange="300">
+		<ai aggroRange="500" clanHelpRange="300" isAggressive="true">
 			<clanList>
 				<clan>ELEMENTAL2</clan>
 			</clanList>
 		</ai>
 		<dropLists>
 			<death>
-				<group chance="70">
-					<item id="57" min="220" max="435" chance="100" /> <!-- Adena -->
-				</group>
-				<group chance="0.1420000046491623">
-					<item id="275" min="1" max="1" chance="2.6815" /> <!-- Long Bow -->
-					<item id="276" min="1" max="1" chance="2.6815" /> <!-- Elven Bow -->
-					<item id="2024" min="1" max="1" chance="94.637" /> <!-- Elven Bow Shaft -->
-				</group>
-				<group chance="12.565500259399414">
-					<item id="1872" min="1" max="1" chance="42.9045" /> <!-- Animal Bone -->
-					<item id="1867" min="1" max="1" chance="42.9045" /> <!-- Animal Skin -->
-					<item id="1881" min="1" max="1" chance="4.2904" /> <!-- Coarse Bone Powder -->
-					<item id="1875" min="1" max="1" chance="2.1452" /> <!-- Stone of Purity -->
-					<item id="737" min="1" max="1" chance="3.2178" /> <!-- Scroll of Resurrection -->
-					<item id="2274" min="1" max="1" chance="0.2298" /> <!-- Recipe: Skull Breaker -->
-					<item id="2191" min="1" max="1" chance="4.3078" /> <!-- Recipe: RIP Gauntlets -->
-				</group>
+					<item id="57" min="9" max="20" chance="70" /> <!-- Adena -->
+					<item id="1834" min="1" max="1" chance="5.103" /> <!-- Emergency Dressing -->
+					<item id="36556" min="1" max="1" chance="1.451" /> <!-- Accessory Gem (Low-grade) -->
+					<item id="36932" min="1" max="1" chance="0.0009" /> <!-- Recipe: Accessory Gem - Upgrade -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
 				<group chance="42.0">
 					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
 					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
@@ -2973,9 +2928,7 @@
 				</group>
 			</death>
 			<corpse>
-				<item id="1834" min="1" max="1" chance="57.5495" /> <!-- Emergency Dressing -->
-				<item id="2025" min="1" max="1" chance="0.7174" /> <!-- Dwarven Trident Edge -->
-				<item id="1900" min="1" max="1" chance="5.6668" /> <!-- Enchanted Necklace Chain -->
+					<item id="36556" min="1" max="1" chance="4.473" /> <!-- Accessory Gem (Low-grade) -->
 			</corpse>
 		</dropLists>
 		<collision>
diff --git a/trunk/dist/game/data/stats/npcs/23400-23499.xml b/trunk/dist/game/data/stats/npcs/23400-23499.xml
index b875c9f99b..dc929feb2d 100644
--- a/trunk/dist/game/data/stats/npcs/23400-23499.xml
+++ b/trunk/dist/game/data/stats/npcs/23400-23499.xml
@@ -250,17 +250,27 @@
 		</collision>
 	</npc>
 	<npc id="23414" level="21" type="L2Monster" name="Windima">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<!-- Source: www.l2wiki.com -->
+		<parameters>
+			<param name="MoveAroundSocial" value="0" />
+			<param name="MoveAroundSocial1" value="0" />
+			<param name="MoveAroundSocial2" value="0" />
+			<skill name="DeBuff" id="4098" level="1" /> <!-- Silence -->
+		</parameters>
 		<race>ELEMENTAL</race>
 		<acquire exp="1184" sp="0" />
 		<stats>
 			<vitals hp="411" hpRegen="3.5" mp="231" mpRegen="1.5" />
+			<attack physical="101.09" magical="22.77" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
+			<defence physical="101.948" magical="72.519" />
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
 			<speed>
 				<walk ground="60" /> <!-- Need retail value -->
 				<run ground="120" /> <!-- Need retail value -->
 			</speed>
 		</stats>
-		<status attackable="true" />
 		<skillList>
 			<skill id="4416" level="7" /> <!-- Spirits -->
 			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
@@ -271,11 +281,47 @@
 			<radius normal="23" />
 			<height normal="90" />
 		</collision>
+		<ai type="BALANCED" aggroRange="500" clanHelpRange="300" isAggressive="false">
+			<clanList>
+				<clan>ELEMENTAL2</clan>
+			</clanList>
+		</ai>	
 		<dropLists>
 			<death>
-				<item id="57" min="7" max="16" chance="70" /> <!-- Adena -->
-				<item id="36526" min="1" max="1" chance="23.37" /> <!-- Fiber -->
-				<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+					<item id="57" min="7" max="16" chance="70" /> <!-- Adena -->
+					<item id="36526" min="1" max="1" chance="23.37" /> <!-- Fiber -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+				<group chance="42.0">
+					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
+					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
+					<item id="8602" min="1" max="1" chance="7" /> <!-- Superior Herb of Life -->
+				</group>
+				<group chance="11.0">
+					<item id="8603" min="1" max="1" chance="50" /> <!-- Herb of Mana -->
+					<item id="8604" min="1" max="1" chance="43" /> <!-- Greater Herb of Mana -->
+					<item id="8605" min="1" max="1" chance="7" /> <!-- Superior Herb of Mana -->
+				</group>
+				<group chance="25.0">
+					<item id="8606" min="1" max="1" chance="20" /> <!-- Herb of Power -->
+					<item id="8608" min="1" max="1" chance="20" /> <!-- Herb of Alacrity -->
+					<item id="8610" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Probability -->
+					<item id="10655" min="1" max="1" chance="20" /> <!-- Herb of Vampiric Rage -->
+					<item id="10656" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Power -->
+				</group>
+				<group chance="10.0">
+					<item id="8607" min="1" max="1" chance="50" /> <!-- Herb of Magic -->
+					<item id="8609" min="1" max="1" chance="50" /> <!-- Herb of Casting Spd. -->
+				</group>
+				<group chance="1.0">
+					<item id="8612" min="1" max="1" chance="33" /> <!-- Herb of the Warrior -->
+					<item id="8613" min="1" max="1" chance="33" /> <!-- Herb of the Mystic -->
+					<item id="8614" min="1" max="1" chance="34" /> <!-- Herb of Recovery -->
+				</group>
+				<group chance="11.0">
+					<item id="8611" min="1" max="1" chance="94" /> <!-- Herb of Speed -->
+					<item id="10657" min="1" max="1" chance="3" /> <!-- Herb of Doubt -->
+					<item id="13028" min="1" max="1" chance="3" /> <!-- Vitality Replenishing Herb -->
+				</group>
 			</death>
 			<corpse>
 				<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
@@ -283,7 +329,13 @@
 		</dropLists>
 	</npc>
 	<npc id="23415" level="23" type="L2Monster" name="Windima Feri">
-		<!-- Source: www.l2wiki.com (2015-10-31) -->
+		<!-- Source: www.l2wiki.com -->
+		<parameters>
+			<param name="MoveAroundSocial" value="0" />
+			<param name="MoveAroundSocial1" value="0" />
+			<param name="MoveAroundSocial2" value="0" />
+			<skill name="DeBuff" id="4098" level="1" /> <!-- Silence -->
+		</parameters>
 		<race>ELEMENTAL</race>
 		<acquire exp="1184" sp="0" />
 		<stats>
@@ -304,33 +356,128 @@
 			<radius normal="23" />
 			<height normal="90" />
 		</collision>
+		<ai type="BALANCED" aggroRange="500" clanHelpRange="300" isAggressive="true">
+			<clanList>
+				<clan>ELEMENTAL2</clan>
+			</clanList>
+		</ai>
 		<dropLists>
 			<death>
-				<item id="57" min="7" max="16" chance="70" /> <!-- Adena -->
-				<item id="36526" min="1" max="1" chance="23.37" /> <!-- Fiber -->
-				<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+					<item id="57" min="7" max="16" chance="70" /> <!-- Adena -->
+					<item id="36526" min="1" max="1" chance="23.37" /> <!-- Fiber -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+				<group chance="42.0">
+					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
+					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
+					<item id="8602" min="1" max="1" chance="7" /> <!-- Superior Herb of Life -->
+				</group>
+				<group chance="11.0">
+					<item id="8603" min="1" max="1" chance="50" /> <!-- Herb of Mana -->
+					<item id="8604" min="1" max="1" chance="43" /> <!-- Greater Herb of Mana -->
+					<item id="8605" min="1" max="1" chance="7" /> <!-- Superior Herb of Mana -->
+				</group>
+				<group chance="25.0">
+					<item id="8606" min="1" max="1" chance="20" /> <!-- Herb of Power -->
+					<item id="8608" min="1" max="1" chance="20" /> <!-- Herb of Alacrity -->
+					<item id="8610" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Probability -->
+					<item id="10655" min="1" max="1" chance="20" /> <!-- Herb of Vampiric Rage -->
+					<item id="10656" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Power -->
+				</group>
+				<group chance="10.0">
+					<item id="8607" min="1" max="1" chance="50" /> <!-- Herb of Magic -->
+					<item id="8609" min="1" max="1" chance="50" /> <!-- Herb of Casting Spd. -->
+				</group>
+				<group chance="1.0">
+					<item id="8612" min="1" max="1" chance="33" /> <!-- Herb of the Warrior -->
+					<item id="8613" min="1" max="1" chance="33" /> <!-- Herb of the Mystic -->
+					<item id="8614" min="1" max="1" chance="34" /> <!-- Herb of Recovery -->
+				</group>
+				<group chance="11.0">
+					<item id="8611" min="1" max="1" chance="94" /> <!-- Herb of Speed -->
+					<item id="10657" min="1" max="1" chance="3" /> <!-- Herb of Doubt -->
+					<item id="13028" min="1" max="1" chance="3" /> <!-- Vitality Replenishing Herb -->
+				</group>
 			</death>
 			<corpse>
 				<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
 			</corpse>
 		</dropLists>
 	</npc>
-	<npc id="23416" level="25" type="L2Npc" name="Windima Resh">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23416" level="25" type="L2Monster" name="Windima Resh">
+		<!-- Source: www.l2wiki.com (2015-10-31) -->
+		<parameters>
+			<param name="MoveAroundSocial" value="0" />
+			<param name="MoveAroundSocial1" value="0" />
+			<param name="MoveAroundSocial2" value="0" />
+			<skill name="DeBuff" id="4098" level="1" /> <!-- Silence -->
+		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="730" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
+		<acquire exp="1894" sp="0" />
+		<stats>
+			<vitals hp="461" hpRegen="3.5" mp="259" mpRegen="1.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<skillList>
+			<skill id="4416" level="7" /> <!-- Spirits -->
+			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
+			<skill id="4411" level="15" /> <!-- Strong M. Atk. -->
+			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
+			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
+		</skillList>
+		<ai type="BALANCED" aggroRange="500" clanHelpRange="300" isAggressive="true">
+			<clanList>
+				<clan>ELEMENTAL2</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="23" />
 			<height normal="90" />
 		</collision>
+		<dropLists>
+			<death>
+					<item id="57" min="8" max="18" chance="70" /> <!-- Adena -->
+					<item id="36551" min="1" max="1" chance="1.113" /> <!-- Armor Fragment (Low-grade) -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+				<group chance="42.0">
+					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
+					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
+					<item id="8602" min="1" max="1" chance="7" /> <!-- Superior Herb of Life -->
+				</group>
+				<group chance="11.0">
+					<item id="8603" min="1" max="1" chance="50" /> <!-- Herb of Mana -->
+					<item id="8604" min="1" max="1" chance="43" /> <!-- Greater Herb of Mana -->
+					<item id="8605" min="1" max="1" chance="7" /> <!-- Superior Herb of Mana -->
+				</group>
+				<group chance="25.0">
+					<item id="8606" min="1" max="1" chance="20" /> <!-- Herb of Power -->
+					<item id="8608" min="1" max="1" chance="20" /> <!-- Herb of Alacrity -->
+					<item id="8610" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Probability -->
+					<item id="10655" min="1" max="1" chance="20" /> <!-- Herb of Vampiric Rage -->
+					<item id="10656" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Power -->
+				</group>
+				<group chance="10.0">
+					<item id="8607" min="1" max="1" chance="50" /> <!-- Herb of Magic -->
+					<item id="8609" min="1" max="1" chance="50" /> <!-- Herb of Casting Spd. -->
+				</group>
+				<group chance="1.0">
+					<item id="8612" min="1" max="1" chance="33" /> <!-- Herb of the Warrior -->
+					<item id="8613" min="1" max="1" chance="33" /> <!-- Herb of the Mystic -->
+					<item id="8614" min="1" max="1" chance="34" /> <!-- Herb of Recovery -->
+				</group>
+				<group chance="11.0">
+					<item id="8611" min="1" max="1" chance="94" /> <!-- Herb of Speed -->
+					<item id="10657" min="1" max="1" chance="3" /> <!-- Herb of Doubt -->
+					<item id="13028" min="1" max="1" chance="3" /> <!-- Vitality Replenishing Herb -->
+				</group>
+			</death>
+			<corpse>
+				<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
+			</corpse>
+		</dropLists>
 	</npc>
 	<npc id="23417" level="26" type="L2Monster" name="Wind Vortex" title="Cyclone">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -350,39 +497,92 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="23418" level="35" type="L2Npc" name="Marionette Spirit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+	<npc id="23418" level="35" type="L2Monster" name="Marionette Spirit">
+		<!-- Source: http://l2on.net/en/?c=npc&id=23418 -->
+		<race>PLANT</race>
+		<stats>
 			<vitals hp="1224" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="60" />
 			<height normal="47" />
 		</collision>
+		<dropLists>
+			<death>
+					<item id="57" min="13" max="30" chance="61" /> <!-- Adena -->
+					<item id="1879" min="1" max="1" chance="0.9" /> <!-- Cokes -->
+					<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+				<group chance="42.0">
+					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
+					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
+					<item id="8602" min="1" max="1" chance="7" /> <!-- Superior Herb of Life -->
+				</group>
+				<group chance="11.0">
+					<item id="8603" min="1" max="1" chance="50" /> <!-- Herb of Mana -->
+					<item id="8604" min="1" max="1" chance="43" /> <!-- Greater Herb of Mana -->
+					<item id="8605" min="1" max="1" chance="7" /> <!-- Superior Herb of Mana -->
+				</group>
+				<group chance="25.0">
+					<item id="8606" min="1" max="1" chance="20" /> <!-- Herb of Power -->
+					<item id="8608" min="1" max="1" chance="20" /> <!-- Herb of Alacrity -->
+					<item id="8610" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Probability -->
+					<item id="10655" min="1" max="1" chance="20" /> <!-- Herb of Vampiric Rage -->
+					<item id="10656" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Power -->
+				</group>
+				<group chance="10.0">
+					<item id="8607" min="1" max="1" chance="50" /> <!-- Herb of Magic -->
+					<item id="8609" min="1" max="1" chance="50" /> <!-- Herb of Casting Spd. -->
+				</group>
+				<group chance="1.0">
+					<item id="8612" min="1" max="1" chance="33" /> <!-- Herb of the Warrior -->
+					<item id="8613" min="1" max="1" chance="33" /> <!-- Herb of the Mystic -->
+					<item id="8614" min="1" max="1" chance="34" /> <!-- Herb of Recovery -->
+				</group>
+				<group chance="11.0">
+					<item id="8611" min="1" max="1" chance="94" /> <!-- Herb of Speed -->
+					<item id="10657" min="1" max="1" chance="3" /> <!-- Herb of Doubt -->
+					<item id="13028" min="1" max="1" chance="3" /> <!-- Vitality Replenishing Herb -->
+				</group>
+			</death>
+			<corpse>
+				<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
+			</corpse>
+		</dropLists>
 	</npc>
-	<npc id="23419" level="25" type="L2Npc" name="Giant Windima">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4899" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
+	<npc id="23419" level="25" type="L2Monster" name="Giant Windima">
+		<!-- Source: www.l2wiki.com (2015-04-08) -->
+		<race>PLANT</race>
+		<acquire exp="2956" sp="0" />
+		<stats>
+			<vitals hp="3092" hpRegen="3.5" mp="402" mpRegen="1.5" />
 			<speed>
 				<walk ground="50" />
-				<run ground="120" />
+				<run ground="120" /> 
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4412" level="5" /> <!-- Very Weak P. Def. -->
+		</skillList>
 		<collision>
 			<radius normal="60" />
 			<height normal="47" />
 		</collision>
+		<dropLists>
+			<death>
+				<item id="57" min="8" max="18" chance="70" /> <!-- Adena -->
+				<item id="36527" min="1" max="1" chance="0.75" /> <!-- Synthetic Fiber -->
+				<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+			</death>
+			<corpse>
+				<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
+			</corpse>
+		</dropLists>
 	</npc>
 	<npc id="23420" level="25" type="L2Monster" name="Immense Windima">
 		<!-- Source: www.l2wiki.com (2015-04-08) -->
@@ -395,7 +595,6 @@
 				<run ground="120" /> <!-- Need retail value -->
 			</speed>
 		</stats>
-		<status attackable="true" />
 		<skillList>
 			<skill id="4416" level="5" /> <!-- Plants -->
 			<skill id="4413" level="5" /> <!-- Very Weak M. Def. -->
@@ -416,38 +615,98 @@
 		</dropLists>
 	</npc>
 	<npc id="23421" level="25" type="L2Npc" name="Chertuba Mirage">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+		<!-- http://l2on.net/en/?c=npc&id=23422 -->
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="7276" sp="1" />
+		<stats>
 			<vitals hp="7505" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 		</stats>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoides -->
+		</skillList>
 		<status attackable="false" />
 		<collision>
 			<radius normal="24" />
 			<height normal="51" />
 		</collision>
+		<dropLists>
+			<death>
+				<item id="57" min="13" max="30" chance="70" /> <!-- Adena -->
+				<item id="36552" min="1" max="1" chance="0.003" /> <!-- Armor Fragment -->
+				<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+			</death>
+			<corpse>
+				<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
+			</corpse>
+		</dropLists>
 	</npc>
-	<npc id="23422" level="35" type="L2Npc" name="Chertuba Illusion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+	<npc id="23422" level="35" type="L2Monster" name="Chertuba Illusion">
+		<!-- http://l2on.net/en/?c=npc&id=23422 -->
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="78" /> <!-- rhand: Great Sword -->
+		<acquire exp="7276" sp="1" />
+		<stats>
 			<vitals hp="7505" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoides -->
+            <skill id="4413" level="5" /> <!-- Weak M. Def. -->
+		</skillList>
 		<collision>
 			<radius normal="24" />
 			<height normal="51" />
 		</collision>
+		<dropLists>
+			<death>
+				<item id="57" min="13" max="30" chance="70" /> <!-- Adena -->
+				<item id="36552" min="1" max="1" chance="0.003" /> <!-- Armor Fragment -->
+				<item id="39629" min="1" max="1" chance="0.01" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+				<group chance="42.0">
+					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
+					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
+					<item id="8602" min="1" max="1" chance="7" /> <!-- Superior Herb of Life -->
+				</group>
+				<group chance="11.0">
+					<item id="8603" min="1" max="1" chance="50" /> <!-- Herb of Mana -->
+					<item id="8604" min="1" max="1" chance="43" /> <!-- Greater Herb of Mana -->
+					<item id="8605" min="1" max="1" chance="7" /> <!-- Superior Herb of Mana -->
+				</group>
+				<group chance="25.0">
+					<item id="8606" min="1" max="1" chance="20" /> <!-- Herb of Power -->
+					<item id="8608" min="1" max="1" chance="20" /> <!-- Herb of Alacrity -->
+					<item id="8610" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Probability -->
+					<item id="10655" min="1" max="1" chance="20" /> <!-- Herb of Vampiric Rage -->
+					<item id="10656" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Power -->
+				</group>
+				<group chance="10.0">
+					<item id="8607" min="1" max="1" chance="50" /> <!-- Herb of Magic -->
+					<item id="8609" min="1" max="1" chance="50" /> <!-- Herb of Casting Spd. -->
+				</group>
+				<group chance="1.0">
+					<item id="8612" min="1" max="1" chance="33" /> <!-- Herb of the Warrior -->
+					<item id="8613" min="1" max="1" chance="33" /> <!-- Herb of the Mystic -->
+					<item id="8614" min="1" max="1" chance="34" /> <!-- Herb of Recovery -->
+				</group>
+				<group chance="11.0">
+					<item id="8611" min="1" max="1" chance="94" /> <!-- Herb of Speed -->
+					<item id="10657" min="1" max="1" chance="3" /> <!-- Herb of Doubt -->
+					<item id="13028" min="1" max="1" chance="3" /> <!-- Vitality Replenishing Herb -->
+				</group>
+			</death>
+			<corpse>
+				<item id="36532" min="1" max="1" chance="0.3" /> <!-- Thin Braid -->
+			</corpse>
+		</dropLists>
 	</npc>
 	<npc id="23423" level="77" type="L2Monster" name="Mesmer Dragon">
 		<race>DRAGON</race>
diff --git a/trunk/dist/game/data/stats/npcs/25000-25099.xml b/trunk/dist/game/data/stats/npcs/25000-25099.xml
index 1fb2123e1c..b8e793509a 100644
--- a/trunk/dist/game/data/stats/npcs/25000-25099.xml
+++ b/trunk/dist/game/data/stats/npcs/25000-25099.xml
@@ -168,8 +168,8 @@
 		<sex>MALE</sex>
 		<equipment rhand="124" /> <!-- rhand: Two-Handed Sword -->
 		<acquire exp="2417862" sp="580" raidPoints="792" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="70742.0690017771" hpRegen="28.5646425862605" mp="329.4" mpRegen="1.5" />
+		<stats>
+			<vitals hp="336876" hpRegen="3.5" mp="329" mpRegen="1.5" />
 			<attack physical="208.03648068846" magical="25.0177222049995" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.39281" magical="173.38" evasion="-18" />
 			<attribute>
@@ -184,8 +184,6 @@
 		<status undying="false" />
 		<skillList>
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
@@ -201,22 +199,42 @@
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="false" />
 		<dropLists>
 			<death>
-				<group chance="60.14440155029297">
-					<item id="352" min="1" max="1" chance="23.9206" /> <!-- Brigandine Tunic -->
-					<item id="2377" min="6" max="16" chance="3.4785" /> <!-- Mithril Scale Gaiters -->
-					<item id="2378" min="1" max="1" chance="38.263" /> <!-- Brigandine Gaiters -->
-					<item id="1941" min="140" max="420" chance="3.9021" /> <!-- Brigandine Temper -->
-					<item id="2918" min="40" max="120" chance="20.3744" /> <!-- Mithril Scale Gaiters Material -->
-					<item id="2919" min="81" max="243" chance="10.0614" /> <!-- Brigandine Gaiters Material -->
+				<item id="2377" min="1" max="1" chance="3.007" /> <!-- Mithril Scale Gaiters -->
+				<item id="2378" min="1" max="1" chance="2.974" /> <!-- Brigandine Gaiters -->
+				<item id="352" min="1" max="1" chance="1.939" /> <!-- Brigandine -->
+				<item id="224" min="1" max="1" chance="0.3" /> <!-- Maingauche -->
+				<item id="1660" min="1" max="1" chance="0.3" /> <!-- Cursed Maingauche -->
+				<item id="39629" min="1" max="1" chance="0.004961" /> <!-- Fortune Bag - Stage 1 --> <!-- Lucky Drop -->
+				<group chance="42.0">
+					<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
+					<item id="8601" min="1" max="1" chance="38" /> <!-- Greater Herb of Life -->
+					<item id="8602" min="1" max="1" chance="7" /> <!-- Superior Herb of Life -->
 				</group>
-				<group chance="48.21739959716797">
-					<item id="21731" min="1" max="1" chance="14.3583" /> <!-- Maingauche - Event -->
-					<item id="1660" min="1" max="1" chance="14.3583" /> <!-- Cursed Maingauche -->
-					<item id="2038" min="24" max="72" chance="16.9722" /> <!-- Maingauche Edge -->
-					<item id="2044" min="8" max="22" chance="54.3112" /> <!-- Cursed Maingauche Edge -->
+				<group chance="11.0">
+					<item id="8603" min="1" max="1" chance="26" /> <!-- Herb of Mana -->
+					<item id="8604" min="1" max="1" chance="65" /> <!-- Greater Herb of Mana -->
+					<item id="8605" min="1" max="1" chance="9" /> <!-- Superior Herb of Mana -->
 				</group>
-				<group chance="32.128700256347656">
-					<item id="6387" min="60" max="180" chance="100" /> <!-- Blessed Scroll of Resurrection for Pets -->
+				<group chance="25.0">
+					<item id="8606" min="1" max="1" chance="20" /> <!-- Herb of Power -->
+					<item id="8608" min="1" max="1" chance="20" /> <!-- Herb of Alacrity -->
+					<item id="8610" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Probability -->
+					<item id="10655" min="1" max="1" chance="20" /> <!-- Herb of Vampiric Rage -->
+					<item id="10656" min="1" max="1" chance="20" /> <!-- Herb of Critical Attack - Power -->
+				</group>
+				<group chance="10.0">
+					<item id="8607" min="1" max="1" chance="50" /> <!-- Herb of Magic -->
+					<item id="8609" min="1" max="1" chance="50" /> <!-- Herb of Casting Spd. -->
+				</group>
+				<group chance="1.0">
+					<item id="8612" min="1" max="1" chance="33" /> <!-- Herb of the Warrior -->
+					<item id="8613" min="1" max="1" chance="33" /> <!-- Herb of the Mystic -->
+					<item id="8614" min="1" max="1" chance="34" /> <!-- Herb of Recovery -->
+				</group>
+				<group chance="11.0">
+					<item id="8611" min="1" max="1" chance="94" /> <!-- Herb of Speed -->
+					<item id="10657" min="1" max="1" chance="3" /> <!-- Herb of Doubt -->
+					<item id="13028" min="1" max="1" chance="3" /> <!-- Vitality Replenishing Herb -->
 				</group>
 			</death>
 		</dropLists>
@@ -232,8 +250,8 @@
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="271" /> <!-- rhand: Hunting Bow -->
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7224.12981331993" hpRegen="27.4866850745812" mp="315.12" mpRegen="1.5" />
+		<stats>
+			<vitals hp="233166" hpRegen="27.4866850745812" mp="315.12" mpRegen="1.5" />
 			<attack physical="384.046074440949" magical="90.88351131428" random="10" critical="8" accuracy="0" attackSpeed="253" reuseDelay="1500" type="BOW" range="1100" distance="10" width="0" />
 			<defence physical="172.50897" magical="168.32" evasion="-18" />
 			<attribute>
@@ -248,8 +266,6 @@
 		<status undying="false" />
 		<skillList>
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
@@ -270,8 +286,8 @@
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="2" /> <!-- rhand: Long Sword -->
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="5391.14165173129" hpRegen="27.4866850745812" mp="315.12" mpRegen="1.5" />
+		<stats>
+			<vitals hp="233166" hpRegen="27.4866850745812" mp="315.12" mpRegen="1.5" />
 			<attack physical="384.046074440949" magical="90.88351131428" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="172.50897" magical="168.32" evasion="-18" />
 			<attribute>
@@ -286,8 +302,6 @@
 		<status undying="false" />
 		<skillList>
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
diff --git a/trunk/dist/game/data/stats/npcs/26000-26099.xml b/trunk/dist/game/data/stats/npcs/26000-26099.xml
index 33581ee344..2d76212c48 100644
--- a/trunk/dist/game/data/stats/npcs/26000-26099.xml
+++ b/trunk/dist/game/data/stats/npcs/26000-26099.xml
@@ -486,7 +486,7 @@
 			</death>
 		</dropLists>
 	</npc>
-	<npc id="26006" level="92" type="L2Npc" name="Encroached Orc Warrior" title="Raid Minion">
+	<npc id="26006" level="92" type="L2Monster" name="Encroached Orc Warrior" title="Raid Minion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -497,13 +497,12 @@
 				<run ground="120" />
 			</speed>
 		</stats>
-		<status attackable="false" />
 		<collision>
 			<radius normal="14" />
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="26007" level="92" type="L2Npc" name="Encroached Orc Thrower" title="Raid Minion">
+	<npc id="26007" level="92" type="L2Monster" name="Encroached Orc Thrower" title="Raid Minion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -514,13 +513,12 @@
 				<run ground="120" />
 			</speed>
 		</stats>
-		<status attackable="false" />
 		<collision>
 			<radius normal="15" />
 			<height normal="26.5" />
 		</collision>
 	</npc>
-	<npc id="26008" level="92" type="L2Npc" name="Encroached Orc Wizard" title="Raid Minion">
+	<npc id="26008" level="92" type="L2Monster" name="Encroached Orc Wizard" title="Raid Minion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -531,7 +529,6 @@
 				<run ground="120" />
 			</speed>
 		</stats>
-		<status attackable="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="27.5" />
diff --git a/trunk/dist/game/data/stats/npcs/27100-27199.xml b/trunk/dist/game/data/stats/npcs/27100-27199.xml
index 0f61bdfb6f..a9dd87fe0b 100644
--- a/trunk/dist/game/data/stats/npcs/27100-27199.xml
+++ b/trunk/dist/game/data/stats/npcs/27100-27199.xml
@@ -2759,8 +2759,8 @@
 		</parameters>
 		<race>FAIRY</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1933.24044" hpRegen="6.5" mp="1036.8" mpRegen="2.4" />
+		<stats>
+			<vitals hp="27577" hpRegen="6.5" mp="1036.8" mpRegen="2.4" />
 			<attack physical="481.34551" magical="328.69659" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="247.65008" magical="181.21958" />
 			<attribute>
@@ -2774,8 +2774,6 @@
 		</stats>
 		<status />
 		<skillList>
-			<skill id="4408" level="17" /> <!-- HP Increase (9x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
