diff --git a/data/XML/vocations.xml b/data/XML/vocations.xml
index 6daa64a..dfdee2d 100644
--- a/data/XML/vocations.xml
+++ b/data/XML/vocations.xml
@@ -9,7 +9,7 @@
<skill id="5" multiplier="1.5"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="1" flagid="1" name="Sorcerer" description="a sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="1">
+ <vocation id="1" flagid="1" name="Sorcerer" description="a sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="12" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="1">
<skill id="0" multiplier="1.5"/>
<skill id="1" multiplier="2.0"/>
<skill id="2" multiplier="2.0"/>
@@ -18,7 +18,7 @@
<skill id="5" multiplier="1.5"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="2" flagid="2" name="Druid" description="a druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="2">
+ <vocation id="2" flagid="2" name="Druid" description="a druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="12" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="2">
<skill id="0" multiplier="1.5"/>
<skill id="1" multiplier="1.8"/>
<skill id="2" multiplier="1.8"/>
@@ -27,7 +27,7 @@
<skill id="5" multiplier="1.5"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="3" flagid="4" name="Paladin" description="a paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="4" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="3">
+ <vocation id="3" flagid="4" name="Paladin" description="a paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="8" gainhpamount="1" gainmanaticks="4" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="3">
<skill id="0" multiplier="1.2"/>
<skill id="1" multiplier="1.2"/>
<skill id="2" multiplier="1.2"/>
@@ -36,7 +36,7 @@
<skill id="5" multiplier="1.1"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="4" flagid="8" name="Knight" description="a knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="3" gainhpamount="2" gainmanaticks="4" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="4">
+ <vocation id="4" flagid="8" name="Knight" description="a knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="6" gainhpamount="1" gainmanaticks="6" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="4">
<skill id="0" multiplier="1.1"/>
<skill id="1" multiplier="1.1"/>
<skill id="2" multiplier="1.1"/>
@@ -45,7 +45,7 @@
<skill id="5" multiplier="1.1"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="5" flagid="1" name="Master Sorcerer" description="a master sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="3" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="1">
+ <vocation id="5" flagid="1" name="Master Sorcerer" description="a master sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="12" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="1">
<skill id="0" multiplier="1.5"/>
<skill id="1" multiplier="2.0"/>
<skill id="2" multiplier="2.0"/>
@@ -54,7 +54,7 @@
<skill id="5" multiplier="1.5"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="6" flagid="2" name="Elder Druid" description="an elder druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="3" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="2">
+ <vocation id="6" flagid="2" name="Elder Druid" description="an elder druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="12" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="2">
<skill id="0" multiplier="1.5"/>
<skill id="1" multiplier="1.8"/>
<skill id="2" multiplier="1.8"/>
@@ -63,7 +63,7 @@
<skill id="5" multiplier="1.5"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="7" flagid="4" name="Royal Paladin" description="a royal paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="3" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="3">
+ <vocation id="7" flagid="4" name="Royal Paladin" description="a royal paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="6" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="3">
<skill id="0" multiplier="1.2"/>
<skill id="1" multiplier="1.2"/>
<skill id="2" multiplier="1.2"/>
@@ -72,7 +72,7 @@
<skill id="5" multiplier="1.1"/>
<skill id="6" multiplier="1.1"/>
</vocation>
- <vocation id="8" flagid="8" name="Elite Knight" description="an elite knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="2" gainhpamount="2" gainmanaticks="3" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="4">
+ <vocation id="8" flagid="8" name="Elite Knight" description="an elite knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="4" gainhpamount="1" gainmanaticks="6" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="4">
<skill id="0" multiplier="1.1"/>
<skill id="1" multiplier="1.1"/>
<skill id="2" multiplier="1.1"/>
diff --git a/data/items792/items.srv b/data/items792/items.srv
index d9c14cb..40847a7 100644
--- a/data/items792/items.srv
+++ b/data/items792/items.srv
@@ -13838,7 +13838,7 @@ Attributes = {Weight=80,SlotType=RING,ManaShield=1,ExpireTarget=0,TotalExpireTi
TypeID = 3089
Name = "a life ring"
Flags = {Take,Expire,ShowDetail}
-Attributes = {Weight=80,SlotType=RING,HealthTicks=2000,HealthGain=1,ManaTicks=2000,ManaGain=4,ExpireTarget=0,TotalExpireTime=1200,DeEquipTarget=3052}
+Attributes = {Weight=80,SlotType=RING,HealthTicks=3000,HealthGain=1,ManaTicks=3000,ManaGain=1,ExpireTarget=0,TotalExpireTime=1200,DeEquipTarget=3052}
TypeID = 3090
Name = "a time ring"
@@ -13893,7 +13893,7 @@ Attributes = {Weight=110,SlotType=RING,SuppressDrunk=1,ExpireTarget=0,TotalExpi
TypeID = 3100
Name = "a ring of healing"
Flags = {Take,Expire,ShowDetail}
-Attributes = {Weight=80,SlotType=RING,HealthTicks=2000,HealthGain=3,ManaTicks=2000,ManaGain=12,ExpireTarget=0,TotalExpireTime=450,DeEquipTarget=3098}
+Attributes = {Weight=80,SlotType=RING,HealthTicks=2000,HealthGain=1,ManaTicks=2000,ManaGain=4,ExpireTarget=0,TotalExpireTime=450,DeEquipTarget=3098}
TypeID = 3101
Name = "a screaming spellbook"
@@ -16169,7 +16169,7 @@ Attributes = {Weight=500}
TypeID = 3549
Name = "soft boots"
Flags = {Take,Expire,ShowDetail}
-Attributes = {Weight=800,DeEquipTarget=6529,SlotType=FEET,ExpireTarget=6530,TotalExpireTime=14400,HealthGain=3,HealthTicks=4000,ManaGain=6,ManaTicks=2000}
+Attributes = {Weight=800,DeEquipTarget=6529,SlotType=FEET,ExpireTarget=6530,TotalExpireTime=14400,HealthGain=1,HealthTicks=2000,ManaGain=1,ManaTicks=2000}
TypeID = 3550
Name = "patched boots"
@@ -25411,122 +25411,122 @@ Attributes = {Weight=6000,ExpireTarget=0,TotalExpireTime=600}
TypeID = 5630
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5631
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5632
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5633
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5634
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5635
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5636
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5637
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5638
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5639
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5640
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5641
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5642
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5643
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5644
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5645
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5646
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5647
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5648
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5649
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5650
Name = "a dirt wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5651
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5652
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5653
Name = "a stone wall"
-Flags = {Unpass,Unmove,Unthrow,Unlay}
+Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
Attributes = {Waypoints=0}
TypeID = 5654