소스 검색

Update required by [L1619] (zhyla), and several community contributions:
- Circlet, ubiquitous and dream armor updates (izzy)
- Emerald boar (izzy)
- Hellbound link (izzy)
- Some Rune and Schuttgart guard-related fixes (lanabel)
- Valhalla Magic Regen SA (rodo)
- Item skill: mana gain (zhyla)

DrLecter 17 년 전
부모
커밋
ae7f7b8df0

+ 1 - 1
datapack_development/data/html/admin/tele/locations/kamael.htm

@@ -3,7 +3,7 @@
 <a action="bypass -h admin_move_to 159111 183721 -3720">Isle Of Prayer</a><br1>
 <a action="bypass -h admin_move_to 149361 172327 -945">Parnassas</a><br1>
 <a action="bypass -h admin_move_to 152857 149040 -3280">Chromatic Highlands</a><br1>
-<a action="bypass -h admin_move_to -116793 46565 368">Hellbound Island</a><br1>
+<a action="bypass -h admin_move_to -23414 249423 -3207">Hellbound Island</a><br1>
 <a action="bypass -h admin_move_to -122201 73090 -2871">Stronghold I</a><br1>
 <a action="bypass -h admin_move_to -95267 52168 -2029">Stronghold II</a><br1>
 <a action="bypass -h admin_move_to -86077 37332 -1998">Stronghold III</a><br1>

+ 6 - 6
datapack_development/data/stats/skills/0000-0099.xml

@@ -268,9 +268,9 @@
   <for>
   </for>
 </skill>
-<skill id="8" levels="7" name="Sonic Focus">
-  <table name="#power"> 1.0 2.0 3.0 4.0 5.0 6.0 7.0 </table>
-  <table name="#charges"> 1 2 3 4 5 6 7 </table>
+<skill id="8" levels="8" name="Sonic Focus">
+  <table name="#power"> 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 </table>
+  <table name="#charges"> 1 2 3 4 5 6 7 8 </table>
   <set name="mpConsume" val="5"/>
   <set name="hpConsume" val="25"/>
   <set name="power" val="#power"/>
@@ -1235,9 +1235,9 @@
   <for>
   </for>
 </skill>
-<skill id="50" levels="7" name="Focused Force">
-  <table name="#power"> 1.0 2.0 3.0 4.0 5.0 6.0 7.0 </table>
-  <table name="#charges"> 1 2 3 4 5 6 7 </table>
+<skill id="50" levels="8" name="Focused Force">
+  <table name="#power"> 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 </table>
+  <table name="#charges"> 1 2 3 4 5 6 7 8 </table>
   <set name="mpConsume" val="5"/>
   <set name="hpConsume" val="20"/>
   <set name="power" val="#power"/>

+ 1 - 1
datapack_development/data/stats/skills/3200-3299.xml

@@ -638,7 +638,7 @@
   <set name="castRange" val="-1"/>
   <set name="effectRange" val="-1"/>
   <for>
-    <mul order="0x30" stat="regMp" val="#rate"/>
+    <mul order="0x30" stat="gainMp" val="#rate"/>
   </for>
 </skill>
 <skill id="3240" levels="10" name="Item Skill: Might">

+ 21 - 8
datapack_development/data/stats/skills/3600-3699.xml

@@ -566,18 +566,31 @@ Description(s):
   </for>
 </skill>
 <skill id="3633" levels="2" name="Residential Shock Immunity">
-<!--
-  Needs to be finished.
-  Target is set to TARGET_NONE, skillType to NOTDONE for server compatability.
-  Description(s):
+<!-- Done by theREALizzy
       Lvl 1 - Active: Momentarily increases resistance to shock attacks.
       Lvl 2 - Active: Momentarily gives complete resistance to shock attacks.
 -->
-  <set name="target" val="TARGET_NONE"/>
-  <set name="skillType" val="NOTDONE"/>
-  <set name="operateType" val="OP_PASSIVE"/>
-  <set name="castRange" val="-1"/>
+  <table name="#mpConsume_Init"> 7 10 </table>
+  <table name="#mpConsume"> 28 38 </table>
+  <table name="#vuln"> 0.85 0.8 </table>
+  <table name="#stack"> 15 20 </table>
+  <table name="#aggro"> 379 495 </table>
+  <set name="mpInitialConsume" val="#mpConsume_Init"/>
+  <set name="mpConsume" val="#mpConsume"/>
+  <set name="power" val="0.0"/>
+  <set name="target" val="TARGET_ONE"/>
+  <set name="reuseDelay" val="6000"/>
+  <set name="hitTime" val="4000"/>
+  <set name="skillType" val="BUFF"/>
+  <set name="isMagic" val="true"/>
+  <set name="operateType" val="OP_ACTIVE"/>
+  <set name="castRange" val="400"/>
+  <set name="effectRange" val="900"/> 
+  <set name="aggroPoints" val="#aggro"/>
   <for>
+     <effect count="1" name="Buff" time="1200" val="0" stackOrder="#stack" stackType="ShockVuln">
+      <mul order="0x30" stat="stunVuln" val="#vuln"/>
+    </effect>
   </for>
 </skill>
 </list>

+ 12 - 12
datapack_development/sql/armor.sql

@@ -655,14 +655,14 @@ INSERT INTO `armor` VALUES
 (3916,'Hatchling\'s Steel Coat','hatchling','false','pet',160,'leather','none',0,-1,36,36,0,760000,0,'true','true','true','true',0,0),
 (3917,'Hatchling\'s Shadowplate','hatchling','false','pet',160,'leather','none',0,-1,38,38,0,1100000,0,'true','true','true','true',0,0),
 (3918,'Hatchling\'s Mithril Coat','hatchling','false','pet',160,'leather','none',0,-1,41,41,0,1600000,0,'true','true','true','true',0,0),
-(4224,'Dream Armor','chest','true','heavy',8920,'bronze','none',0,-1,68,0,0,49200,0,'false','false','false','false',0,0),
-(4225,'Dream Stockings','legs','true','heavy',3960,'bronze','none',0,-1,43,0,0,30700,0,'false','false','false','false',0,0),
-(4226,'Dream Gloves','gloves','true','none',650,'leather','none',0,-1,17,0,0,12300,0,'false','false','false','false',0,0),
-(4227,'Dream Boots','feet','true','none',1310,'cloth','none',0,-1,17,0,0,12300,0,'false','false','false','false',0,0),
-(4228,'Ubiquitous Armor','chest','true','heavy',8920,'bronze','none',0,-1,68,0,0,49200,0,'false','false','false','false',0,0),
-(4229,'Ubiquitous Stockings','legs','true','heavy',3960,'bronze','none',0,-1,43,0,0,30700,0,'false','false','false','false',0,0),
-(4230,'Ubiquitous Gloves','gloves','true','none',650,'leather','none',0,-1,17,0,0,12300,0,'false','false','false','false',0,0),
-(4231,'Ubiquitous Boots','feet','true','none',1310,'cloth','none',0,-1,17,0,0,12300,0,'false','false','false','false',0,0),
+(4224,'Dream Armor','chest','true','heavy',8920,'bronze','none',0,-1,68,0,0,49200,0,'true','true','true','true',0,0),
+(4225,'Dream Stockings','legs','true','heavy',3960,'bronze','none',0,-1,43,0,0,30700,0,'true','true','true','true',0,0),
+(4226,'Dream Gloves','gloves','true','none',650,'leather','none',0,-1,17,0,0,12300,0,'true','true','true','true',0,0),
+(4227,'Dream Boots','feet','true','none',1310,'cloth','none',0,-1,17,0,0,12300,0,'true','true','true','true',0,0),
+(4228,'Ubiquitous Armor','chest','true','heavy',8920,'bronze','none',0,-1,68,0,0,49200,0,'true','true','true','true',0,0),
+(4229,'Ubiquitous Stockings','legs','true','heavy',3960,'bronze','none',0,-1,43,0,0,30700,0,'true','true','true','true',0,0),
+(4230,'Ubiquitous Gloves','gloves','true','none',650,'leather','none',0,-1,17,0,0,12300,0,'true','true','true','true',0,0),
+(4231,'Ubiquitous Boots','feet','true','none',1310,'cloth','none',0,-1,17,0,0,12300,0,'true','true','true','true',0,0),
 (4234,'Hatchling\'s Level 65 Armor','hatchling','false','pet',160,'leather','none',0,-1,50,50,0,5628000,0,'true','true','true','true',0,0),
 (4235,'Hatchling\'s Level 75 Armor','hatchling','false','pet',160,'leather','none',0,-1,58,58,0,19073000,0,'true','true','true','true',0,0),
 (4236,'Gara Item','chest','false','light',160,'leather','none',0,-1,58,58,0,19073000,0,'true','true','true','true',0,0),
