diff --git a/trunk/dist/game/data/stats/npcs/20000-20099.xml b/trunk/dist/game/data/stats/npcs/20000-20099.xml
index 16c8db3c6e..47590e3ad3 100644
--- a/trunk/dist/game/data/stats/npcs/20000-20099.xml
+++ b/trunk/dist/game/data/stats/npcs/20000-20099.xml
@@ -1650,22 +1650,14 @@
ELEMENTAL1
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1699,15 +1691,9 @@
-
-
-
+
-
-
-
-
@@ -3262,23 +3248,15 @@
ELEMENTAL2
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -3312,15 +3290,9 @@
-
-
-
+
-
-
-
-
@@ -3979,21 +3951,17 @@
ELEMENTAL1
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -4027,15 +3995,9 @@
-
-
-
+
-
-
-
-
diff --git a/trunk/dist/game/data/stats/npcs/20300-20399.xml b/trunk/dist/game/data/stats/npcs/20300-20399.xml
index a89e804f9b..8a5240b256 100644
--- a/trunk/dist/game/data/stats/npcs/20300-20399.xml
+++ b/trunk/dist/game/data/stats/npcs/20300-20399.xml
@@ -454,22 +454,14 @@
ALL
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -503,15 +495,9 @@
-
-
-
+
-
-
-
-
@@ -2658,25 +2644,16 @@
ALL
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -2710,15 +2687,9 @@
-
-
-
+
-
-
-
-
diff --git a/trunk/dist/game/data/stats/npcs/20400-20499.xml b/trunk/dist/game/data/stats/npcs/20400-20499.xml
index e34f60740b..0083afb272 100644
--- a/trunk/dist/game/data/stats/npcs/20400-20499.xml
+++ b/trunk/dist/game/data/stats/npcs/20400-20499.xml
@@ -4016,23 +4016,14 @@
ALL
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -4066,15 +4057,9 @@
-
-
-
+
-
-
-
-
@@ -4510,21 +4495,14 @@
ORC
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -4558,15 +4536,9 @@
-
-
-
+
-
-
-
-
@@ -4609,21 +4581,14 @@
ORC
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -4657,15 +4622,9 @@
-
-
-
+
-
-
-
-
diff --git a/trunk/dist/game/data/stats/npcs/20500-20599.xml b/trunk/dist/game/data/stats/npcs/20500-20599.xml
index ed813c2553..84d1d0450f 100644
--- a/trunk/dist/game/data/stats/npcs/20500-20599.xml
+++ b/trunk/dist/game/data/stats/npcs/20500-20599.xml
@@ -1,4 +1,3 @@
-
@@ -848,23 +847,14 @@
ALL
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -898,15 +888,9 @@
-
-
-
+
-
-
-
-
diff --git a/trunk/dist/game/data/stats/npcs/25300-25399.xml b/trunk/dist/game/data/stats/npcs/25300-25399.xml
index 00d67af91f..14c1b50f53 100644
--- a/trunk/dist/game/data/stats/npcs/25300-25399.xml
+++ b/trunk/dist/game/data/stats/npcs/25300-25399.xml
@@ -4039,7 +4039,7 @@
MALE
-
+
@@ -4072,28 +4072,22 @@
true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/dist/game/data/stats/npcs/25900-25999.xml b/trunk/dist/game/data/stats/npcs/25900-25999.xml
index a505d3b5d2..40ab9d701e 100644
--- a/trunk/dist/game/data/stats/npcs/25900-25999.xml
+++ b/trunk/dist/game/data/stats/npcs/25900-25999.xml
@@ -3112,8 +3112,8 @@
-
-
+
+
HUMAN
FEMALE
@@ -3124,13 +3124,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
HUMAN
FEMALE
@@ -3141,13 +3198,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
HUMAN
FEMALE
@@ -3158,30 +3272,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- HUMAN
- FEMALE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
HUMAN
FEMALE
@@ -3192,10 +3346,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HUMAN
+ FEMALE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+