@@ -826,11 +826,11 @@ INSERT INTO `armor` VALUES
 (6726,'Sealed Tateossian Necklace','neck','true','none',150,'silver','s',0,-1,0,91,0,4940000,247,'true','true','true','true',0,0),
 (6834,'Circlet of Innadril','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
 (6835,'Circlet of Dion','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
-(6836,'Circlet of Goddard','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
+(6836,'Circlet of Goddard','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,2),
 (6837,'Circlet of Oren','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
 (6838,'Circlet of Gludio','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
 (6839,'Circlet of Giran','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
-(6840,'Circlet of Aden','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
+(6840,'Circlet of Aden','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,2),
 (6841,'The Lord\'s Crown','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
 (6842,'Wings of Destiny Circlet','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','true','false',0,0),
 (6843,'Cat Ear','hair','false','none',10,'wood','none',0,-1,0,0,0,500000,0,'true','true','true','true',0,0),
@@ -894,8 +894,8 @@ INSERT INTO `armor` VALUES
 (8179,'Raid Master\'s Circlet','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true',0,0),
 (8180,'Circlet of Ice Fairy Sirra','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true',0,0),
 (8181,'Academy Circlet','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',0,0),
-(8182,'Circlet of Rune','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
-(8183,'Circlet of Schuttgart','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,1),
+(8182,'Circlet of Rune','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,2),
+(8183,'Circlet of Schuttgart','face','false','none',10,'wood','none',0,-1,0,0,0,0,0,'false','false','false','false',3633,2),
 (8184,'Party Hat','dhair','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true',0,0),
 (8185,'Feathered Hat','dhair','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true',0,0),
 (8186,'Artisan\'s Goggles','dhair','false','none',10,'wood','none',0,-1,0,0,0,0,0,'true','true','true','true',0,0),

+ 242 - 242
datapack_development/sql/castle_siege_guards.sql

@@ -3490,248 +3490,248 @@ REPLACE INTO `castle_siege_guards` (`castleId`, `id`, `npcId`, `x`, `y`, `z`, `h
 
 -- Rune Castle
 REPLACE INTO `castle_siege_guards` (`castleId`, `id`, `npcId`, `x`, `y`, `z`, `heading`, `respawnDelay`, `isHired`) VALUES 
-(8,null,35486,18535,-49055,-1217,63418,10800,0),
-(8,null,35486,18535,-49095,-1217,63418,10800,0),
-(8,null,35486,18535,-49135,-1217,63418,10800,0),
-(8,null,35486,18535,-49175,-1217,63418,10800,0),
-(8,null,35486,18535,-49215,-1217,63418,10800,0),
-(8,null,35490,18555,-49055,-1217,63418,10800,0),
-(8,null,35490,18555,-49075,-1217,63418,10800,0),
-(8,null,35490,18555,-49095,-1217,63418,10800,0),
-(8,null,35490,18555,-49115,-1217,63418,10800,0),
-(8,null,35490,18555,-49135,-1217,63418,10800,0),
-(8,null,35490,18555,-49155,-1217,63418,10800,0),
-(8,null,35490,18555,-49175,-1217,63418,10800,0),
-(8,null,35490,18555,-49195,-1217,63418,10800,0),
-(8,null,35490,18555,-49215,-1217,63418,10800,0),
-(8,null,35490,18555,-49235,-1217,63418,10800,0),
-(8,null,35490,18575,-49055,-1217,63418,10800,0),
-(8,null,35488,18575,-49075,-1217,63418,10800,0),
-(8,null,35487,18575,-49095,-1217,63418,10800,0),
-(8,null,35488,18575,-49115,-1217,63418,10800,0),
-(8,null,35487,18575,-49135,-1217,63418,10800,0),
-(8,null,35488,18575,-49155,-1217,63418,10800,0),
-(8,null,35487,18575,-49175,-1217,63418,10800,0),
-(8,null,35488,18575,-49195,-1217,63418,10800,0),
-(8,null,35487,18575,-49215,-1217,63418,10800,0),
-(8,null,35488,18575,-49235,-1217,63418,10800,0),
-(8,null,35487,18595,-49055,-1217,63418,10800,0),
-(8,null,35489,18595,-49075,-1217,63418,10800,0),
-(8,null,35489,18595,-49095,-1217,63418,10800,0),
-(8,null,35489,18595,-49115,-1217,63418,10800,0),
-(8,null,35489,18595,-49135,-1217,63418,10800,0),
-(8,null,35484,18595,-49155,-1217,63418,10800,0),
-(8,null,35489,18595,-49175,-1217,63418,10800,0),
-(8,null,35489,18595,-49195,-1217,63418,10800,0),
-(8,null,35489,18595,-49215,-1217,63418,10800,0),
-(8,null,35489,18595,-49235,-1217,63418,10800,0),
-(8,null,35486,15490,-49055,-1059,63418,10800,0),
-(8,null,35486,15490,-49095,-1059,63418,10800,0),
-(8,null,35486,15490,-49135,-1059,63418,10800,0),
-(8,null,35486,15490,-49175,-1059,63418,10800,0),
-(8,null,35486,15490,-49215,-1059,63418,10800,0),
-(8,null,35490,15510,-49055,-1059,63418,10800,0),
-(8,null,35490,15510,-49075,-1059,63418,10800,0),
-(8,null,35490,15510,-49095,-1059,63418,10800,0),
-(8,null,35490,15510,-49115,-1059,63418,10800,0),
-(8,null,35490,15510,-49135,-1059,63418,10800,0),
-(8,null,35490,15510,-49155,-1059,63418,10800,0),
-(8,null,35490,15510,-49175,-1059,63418,10800,0),
-(8,null,35490,15510,-49195,-1059,63418,10800,0),
-(8,null,35490,15510,-49215,-1059,63418,10800,0),
-(8,null,35490,15510,-49235,-1059,63418,10800,0),
-(8,null,35490,15530,-49055,-1059,63418,10800,0),
-(8,null,35488,15530,-49075,-1059,63418,10800,0),
-(8,null,35487,15530,-49095,-1059,63418,10800,0),
-(8,null,35488,15530,-49115,-1059,63418,10800,0),
-(8,null,35487,15530,-49135,-1059,63418,10800,0),
-(8,null,35488,15530,-49155,-1059,63418,10800,0),
-(8,null,35487,15530,-49175,-1059,63418,10800,0),
-(8,null,35488,15530,-49195,-1059,63418,10800,0),
-(8,null,35487,15530,-49215,-1059,63418,10800,0),
-(8,null,35488,15530,-49235,-1059,63418,10800,0),
-(8,null,35487,15550,-49055,-1059,63418,10800,0),
-(8,null,35489,15550,-49075,-1059,63418,10800,0),
-(8,null,35489,15550,-49095,-1059,63418,10800,0),
-(8,null,35489,15550,-49115,-1059,63418,10800,0),
-(8,null,35489,15550,-49135,-1059,63418,10800,0),
-(8,null,35484,15550,-49155,-1059,63418,10800,0),
-(8,null,35489,15550,-49175,-1059,63418,10800,0),
-(8,null,35489,15550,-49195,-1059,63418,10800,0),
-(8,null,35489,15550,-49215,-1059,63418,10800,0),
-(8,null,35489,15550,-49235,-1059,63418,10800,0),
-(8,null,35486,13395,-49055,-537,63418,10800,0),
-(8,null,35486,13395,-49095,-537,63418,10800,0),
-(8,null,35486,13395,-49135,-537,63418,10800,0),
-(8,null,35486,13395,-49175,-537,63418,10800,0),
-(8,null,35486,13405,-49215,-537,63418,10800,0),
-(8,null,35490,13405,-49055,-537,63418,10800,0),
-(8,null,35490,13405,-49075,-537,63418,10800,0),
-(8,null,35490,13405,-49095,-537,63418,10800,0),
-(8,null,35490,13405,-49115,-537,63418,10800,0),
-(8,null,35490,13405,-49135,-537,63418,10800,0),
-(8,null,35490,13405,-49155,-537,63418,10800,0),
-(8,null,35490,13405,-49175,-537,63418,10800,0),
-(8,null,35490,13405,-49195,-537,63418,10800,0),
-(8,null,35490,13405,-49215,-537,63418,10800,0),
-(8,null,35490,13405,-49235,-537,63418,10800,0),
-(8,null,35490,13415,-49055,-537,63418,10800,0),
-(8,null,35488,13415,-49075,-537,63418,10800,0),
-(8,null,35487,13415,-49095,-537,63418,10800,0),
-(8,null,35488,13415,-49115,-537,63418,10800,0),
-(8,null,35487,13415,-49135,-537,63418,10800,0),
-(8,null,35488,13415,-49155,-537,63418,10800,0),
-(8,null,35487,13415,-49175,-537,63418,10800,0),
-(8,null,35488,13415,-49195,-537,63418,10800,0),
-(8,null,35487,13415,-49215,-537,63418,10800,0),
-(8,null,35488,13415,-49235,-537,63418,10800,0),
-(8,null,35487,13435,-49055,-537,63418,10800,0),
-(8,null,35489,13435,-49075,-537,63418,10800,0),
-(8,null,35489,13435,-49095,-537,63418,10800,0),
-(8,null,35489,13435,-49115,-537,63418,10800,0),
-(8,null,35489,13435,-49135,-537,63418,10800,0),
-(8,null,35484,13435,-49155,-537,63418,10800,0),
-(8,null,35489,13435,-49175,-537,63418,10800,0),
-(8,null,35489,13435,-49195,-537,63418,10800,0),
-(8,null,35489,13435,-49215,-537,63418,10800,0),
-(8,null,35489,13435,-49235,-537,63418,10800,0),
-(8,null,35486,11040,-49055,996,63418,10800,0),
-(8,null,35486,11040,-49095,996,63418,10800,0),
-(8,null,35486,11040,-49135,996,63418,10800,0),
-(8,null,35486,11040,-49175,996,63418,10800,0),
-(8,null,35486,11060,-49215,996,63418,10800,0),
-(8,null,35490,11060,-49055,996,63418,10800,0),
-(8,null,35490,11060,-49075,996,63418,10800,0),
-(8,null,35490,11060,-49095,996,63418,10800,0),
-(8,null,35490,11060,-49115,996,63418,10800,0),
-(8,null,35490,11060,-49135,996,63418,10800,0),
-(8,null,35490,11060,-49155,996,63418,10800,0),
-(8,null,35490,11060,-49175,996,63418,10800,0),
-(8,null,35490,11060,-49195,996,63418,10800,0),
-(8,null,35490,11060,-49215,996,63418,10800,0),
-(8,null,35490,11060,-49235,996,63418,10800,0),
-(8,null,35490,11080,-49055,996,63418,10800,0),
-(8,null,35488,11080,-49075,996,63418,10800,0),
-(8,null,35487,11080,-49095,996,63418,10800,0),
-(8,null,35488,11080,-49115,996,63418,10800,0),
-(8,null,35487,11080,-49135,996,63418,10800,0),
-(8,null,35488,11080,-49155,996,63418,10800,0),
-(8,null,35487,11080,-49175,996,63418,10800,0),
-(8,null,35488,11080,-49195,996,63418,10800,0),
-(8,null,35487,11080,-49215,996,63418,10800,0),
-(8,null,35488,11080,-49235,996,63418,10800,0),
-(8,null,35487,11100,-49055,996,63418,10800,0),
-(8,null,35489,11100,-49075,996,63418,10800,0),
-(8,null,35489,11100,-49095,996,63418,10800,0),
-(8,null,35489,11100,-49115,996,63418,10800,0),
-(8,null,35489,11100,-49135,996,63418,10800,0),
-(8,null,35484,11100,-49155,996,63418,10800,0),
-(8,null,35489,11100,-49175,996,63418,10800,0),
-(8,null,35489,11100,-49195,996,63418,10800,0),
-(8,null,35489,11100,-49215,996,63418,10800,0),
-(8,null,35489,11100,-49235,996,63418,10800,0),
-(8,null,35486,9445,-49055,996,63418,10800,0),
-(8,null,35486,9445,-49095,996,63418,10800,0),
-(8,null,35486,9445,-49135,996,63418,10800,0),
-(8,null,35486,9445,-49175,996,63418,10800,0),
-(8,null,35486,9445,-49215,996,63418,10800,0),
-(8,null,35490,9465,-48905,996,63418,10800,0),
-(8,null,35490,9465,-48955,996,63418,10800,0),
-(8,null,35490,9465,-49005,996,63418,10800,0),
-(8,null,35490,9465,-49055,996,63418,10800,0),
-(8,null,35490,9465,-49105,996,63418,10800,0),
-(8,null,35490,9465,-49155,996,63418,10800,0),
-(8,null,35490,9465,-49205,996,63418,10800,0),
-(8,null,35490,9465,-49255,996,63418,10800,0),
-(8,null,35490,9465,-49305,996,63418,10800,0),
-(8,null,35490,9465,-49355,996,63418,10800,0),
-(8,null,35490,9485,-48905,996,63418,10800,0),
-(8,null,35488,9485,-48955,996,63418,10800,0),
-(8,null,35487,9485,-49005,996,63418,10800,0),
-(8,null,35488,9485,-49055,996,63418,10800,0),
-(8,null,35487,9485,-49105,996,63418,10800,0),
-(8,null,35488,9485,-49155,996,63418,10800,0),
-(8,null,35487,9485,-49205,996,63418,10800,0),
-(8,null,35488,9485,-49255,996,63418,10800,0),
-(8,null,35487,9485,-49305,996,63418,10800,0),
-(8,null,35488,9485,-49355,996,63418,10800,0),
-(8,null,35487,9505,-48905,996,63418,10800,0),
-(8,null,35489,9505,-48955,996,63418,10800,0),
-(8,null,35489,9505,-49005,996,63418,10800,0),
-(8,null,35489,9505,-49055,996,63418,10800,0),
-(8,null,35489,9505,-49105,996,63418,10800,0),
-(8,null,35484,9505,-49155,996,63418,10800,0),
-(8,null,35489,9505,-49205,996,63418,10800,0),
-(8,null,35489,9505,-49255,996,63418,10800,0),
-(8,null,35489,9505,-49305,996,63418,10800,0),
-(8,null,35489,9505,-49355,996,63418,10800,0),
-(8,null,35484,9231,-49151,1093,63418,10800,0),
-(8,null,35486,9135,-49076,1093,63418,10800,0),
-(8,null,35486,9135,-49236,1093,63418,10800,0),
-(8,null,35484,9035,-49151,1093,63418,10800,0),
-(8,null,35480,8941,-48580,1252,16389,10800,0),
-(8,null,35480,8974,-48580,1252,16389,10800,0),
-(8,null,35480,9007,-48580,1252,16389,10800,0),
-(8,null,35480,9051,-48580,1252,16389,10800,0),
-(8,null,35480,9074,-48580,1252,16389,10800,0),
-(8,null,35480,9107,-48580,1252,16389,10800,0),
-(8,null,35480,9151,-48580,1252,16389,10800,0),
-(8,null,35480,9174,-48580,1252,16389,10800,0),
-(8,null,35480,9207,-48580,1252,16389,10800,0),
-(8,null,35480,9251,-48580,1252,16389,10800,0),
-(8,null,35480,8941,-48600,1252,16389,10800,0),
-(8,null,35480,8974,-48600,1252,16389,10800,0),
-(8,null,35480,9007,-48600,1252,16389,10800,0),
-(8,null,35480,9051,-48600,1252,16389,10800,0),
-(8,null,35480,9074,-48600,1252,16389,10800,0),
-(8,null,35480,9107,-48600,1252,16389,10800,0),
-(8,null,35480,9151,-48600,1252,16389,10800,0),
-(8,null,35480,9174,-48600,1252,16389,10800,0),
-(8,null,35480,9207,-48600,1252,16389,10800,0),
-(8,null,35480,9251,-48600,1252,16389,10800,0),
-(8,null,35480,8941,-49701,1252,16389,10800,0),
-(8,null,35480,8974,-49701,1252,16389,10800,0),
-(8,null,35480,9007,-49701,1252,16389,10800,0),
-(8,null,35480,9051,-49701,1252,16389,10800,0),
-(8,null,35480,9074,-49701,1252,16389,10800,0),
-(8,null,35480,9107,-49701,1252,16389,10800,0),
-(8,null,35480,9151,-49701,1252,16389,10800,0),
-(8,null,35480,9174,-49701,1252,16389,10800,0),
-(8,null,35480,9207,-49701,1252,16389,10800,0),
-(8,null,35480,9251,-49701,1252,16389,10800,0),
-(8,null,35480,8941,-49721,1252,16389,10800,0),
-(8,null,35480,8974,-49721,1252,16389,10800,0),
-(8,null,35480,9007,-49721,1252,16389,10800,0),
-(8,null,35480,9051,-49721,1252,16389,10800,0),
-(8,null,35480,9074,-49721,1252,16389,10800,0),
-(8,null,35480,9107,-49721,1252,16389,10800,0),
-(8,null,35480,9151,-49721,1252,16389,10800,0),
-(8,null,35480,9174,-49721,1252,16389,10800,0),
-(8,null,35480,9207,-49721,1252,16389,10800,0),
-(8,null,35480,9251,-49721,1252,16389,10800,0),
-(8,null,35477,8484,-48905,1252,63418,10800,0),
-(8,null,35477,8484,-48955,1252,63418,10800,0),
-(8,null,35477,8484,-49005,1252,63418,10800,0),
-(8,null,35477,8484,-49055,1252,63418,10800,0),
-(8,null,35477,8484,-49105,1252,63418,10800,0),
-(8,null,35477,8484,-49155,1252,63418,10800,0),
-(8,null,35477,8484,-49205,1252,63418,10800,0),
-(8,null,35477,8484,-49255,1252,63418,10800,0),
-(8,null,35477,8484,-49305,1252,63418,10800,0),
-(8,null,35477,8484,-49355,1252,63418,10800,0),
-(8,null,35477,8484,-48905,1252,63418,10800,0),
-(8,null,35477,8484,-48955,1252,63418,10800,0),
-(8,null,35477,8484,-49005,1252,63418,10800,0),
-(8,null,35477,8484,-49055,1252,63418,10800,0),
-(8,null,35477,8504,-49105,1252,63418,10800,0),
-(8,null,35477,8505,-49155,1252,63418,10800,0),
-(8,null,35477,8505,-49205,1252,63418,10800,0),
-(8,null,35477,8505,-49255,1252,63418,10800,0),
-(8,null,35477,8505,-49305,1252,63418,10800,0),
-(8,null,35475,17655,-49140,-1181,63418,10800,0),
-(8,null,35475,17255,-49140,-1124,63418,10800,0),
-(8,null,35475,16855,-49140,-1088,63418,10800,0),
-(8,null,35477,8505,-49355,1252,63418,10800,0);
+(8,3448,35486,18535,-49055,-1217,63418,10800,0),
+(8,3449,35486,18535,-49095,-1217,63418,10800,0),
+(8,3450,35486,18535,-49135,-1217,63418,10800,0),
+(8,3451,35486,18535,-49175,-1217,63418,10800,0),
+(8,3452,35486,18535,-49215,-1217,63418,10800,0),
+(8,3453,35490,18555,-49055,-1217,63418,10800,0),
+(8,3454,35490,18555,-49075,-1217,63418,10800,0),
+(8,3455,35490,18555,-49095,-1217,63418,10800,0),
+(8,3456,35490,18555,-49115,-1217,63418,10800,0),
+(8,3457,35490,18555,-49135,-1217,63418,10800,0),
+(8,3458,35490,18555,-49155,-1217,63418,10800,0),
+(8,3459,35490,18555,-49175,-1217,63418,10800,0),
+(8,3460,35490,18555,-49195,-1217,63418,10800,0),
+(8,3461,35490,18555,-49215,-1217,63418,10800,0),
+(8,3462,35490,18555,-49235,-1217,63418,10800,0),
+(8,3463,35490,18575,-49055,-1217,63418,10800,0),
+(8,3464,35488,18575,-49075,-1217,63418,10800,0),
+(8,3465,35487,18575,-49095,-1217,63418,10800,0),
+(8,3466,35488,18575,-49115,-1217,63418,10800,0),
+(8,3467,35487,18575,-49135,-1217,63418,10800,0),
+(8,3468,35488,18575,-49155,-1217,63418,10800,0),
+(8,3469,35487,18575,-49175,-1217,63418,10800,0),
+(8,3470,35488,18575,-49195,-1217,63418,10800,0),
+(8,3471,35487,18575,-49215,-1217,63418,10800,0),
+(8,3472,35488,18575,-49235,-1217,63418,10800,0),
+(8,3473,35487,18595,-49055,-1217,63418,10800,0),
+(8,3474,35489,18595,-49075,-1217,63418,10800,0),
+(8,3475,35489,18595,-49095,-1217,63418,10800,0),
+(8,3476,35489,18595,-49115,-1217,63418,10800,0),
+(8,3477,35489,18595,-49135,-1217,63418,10800,0),
+(8,3478,35484,18595,-49155,-1217,63418,10800,0),
+(8,3479,35489,18595,-49175,-1217,63418,10800,0),
+(8,3480,35489,18595,-49195,-1217,63418,10800,0),
+(8,3481,35489,18595,-49215,-1217,63418,10800,0),
+(8,3482,35489,18595,-49235,-1217,63418,10800,0),
+(8,3483,35486,15490,-49055,-1059,63418,10800,0),
+(8,3484,35486,15490,-49095,-1059,63418,10800,0),
+(8,3485,35486,15490,-49135,-1059,63418,10800,0),
+(8,3486,35486,15490,-49175,-1059,63418,10800,0),
+(8,3487,35486,15490,-49215,-1059,63418,10800,0),
+(8,3488,35490,15510,-49055,-1059,63418,10800,0),
+(8,3489,35490,15510,-49075,-1059,63418,10800,0),
+(8,3490,35490,15510,-49095,-1059,63418,10800,0),
+(8,3491,35490,15510,-49115,-1059,63418,10800,0),
+(8,3492,35490,15510,-49135,-1059,63418,10800,0),
+(8,3493,35490,15510,-49155,-1059,63418,10800,0),
+(8,3494,35490,15510,-49175,-1059,63418,10800,0),
+(8,3495,35490,15510,-49195,-1059,63418,10800,0),
+(8,3496,35490,15510,-49215,-1059,63418,10800,0),
+(8,3497,35490,15510,-49235,-1059,63418,10800,0),
+(8,3498,35490,15530,-49055,-1059,63418,10800,0),
+(8,3499,35488,15530,-49075,-1059,63418,10800,0),
+(8,3500,35487,15530,-49095,-1059,63418,10800,0),
+(8,3501,35488,15530,-49115,-1059,63418,10800,0),
+(8,3502,35487,15530,-49135,-1059,63418,10800,0),
+(8,3503,35488,15530,-49155,-1059,63418,10800,0),
+(8,3504,35487,15530,-49175,-1059,63418,10800,0),
+(8,3505,35488,15530,-49195,-1059,63418,10800,0),
+(8,3506,35487,15530,-49215,-1059,63418,10800,0),
+(8,3507,35488,15530,-49235,-1059,63418,10800,0),
+(8,3508,35487,15550,-49055,-1059,63418,10800,0),
+(8,3509,35489,15550,-49075,-1059,63418,10800,0),
+(8,3510,35489,15550,-49095,-1059,63418,10800,0),
+(8,3511,35489,15550,-49115,-1059,63418,10800,0),
+(8,3512,35489,15550,-49135,-1059,63418,10800,0),
+(8,3513,35484,15550,-49155,-1059,63418,10800,0),
+(8,3514,35489,15550,-49175,-1059,63418,10800,0),
+(8,3515,35489,15550,-49195,-1059,63418,10800,0),
+(8,3516,35489,15550,-49215,-1059,63418,10800,0),
+(8,3517,35489,15550,-49235,-1059,63418,10800,0),
+(8,3518,35486,13395,-49055,-537,63418,10800,0),
+(8,3519,35486,13395,-49095,-537,63418,10800,0),
+(8,3520,35486,13395,-49135,-537,63418,10800,0),
+(8,3521,35486,13395,-49175,-537,63418,10800,0),
+(8,3522,35486,13405,-49215,-537,63418,10800,0),
+(8,3523,35490,13405,-49055,-537,63418,10800,0),
+(8,3524,35490,13405,-49075,-537,63418,10800,0),
+(8,3525,35490,13405,-49095,-537,63418,10800,0),
+(8,3526,35490,13405,-49115,-537,63418,10800,0),
+(8,3527,35490,13405,-49135,-537,63418,10800,0),
+(8,3528,35490,13405,-49155,-537,63418,10800,0),
+(8,3529,35490,13405,-49175,-537,63418,10800,0),
+(8,3530,35490,13405,-49195,-537,63418,10800,0),
+(8,3531,35490,13405,-49215,-537,63418,10800,0),
+(8,3532,35490,13405,-49235,-537,63418,10800,0),
+(8,3533,35490,13415,-49055,-537,63418,10800,0),
+(8,3534,35488,13415,-49075,-537,63418,10800,0),
+(8,3535,35487,13415,-49095,-537,63418,10800,0),
+(8,3536,35488,13415,-49115,-537,63418,10800,0),
+(8,3537,35487,13415,-49135,-537,63418,10800,0),
+(8,3538,35488,13415,-49155,-537,63418,10800,0),
+(8,3539,35487,13415,-49175,-537,63418,10800,0),
+(8,3540,35488,13415,-49195,-537,63418,10800,0),
+(8,3541,35487,13415,-49215,-537,63418,10800,0),
+(8,3542,35488,13415,-49235,-537,63418,10800,0),
+(8,3543,35487,13435,-49055,-537,63418,10800,0),
+(8,3544,35489,13435,-49075,-537,63418,10800,0),
+(8,3545,35489,13435,-49095,-537,63418,10800,0),
+(8,3546,35489,13435,-49115,-537,63418,10800,0),
+(8,3547,35489,13435,-49135,-537,63418,10800,0),
+(8,3548,35484,13435,-49155,-537,63418,10800,0),
+(8,3549,35489,13435,-49175,-537,63418,10800,0),
+(8,3550,35489,13435,-49195,-537,63418,10800,0),
+(8,3551,35489,13435,-49215,-537,63418,10800,0),
+(8,3552,35489,13435,-49235,-537,63418,10800,0),
+(8,3553,35486,11040,-49055,996,63418,10800,0),
+(8,3554,35486,11040,-49095,996,63418,10800,0),
+(8,3555,35486,11040,-49135,996,63418,10800,0),
+(8,3556,35486,11040,-49175,996,63418,10800,0),
+(8,3557,35486,11060,-49215,996,63418,10800,0),
+(8,3558,35490,11060,-49055,996,63418,10800,0),
+(8,3559,35490,11060,-49075,996,63418,10800,0),
+(8,3560,35490,11060,-49095,996,63418,10800,0),
+(8,3561,35490,11060,-49115,996,63418,10800,0),
+(8,3562,35490,11060,-49135,996,63418,10800,0),
+(8,3563,35490,11060,-49155,996,63418,10800,0),
+(8,3564,35490,11060,-49175,996,63418,10800,0),
+(8,3565,35490,11060,-49195,996,63418,10800,0),
+(8,3566,35490,11060,-49215,996,63418,10800,0),
+(8,3567,35490,11060,-49235,996,63418,10800,0),
+(8,3568,35490,11080,-49055,996,63418,10800,0),
+(8,3569,35488,11080,-49075,996,63418,10800,0),
+(8,3570,35487,11080,-49095,996,63418,10800,0),
+(8,3571,35488,11080,-49115,996,63418,10800,0),
+(8,3572,35487,11080,-49135,996,63418,10800,0),
+(8,3573,35488,11080,-49155,996,63418,10800,0),
+(8,3574,35487,11080,-49175,996,63418,10800,0),
+(8,3575,35488,11080,-49195,996,63418,10800,0),
+(8,3576,35487,11080,-49215,996,63418,10800,0),
+(8,3577,35488,11080,-49235,996,63418,10800,0),
+(8,3578,35487,11100,-49055,996,63418,10800,0),
+(8,3579,35489,11100,-49075,996,63418,10800,0),
+(8,3580,35489,11100,-49095,996,63418,10800,0),
+(8,3581,35489,11100,-49115,996,63418,10800,0),
+(8,3582,35489,11100,-49135,996,63418,10800,0),
+(8,3583,35484,11100,-49155,996,63418,10800,0),
+(8,3584,35489,11100,-49175,996,63418,10800,0),
+(8,3585,35489,11100,-49195,996,63418,10800,0),
+(8,3586,35489,11100,-49215,996,63418,10800,0),
+(8,3587,35489,11100,-49235,996,63418,10800,0),
+(8,3588,35486,9445,-49055,996,63418,10800,0),
+(8,3589,35486,9445,-49095,996,63418,10800,0),
+(8,3590,35486,9445,-49135,996,63418,10800,0),
+(8,3591,35486,9445,-49175,996,63418,10800,0),
+(8,3592,35486,9445,-49215,996,63418,10800,0),
+(8,3593,35490,9465,-48905,996,63418,10800,0),
+(8,3594,35490,9465,-48955,996,63418,10800,0),
+(8,3595,35490,9465,-49005,996,63418,10800,0),
+(8,3596,35490,9465,-49055,996,63418,10800,0),
+(8,3597,35490,9465,-49105,996,63418,10800,0),
+(8,3598,35490,9465,-49155,996,63418,10800,0),
+(8,3599,35490,9465,-49205,996,63418,10800,0),
+(8,3600,35490,9465,-49255,996,63418,10800,0),
+(8,3601,35490,9465,-49305,996,63418,10800,0),
+(8,3602,35490,9465,-49355,996,63418,10800,0),
+(8,3603,35490,9485,-48905,996,63418,10800,0),
+(8,3604,35488,9485,-48955,996,63418,10800,0),
+(8,3605,35487,9485,-49005,996,63418,10800,0),
+(8,3606,35488,9485,-49055,996,63418,10800,0),
+(8,3607,35487,9485,-49105,996,63418,10800,0),
+(8,3608,35488,9485,-49155,996,63418,10800,0),
+(8,3609,35487,9485,-49205,996,63418,10800,0),
+(8,3610,35488,9485,-49255,996,63418,10800,0),
+(8,3611,35487,9485,-49305,996,63418,10800,0),
+(8,3612,35488,9485,-49355,996,63418,10800,0),
+(8,3613,35487,9505,-48905,996,63418,10800,0),
+(8,3614,35489,9505,-48955,996,63418,10800,0),
+(8,3615,35489,9505,-49005,996,63418,10800,0),
+(8,3616,35489,9505,-49055,996,63418,10800,0),
+(8,3617,35489,9505,-49105,996,63418,10800,0),
+(8,3618,35484,9505,-49155,996,63418,10800,0),
+(8,3619,35489,9505,-49205,996,63418,10800,0),
+(8,3620,35489,9505,-49255,996,63418,10800,0),
+(8,3621,35489,9505,-49305,996,63418,10800,0),
+(8,3622,35489,9505,-49355,996,63418,10800,0),
+(8,3623,35484,9231,-49151,1093,63418,10800,0),
+(8,3624,35486,9135,-49076,1093,63418,10800,0),
+(8,3625,35486,9135,-49236,1093,63418,10800,0),
+(8,3626,35484,9035,-49151,1093,63418,10800,0),
+(8,3627,35480,8941,-48580,1252,16389,10800,0),
+(8,3628,35480,8974,-48580,1252,16389,10800,0),
+(8,3629,35480,9007,-48580,1252,16389,10800,0),
+(8,3630,35480,9051,-48580,1252,16389,10800,0),
+(8,3631,35480,9074,-48580,1252,16389,10800,0),
+(8,3632,35480,9107,-48580,1252,16389,10800,0),
+(8,3633,35480,9151,-48580,1252,16389,10800,0),
+(8,3634,35480,9174,-48580,1252,16389,10800,0),
+(8,3635,35480,9207,-48580,1252,16389,10800,0),
+(8,3636,35480,9251,-48580,1252,16389,10800,0),
+(8,3637,35480,8941,-48600,1252,16389,10800,0),
+(8,3638,35480,8974,-48600,1252,16389,10800,0),
+(8,3639,35480,9007,-48600,1252,16389,10800,0),
+(8,3640,35480,9051,-48600,1252,16389,10800,0),
+(8,3641,35480,9074,-48600,1252,16389,10800,0),
+(8,3642,35480,9107,-48600,1252,16389,10800,0),
+(8,3643,35480,9151,-48600,1252,16389,10800,0),
+(8,3644,35480,9174,-48600,1252,16389,10800,0),
+(8,3645,35480,9207,-48600,1252,16389,10800,0),
+(8,3646,35480,9251,-48600,1252,16389,10800,0),
+(8,3647,35480,8941,-49701,1252,16389,10800,0),
+(8,3648,35480,8974,-49701,1252,16389,10800,0),
+(8,3649,35480,9007,-49701,1252,16389,10800,0),
+(8,3650,35480,9051,-49701,1252,16389,10800,0),
+(8,3651,35480,9074,-49701,1252,16389,10800,0),
+(8,3652,35480,9107,-49701,1252,16389,10800,0),
+(8,3653,35480,9151,-49701,1252,16389,10800,0),
+(8,3654,35480,9174,-49701,1252,16389,10800,0),
+(8,3655,35480,9207,-49701,1252,16389,10800,0),
+(8,3656,35480,9251,-49701,1252,16389,10800,0),
+(8,3657,35480,8941,-49721,1252,16389,10800,0),
+(8,3658,35480,8974,-49721,1252,16389,10800,0),
+(8,3659,35480,9007,-49721,1252,16389,10800,0),
+(8,3660,35480,9051,-49721,1252,16389,10800,0),
+(8,3661,35480,9074,-49721,1252,16389,10800,0),
+(8,3662,35480,9107,-49721,1252,16389,10800,0),
+(8,3663,35480,9151,-49721,1252,16389,10800,0),
+(8,3664,35480,9174,-49721,1252,16389,10800,0),
+(8,3665,35480,9207,-49721,1252,16389,10800,0),
+(8,3666,35480,9251,-49721,1252,16389,10800,0),
+(8,3667,35477,8484,-48905,1252,63418,10800,0),
+(8,3668,35477,8484,-48955,1252,63418,10800,0),
+(8,3669,35477,8484,-49005,1252,63418,10800,0),
+(8,3670,35477,8484,-49055,1252,63418,10800,0),
+(8,3671,35477,8484,-49105,1252,63418,10800,0),
+(8,3672,35477,8484,-49155,1252,63418,10800,0),
+(8,3673,35477,8484,-49205,1252,63418,10800,0),
+(8,3674,35477,8484,-49255,1252,63418,10800,0),
+(8,3675,35477,8484,-49305,1252,63418,10800,0),
+(8,3676,35477,8484,-49355,1252,63418,10800,0),
+(8,3677,35477,8484,-48905,1252,63418,10800,0),
+(8,3678,35477,8484,-48955,1252,63418,10800,0),
+(8,3679,35477,8484,-49005,1252,63418,10800,0),
+(8,3680,35477,8484,-49055,1252,63418,10800,0),
+(8,3681,35477,8504,-49105,1252,63418,10800,0),
+(8,3682,35477,8505,-49155,1252,63418,10800,0),
+(8,3683,35477,8505,-49205,1252,63418,10800,0),
+(8,3684,35477,8505,-49255,1252,63418,10800,0),
+(8,3685,35477,8505,-49305,1252,63418,10800,0),
+(8,3686,35475,17655,-49140,-1181,63418,10800,0),
+(8,3687,35475,17255,-49140,-1124,63418,10800,0),
+(8,3688,35475,16855,-49140,-1088,63418,10800,0),
+(8,3689,35477,8505,-49355,1252,63418,10800,0);
 
 -- Devastated Castle (NPC Clanhall siege)
 -- (id,2910,35413,178222,-14944,-2200,6320,10800,0),

+ 32 - 28
datapack_development/sql/droplist.sql

@@ -222,22 +222,22 @@ INSERT INTO `droplist` VALUES
 (18274,951,1,1,2,4652), -- Scroll: Enchant Weapon (Grade C)
 (18274,952,1,1,2,34111), -- Scroll: Enchant Armor (Grade C)
 (18275,57,1952,3909,0,700000), -- Adena
-(18275,951,1, 1, 2, 6718), -- Scroll: Enchant Weapon (Grade C)
-(18275, 952, 1, 1, 2, 49264), -- Scroll: Enchant Armor (Grade C)
-(18276, 57, 1997, 3995, 0, 700000), -- Adena
-(18276, 947, 1, 1, 2, 1468), -- Scroll: Enchant Weapon (Grade B)
-(18276, 948, 1, 1, 2, 9176), -- Scroll: Enchant Armor (Grade B)
-(18277, 57, 2049, 4095, 0, 700000), -- Adena
-(18277, 947, 1, 1, 2, 1433), -- Scroll: Enchant Weapon (Grade B)
-(18277, 948, 1, 1, 2, 8957), -- Scroll: Enchant Armor (Grade B)
-(18278, 57, 2683, 5361, 0, 700000), -- Adena
-(18278, 947, 1, 1, 2, 1877), -- Scroll: Enchant Weapon (Grade B)
-(18278, 948, 1, 1, 2, 11732), -- Scroll: Enchant Armor (Grade B)
-(18279, 57, 2736, 5473, 0, 700000), -- Adena
-(18279, 947, 1, 1, 2, 1916), -- Scroll: Enchant Weapon (Grade B)
-(18279, 948, 1, 1, 2, 11969), -- Scroll: Enchant Armor (Grade B)
-(18280, 57, 2790, 5576, 0, 700000), -- Adena
-(18280, 729, 1, 1, 2,543), -- Scroll: Enchant Weapon (Grade A)
+(18275,951,1,1,2,6718), -- Scroll: Enchant Weapon (Grade C)
+(18275,952,1,1,2,49264), -- Scroll: Enchant Armor (Grade C)
+(18276,57,1997,3995,0,700000), -- Adena
+(18276,947,1,1,2,1468), -- Scroll: Enchant Weapon (Grade B)
+(18276,948,1,1,2,9176), -- Scroll: Enchant Armor (Grade B)
+(18277,57,2049,4095,0,700000), -- Adena
+(18277,947,1,1,2,1433), -- Scroll: Enchant Weapon (Grade B)
+(18277,948,1,1,2,8957), -- Scroll: Enchant Armor (Grade B)
+(18278,57,2683,5361,0,700000), -- Adena
+(18278,947,1,1,2,1877), -- Scroll: Enchant Weapon (Grade B)
+(18278,948,1,1,2,11732), -- Scroll: Enchant Armor (Grade B)
+(18279,57,2736,5473,0,700000), -- Adena
+(18279,947,1,1,2,1916), -- Scroll: Enchant Weapon (Grade B)
+(18279,948,1,1,2,11969), -- Scroll: Enchant Armor (Grade B)
+(18280,57,2790,5576,0,700000), -- Adena
+(18280,729,1,1,2,543), -- Scroll: Enchant Weapon (Grade A)
 (18280,730,1,1,2,4067), -- Scroll: Enchant Armor (Grade A)
 (18281,57,2849,5701,0,700000), -- Adena
 (18281,729,1,1,2,555), -- Scroll: Enchant Weapon (Grade A)
@@ -424,15 +424,15 @@ INSERT INTO `droplist` VALUES
 (20012,57,120,187,0,700000), -- Adena
 (20012,1101,1,1,1,706), -- Tunic of Devotion
 (20012,1104,1,1,1,1127), -- Stockings of Devotion
-(20012, 1800, 1, 1, 2, 11255), -- Recipe: Piece Bone Breastplate
-(20012, 1865, 1, 1, 2, 35789), -- Varnish
-(20012, 1870, 1, 1, 2, 35789), -- Coal
-(20012, 6035, 1, 1, 2, 2983), -- Magic Haste Potion
-(20013, 1866, 1, 1, -1, 143423), -- Suede
-(20013, 1896, 1, 1, -1, 91159), -- Necklace of Anguish Chain
-(20013, 1922, 1, 1, -1, 54881), -- Leather Tunic Pattern
-(20013, 57, 113, 160, 0, 700000), -- Adena
-(20013, 9, 1, 1, 1,157), -- Cedar Staff
+(20012,1800,1,1,2,11255), -- Recipe: Piece Bone Breastplate
+(20012,1865,1,1,2,35789), -- Varnish
+(20012,1870,1,1,2,35789), -- Coal
+(20012,6035,1,1,2,2983), -- Magic Haste Potion
+(20013,1866,1,1,-1,143423), -- Suede
+(20013,1896,1,1,-1,91159), -- Necklace of Anguish Chain
+(20013,1922,1,1,-1,54881), -- Leather Tunic Pattern
+(20013,57,113,160,0,700000), -- Adena
+(20013,9,1,1,1,157), -- Cedar Staff
 (20013,154,1,1,1,157), -- Dwarven Mace
 (20013,2008,1,1,1,1649), -- Cedar Staff Head
 (20013,1792,1,1,2,3115), -- Recipe: Short Spear
@@ -22965,7 +22965,11 @@ INSERT INTO `droplist` VALUES
 (22188,4044,1,1,2,166066), -- Thons
 (22189,57,4456,7385,0,700000), -- Adena
 (22190,57,7411,7610,0,700000), -- Adena
-(22190,1895,1,1,2,350000); -- Metallic Fiber
+(22190,1895,1,1,2,350000), -- Metallic Fiber
+(22288,57,6113, 9156, 1, 700000), -- Adena
+(22288,1868,9,9,1,133000), -- Thread
+(22288,1873,3,6,1,250000), -- Silver Nugget
+(22288,1876,1,1,1,133000); -- Mithril Ore
 
 -- 
 -- Category Explanation (RaidBoss & their minions)
@@ -25927,7 +25931,7 @@ INSERT INTO `droplist` VALUES
 (21465,5370,1,1,2,3534), -- Recipe: Sealed Tallum Boots(60%)
 (21466,5368,1,1,2,1244), -- Recipe: Sealed Dark Crystal Boots(60%)
 (21467,5368,1,1,2,3049), -- Recipe: Sealed Dark Crystal Boots(60%)
-(21468,5370,1,1,-1,40000),-- Recipe: Sealed Tallum Boots(60%)
+(21468,5370,1,1,-1,40000), -- Recipe: Sealed Tallum Boots(60%)
 (21470,5364,1,1,2,143), -- Recipe: Sealed Dark Crystal Shield(60%)
 (21483,5364,1,1,-1,36232), -- Recipe: Sealed Dark Crystal Shield(60%)
 (21485,5368,1,1,-1,43478), -- Recipe: Sealed Dark Crystal Boots(60%)
@@ -27356,4 +27360,4 @@ INSERT INTO `droplist` VALUES
 (22123,8742,1,1,200,53), -- Monastic Crusader
 (21164,8742,1,1,200,49), -- Guardian Spirit of Ancient Holy Ground
 (21427,8742,1,1,200,34), -- Abraxion
-(22142,8742,1,1,200,21); -- Triol's Layperson
+(22142,8742,1,1,200,21); -- Triol's Layperson

+ 40 - 40
datapack_development/sql/merchant_buylists.sql

@@ -15947,46 +15947,46 @@ INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`) VALUES
 (7679,0,300542,31);
 
 INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`) VALUES
-(6779,30000,355111,1),
-(6793,90000,355111,12),
-(6794,200000,355111,13),
-(6795,300000,355111,14),
-(6796,300000,355111,15),
-(6797,60000,355111,16),
-(6798,80000,355111,17),
-(6799,100000,355111,18),
-(6800,300000,355111,19),
-(6792,60000,355111,11),
-(6788,150000,355111,10),
-(6780,40000,355111,2),
-(6781,50000,355111,3),
-(6782,150000,355111,4),
-(6783,150000,355111,5),
-(6784,30000,355111,6),
-(6785,40000,355111,7),
-(6786,50000,355111,8),
-(6787,150000,355111,9),
-(6801,300000,355111,20),
-(6779,30000,355571,1),
-(6793,90000,355571,12),
-(6794,200000,355571,13),
-(6795,300000,355571,14),
-(6796,300000,355571,15),
-(6797,60000,355571,16),
-(6798,80000,355571,17),
-(6799,100000,355571,18),
-(6800,300000,355571,19),
-(6792,60000,355571,11),
-(6788,150000,355571,10),
-(6780,40000,355571,2),
-(6781,50000,355571,3),
-(6782,150000,355571,4),
-(6783,150000,355571,5),
-(6784,30000,355571,6),
-(6785,40000,355571,7),
-(6786,50000,355571,8),
-(6787,150000,355571,9),
-(6801,300000,355571,20),
+(7973,30000,355111,1),
+(7974,40000,355111,2),
+(7975,50000,355111,3),
+(7976,150000,355111,4),
+(7977,150000,355111,5),
+(7978,30000,355111,6),
+(7979,40000,355111,7),
+(7980,50000,355111,8),
+(7981,150000,355111,9),
+(7982,150000,355111,10),
+(7988,60000,355111,11),
+(7989,90000,355111,12),
+(7990,200000,355111,13),
+(7991,300000,355111,14),
+(7992,300000,355111,15),
+(7993,60000,355111,16),
+(7994,80000,355111,17),
+(7995,100000,355111,18),
+(7996,300000,355111,19),
+(7997,300000,355111,20),
+(7918,30000,355571,1),
+(7919,40000,355571,2),
+(7920,50000,355571,3),
+(7921,150000,355571,4),
+(7922,150000,355571,5),
+(7923,30000,355571,6),
+(7924,40000,355571,7),
+(7925,50000,355571,8),
+(7926,150000,355571,9),
+(7927,150000,355571,10),
+(7931,60000,355571,11),
+(7932,90000,355571,12),
+(7933,200000,355571,13),
+(7934,300000,355571,14),
+(7935,300000,355571,15),
+(7936,60000,355571,16),
+(7937,80000,355571,17),
+(7938,100000,355571,18),
+(7939,300000,355571,19),
+(7940,300000,355571,20),
 (736,600,423,1),
 (737,3000,423,2),
 (734,1800,423,3),

+ 107 - 106
datapack_development/sql/npc.sql

@@ -6163,29 +6163,29 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35187,35187,'Manor Manager',0,'Giran',0,'NPC.a_chamberlain_MHuman',9.50,22.50,70,'male','L2ManorManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0,'LAST_HIT'),
 	(35188,35188,'Holmes',0,'Sir',0,'NPC.a_guard_MHuman',8.00,24.00,70,'male','L2SiegeNpc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,490,10,1314,470,780,382,282,0,333,74,0,0,55,176,NULL,0,1,0,'LAST_HIT'),
 	(35189,35189,'Oren Holy Artifact',0,'',0,'NPC.castle_kent_statue_jewel',25.00,98.00,20,'etc','L2Artefact',40,541,213,3.95,1.21,40,43,30,21,20,10,40,10,57,94,23,76,282,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
-	(35190,35190,'Balthus Van Dyke',0,'Duke',0,'NPC.a_lord_MHuman',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,88,132,'giran_siege_clan',1200,1,0,'LAST_HIT'),
+	(35190,35190,'Balthus Van Dyke',0,'Duke',0,'NPC.a_lord_MHuman',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,88,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35191,35191,'Quant',0,'Sir',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,62,'male','L2SiegeGuard',40,51515,3653,11.85,2.78,40,43,30,21,20,10,384,1,3777,388,532,315,278,0,333,142,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35192,35192,'Royal Knight',0,'Oren',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,60,'male','L2SiegeGuard',40,24436,3452,10.27,2.45,40,43,30,21,20,10,360,1,1721,368,478,299,278,0,333,76,2497,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35193,35193,'Court Sorcerer',0,'Oren',0,'NPC.a_patriarch_MElf',8.00,22.50,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,325,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35194,35194,'Court Sorcerer',0,'Oren',0,'NPC.a_mageguild_master_FHuman',8.00,23.00,58,'female','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,193,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35195,35195,'Court Guard',0,'Oren',0,'NPC.a_royal_guardB_MHuman',7.00,24.00,58,'male','L2SiegeGuard',80,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,237,0,333,94,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35196,35196,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35197,35197,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',40,21799,3059,8.69,2.14,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35198,35198,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,276,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35199,35199,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35200,35200,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',40,21799,3059,8.69,2.14,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35201,35201,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',1100,21799,3059,8.69,2.14,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35202,35202,'Guard',0,'Oren',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35203,35203,'Guard',0,'Oren',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,8.69,2.14,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35204,35204,'Guard',0,'Oren',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35205,35205,'Royal Knight',0,'Oren',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,60,'male','L2SiegeGuard',40,24436,3452,10.27,2.45,40,43,30,21,20,10,360,1,1721,368,478,299,278,0,333,76,2497,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35206,35206,'Court Sorcerer',0,'Oren',0,'NPC.a_patriarch_MElf',8.00,22.50,58,'male','L2SiegeGuard',40,23114,3254,8.69,2.14,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,325,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35207,35207,'Court Sorcerer',0,'Oren',0,'NPC.a_mageguild_master_FHuman',8.00,23.00,58,'female','L2SiegeGuard',40,23114,3254,8.69,2.14,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,193,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35208,35208,'Court Guard',0,'Oren',0,'NPC.a_royal_guardB_MHuman',7.00,24.00,58,'male','L2SiegeGuard',80,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,237,0,333,94,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35209,35209,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,93,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35210,35210,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,33,154,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35197,35197,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35198,35198,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,276,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35199,35199,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35200,35200,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35201,35201,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35202,35202,'Guard',0,'Oren',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35203,35203,'Guard',0,'Oren',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35204,35204,'Guard',0,'Oren',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35205,35205,'Royal Knight',0,'Oren',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,60,'male','L2SiegeGuard',40,24436,3452,10.27,2.45,40,43,30,21,20,10,360,1,1721,368,478,299,278,0,333,76,2497,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35206,35206,'Court Sorcerer',0,'Oren',0,'NPC.a_patriarch_MElf',8.00,22.50,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,325,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35207,35207,'Court Sorcerer',0,'Oren',0,'NPC.a_mageguild_master_FHuman',8.00,23.00,58,'female','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,193,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35208,35208,'Court Guard',0,'Oren',0,'NPC.a_royal_guardB_MHuman',7.00,24.00,58,'male','L2SiegeGuard',80,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,237,0,333,94,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35209,35209,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,93,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35210,35210,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35211,35211,'Guard',0,'Oren',0,'NPC.a_guard_MElf',8.00,23.50,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,276,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
-	(35212,35212,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',80,21799,3059,11.85,2.78,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35212,35212,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35213,35213,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35214,35214,'Guard',0,'Oren',0,'NPC.a_guard_FDarkelf',7.00,25.00,56,'female','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
 	(35215,35215,'Guard',0,'Oren',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
@@ -6207,7 +6207,7 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35231,35231,'Manor Manager',0,'Oren',0,'NPC.a_common_people_MDarkElf',7.00,23.00,70,'male','L2ManorManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0,'LAST_HIT'),
 	(35232,35232,'Sherwood',0,'Messenger',0,'NPC.a_guard_MHuman',8.00,24.00,70,'male','L2SiegeNpc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,490,10,1314,470,780,382,282,0,333,74,0,0,55,176,NULL,0,1,0,'LAST_HIT'),
 	(35233,35233,'Aden Holy Artifact',0,'',0,'NPC.castle_kent_statue_jewel',25.00,98.00,20,'etc','L2Artefact',40,721,213,3.95,1.21,40,43,30,21,20,10,40,10,57,189,23,76,282,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
-	(35234,35234,'Amadeo Cadmus',0,'King',0,'NPC.a_lord_MHuman',7.00,23.00,75,'male','L2SiegeGuard',40,84582,6694,13.43,3.09,40,43,30,21,20,10,562,1,9383,523,957,425,278,0,333,80,0,0,55,132,'oren_siege_clan',1200,1,0,'LAST_HIT'),
+	(35234,35234,'Amadeo Cadmus',0,'King',0,'NPC.a_lord_MHuman',7.00,23.00,75,'male','L2SiegeGuard',40,84582,6694,13.43,3.09,40,43,30,21,20,10,562,1,9383,523,957,425,278,0,333,80,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35235,35235,'Royal Knight',0,'Aden',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,70,'male','L2SiegeGuard',40,38622,5975,11.85,2.78,40,43,30,21,20,10,490,1,3943,470,780,382,278,0,333,76,2497,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35236,35236,'Court Sorcerer',0,'Aden',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,68,'male','L2SiegeGuard',40,37063,5693,11.85,2.78,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,325,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35237,35237,'Court Sorcerer',0,'Aden',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,68,'male','L2SiegeGuard',40,37063,5693,11.85,2.78,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,193,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
@@ -6221,10 +6221,10 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35245,35245,'Guard',0,'Aden',0,'NPC.a_guard_MHuman',8.00,24.00,66,'male','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,237,0,333,16,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35246,35246,'Guard',0,'Aden',0,'NPC.a_guard_MHuman',8.00,24.00,66,'male','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,278,0,333,2,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35247,35247,'Guard',0,'Aden',0,'NPC.a_guard_MHuman',8.00,24.00,66,'male','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,7486,428,649,348,249,0,333,14,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
-	(35248,35248,'Royal Knight',0,'Aden',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,70,'male','L2SiegeGuard',40,38622,5975,11.85,2.78,40,43,30,21,20,10,490,1,3943,470,780,382,278,0,333,76,2497,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
-	(35249,35249,'Court Sorcerer',0,'Aden',0,'NPC.a_patriarch_MElf',8.00,22.50,68,'male','L2SiegeGuard',40,37063,5693,11.85,2.78,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,325,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
-	(35250,35250,'Court Sorcerer',0,'Aden',0,'NPC.a_mageguild_master_FHuman',8.00,23.00,68,'female','L2SiegeGuard',40,37063,5693,11.85,2.78,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,193,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
-	(35251,35251,'Court Guard',0,'Aden',0,'NPC.a_royal_guardB_MHuman',7.00,24.00,68,'male','L2SiegeGuard',80,37063,5693,11.85,2.78,40,43,30,21,20,10,462,1,3652,449,713,365,237,0,333,300,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
+	(35248,35248,'Royal Knight',0,'Aden',0,'NPC.a_royal_guardA_MHuman',7.00,24.00,70,'male','L2SiegeGuard',40,38622,5975,13.43,3.09,40,43,30,21,20,10,490,1,3943,470,780,382,278,0,333,76,2497,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
+	(35249,35249,'Court Sorcerer',0,'Aden',0,'NPC.a_patriarch_MElf',8.00,22.50,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,325,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
+	(35250,35250,'Court Sorcerer',0,'Aden',0,'NPC.a_mageguild_master_FHuman',8.00,23.00,68,'female','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,193,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
+	(35251,35251,'Court Guard',0,'Aden',0,'NPC.a_royal_guardB_MHuman',7.00,24.00,68,'male','L2SiegeGuard',80,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,237,0,333,300,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35252,35252,'Guard',0,'Aden',0,'NPC.a_guard_MElf',8.00,23.50,66,'male','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,237,0,333,16,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35253,35253,'Guard',0,'Aden',0,'NPC.a_guard_MElf',8.00,23.50,66,'male','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,278,0,333,2,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
 	(35254,35254,'Guard',0,'Aden',0,'NPC.a_guard_MElf',8.00,23.50,66,'male','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,7486,428,649,348,249,0,333,285,0,0,55,132,'aden_siege_clan',1200,1,0,'LAST_HIT'),
@@ -6297,34 +6297,34 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35322,35322,'Altar of Fire',0,'',0,'NPC.godad_holything',25.00,65.00,20,'etc','L2Artefact',40,541,213,3.95,1.21,40,43,30,21,20,10,40,10,57,94,23,76,282,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
 	(35323,35323,'Altar of Water',0,'',0,'NPC.godad_holything',25.00,65.00,20,'etc','L2Artefact',40,541,213,3.95,1.21,40,43,30,21,20,10,40,10,57,94,23,76,282,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
 	(35324,35324,'Heinz',0,'Royal Guard Captain',0,'NPC.e_elmore_guard_Mhuman',8.00,23.50,62,'male','L2SiegeGuard',40,51515,3653,11.85,2.78,40,43,30,21,20,10,384,1,3777,388,532,315,278,0,333,142,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
-	(35325,35325,'Duke Mora Ken Abygail',0,'',0,'NPC.a_lord_MHuman',8.00,24.00,65,'male','L2SiegeNpc',40,2725,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35326,35326,'Royal Knight',0,'Goddard',0,'NPC.a_royal_guardA_MHuman',8.00,24.00,60,'male','L2SiegeGuard',40,24436,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,76,2497,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35327,35327,'Court Sorcerer',0,'Goddard',0,'NPC.a_patriarch_MElf',8.00,24.00,58,'male','L2SiegeGuard',40,23114,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,325,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35328,35328,'Court Sorcerer',0,'Goddard',0,'NPC.a_mageguild_master_FHuman',8.00,24.00,58,'female','L2SiegeGuard',40,23114,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,193,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35329,35329,'Guard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,58,'male','L2SiegeGuard',40,23114,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35330,35330,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,93,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35331,35331,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,2499,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35332,35332,'Bodyguard',0,'Goddard',0,'NPC.a_guard_MElf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,276,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35333,35333,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,16,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35334,35334,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,2,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35335,35335,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,14,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35336,35336,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MOrc',8.00,24.00,56,'male','L2SiegeGuard',80,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,16,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35337,35337,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MOrc',8.00,24.00,56,'male','L2SiegeGuard',40,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,2,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35338,35338,'Bodyguard',0,'Goddard',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,14,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35339,35339,'Royal Knight',0,'Goddard',0,'NPC.a_royal_guardA_MHuman',8.00,24.00,60,'male','L2SiegeGuard',40,24436,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,76,2497,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35340,35340,'Court Sorcerer',0,'Goddard',0,'NPC.a_patriarch_MElf',8.00,24.00,58,'male','L2SiegeGuard',40,23114,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,325,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35341,35341,'Court Sorcerer',0,'Goddard',0,'NPC.a_mageguild_master_FHuman',8.00,24.00,58,'female','L2SiegeGuard',40,23114,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,193,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35342,35342,'Guard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,58,'male','L2SiegeGuard',40,23114,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35343,35343,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,93,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35344,35344,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,2499,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35345,35345,'Bodyguard',0,'Goddard',0,'NPC.a_guard_MElf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,276,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35346,35346,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,16,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35347,35347,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,2,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35348,35348,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,14,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35349,35349,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MOrc',8.00,24.00,56,'male','L2SiegeGuard',80,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,16,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35350,35350,'Bodyguard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2SiegeGuard',40,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,2,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35351,35351,'Bodyguard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,14,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
-	(35352,35352,'Gatekeeper',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2CastleTeleporter',40,2724,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
+	(35325,35325,'Duke Mora Ken Abygail',0,'',0,'NPC.a_lord_MHuman',8.00,24.00,65,'male','L2SiegeGuard',40,55449,3958,11.85,2.78,40,43,30,21,20,10,422,1,4308,418,619,340,278,0,333,79,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35326,35326,'Royal Knight',0,'Goddard',0,'NPC.a_royal_guardA_MHuman',8.00,24.00,60,'male','L2SiegeGuard',40,24436,3452,10.27,2.45,40,43,30,21,20,10,360,1,1721,368,478,299,278,0,333,76,2497,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35327,35327,'Court Sorcerer',0,'Goddard',0,'NPC.a_patriarch_MElf',8.00,24.00,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,325,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35328,35328,'Court Sorcerer',0,'Goddard',0,'NPC.a_mageguild_master_FHuman',8.00,24.00,58,'female','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,193,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35329,35329,'Guard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,237,0,333,94,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35330,35330,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35331,35331,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35332,35332,'Bodyguard',0,'Goddard',0,'NPC.a_guard_MElf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,276,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35333,35333,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35334,35334,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35335,35335,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35336,35336,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MOrc',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35337,35337,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MOrc',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35338,35338,'Bodyguard',0,'Goddard',0,'NPC.a_guard_MHuman',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35339,35339,'Royal Knight',0,'Goddard',0,'NPC.a_royal_guardA_MHuman',8.00,24.00,60,'male','L2SiegeGuard',40,24436,3452,10.27,2.45,40,43,30,21,20,10,360,1,1721,368,478,299,278,0,333,76,2497,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35340,35340,'Court Sorcerer',0,'Goddard',0,'NPC.a_patriarch_MElf',8.00,24.00,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,325,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35341,35341,'Court Sorcerer',0,'Goddard',0,'NPC.a_mageguild_master_FHuman',8.00,24.00,58,'female','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,193,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35342,35342,'Guard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,237,0,333,94,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35343,35343,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,93,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35344,35344,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MDwarf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35345,35345,'Bodyguard',0,'Goddard',0,'NPC.a_guard_MElf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,276,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35346,35346,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35347,35347,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35348,35348,'Bodyguard',0,'Goddard',0,'NPC.a_guard_FDarkelf',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35349,35349,'Bodyguard',0,'Goddard',0,'NPC.e_guard_MOrc',8.00,24.00,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35350,35350,'Bodyguard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35351,35351,'Bodyguard',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'godad_siege_clan',1200,1,0,'LAST_HIT'),
+	(35352,35352,'Gatekeeper',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2CastleTeleporter',40,2724,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',6000,1,0,'LAST_HIT'),
 	(35353,35353,'Gatekeeper',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2CastleTeleporter',40,2724,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
 	(35354,35354,'Gatekeeper',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2CastleTeleporter',40,2724,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
 	(35355,35355,'Mass Gatekeeper',0,'Goddard',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2CastleTeleporter',40,2724,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,662,382,268,282,0,333,0,0,0,55,132,'godad_siege_clan',600,1,0,'LAST_HIT'),
@@ -6442,33 +6442,34 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35467,35467,'Branhillde',0,'Clan Hall Manager',0,'NPC.a_traderC_Fhuman',8.00,22.50,70,'female','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
 	(35468,35468,'Lambert',0,'Clan Hall Gatekeeper',0,'NPC.a_common_peopleB_MHuman',8.00,22.00,70,'male','L2Doormen',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0,'LAST_HIT'),
 	(35469,35469,'Gods'' Altar',0,'',0,'NpcEV.rune_holything',46.00,72.50,20,'etc','L2Artefact',40,541,213,3.95,1.21,40,43,30,21,20,10,40,10,57,94,23,76,282,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
-	(35470,35470,'Astair van Halter',0,'King',0,'NPC.a_lord_MHuman',10.00,23.00,93,'male','L2Npc',40,350000,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,22,55,NULL,0,0,0,'LAST_HIT'),
-	(35471,35471,'Royal Knight',0,'Rune',0,'NPC.a_royal_guardA_MHuman',10.00,23.00,70,'male','L2SiegeGuard',40,38622,5975,13.43,3.09,40,43,30,21,20,10,30,2,3943,470,780,382,253,0,333,76,2497,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35472,35472,'Court Sorcerer',0,'Rune',0,'NPC.a_patriarch_MElf',10,21,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,30,2,3652,449,713,365,253,0,333,325,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35473,35473,'Court Sorcerer',0,'Rune',0,'NPC.a_mageguild_master_FHuman',10,21,68,'female','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,30,2,3652,449,713,365,253,0,333,193,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35474,35474,'Court Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,30,2,3652,449,713,365,253,0,333,94,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35475,35475,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',80,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,7486,428,649,348,253,0,333,93,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35476,35476,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',40,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,2499,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35477,35477,'Guard',0,'Rune',0,'NPC.a_guard_MElf',10,23,66,'male','L2SiegeGuard',1100,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,276,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35478,35478,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',80,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,16,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35479,35479,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',40,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,2,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35480,35480,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',1100,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,14,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35481,35481,'Guard',0,'Rune',0,'NPC.e_guard_MOrc',10,27,66,'male','L2SiegeGuard',80,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,7486,428,649,348,253,0,333,16,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35482,35482,'Guard',0,'Rune',0,'NPC.e_guard_MOrc',10,27,66,'male','L2SiegeGuard',40,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,2,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35483,35483,'Guard',0,'Rune',0,'NPC.a_guard_MHuman',10,23,66,'male','L2SiegeGuard',1100,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,14,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35484,35484,'Royal Knight',0,'Rune',0,'NPC.a_royal_guardA_MHuman',10,23,70,'male','L2SiegeGuard',40,38622,5975,13.43,3.09,40,43,30,21,20,10,30,2,3943,470,780,382,253,0,333,76,2497,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35485,35485,'Court Sorcerer',0,'Rune',0,'NPC.a_patriarch_MElf',10,21,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,30,2,3652,449,713,365,253,0,333,325,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35486,35486,'Court Sorcerer',0,'Rune',0,'NPC.a_mageguild_master_FHuman',10,21,68,'female','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,30,2,3652,449,713,365,253,0,333,193,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35487,35487,'Court Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,30,2,3652,449,713,365,253,0,333,94,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35488,35488,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',80,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,93,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35489,35489,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',40,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,2499,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35490,35490,'Guard',0,'Rune',0,'NPC.a_guard_MElf',10,23,66,'male','L2SiegeGuard',1100,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,276,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35491,35491,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',80,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,7486,428,649,348,253,0,333,16,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35492,35492,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',40,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,2,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35493,35493,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',1100,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,14,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35494,35494,'Guard',0,'Rune',0,'NPC.e_guard_MOrc',10,27,66,'male','L2SiegeGuard',80,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,16,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35495,35495,'Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,66,'male','L2SiegeGuard',40,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,7486,428,649,348,253,0,333,2,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
-	(35496,35496,'Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,66,'male','L2SiegeGuard',1100,35465,5415,13.43,3.09,40,43,30,21,20,10,30,2,3369,428,649,348,253,0,333,14,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
+	(35470,35470,'Astair van Halter',0,'King',0,'NPC.a_lord_MHuman',10.00,23.00,75,'male','L2SiegeGuard',40,84582,6694,13.43,3.09,40,43,30,21,20,10,562,1,9383,523,957,425,278,0,333,80,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35471,35471,'Royal Knight',0,'Rune',0,'NPC.a_royal_guardA_MHuman',10.00,23.00,70,'male','L2SiegeGuard',40,38622,5975,13.43,3.09,40,43,30,21,20,10,490,1,3943,470,780,382,278,0,333,76,2497,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	
+	(35472,35472,'Court Sorcerer',0,'Rune',0,'NPC.a_patriarch_MElf',10,21,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,325,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35473,35473,'Court Sorcerer',0,'Rune',0,'NPC.a_mageguild_master_FHuman',10,21,68,'female','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,193,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35474,35474,'Court Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,94,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35475,35475,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,7486,428,649,348,237,0,333,93,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35476,35476,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,278,0,333,2499,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35477,35477,'Guard',0,'Rune',0,'NPC.a_guard_MElf',10,23,66,'male','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,249,0,333,276,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35478,35478,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,237,0,333,16,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35479,35479,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,278,0,333,2,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35480,35480,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,249,0,333,14,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35481,35481,'Guard',0,'Rune',0,'NPC.e_guard_MOrc',10,27,66,'male','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,7486,428,649,348,237,0,333,16,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35482,35482,'Guard',0,'Rune',0,'NPC.e_guard_MOrc',10,27,66,'male','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,278,0,333,2,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35483,35483,'Guard',0,'Rune',0,'NPC.a_guard_MHuman',10,23,66,'male','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,249,0,333,14,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35484,35484,'Royal Knight',0,'Rune',0,'NPC.a_royal_guardA_MHuman',10,23,70,'male','L2SiegeGuard',40,38622,5975,13.43,3.09,40,43,435,21,20,10,490,1,3943,470,780,382,278,0,333,76,2497,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35485,35485,'Court Sorcerer',0,'Rune',0,'NPC.a_patriarch_MElf',10,21,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,325,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35486,35486,'Court Sorcerer',0,'Rune',0,'NPC.a_mageguild_master_FHuman',10,21,68,'female','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,193,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35487,35487,'Court Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,68,'male','L2SiegeGuard',40,37063,5693,13.43,3.09,40,43,30,21,20,10,462,1,3652,449,713,365,278,0,333,94,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35488,35488,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,237,0,333,93,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35489,35489,'Guard',0,'Rune',0,'NPC.e_guard_MDwarf',10,18,66,'male','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,278,0,333,2499,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35490,35490,'Guard',0,'Rune',0,'NPC.a_guard_MElf',10,23,66,'male','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,249,0,333,276,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35491,35491,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,7486,428,649,348,237,0,333,16,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35492,35492,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,278,0,333,2,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35493,35493,'Guard',0,'Rune',0,'NPC.a_guard_FDarkelf',10,23,66,'female','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,249,0,333,14,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35494,35494,'Guard',0,'Rune',0,'NPC.e_guard_MOrc',10,27,66,'male','L2SiegeGuard',80,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,237,0,333,16,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35495,35495,'Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,66,'male','L2SiegeGuard',40,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,7486,428,649,348,278,0,333,2,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
+	(35496,35496,'Guard',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10,23,66,'male','L2SiegeGuard',1100,35465,5415,11.85,2.78,40,43,30,21,20,10,435,1,3369,428,649,348,249,0,333,14,0,0,55,132,'rune_siege_clan',1200,1,0,'LAST_HIT'),
 	(35497,35497,'Gatekeeper',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,56,'male','L2CastleTeleporter',40,2724,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
 	(35498,35498,'Gatekeeper',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,56,'male','L2CastleTeleporter',40,2724,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
 	(35499,35499,'Gatekeeper',0,'Rune',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,56,'male','L2CastleTeleporter',40,2724,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,55,132,'rune_siege_clan',600,1,0,'LAST_HIT'),
@@ -6488,34 +6489,34 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35513,35513,'Sherman',0,'Messenger',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,70,'male','L2SiegeNpc',40,3862,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,22,55,NULL,0,0,0,'LAST_HIT'),
 	(35514,35514,'Altar of Wind',0,'',0,'NPC.godad_holything',25.00,65.00,20,'etc','L2Artefact',40,541,213,3.95,1.21,40,43,30,21,20,10,40,10,57,94,23,76,282,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
 	(35515,35515,'Altar of Earth',0,'',0,'NPC.godad_holything',25.00,65.00,20,'etc','L2Artefact',40,541,213,3.95,1.21,40,43,30,21,20,10,40,10,57,94,23,76,282,0,333,0,0,0,55,0,NULL,0,1,0,'LAST_HIT'),
-	(35516,35516,'Verus',0,'Royal Guard Captain',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,62,'male','L2Npc',40,51515,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,22,55,NULL,0,0,0,'LAST_HIT'),
-	(35517,35517,'Swain Ken Orwen',0,'Count',0,'NPC.a_lord_MHuman',10.00,23.00,65,'male','L2Npc',40,55449,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,22,55,NULL,0,0,0,'LAST_HIT'),
-	(35518,35518,'Royal Knight',0,'Schuttgart ',0,'NPC.a_royal_guardA_MHuman',10,23,60,'male','L2SiegeGuard',40,24436,3452,13.43,3.09,40,43,30,21,20,10,30,2,1721,368,478,299,253,0,333,76,2497,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35519,35519,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_patriarch_MElf',10,21,58,'male','L2SiegeGuard',40,23114,3254,13.43,3.09,40,43,30,21,20,10,30,2,1562,349,428,284,253,0,333,325,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35520,35520,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_mageguild_master_FHuman',10,23,58,'female','L2SiegeGuard',40,23114,3254,13.43,3.09,40,43,30,21,20,10,30,2,1562,349,428,284,253,0,333,193,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35521,35521,'Court Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10,23,58,'male','L2SiegeGuard',40,23114,3254,13.43,3.09,40,43,30,21,20,10,30,2,1562,349,428,284,253,0,333,94,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35522,35522,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',80,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,93,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35523,35523,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',40,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,2499,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35524,35524,'Guard',0,'Schuttgart ',0,'NPC.a_guard_MElf',10,23,56,'male','L2SiegeGuard',1100,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,276,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35525,35525,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',80,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,16,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35526,35526,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',40,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,2,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35527,35527,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',1100,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,14,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35528,35528,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MOrc',10,27,56,'male','L2SiegeGuard',80,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,16,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35529,35529,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MOrc',10,27,56,'male','L2SiegeGuard',40,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,2,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35530,35530,'Guard',0,'Schuttgart ',0,'NPC.a_guard_MHuman',10,23,56,'male','L2SiegeGuard',1100,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,14,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35531,35531,'Royal Knight',0,'Schuttgart ',0,'NPC.a_royal_guardA_MHuman',10,23,60,'male','L2SiegeGuard',40,24436,3452,13.43,3.09,40,43,30,21,20,10,30,2,1721,368,478,299,253,0,333,76,2497,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35532,35532,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_patriarch_MElf',20,21,58,'male','L2SiegeGuard',80,23114,3254,13.43,3.09,40,43,30,21,20,10,0,0,1562,349,428,284,300,0,333,325,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35533,35533,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_mageguild_master_FHuman',20,23,58,'female','L2SiegeGuard',80,23114,3254,13.43,3.09,40,43,30,21,20,10,0,0,1562,349,428,284,300,0,333,193,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35534,35534,'Court Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',20,23,58,'male','L2SiegeGuard',80,23114,3254,13.43,3.09,40,43,30,21,20,10,0,0,1562,349,428,284,300,0,333,94,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35535,35535,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',80,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,93,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35536,35536,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',40,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,2499,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35537,35537,'Guard',0,'Schuttgart ',0,'NPC.a_guard_MElf',10,23,56,'male','L2SiegeGuard',1100,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,276,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35538,35538,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',80,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,16,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35539,35539,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',40,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,2,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35540,35540,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',1100,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,14,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35541,35541,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MOrc',10,27,56,'male','L2SiegeGuard',80,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,16,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35542,35542,'Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10,23,56,'male','L2SiegeGuard',40,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,2,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
-	(35543,35543,'Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10,23,56,'male','L2SiegeGuard',1100,21799,3059,13.43,3.09,40,43,30,21,20,10,30,2,1412,331,382,269,253,0,333,14,0,0,55,132,'schutt_siege_clan',600,1,0,'LAST_HIT'),
+	(35516,35516,'Verus',0,'Royal Guard Captain',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,62,'male','L2SiegeGuard',40,51515,3653,11.85,2.78,40,43,30,21,20,10,384,1,3777,388,532,315,278,0,333,142,0,0,55,132,'schutt_siege_clan',1200,0,0,'LAST_HIT'),
+	(35517,35517,'Swain Ken Orwen',0,'Count',0,'NPC.a_lord_MHuman',10.00,23.00,65,'male','L2SiegeGuard',40,55449,3958,11.85,2.78,40,43,30,21,20,10,422,1,4308,418,619,340,278,0,333,79,0,0,55,132,'schutt_siege_clan',1200,0,0,'LAST_HIT'),
+	(35518,35518,'Royal Knight',0,'Schuttgart ',0,'NPC.a_royal_guardA_MHuman',10,23,60,'male','L2SiegeGuard',40,24436,3452,10.27,2.45,40,43,30,21,20,10,360,1,1721,368,478,299,278,0,333,76,2497,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35519,35519,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_patriarch_MElf',10,21,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,325,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35520,35520,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_mageguild_master_FHuman',10,23,58,'female','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,193,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35521,35521,'Court Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10,23,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,94,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35522,35522,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,93,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35523,35523,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35524,35524,'Guard',0,'Schuttgart ',0,'NPC.a_guard_MElf',10,23,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,249,0,333,276,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35525,35525,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35526,35526,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35527,35527,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,249,0,333,14,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35528,35528,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MOrc',10,27,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35529,35529,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MOrc',10,27,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35530,35530,'Guard',0,'Schuttgart ',0,'NPC.a_guard_MHuman',10,23,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,249,0,333,14,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35531,35531,'Royal Knight',0,'Schuttgart ',0,'NPC.a_royal_guardA_MHuman',10,23,60,'male','L2SiegeGuard',40,24436,3452,10.27,2.45,40,43,30,21,20,10,360,1,1721,368,478,299,278,0,333,76,2497,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35532,35532,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_patriarch_MElf',20,21,58,'male','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,325,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35533,35533,'Court Sorcerer',0,'Schuttgart ',0,'NPC.a_mageguild_master_FHuman',20,23,58,'female','L2SiegeGuard',40,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,300,0,333,193,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35534,35534,'Court Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',20,23,58,'male','L2SiegeGuard',80,23114,3254,10.27,2.45,40,43,30,21,20,10,336,1,1562,349,428,284,278,0,333,94,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35535,35535,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,93,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35536,35536,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MDwarf',10,18,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2499,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35537,35537,'Guard',0,'Schuttgart ',0,'NPC.a_guard_MElf',10,23,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,249,0,333,276,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35538,35538,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35539,35539,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35540,35540,'Guard',0,'Schuttgart ',0,'NPC.a_guard_FDarkelf',10,23,56,'female','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,249,0,333,14,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35541,35541,'Guard',0,'Schuttgart ',0,'NPC.e_guard_MOrc',10,27,56,'male','L2SiegeGuard',80,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,237,0,333,16,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35542,35542,'Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10,23,56,'male','L2SiegeGuard',40,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,1412,331,382,269,278,0,333,2,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
+	(35543,35543,'Guard',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10,23,56,'male','L2SiegeGuard',1100,21799,3059,10.27,2.45,40,43,30,21,20,10,313,1,3139,331,382,269,249,0,333,14,0,0,55,132,'schutt_siege_clan',1200,1,0,'LAST_HIT'),
 	(35544,35544,'Gatekeeper',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,56,'male','L2Doormen',40,2724,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,22,55,NULL,0,0,0,'LAST_HIT'),
 	(35545,35545,'Gatekeeper',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',10.00,23.00,56,'male','L2Doormen',40,2724,44,13.43,3.09,40,43,30,21,20,10,30,2,4,40,3,31,253,0,333,0,0,0,22,55,NULL,0,0,0,'LAST_HIT'),
 	(35546,35546,'Gatekeeper',0,'Schuttgart ',0,'NPC.e_elmore_guard_Mhuman',8.00,24.00,56,'male','L2CastleTeleporter',40,2724,44,13.43,3.09,40,43,30,21,20,10,490,10,2703,470,6964,764,409,0,3819,14,0,0,81,259,NULL,0,1,0,'LAST_HIT'),
@@ -6681,7 +6682,7 @@ insert into `npc`(`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSideT
 ('22285',0,'Chromatic Detainee',0,'',0,'LineageMonster.blade_stakato','32.00','35.00','1','male','L2Monster',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0',0,'0','LAST_HIT'),
 ('22286',0,'Plaza Gaviel',0,'',0,'LineageMonster3.Crokian_Officer','40.00','47.00','1','male','L2Monster',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0',0,'0','LAST_HIT'),
 ('22287',0,'Crystaline Unicorn',0,'',0,'LineageMonster.unicorn','40.00','47.00','1','male','L2Monster',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0',0,'0','LAST_HIT'),
-('22288',0,'Emerald Boar',0,'',0,'LineageMonster.giant_wild_hog','40.00','47.00','1','male','L2Monster',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0',0,'0','LAST_HIT'),
+('22288',0,'Emerald Boar',0,'',0,'LineageMonster.giant_wild_hog','40.00','26,82','1','male','L2Monster',40,'27983.00','8000.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0','0','0','LAST_HIT'),
 ('22289',0,'Plaza Helm',0,'',0,'LineageMonster2.ketra_warbeast','40.00','47.00','1','male','L2Monster',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0',0,'0','LAST_HIT'),
 ('22290',0,'Ted\'s Minion',0,'',0,'LineageMonster4.eyeless_080p','20.00','27.50','1','male','L2Monster',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0',0,'0','LAST_HIT'),
 ('22291',0,'Weylin\'s Minion',0,'',0,'LineageMonster4.eyeless_080p','20.00','27.50','1','male','L2Monster',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120','','0',0,'0','LAST_HIT'),
@@ -8155,4 +8156,4 @@ insert into `npc`(`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSideT
 ('13098',0,'Event Treasure Chest',0,'',0,NULL,'2.00','6.00','1','male','L2Npc',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120',NULL,'0',0,'0','LAST_HIT'),
 ('16030',0,'Great Wolf',0,'',0,'LineageMonster4.Pet_Wolf_Ba','32.00','23.56','70','male','L2Npc',40,'2444.00','2444.00',0.00,0.00,'10','10','10','10','10','10','0','0','500','500','500','500','253','0','253','0','0','80','120',NULL,'0',0,'0','LAST_HIT');
 
-update npc set idtemplate = id where id not in (50007,70010);
+update npc set idtemplate = id where id not in (50007,70010);

+ 11 - 1
datapack_development/sql/npcskills.sql

@@ -22048,4 +22048,14 @@ INSERT INTO `npcskills` VALUES
 ('35327','1230','28'),
 ('35328','1230','28'),
 ('35340','1230','28'),
-('35341','1230','28');
+('35341','1230','28'),
+-- Rune
+('35472','1230','28'),
+('35473','1230','28'),
+('35485','1230','28'),
+('35486','1230','28'),
+-- Schuttgart
+('35519','1230','24'),
+('35520','1230','24'),
+('35532','1230','24'),
+('35533','1230','24');

+ 3 - 1
datapack_development/sql/skill_trees.sql

@@ -13322,6 +13322,7 @@ INSERT INTO skill_trees VALUES
 (88,430,1,'Master of Combat',16000000,78),
 (88,440,1,'Braveheart',16000000,78),
 (88,442,1,'Sonic Barrier',80000000,79),
+(88,8,8,'Sonic Focus',80000000,79),
 (88,458,1,'Symbol of Energy',150000000,80),
 (89,328,1,'Wisdom',10000000,76),
 (89,329,1,'Health',10000000,76),
@@ -13624,6 +13625,7 @@ INSERT INTO skill_trees VALUES
 (114,430,1,'Master of Combat',21340000,78),
 (114,441,1,'Force Meditation',21340000,78),
 (114,443,1,'Force Barrier',80000000,79),
+(114,50,8,'Focused Force',80000000,79),
 (114,458,1,'Symbol of Energy',150000000,80),
 (115,328,1,'Wisdom',8340000,76),
 (115,329,1,'Health',8340000,76),
@@ -15801,4 +15803,4 @@ INSERT INTO skill_trees VALUES
 (38,1322,1,'Common Craft',0,1),
 (44,1322,1,'Common Craft',0,1),
 (49,1322,1,'Common Craft',0,1),
-(53,1322,1,'Common Craft',0,1);
+(53,1322,1,'Common Craft',0,1);

+ 1 - 1
datapack_development/sql/weapon.sql

@@ -1046,7 +1046,7 @@ INSERT INTO `weapon` VALUES
 (7721,'Poleaxe - Wide Blow','lrhand','true',2010,3,3,'bronze','c',139,10,'pole',8,-3.00000,0,0,0,325,0,76,-1,4300000,1720,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),
 (7722,'Sword of Valhalla - Acumen','rhand','true',900,1,1,'oriharukon','b',140,10,'sword',8,0.00000,0,0,0,379,0,122,-1,8680000,1157,'true','true','true','true',3047,1,0,0,0,0,0,0,0,0,0),
 (7723,'Sword of Valhalla - Magic Weakness','rhand','true',900,1,1,'oriharukon','b',140,10,'sword',8,0.00000,0,0,0,379,0,122,-1,8680000,1157,'true','true','true','true',0,0,0,0,1164,6,7,0,0,0,0),
-(7724,'Sword of Valhalla - Magic Regeneration','rhand','true',900,1,1,'oriharukon','b',140,10,'sword',8,0.00000,0,0,0,379,0,122,-1,8680000,1157,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),
+(7724,'Sword of Valhalla - Magic Regeneration','rhand','true',900,1,1,'oriharukon','b',140,10,'sword',8,0.00000,0,0,0,379,0,122,-1,8680000,1157,'true','true','true','true',0,0,0,0,1044,3,30,0,0,0,0),
 (7810,'Soulfire Dirk - Mana Up','rhand','true',750,2,2,'fine_steel','c',86,5,'dagger',12,-3.00000,0,0,0,433,0,91,-1,2870000,1148,'true','true','true','true',3014,1,0,0,0,0,0,0,0,0,0),
 (7811,'Soulfire Dirk - Magic Hold','rhand','true',750,2,2,'fine_steel','c',86,5,'dagger',12,-3.00000,0,0,0,433,0,91,-1,2870000,1148,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),
 (7812,'Soulfire Dirk - Magic Silence','rhand','true',750,2,2,'fine_steel','c',86,5,'dagger',12,-3.00000,0,0,0,433,0,91,-1,2870000,1148,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),