diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index eb31345d8e3066bb05ac597e113296cf859052f8..58f2a3a6b34563c1b9f3509e90ab9fe13fdb7bdb 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -4780,8 +4780,8 @@ local function upgradeStore(store, storename)
 	for k,_ in pairs(store) do priorities[k] = 0 end
 	store.__priorities = priorities
 	local sorted = {}
-	for id, _ in pairs(self[store].__priorities) do
-		sorted[#sorted + 1] = {self[store].__priorities[id], self[store][id], convertToString(id), id}
+	for id, _ in pairs(store.__priorities) do
+		sorted[#sorted + 1] = {store.__priorities[id], store[id], convertToString(id), id}
 	end
 	table.sort(sorted, callbackKeyLess)
 	store.__sorted = sorted
diff --git a/game/modules/tome/data/gfx/shockbolt/attachements.lua b/game/modules/tome/data/gfx/shockbolt/attachements.lua
index d6648c3317a4c39d6152c79478b65617a88e0e35..4f1c6d32a22d930b8cdf0c62596e3c717bec3ca7 100644
--- a/game/modules/tome/data/gfx/shockbolt/attachements.lua
+++ b/game/modules/tome/data/gfx/shockbolt/attachements.lua
@@ -2,95 +2,95 @@ tiles={} dolls={}
 
 tiles["npc/humanoid_shalore_elven_guard.png"] = { base=64,
 	feet = {x=33, y=61},
+	back = {x=32, y=15},
 	belly = {x=32, y=28},
 	hand1 = {x=13, y=31},
-	back = {x=32, y=15},
 	head = {x=31, y=5},
 }
-tiles["npc/humanoid_human_gladiator.png"] = { base=64,
-	feet = {x=35, y=58},
-	hand1 = {x=13, y=35},
-	hand2 = {x=53, y=36},
-	back = {x=34, y=19},
-	belly = {x=35, y=31},
-	head = {x=32, y=7},
+tiles["npc/humanoid_player_default.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=21, y=35},
+	hand2 = {x=44, y=36},
+	back = {x=32, y=14},
+	belly = {x=33, y=28},
+	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_high_gladiator.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=8, y=13},
 	hand2 = {x=55, y=33},
-	back = {x=34, y=17},
 	belly = {x=33, y=30},
+	back = {x=34, y=17},
 	head = {x=30, y=7},
 }
 tiles["npc/humanoid_shalore_elvala_guard.png"] = { base=64,
 	feet = {x=32, y=61},
+	back = {x=31, y=15},
 	belly = {x=31, y=27},
 	hand1 = {x=13, y=30},
-	back = {x=31, y=15},
 	head = {x=31, y=5},
 }
 tiles["npc/humanoid_naga_slasul.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=11, y=30},
 	hand2 = {x=46, y=-2},
-	belly = {x=23, y=14},
 	back = {x=23, y=3},
+	belly = {x=23, y=14},
 	head = {x=24, y=-12},
 }
 tiles["npc/humanoid_human_human_citizen.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=11, y=13},
 	hand2 = {x=47, y=30},
-	back = {x=36, y=16},
 	belly = {x=36, y=28},
+	back = {x=36, y=16},
 	head = {x=36, y=5},
 }
 tiles["npc/humanoid_yeek_yeek_psionic.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=31, y=38},
 	hand2 = {x=33, y=38},
-	belly = {x=32, y=34},
 	back = {x=32, y=23},
+	belly = {x=32, y=34},
 	head = {x=32, y=12},
 }
 tiles["npc/humanoid_orc_vor__grand_geomancer_of_the_pride.png"] = { base=64,
 	feet = {x=32, y=60},
 	hand1 = {x=4, y=34},
 	hand2 = {x=58, y=39},
-	belly = {x=32, y=35},
 	back = {x=33, y=20},
+	belly = {x=32, y=35},
 	head = {x=34, y=9},
 }
 tiles["npc/humanoid_human_ziguranth_wyrmic.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=12, y=32},
 	hand2 = {x=51, y=34},
-	belly = {x=33, y=30},
 	back = {x=32, y=16},
+	belly = {x=33, y=30},
 	head = {x=32, y=4},
 }
 tiles["npc/humanoid_shalore_elven_warrior.png"] = { base=64,
 	feet = {x=32, y=61},
+	back = {x=31, y=14},
 	belly = {x=31, y=26},
 	hand1 = {x=13, y=31},
-	back = {x=31, y=14},
 	head = {x=31, y=5},
 }
 tiles["npc/humanoid_shalore_elandar.png"] = { base=64,
 	feet = {x=34, y=59},
 	hand1 = {x=13, y=26},
 	hand2 = {x=50, y=-12},
-	belly = {x=33, y=22},
 	back = {x=30, y=8},
+	belly = {x=33, y=22},
 	head = {x=29, y=-2},
 }
 tiles["npc/humanoid_human_high_sun_paladin_rodmour.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=12, y=35},
 	hand2 = {x=48, y=36},
-	back = {x=32, y=15},
 	belly = {x=32, y=29},
+	back = {x=32, y=15},
 	head = {x=32, y=3},
 }
 dolls.race_runic_golem = dolls.race_runic_golem or {}
@@ -98,32 +98,32 @@ dolls.race_runic_golem.all = { base=64,
 	feet = {x=54, y=43},
 	hand1 = {x=29, y=18},
 	hand2 = {x=22, y=28},
-	belly = {x=43, y=49},
 	back = {x=28, y=48},
+	belly = {x=43, y=49},
 	head = {x=39, y=29},
 }
 tiles["npc/humanoid_human_assassin_lord.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=10, y=10},
 	hand2 = {x=56, y=34},
-	back = {x=31, y=16},
 	belly = {x=32, y=28},
+	back = {x=31, y=16},
 	head = {x=32, y=5},
 }
-tiles["npc/humanoid_human_hexer.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=26, y=25},
-	hand2 = {x=37, y=25},
-	back = {x=31, y=16},
-	belly = {x=32, y=37},
-	head = {x=31, y=3},
+tiles["npc/humanoid_human_rogue.png"] = { base=64,
+	feet = {x=36, y=58},
+	hand1 = {x=8, y=36},
+	hand2 = {x=55, y=29},
+	back = {x=30, y=21},
+	belly = {x=30, y=31},
+	head = {x=27, y=7},
 }
 tiles["npc/humanoid_dwarf_norgan.png"] = { base=64,
 	feet = {x=41, y=57},
 	hand1 = {x=15, y=40},
 	hand2 = {x=47, y=19},
-	back = {x=32, y=23},
 	belly = {x=35, y=37},
+	back = {x=32, y=23},
 	head = {x=27, y=8},
 }
 dolls.race_human = dolls.race_human or {}
@@ -131,64 +131,64 @@ dolls.race_human.male = { base=64,
 	feet = {x=32, y=60},
 	hand1 = {x=15, y=32},
 	hand2 = {x=48, y=34},
-	belly = {x=32, y=28},
 	back = {x=32, y=15},
+	belly = {x=32, y=28},
 	head = {x=30, y=3},
 }
 tiles["npc/humanoid_yaech_murgol__the_yaech_lord.png"] = { base=64,
 	feet = {x=56, y=58},
 	hand1 = {x=7, y=28},
 	hand2 = {x=20, y=32},
-	belly = {x=38, y=39},
 	back = {x=38, y=31},
+	belly = {x=38, y=39},
 	head = {x=32, y=16},
 }
 tiles["npc/humanoid_human_the_possessed.png"] = { base=64,
 	feet = {x=30, y=62},
 	hand1 = {x=9, y=17},
 	hand2 = {x=47, y=37},
-	belly = {x=33, y=35},
 	back = {x=33, y=17},
+	belly = {x=33, y=35},
 	head = {x=33, y=4},
 }
-tiles["npc/humanoid_halfling_master_slinger.png"] = { base=64,
-	feet = {x=39, y=59},
-	hand1 = {x=15, y=42},
-	hand2 = {x=47, y=10},
-	back = {x=31, y=27},
-	belly = {x=32, y=38},
-	head = {x=28, y=14},
+tiles["npc/humanoid_halfling_halfling_guard.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=8, y=28},
+	hand2 = {x=54, y=43},
+	belly = {x=36, y=36},
+	back = {x=33, y=24},
+	head = {x=30, y=10},
 }
 tiles["npc/humanoid_thalore_mindworm.png"] = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=21, y=36},
 	hand2 = {x=44, y=35},
-	belly = {x=32, y=30},
 	back = {x=31, y=13},
+	belly = {x=32, y=30},
 	head = {x=31, y=6},
 }
 tiles["npc/humanoid_shalore_grand_corruptor.png"] = { base=64,
 	feet = {x=25, y=61},
 	hand1 = {x=11, y=34},
 	hand2 = {x=53, y=17},
-	belly = {x=28, y=31},
 	back = {x=28, y=19},
+	belly = {x=28, y=31},
 	head = {x=28, y=10},
 }
-tiles["npc/humanoid_human_harno__herald_of_last_hope.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=16, y=37},
-	hand2 = {x=45, y=36},
-	back = {x=30, y=15},
-	belly = {x=31, y=31},
-	head = {x=29, y=4},
+tiles["npc/humanoid_shalore_elven_blood_mage.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=15, y=36},
+	hand2 = {x=46, y=36},
+	back = {x=30, y=17},
+	belly = {x=30, y=33},
+	head = {x=30, y=7},
 }
 tiles["npc/humanoid_human_slave_combatant.png"] = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=18, y=37},
 	hand2 = {x=47, y=32},
-	belly = {x=31, y=29},
 	back = {x=30, y=17},
+	belly = {x=31, y=29},
 	head = {x=29, y=6},
 }
 dolls.race_elf = dolls.race_elf or {}
@@ -196,62 +196,62 @@ dolls.race_elf.male = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=19, y=32},
 	hand2 = {x=44, y=34},
-	belly = {x=33, y=27},
 	back = {x=32, y=15},
+	belly = {x=33, y=27},
 	head = {x=30, y=4},
 }
 tiles["npc/humanoid_male_sluttymaid.png"] = { base=64,
 	feet = {x=30, y=60},
 	hand1 = {x=24, y=30},
 	hand2 = {x=41, y=21},
-	belly = {x=35, y=24},
 	back = {x=35, y=11},
+	belly = {x=35, y=24},
 	head = {x=35, y=0},
 }
 tiles["npc/humanoid_elf_limmir_the_jeweler.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=11, y=37},
 	hand2 = {x=49, y=9},
-	back = {x=31, y=19},
 	belly = {x=31, y=30},
+	back = {x=31, y=19},
 	head = {x=32, y=4},
 }
 tiles["npc/canine_warg.png"] = { base=64,
 	feet = {x=15, y=18},
 	hand1 = {x=48, y=22},
 	hand2 = {x=46, y=48},
-	belly = {x=12, y=32},
 	back = {x=26, y=51},
+	belly = {x=12, y=32},
 	head = {x=33, y=13},
 }
 tiles["npc/humanoid_human_cryomancer.png"] = { base=64,
 	feet = {x=37, y=59},
 	hand1 = {x=22, y=6},
 	hand2 = {x=44, y=32},
-	back = {x=35, y=16},
 	belly = {x=36, y=28},
+	back = {x=35, y=16},
 	head = {x=34, y=5},
 }
 tiles["npc/acid_ant.png"] = { base=64,
 	feet = {x=36, y=57},
 	back = {x=45, y=37},
 	hand2 = {x=51, y=17},
-	hand1 = {x=32, y=22},
 	belly = {x=11, y=33},
+	hand1 = {x=32, y=22},
 	head = {x=15, y=13},
 }
 tiles["npc/humanoid_shalore_elven_corruptor.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=12, y=17},
 	hand2 = {x=48, y=34},
-	belly = {x=31, y=33},
 	back = {x=31, y=20},
+	belly = {x=31, y=33},
 	head = {x=31, y=10},
 }
 tiles["npc/humanoid_human_townsfolk_village_idiot01_64.png"] = { base=64,
-	back = {x=33, y=24},
-	feet = {x=35, y=58},
 	belly = {x=37, y=34},
+	feet = {x=35, y=58},
+	back = {x=33, y=24},
 	head = {x=32, y=8},
 }
 dolls.race_halfling = dolls.race_halfling or {}
@@ -259,16 +259,16 @@ dolls.race_halfling.female = { base=64,
 	feet = {x=34, y=62},
 	hand1 = {x=12, y=38},
 	hand2 = {x=50, y=40},
-	back = {x=32, y=24},
 	belly = {x=34, y=36},
+	back = {x=32, y=24},
 	head = {x=32, y=12},
 }
 tiles["npc/humanoid_elf_elven_sun_mage.png"] = { base=64,
 	feet = {x=35, y=62},
 	hand1 = {x=13, y=28},
 	hand2 = {x=50, y=37},
-	back = {x=32, y=16},
 	belly = {x=34, y=35},
+	back = {x=32, y=16},
 	head = {x=31, y=4},
 }
 dolls.race_halfling = dolls.race_halfling or {}
@@ -276,25 +276,25 @@ dolls.race_halfling.male = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=14, y=39},
 	hand2 = {x=50, y=39},
-	back = {x=32, y=25},
 	belly = {x=33, y=36},
+	back = {x=32, y=25},
 	head = {x=32, y=14},
 }
-tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { base=64,
-	feet = {x=35, y=57},
-	hand1 = {x=16, y=39},
-	hand2 = {x=52, y=39},
-	belly = {x=33, y=30},
-	back = {x=33, y=19},
-	head = {x=32, y=7},
+tiles["npc/humanoid_human_arcane_blade.png"] = { base=64,
+	feet = {x=26, y=61},
+	hand1 = {x=17, y=3},
+	hand2 = {x=38, y=35},
+	belly = {x=27, y=29},
+	back = {x=27, y=22},
+	head = {x=29, y=13},
 }
 dolls.race_ghoul = dolls.race_ghoul or {}
 dolls.race_ghoul.all = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=20, y=37},
 	hand2 = {x=48, y=38},
-	belly = {x=33, y=38},
 	back = {x=34, y=20},
+	belly = {x=33, y=38},
 	head = {x=33, y=8},
 }
 tiles["npc/animal_feline_snow_cat.png"] = { base=64,
@@ -304,47 +304,47 @@ tiles["npc/humanoid_human_master_alchemist.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=7, y=18},
 	hand2 = {x=57, y=35},
-	belly = {x=37, y=28},
 	back = {x=34, y=18},
+	belly = {x=37, y=28},
 	head = {x=29, y=8},
 }
-tiles["npc/humanoid_orc_orc_grand_summoner.png"] = { base=64,
-	feet = {x=29, y=60},
-	hand1 = {x=9, y=8},
-	hand2 = {x=55, y=35},
-	belly = {x=32, y=30},
-	back = {x=34, y=18},
-	head = {x=36, y=7},
+tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { base=64,
+	feet = {x=36, y=57},
+	hand1 = {x=17, y=23},
+	hand2 = {x=18, y=35},
+	back = {x=32, y=18},
+	belly = {x=36, y=31},
+	head = {x=28, y=5},
 }
 tiles["npc/humanoid_human_human_guard.png"] = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=19, y=29},
 	hand2 = {x=46, y=25},
-	back = {x=30, y=17},
 	belly = {x=31, y=30},
+	back = {x=30, y=17},
 	head = {x=28, y=5},
 }
 tiles["npc/humanoid_shalore_elven_elite_warrior.png"] = { base=64,
 	feet = {x=33, y=62},
+	back = {x=31, y=15},
 	belly = {x=31, y=27},
 	hand1 = {x=13, y=32},
-	back = {x=31, y=15},
 	head = {x=32, y=6},
 }
-tiles["npc/humanoid_human_riala_shalarak.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=17, y=7},
-	hand2 = {x=58, y=30},
-	belly = {x=34, y=27},
-	back = {x=35, y=17},
-	head = {x=33, y=5},
+tiles["npc/humanoid_orc_orc_assassin.png"] = { base=64,
+	feet = {x=36, y=60},
+	hand1 = {x=4, y=30},
+	hand2 = {x=40, y=3},
+	back = {x=33, y=20},
+	belly = {x=42, y=29},
+	head = {x=24, y=11},
 }
 tiles["npc/humanoid_yaech_slaver.png"] = { base=64,
 	feet = {x=46, y=58},
 	hand1 = {x=16, y=28},
 	hand2 = {x=51, y=10},
-	belly = {x=38, y=34},
 	back = {x=37, y=25},
+	belly = {x=38, y=34},
 	head = {x=28, y=17},
 }
 dolls.race_human = dolls.race_human or {}
@@ -352,33 +352,33 @@ dolls.race_human.female = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=20, y=33},
 	hand2 = {x=46, y=33},
-	back = {x=33, y=16},
 	belly = {x=34, y=28},
+	back = {x=33, y=16},
 	head = {x=32, y=3},
 }
-tiles["npc/humanoid_human_human_sun_paladin.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=14, y=32},
-	hand2 = {x=46, y=32},
-	back = {x=31, y=17},
-	belly = {x=31, y=29},
-	head = {x=31, y=5},
+tiles["npc/humanoid_orc_orc_greatmother.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=4, y=-4},
+	hand2 = {x=58, y=2},
+	back = {x=32, y=-40},
+	belly = {x=30, y=-3},
+	head = {x=33, y=-55},
 }
-tiles["npc/humanoid_human_shady_cornac_man.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=19, y=35},
-	hand2 = {x=49, y=35},
-	belly = {x=33, y=29},
-	back = {x=32, y=17},
-	head = {x=29, y=4},
+tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { base=64,
+	feet = {x=31, y=59},
+	hand1 = {x=10, y=20},
+	hand2 = {x=23, y=35},
+	back = {x=30, y=21},
+	belly = {x=32, y=35},
+	head = {x=31, y=11},
 }
 dolls.race_dwarf = dolls.race_dwarf or {}
 dolls.race_dwarf.male = { base=64,
 	feet = {x=34, y=61},
 	back = {x=32, y=25},
 	hand2 = {x=55, y=39},
-	hand1 = {x=10, y=39},
 	belly = {x=34, y=34},
+	hand1 = {x=10, y=39},
 	head = {x=32, y=10},
 }
 dolls.race_dwarf = dolls.race_dwarf or {}
@@ -386,8 +386,8 @@ dolls.race_dwarf.female = { base=64,
 	feet = {x=33, y=59},
 	back = {x=33, y=25},
 	hand2 = {x=55, y=39},
-	hand1 = {x=9, y=39},
 	belly = {x=33, y=37},
+	hand1 = {x=9, y=39},
 	head = {x=33, y=9},
 }
 dolls.race_skeleton = dolls.race_skeleton or {}
@@ -395,8 +395,8 @@ dolls.race_skeleton.all = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=15, y=33},
 	hand2 = {x=47, y=34},
-	back = {x=31, y=16},
 	belly = {x=32, y=26},
+	back = {x=31, y=16},
 	head = {x=30, y=4},
 }
 dolls.race_yeek = dolls.race_yeek or {}
@@ -404,1240 +404,1240 @@ dolls.race_yeek.all = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=16, y=39},
 	hand2 = {x=46, y=40},
-	back = {x=31, y=26},
 	belly = {x=32, y=36},
+	back = {x=31, y=26},
 	head = {x=31, y=12},
 }
-tiles["npc/humanoid_orc_orc_cryomancer.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=5, y=14},
-	hand2 = {x=57, y=30},
-	belly = {x=36, y=31},
-	back = {x=29, y=17},
-	head = {x=23, y=7},
+tiles["npc/humanoid_orc_orc_blood_mage.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=11, y=36},
+	hand2 = {x=57, y=37},
+	back = {x=33, y=17},
+	belly = {x=34, y=32},
+	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_aluin_the_fallen.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=18, y=36},
 	hand2 = {x=41, y=38},
-	back = {x=29, y=18},
 	belly = {x=29, y=29},
+	back = {x=29, y=18},
 	head = {x=28, y=5},
 }
-tiles["npc/humanoid_orc_orc_pyromancer.png"] = { base=64,
-	feet = {x=28, y=61},
-	hand1 = {x=6, y=30},
-	hand2 = {x=59, y=15},
-	belly = {x=28, y=30},
-	back = {x=30, y=17},
-	head = {x=40, y=5},
+tiles["npc/humanoid_human_fryjia_loren.png"] = { base=64,
+	feet = {x=32, y=58},
+	hand1 = {x=17, y=31},
+	hand2 = {x=45, y=41},
+	belly = {x=29, y=32},
+	back = {x=29, y=21},
+	head = {x=29, y=8},
 }
-tiles["npc/humanoid_orc_orc_warrior.png"] = { base=64,
-	feet = {x=35, y=61},
-	hand1 = {x=8, y=38},
-	hand2 = {x=57, y=35},
-	belly = {x=34, y=34},
-	back = {x=29, y=20},
-	head = {x=25, y=9},
+tiles["npc/humanoid_orc_orc_fighter.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=7, y=8},
+	hand2 = {x=57, y=39},
+	back = {x=35, y=20},
+	belly = {x=31, y=34},
+	head = {x=39, y=10},
 }
-tiles["npc/humanoid_human_linaniil_supreme_archmage.png"] = { base=64,
-	feet = {x=38, y=60},
-	hand1 = {x=10, y=7},
-	hand2 = {x=49, y=29},
-	back = {x=35, y=1},
-	belly = {x=37, y=19},
-	head = {x=31, y=-13},
+tiles["npc/humanoid_human_lost_merchant.png"] = { base=64,
+	feet = {x=35, y=59},
+	back = {x=32, y=24},
+	belly = {x=35, y=36},
+	hand1 = {x=16, y=47},
+	head = {x=30, y=5},
 }
 tiles["npc/humanoid_elf_elven_archer.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=13, y=32},
 	hand2 = {x=51, y=32},
-	back = {x=32, y=15},
 	belly = {x=32, y=28},
+	back = {x=32, y=15},
 	head = {x=32, y=5},
 }
-tiles["npc/humanoid_human_melnela.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=17, y=8},
-	hand2 = {x=58, y=30},
-	belly = {x=35, y=31},
-	back = {x=35, y=19},
-	head = {x=33, y=6},
+tiles["npc/humanoid_human_subject_z.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=8, y=11},
+	hand2 = {x=55, y=11},
+	back = {x=31, y=15},
+	belly = {x=31, y=27},
+	head = {x=32, y=3},
 }
-tiles["npc/humanoid_human_sand_wyrmic.png"] = { base=64,
-	feet = {x=29, y=60},
-	hand1 = {x=10, y=38},
-	hand2 = {x=58, y=17},
-	belly = {x=31, y=30},
-	back = {x=32, y=19},
-	head = {x=37, y=8},
+tiles["npc/humanoid_dwarf_dwarven_earthwarden.png"] = { base=64,
+	feet = {x=34, y=58},
+	back = {x=36, y=22},
+	hand2 = {x=51, y=36},
+	belly = {x=35, y=37},
+	hand1 = {x=20, y=37},
+	head = {x=35, y=7},
 }
-tiles["npc/humanoid_human_rej_arkatis.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=24, y=17},
-	hand2 = {x=38, y=19},
-	belly = {x=33, y=26},
-	back = {x=33, y=15},
-	head = {x=32, y=4},
+tiles["npc/humanoid_human_shadowblade.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=8, y=15},
+	hand2 = {x=56, y=40},
+	back = {x=34, y=21},
+	belly = {x=28, y=31},
+	head = {x=37, y=9},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { base=64,
-	feet = {x=31, y=61},
-	hand1 = {x=12, y=22},
-	hand2 = {x=24, y=35},
-	belly = {x=32, y=34},
-	back = {x=30, y=21},
-	head = {x=30, y=12},
+tiles["npc/humanoid_human_enthralled_slave.png"] = { base=64,
+	feet = {x=33, y=58},
+	hand1 = {x=16, y=35},
+	hand2 = {x=47, y=36},
+	belly = {x=32, y=29},
+	back = {x=32, y=18},
+	head = {x=31, y=5},
 }
-tiles["npc/humanoid_halfling_halfling_slinger.png"] = { base=64,
-	feet = {x=27, y=57},
-	hand1 = {x=16, y=15},
-	hand2 = {x=55, y=30},
-	back = {x=33, y=32},
-	belly = {x=31, y=42},
-	head = {x=36, y=19},
+tiles["npc/humanoid_human_trickster.png"] = { base=64,
+	feet = {x=36, y=60},
+	back = {x=35, y=17},
+	hand2 = {x=5, y=32},
+	belly = {x=37, y=29},
+	head = {x=30, y=6},
 }
 tiles["npc/humanoid_orc_orc_archer.png"] = { base=64,
 	feet = {x=30, y=60},
 	hand1 = {x=20, y=29},
 	hand2 = {x=56, y=30},
-	belly = {x=31, y=34},
 	back = {x=30, y=20},
+	belly = {x=31, y=34},
 	head = {x=31, y=10},
 }
-tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { base=64,
-	feet = {x=29, y=60},
-	hand1 = {x=9, y=32},
-	hand2 = {x=58, y=18},
-	belly = {x=28, y=33},
-	back = {x=30, y=20},
-	head = {x=39, y=10},
+tiles["npc/humanoid_human_storm_wyrmic.png"] = { base=64,
+	feet = {x=34, y=60},
+	hand1 = {x=15, y=32},
+	hand2 = {x=53, y=37},
+	back = {x=31, y=21},
+	belly = {x=31, y=31},
+	head = {x=27, y=9},
 }
 tiles["npc/humanoid_halfling_sm_halfling.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=10, y=14},
 	hand2 = {x=52, y=11},
-	back = {x=30, y=23},
 	belly = {x=30, y=35},
+	back = {x=30, y=23},
 	head = {x=31, y=7},
 }
-tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=11, y=37},
-	hand2 = {x=53, y=29},
-	belly = {x=31, y=33},
-	back = {x=29, y=16},
-	head = {x=29, y=4},
+tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { base=64,
+	feet = {x=39, y=60},
+	hand1 = {x=16, y=40},
+	hand2 = {x=58, y=36},
+	back = {x=33, y=21},
+	belly = {x=36, y=32},
+	head = {x=30, y=13},
 }
-tiles["npc/humanoid_human_bandit.png"] = { base=64,
-	feet = {x=39, y=56},
-	hand1 = {x=8, y=40},
-	hand2 = {x=51, y=26},
-	back = {x=30, y=16},
-	belly = {x=33, y=28},
-	head = {x=29, y=5},
+tiles["npc/humanoid_human_tannen.png"] = { base=64,
+	feet = {x=37, y=60},
+	hand1 = {x=10, y=16},
+	hand2 = {x=56, y=14},
+	back = {x=31, y=15},
+	belly = {x=35, y=28},
+	head = {x=29, y=4},
 }
 tiles["npc/humanoid_elf_star_crusader.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=11, y=30},
 	hand2 = {x=51, y=33},
-	back = {x=34, y=17},
 	belly = {x=34, y=30},
+	back = {x=34, y=17},
 	head = {x=34, y=4},
 }
 tiles["npc/humanoid_elf_high_chronomancer_zemekkys.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=11, y=36},
 	hand2 = {x=51, y=38},
-	back = {x=32, y=19},
 	belly = {x=32, y=29},
+	back = {x=32, y=19},
 	head = {x=30, y=6},
 }
 tiles["npc/humanoid_yaech_yaech_psion.png"] = { base=64,
 	feet = {x=5, y=58},
 	hand1 = {x=55, y=27},
 	hand2 = {x=42, y=32},
-	belly = {x=25, y=40},
 	back = {x=23, y=31},
+	belly = {x=25, y=40},
 	head = {x=33, y=15},
 }
 tiles["npc/humanoid_orc_orc_corruptor.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=15, y=39},
 	hand2 = {x=51, y=37},
-	belly = {x=34, y=36},
 	back = {x=31, y=17},
+	belly = {x=34, y=36},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_halfling_halfling_gardener.png"] = { base=64,
 	feet = {x=33, y=58},
 	hand1 = {x=17, y=36},
 	hand2 = {x=48, y=38},
-	back = {x=31, y=22},
 	belly = {x=31, y=32},
+	back = {x=31, y=22},
 	head = {x=29, y=8},
 }
-tiles["npc/humanoid_human_argoniel.png"] = { base=64,
-	feet = {x=30, y=59},
-	hand1 = {x=9, y=2},
-	hand2 = {x=57, y=9},
-	back = {x=32, y=10},
-	belly = {x=32, y=22},
-	head = {x=32, y=-3},
+tiles["npc/humanoid_human_cutpurse.png"] = { base=64,
+	feet = {x=36, y=59},
+	hand1 = {x=9, y=34},
+	hand2 = {x=46, y=34},
+	belly = {x=30, y=29},
+	back = {x=29, y=18},
+	head = {x=28, y=7},
 }
 tiles["npc/humanoid_orc_fiery_orc_wyrmic.png"] = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=20, y=20},
 	hand2 = {x=57, y=36},
-	belly = {x=32, y=31},
 	back = {x=30, y=21},
+	belly = {x=32, y=31},
 	head = {x=25, y=9},
 }
 tiles["npc/humanoid_orc_ukruk_the_fierce.png"] = { base=64,
 	feet = {x=34, y=60},
+	back = {x=28, y=17},
 	belly = {x=29, y=33},
 	hand1 = {x=10, y=38},
-	back = {x=28, y=17},
 	head = {x=25, y=8},
 }
-tiles["npc/humanoid_human_storm_wyrmic.png"] = { base=64,
-	feet = {x=34, y=60},
-	hand1 = {x=15, y=32},
-	hand2 = {x=53, y=37},
-	belly = {x=31, y=31},
-	back = {x=31, y=21},
-	head = {x=27, y=9},
+tiles["npc/humanoid_human_hexer.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=26, y=25},
+	hand2 = {x=37, y=25},
+	belly = {x=32, y=37},
+	back = {x=31, y=16},
+	head = {x=31, y=3},
 }
-tiles["npc/humanoid_orc_orc_child.png"] = { base=64,
-	feet = {x=31, y=55},
-	hand1 = {x=8, y=36},
-	hand2 = {x=48, y=35},
-	belly = {x=30, y=32},
-	back = {x=29, y=24},
-	head = {x=25, y=12},
+tiles["npc/humanoid_orc_young_orc.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=14, y=10},
+	hand2 = {x=52, y=40},
+	back = {x=32, y=19},
+	belly = {x=35, y=32},
+	head = {x=30, y=8},
 }
-tiles["npc/humanoid_human_townsfolk_farmer_maggot01_64.png"] = { base=64,
-	feet = {x=36, y=60},
-	hand1 = {x=11, y=31},
-	hand2 = {x=51, y=25},
-	belly = {x=36, y=37},
-	back = {x=35, y=25},
-	head = {x=34, y=11},
+tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { base=64,
+	feet = {x=35, y=57},
+	hand1 = {x=16, y=39},
+	hand2 = {x=52, y=39},
+	back = {x=33, y=19},
+	belly = {x=33, y=30},
+	head = {x=32, y=7},
 }
-tiles["npc/humanoid_human_pyromancer.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=19, y=7},
-	hand2 = {x=41, y=32},
-	belly = {x=34, y=29},
-	back = {x=32, y=17},
-	head = {x=32, y=4},
+tiles["npc/humanoid_orc_orc_master_assassin.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=4, y=39},
+	hand2 = {x=59, y=32},
+	back = {x=29, y=18},
+	belly = {x=30, y=30},
+	head = {x=28, y=8},
 }
-tiles["npc/humanoid_halfling_halfling_citizen.png"] = { base=64,
-	feet = {x=31, y=58},
-	hand1 = {x=13, y=38},
-	hand2 = {x=48, y=41},
-	back = {x=30, y=22},
-	belly = {x=31, y=33},
-	head = {x=30, y=8},
+tiles["npc/humanoid_human_spectator.png"] = { base=64,
+	feet = {x=37, y=59},
+	back = {x=35, y=17},
+	belly = {x=36, y=29},
+	hand1 = {x=50, y=37},
+	head = {x=34, y=5},
 }
 tiles["npc/humanoid_dwarf_dwarven_guard.png"] = { base=64,
 	feet = {x=30, y=59},
 	hand1 = {x=13, y=40},
 	hand2 = {x=40, y=22},
-	belly = {x=29, y=36},
 	back = {x=29, y=23},
+	belly = {x=29, y=36},
 	head = {x=28, y=6},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_03.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=17, y=42},
-	hand2 = {x=50, y=44},
-	belly = {x=33, y=36},
-	back = {x=32, y=24},
-	head = {x=31, y=12},
+tiles["npc/humanoid_halfling_protector_myssil.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=16, y=43},
+	hand2 = {x=45, y=39},
+	belly = {x=31, y=34},
+	back = {x=30, y=22},
+	head = {x=30, y=7},
 }
 tiles["npc/humanoid_human_townsfolk_blubbering_idiot01_64.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=19, y=41},
 	hand2 = {x=47, y=40},
-	belly = {x=31, y=33},
 	back = {x=31, y=19},
+	belly = {x=31, y=33},
 	head = {x=29, y=7},
 }
 tiles["npc/humanoid_human_townsfolk_meanlooking_mercenary01_64.png"] = { base=64,
 	feet = {x=35, y=58},
+	back = {x=36, y=19},
 	belly = {x=36, y=30},
 	hand1 = {x=8, y=29},
-	back = {x=36, y=19},
 	head = {x=33, y=6},
 }
-tiles["npc/humanoid_human_fryjia_loren.png"] = { base=64,
-	feet = {x=32, y=58},
-	hand1 = {x=17, y=31},
-	hand2 = {x=45, y=41},
-	back = {x=29, y=21},
-	belly = {x=29, y=32},
-	head = {x=29, y=8},
+tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=14, y=31},
+	hand2 = {x=58, y=33},
+	back = {x=38, y=15},
+	belly = {x=38, y=26},
+	head = {x=35, y=3},
 }
-tiles["npc/humanoid_yaech_yaech_hunter.png"] = { base=64,
-	feet = {x=6, y=7},
-	hand1 = {x=33, y=50},
-	hand2 = {x=59, y=37},
-	belly = {x=23, y=29},
-	back = {x=34, y=29},
-	head = {x=46, y=19},
+tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=17, y=40},
+	hand2 = {x=50, y=44},
+	back = {x=32, y=25},
+	belly = {x=32, y=36},
+	head = {x=32, y=8},
 }
 tiles["npc/humanoid_shalore_shalore_rune_master.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=17, y=34},
 	hand2 = {x=48, y=34},
-	belly = {x=33, y=30},
 	back = {x=32, y=14},
+	belly = {x=33, y=30},
 	head = {x=32, y=4},
 }
 tiles["npc/humanoid_thalore_thalore_wilder.png"] = { base=64,
 	feet = {x=27, y=59},
 	hand1 = {x=11, y=31},
 	hand2 = {x=44, y=30},
-	belly = {x=28, y=23},
 	back = {x=29, y=11},
+	belly = {x=28, y=23},
 	head = {x=29, y=-1},
 }
 tiles["npc/humanoid_orc_rak_shor_cultist.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=5, y=39},
 	hand2 = {x=58, y=34},
-	belly = {x=30, y=35},
 	back = {x=29, y=19},
+	belly = {x=30, y=35},
 	head = {x=29, y=8},
 }
-tiles["npc/humanoid_orc_orc_grand_master_assassin.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=4, y=32},
-	hand2 = {x=60, y=39},
-	belly = {x=34, y=30},
-	back = {x=35, y=18},
-	head = {x=37, y=7},
+tiles["npc/humanoid_halfling_halfling_slinger.png"] = { base=64,
+	feet = {x=27, y=57},
+	hand1 = {x=16, y=15},
+	hand2 = {x=55, y=30},
+	belly = {x=31, y=42},
+	back = {x=33, y=32},
+	head = {x=36, y=19},
 }
-tiles["npc/humanoid_human_tempest.png"] = { base=64,
-	feet = {x=26, y=59},
-	hand1 = {x=19, y=31},
-	hand2 = {x=41, y=6},
-	belly = {x=26, y=30},
-	back = {x=27, y=16},
-	head = {x=28, y=4},
+tiles["npc/humanoid_human_melnela.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=17, y=8},
+	hand2 = {x=58, y=30},
+	back = {x=35, y=19},
+	belly = {x=35, y=31},
+	head = {x=33, y=6},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { base=64,
-	feet = {x=30, y=61},
-	hand1 = {x=10, y=22},
-	hand2 = {x=23, y=36},
-	belly = {x=31, y=36},
-	back = {x=31, y=22},
-	head = {x=30, y=13},
+tiles["npc/humanoid_elenulach_thief.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=18, y=37},
+	hand2 = {x=42, y=37},
+	belly = {x=30, y=32},
+	back = {x=30, y=17},
+	head = {x=30, y=6},
 }
 tiles["npc/humanoid_elf_fillarel_aldaren.png"] = { base=64,
 	feet = {x=25, y=59},
 	hand1 = {x=10, y=28},
 	hand2 = {x=49, y=7},
-	back = {x=24, y=3},
 	belly = {x=24, y=15},
+	back = {x=24, y=3},
 	head = {x=23, y=-12},
 }
 tiles["npc/humanoid_orc_grushnak__battlemaster_of_the_pride.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=10, y=40},
 	hand2 = {x=56, y=36},
-	belly = {x=30, y=32},
 	back = {x=30, y=18},
-	head = {x=30, y=11},
-}
-tiles["npc/humanoid_orc_orc_necromancer.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=7, y=39},
-	hand2 = {x=53, y=36},
 	belly = {x=30, y=32},
-	back = {x=28, y=17},
-	head = {x=29, y=6},
-}
-tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=17, y=40},
-	hand2 = {x=50, y=44},
-	belly = {x=32, y=36},
-	back = {x=32, y=25},
-	head = {x=32, y=8},
+	head = {x=30, y=11},
 }
-tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=14, y=31},
-	hand2 = {x=58, y=33},
-	belly = {x=38, y=26},
-	back = {x=38, y=15},
-	head = {x=35, y=3},
+tiles["npc/humanoid_human_tempest.png"] = { base=64,
+	feet = {x=26, y=59},
+	hand1 = {x=19, y=31},
+	hand2 = {x=41, y=6},
+	back = {x=27, y=16},
+	belly = {x=26, y=30},
+	head = {x=28, y=4},
 }
-tiles["npc/humanoid_halfling_protector_myssil.png"] = { base=64,
+tiles["npc/humanoid_human_human_sun_paladin.png"] = { base=64,
 	feet = {x=32, y=60},
-	hand1 = {x=16, y=43},
-	hand2 = {x=45, y=39},
-	back = {x=30, y=22},
-	belly = {x=31, y=34},
-	head = {x=30, y=7},
+	hand1 = {x=14, y=32},
+	hand2 = {x=46, y=32},
+	belly = {x=31, y=29},
+	back = {x=31, y=17},
+	head = {x=31, y=5},
+}
+tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { base=64,
+	feet = {x=31, y=61},
+	hand1 = {x=12, y=22},
+	hand2 = {x=24, y=35},
+	back = {x=30, y=21},
+	belly = {x=32, y=34},
+	head = {x=30, y=12},
 }
-tiles["npc/humanoid_naga_naga_tidecaller.png"] = { base=64,
+tiles["npc/humanoid_orc_orc_grand_master_assassin.png"] = { base=64,
 	feet = {x=33, y=61},
-	hand1 = {x=12, y=15},
-	hand2 = {x=47, y=-14},
-	belly = {x=30, y=7},
-	back = {x=27, y=-6},
-	head = {x=26, y=-17},
+	hand1 = {x=4, y=32},
+	hand2 = {x=60, y=39},
+	back = {x=35, y=18},
+	belly = {x=34, y=30},
+	head = {x=37, y=7},
+}
+tiles["npc/humanoid_naga_naga_tidewarden.png"] = { base=64,
+	feet = {x=32, y=61},
+	back = {x=32, y=-3},
+	belly = {x=32, y=9},
+	hand1 = {x=31, y=12},
+	head = {x=34, y=-15},
 }
 tiles["npc/humanoid_yeek_yeek_summoner.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=14, y=38},
 	hand2 = {x=48, y=37},
-	belly = {x=32, y=36},
 	back = {x=31, y=23},
+	belly = {x=32, y=36},
 	head = {x=30, y=10},
 }
 tiles["npc/humanoid_thalore_ziguranth_summoner.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=12, y=17},
 	hand2 = {x=49, y=39},
-	belly = {x=33, y=26},
 	back = {x=34, y=15},
+	belly = {x=33, y=26},
 	head = {x=32, y=4},
 }
-tiles["npc/humanoid_orc_orc_master_assassin.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=4, y=39},
-	hand2 = {x=59, y=32},
-	belly = {x=30, y=30},
-	back = {x=29, y=18},
-	head = {x=28, y=8},
+tiles["npc/humanoid_naga_naga_tidecaller.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=12, y=15},
+	hand2 = {x=47, y=-14},
+	back = {x=27, y=-6},
+	belly = {x=30, y=7},
+	head = {x=26, y=-17},
 }
-tiles["npc/humanoid_naga_naga_tidewarden.png"] = { base=64,
-	feet = {x=32, y=61},
-	belly = {x=32, y=9},
-	hand1 = {x=31, y=12},
-	back = {x=32, y=-3},
-	head = {x=34, y=-15},
+tiles["npc/humanoid_human_townsfolk_farmer_maggot01_64.png"] = { base=64,
+	feet = {x=36, y=60},
+	hand1 = {x=11, y=31},
+	hand2 = {x=51, y=25},
+	back = {x=35, y=25},
+	belly = {x=36, y=37},
+	head = {x=34, y=11},
 }
-tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=6, y=34},
-	hand2 = {x=57, y=31},
-	belly = {x=29, y=32},
-	back = {x=28, y=20},
-	head = {x=27, y=8},
+tiles["npc/humanoid_yeek_yeek_commoner_03.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=17, y=42},
+	hand2 = {x=50, y=44},
+	back = {x=32, y=24},
+	belly = {x=33, y=36},
+	head = {x=31, y=12},
 }
-tiles["npc/humanoid_orc_orc_soldier.png"] = { base=64,
-	feet = {x=36, y=62},
-	hand1 = {x=9, y=39},
-	hand2 = {x=58, y=36},
+tiles["npc/humanoid_orc_orc_warrior.png"] = { base=64,
+	feet = {x=35, y=61},
+	hand1 = {x=8, y=38},
+	hand2 = {x=57, y=35},
+	back = {x=29, y=20},
 	belly = {x=34, y=34},
-	back = {x=29, y=21},
 	head = {x=25, y=9},
 }
 tiles["npc/humanoid_naga_lady_zoisla_the_tidebringer.png"] = { base=64,
 	feet = {x=36, y=61},
 	hand1 = {x=9, y=-28},
 	hand2 = {x=49, y=-20},
-	belly = {x=30, y=-6},
 	back = {x=30, y=-19},
+	belly = {x=30, y=-6},
 	head = {x=30, y=-33},
 }
 tiles["npc/humanoid_yeek_yeek_mindslayer.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=23, y=34},
 	hand2 = {x=24, y=41},
-	belly = {x=30, y=37},
 	back = {x=31, y=22},
+	belly = {x=30, y=37},
 	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_great_gladiator.png"] = { base=64,
 	feet = {x=30, y=60},
 	hand1 = {x=17, y=35},
 	hand2 = {x=47, y=32},
-	back = {x=29, y=11},
 	belly = {x=31, y=25},
+	back = {x=29, y=11},
 	head = {x=29, y=0},
 }
 tiles["npc/humanoid_orc_gorbat__supreme_wyrmic_of_the_pride.png"] = { base=64,
 	feet = {x=38, y=60},
 	hand1 = {x=18, y=14},
 	hand2 = {x=53, y=45},
-	belly = {x=36, y=38},
 	back = {x=34, y=25},
+	belly = {x=36, y=38},
 	head = {x=33, y=12},
 }
 tiles["npc/humanoid_human_townsfolk_singing_happy_drunk01_64.png"] = { base=64,
 	feet = {x=36, y=58},
 	hand1 = {x=9, y=40},
 	hand2 = {x=52, y=16},
-	belly = {x=30, y=31},
 	back = {x=27, y=21},
+	belly = {x=30, y=31},
 	head = {x=23, y=10},
 }
-tiles["npc/humanoid_dwarf_dwarven_earthwarden.png"] = { base=64,
-	feet = {x=34, y=58},
-	back = {x=36, y=22},
-	hand2 = {x=51, y=36},
-	hand1 = {x=20, y=37},
-	belly = {x=35, y=37},
-	head = {x=35, y=7},
+tiles["npc/humanoid_human_bandit.png"] = { base=64,
+	feet = {x=39, y=56},
+	hand1 = {x=8, y=40},
+	hand2 = {x=51, y=26},
+	belly = {x=33, y=28},
+	back = {x=30, y=16},
+	head = {x=29, y=5},
 }
 dolls.race_orc = dolls.race_orc or {}
 dolls.race_orc.all = { base=64,
 	feet = {x=34, y=62},
 	hand1 = {x=13, y=37},
 	hand2 = {x=52, y=38},
-	back = {x=32, y=23},
 	belly = {x=33, y=34},
+	back = {x=32, y=23},
 	head = {x=32, y=9},
 }
 tiles["npc/humanoid_orc_krogar.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=14, y=0},
 	hand2 = {x=53, y=13},
-	belly = {x=29, y=35},
 	back = {x=29, y=25},
+	belly = {x=29, y=35},
 	head = {x=30, y=11},
 }
 tiles["npc/humanoid_orc_orc_mother.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=10, y=37},
 	hand2 = {x=53, y=35},
-	belly = {x=30, y=31},
 	back = {x=30, y=9},
+	belly = {x=30, y=31},
 	head = {x=28, y=-6},
 }
-tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { base=64,
-	feet = {x=39, y=60},
-	hand1 = {x=16, y=40},
-	hand2 = {x=58, y=36},
-	belly = {x=36, y=32},
-	back = {x=33, y=21},
-	head = {x=30, y=13},
+tiles["npc/humanoid_human_pyromancer.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=19, y=7},
+	hand2 = {x=41, y=32},
+	back = {x=32, y=17},
+	belly = {x=34, y=29},
+	head = {x=32, y=4},
 }
-tiles["npc/humanoid_human_derth_guard.png"] = { base=64,
-	feet = {x=37, y=59},
-	hand1 = {x=10, y=18},
-	hand2 = {x=48, y=33},
-	back = {x=34, y=17},
-	belly = {x=36, y=29},
-	head = {x=34, y=5},
+tiles["npc/humanoid_human_spectator02.png"] = { base=64,
+	feet = {x=30, y=59},
+	hand1 = {x=18, y=37},
+	hand2 = {x=41, y=37},
+	back = {x=30, y=16},
+	belly = {x=31, y=30},
+	head = {x=30, y=5},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=14, y=39},
-	hand2 = {x=48, y=38},
-	belly = {x=33, y=32},
-	back = {x=30, y=19},
-	head = {x=30, y=10},
+tiles["npc/humanoid_orc_orc_necromancer.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=7, y=39},
+	hand2 = {x=53, y=36},
+	back = {x=28, y=17},
+	belly = {x=30, y=32},
+	head = {x=29, y=6},
 }
 tiles["npc/humanoid_shalore_rhaloren_inquisitor.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=9, y=17},
 	hand2 = {x=56, y=22},
-	belly = {x=31, y=26},
 	back = {x=30, y=14},
+	belly = {x=31, y=26},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_human_multihued_wyrmic.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=13, y=39},
 	hand2 = {x=49, y=38},
-	belly = {x=31, y=30},
 	back = {x=30, y=17},
+	belly = {x=31, y=30},
 	head = {x=30, y=8},
 }
 tiles["npc/humanoid_human_agrimley_the_hermit.png"] = { base=64,
 	feet = {x=35, y=60},
 	hand1 = {x=23, y=36},
 	hand2 = {x=54, y=22},
-	back = {x=35, y=17},
 	belly = {x=35, y=30},
+	back = {x=35, y=17},
 	head = {x=35, y=5},
 }
 tiles["npc/humanoid_human_meranas__herald_of_angolwen.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=16, y=40},
 	hand2 = {x=52, y=39},
-	belly = {x=35, y=31},
 	back = {x=34, y=21},
+	belly = {x=35, y=31},
 	head = {x=31, y=4},
 }
-tiles["npc/humanoid_yaech_yaech_mindslayer.png"] = { base=64,
-	feet = {x=58, y=58},
-	hand1 = {x=7, y=28},
-	hand2 = {x=21, y=32},
-	belly = {x=39, y=40},
-	back = {x=37, y=31},
-	head = {x=28, y=19},
+tiles["npc/humanoid_human_shady_cornac_man.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=19, y=35},
+	hand2 = {x=49, y=35},
+	back = {x=32, y=17},
+	belly = {x=33, y=29},
+	head = {x=29, y=4},
 }
 tiles["npc/humanoid_orc_kra_tor_the_gluttonous.png"] = { base=64,
 	feet = {x=38, y=57},
 	hand1 = {x=20, y=18},
 	hand2 = {x=38, y=-2},
-	belly = {x=29, y=27},
 	back = {x=27, y=14},
+	belly = {x=29, y=27},
 	head = {x=23, y=1},
 }
-tiles["npc/humanoid_human_tannen.png"] = { base=64,
-	feet = {x=37, y=60},
-	hand1 = {x=10, y=16},
-	hand2 = {x=56, y=14},
-	belly = {x=35, y=28},
-	back = {x=31, y=15},
-	head = {x=29, y=4},
+tiles["npc/humanoid_human_reaver.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=8, y=37},
+	hand2 = {x=52, y=31},
+	back = {x=29, y=17},
+	belly = {x=29, y=29},
+	head = {x=28, y=6},
 }
-tiles["npc/humanoid_human_subject_z.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=8, y=11},
-	hand2 = {x=55, y=11},
-	belly = {x=31, y=27},
-	back = {x=31, y=15},
-	head = {x=32, y=3},
+tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=11, y=37},
+	hand2 = {x=53, y=29},
+	back = {x=29, y=16},
+	belly = {x=31, y=33},
+	head = {x=29, y=4},
 }
 tiles["npc/humanoid_human_townsfolk_filthy_street_urchin01_64.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=12, y=32},
 	hand2 = {x=49, y=40},
-	belly = {x=33, y=32},
 	back = {x=31, y=21},
+	belly = {x=33, y=32},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_orc_icy_orc_wyrmic.png"] = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=21, y=21},
 	hand2 = {x=57, y=36},
-	belly = {x=32, y=32},
 	back = {x=32, y=20},
+	belly = {x=32, y=32},
 	head = {x=26, y=7},
 }
 tiles["npc/humanoid_human_urkis__the_high_tempest.png"] = { base=64,
 	feet = {x=35, y=60},
 	hand1 = {x=13, y=32},
 	hand2 = {x=51, y=29},
-	belly = {x=33, y=24},
 	back = {x=33, y=9},
+	belly = {x=33, y=24},
 	head = {x=33, y=-4},
 }
-tiles["npc/humanoid_human_trickster.png"] = { base=64,
-	feet = {x=36, y=60},
-	back = {x=35, y=17},
-	hand2 = {x=5, y=32},
-	belly = {x=37, y=29},
-	head = {x=30, y=6},
+tiles["npc/humanoid_yaech_yaech_mindslayer.png"] = { base=64,
+	feet = {x=58, y=58},
+	hand1 = {x=7, y=28},
+	hand2 = {x=21, y=32},
+	back = {x=37, y=31},
+	belly = {x=39, y=40},
+	head = {x=28, y=19},
 }
-tiles["npc/humanoid_human_enthralled_slave.png"] = { base=64,
-	feet = {x=33, y=58},
-	hand1 = {x=16, y=35},
-	hand2 = {x=47, y=36},
-	back = {x=32, y=18},
-	belly = {x=32, y=29},
-	head = {x=31, y=5},
+tiles["npc/humanoid_human_derth_guard.png"] = { base=64,
+	feet = {x=37, y=59},
+	hand1 = {x=10, y=18},
+	hand2 = {x=48, y=33},
+	belly = {x=36, y=29},
+	back = {x=34, y=17},
+	head = {x=34, y=5},
 }
 tiles["npc/humanoid_yaech_blood_master.png"] = { base=64,
 	feet = {x=22, y=60},
 	hand1 = {x=6, y=17},
 	hand2 = {x=50, y=27},
-	belly = {x=31, y=32},
 	back = {x=29, y=25},
+	belly = {x=31, y=32},
 	head = {x=36, y=14},
 }
 tiles["npc/humanoid_dwarf_dwarven_summoner.png"] = { base=64,
 	feet = {x=38, y=59},
 	hand1 = {x=14, y=44},
 	hand2 = {x=54, y=44},
-	belly = {x=39, y=41},
 	back = {x=39, y=24},
+	belly = {x=39, y=41},
 	head = {x=39, y=7},
 }
-tiles["npc/humanoid_human_cutpurse.png"] = { base=64,
-	feet = {x=36, y=59},
-	hand1 = {x=9, y=34},
-	hand2 = {x=46, y=34},
-	back = {x=29, y=18},
-	belly = {x=30, y=29},
-	head = {x=28, y=7},
+tiles["npc/humanoid_human_argoniel.png"] = { base=64,
+	feet = {x=30, y=59},
+	hand1 = {x=9, y=2},
+	hand2 = {x=57, y=9},
+	belly = {x=32, y=22},
+	back = {x=32, y=10},
+	head = {x=32, y=-3},
 }
 tiles["npc/humanoid_human_townsfolk_boilcovered_wretch01_64.png"] = { base=64,
 	feet = {x=35, y=58},
 	hand1 = {x=19, y=38},
 	hand2 = {x=50, y=39},
-	belly = {x=34, y=34},
 	back = {x=34, y=21},
+	belly = {x=34, y=34},
 	head = {x=28, y=10},
 }
-tiles["npc/humanoid_human_rogue.png"] = { base=64,
-	feet = {x=36, y=58},
-	hand1 = {x=8, y=36},
-	hand2 = {x=55, y=29},
-	belly = {x=30, y=31},
-	back = {x=30, y=21},
-	head = {x=27, y=7},
+tiles["npc/humanoid_human_spectator03.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=16, y=38},
+	hand2 = {x=44, y=38},
+	back = {x=30, y=19},
+	belly = {x=30, y=30},
+	head = {x=30, y=4},
 }
 tiles["npc/humanoid_orc_orc_high_cryomancer.png"] = { base=64,
 	feet = {x=36, y=60},
 	hand1 = {x=7, y=17},
 	hand2 = {x=57, y=31},
-	belly = {x=37, y=32},
 	back = {x=33, y=22},
+	belly = {x=37, y=32},
 	head = {x=26, y=8},
 }
-tiles["npc/humanoid_human_fire_wyrmic.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=12, y=30},
-	hand2 = {x=49, y=36},
-	back = {x=28, y=19},
-	belly = {x=28, y=28},
-	head = {x=24, y=9},
+tiles["npc/humanoid_human_sand_wyrmic.png"] = { base=64,
+	feet = {x=29, y=60},
+	hand1 = {x=10, y=38},
+	hand2 = {x=58, y=17},
+	back = {x=32, y=19},
+	belly = {x=31, y=30},
+	head = {x=37, y=8},
 }
 tiles["npc/humanoid_orc_orc_elite_berserker.png"] = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=19, y=21},
 	hand2 = {x=54, y=31},
-	belly = {x=30, y=32},
 	back = {x=33, y=17},
+	belly = {x=30, y=32},
 	head = {x=33, y=7},
 }
-tiles["npc/humanoid_player_default.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=21, y=35},
-	hand2 = {x=44, y=36},
-	belly = {x=33, y=28},
-	back = {x=32, y=14},
-	head = {x=32, y=5},
+tiles["npc/humanoid_human_rej_arkatis.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=24, y=17},
+	hand2 = {x=38, y=19},
+	back = {x=33, y=15},
+	belly = {x=33, y=26},
+	head = {x=32, y=4},
 }
-tiles["npc/humanoid_elenulach_thief.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=18, y=37},
-	hand2 = {x=42, y=37},
-	back = {x=30, y=17},
-	belly = {x=30, y=32},
-	head = {x=30, y=6},
+tiles["npc/humanoid_orc_orc_cryomancer.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=5, y=14},
+	hand2 = {x=57, y=30},
+	back = {x=29, y=17},
+	belly = {x=36, y=31},
+	head = {x=23, y=7},
 }
 tiles["npc/humanoid_human_townsfolk_pitiful_looking_beggar01_64.png"] = { base=64,
 	feet = {x=41, y=60},
+	belly = {x=41, y=33},
 	back = {x=40, y=20},
 	hand1 = {x=25, y=32},
-	belly = {x=41, y=33},
 	head = {x=31, y=10},
 }
 tiles["npc/humanoid_shalore_elven_cultist.png"] = { base=64,
 	feet = {x=29, y=60},
 	hand1 = {x=8, y=9},
 	hand2 = {x=52, y=9},
-	belly = {x=31, y=28},
 	back = {x=30, y=16},
+	belly = {x=31, y=28},
 	head = {x=31, y=6},
 }
 tiles["npc/humanoid_shalore_elven_tempest.png"] = { base=64,
 	feet = {x=35, y=60},
 	hand1 = {x=11, y=9},
 	hand2 = {x=49, y=36},
-	belly = {x=31, y=28},
 	back = {x=32, y=16},
+	belly = {x=31, y=28},
 	head = {x=33, y=7},
 }
 tiles["npc/humanoid_human_assassin.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=12, y=16},
 	hand2 = {x=51, y=33},
-	back = {x=31, y=16},
 	belly = {x=34, y=32},
+	back = {x=31, y=16},
 	head = {x=29, y=5},
 }
 tiles["npc/humanoid_shalore_archmage_tarelion.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=17, y=26},
 	hand2 = {x=45, y=26},
-	belly = {x=33, y=18},
 	back = {x=31, y=0},
+	belly = {x=33, y=18},
 	head = {x=30, y=-11},
 }
 tiles["npc/humanoid_human_bandit_lord.png"] = { base=64,
 	feet = {x=34, y=59},
 	hand1 = {x=20, y=20},
 	hand2 = {x=38, y=21},
-	back = {x=31, y=16},
 	belly = {x=32, y=30},
+	back = {x=31, y=16},
 	head = {x=30, y=5},
 }
 tiles["npc/humanoid_human_celia.png"] = { base=64,
 	feet = {x=28, y=59},
 	hand1 = {x=15, y=16},
 	hand2 = {x=50, y=-20},
-	back = {x=29, y=-16},
 	belly = {x=28, y=2},
+	back = {x=29, y=-16},
 	head = {x=29, y=-33},
 }
 tiles["npc/humanoid_shalore_elven_mage.png"] = { base=64,
 	feet = {x=31, y=61},
 	hand1 = {x=11, y=35},
 	hand2 = {x=50, y=39},
-	belly = {x=31, y=30},
 	back = {x=31, y=18},
+	belly = {x=31, y=30},
 	head = {x=30, y=6},
 }
 tiles["npc/humanoid_human_blood_mage.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=13, y=42},
 	hand2 = {x=51, y=18},
-	back = {x=29, y=19},
 	belly = {x=30, y=30},
+	back = {x=29, y=19},
 	head = {x=28, y=5},
 }
 tiles["npc/humanoid_human_geomancer.png"] = { base=64,
 	feet = {x=26, y=59},
 	hand1 = {x=19, y=31},
 	hand2 = {x=42, y=6},
-	back = {x=28, y=15},
 	belly = {x=27, y=28},
+	back = {x=28, y=15},
 	head = {x=28, y=2},
 }
 tiles["npc/humanoid_orc_orc_summoner.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=9, y=35},
 	hand2 = {x=57, y=34},
-	belly = {x=32, y=34},
 	back = {x=28, y=18},
+	belly = {x=32, y=34},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_human_fallen_sun_paladin_aeryn.png"] = { base=64,
 	feet = {x=33, y=58},
 	hand1 = {x=15, y=20},
 	hand2 = {x=45, y=25},
-	back = {x=32, y=0},
 	belly = {x=32, y=14},
+	back = {x=32, y=0},
 	head = {x=31, y=-12},
 }
 tiles["npc/humanoid_yeek_yeek_commoner_07.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=14, y=39},
 	hand2 = {x=48, y=36},
-	belly = {x=33, y=37},
 	back = {x=30, y=23},
+	belly = {x=33, y=37},
 	head = {x=31, y=11},
 }
 tiles["npc/humanoid_orc_warmaster_gnarg.png"] = { base=64,
 	feet = {x=40, y=60},
 	hand1 = {x=60, y=27},
 	hand2 = {x=58, y=28},
-	belly = {x=43, y=29},
 	back = {x=32, y=18},
+	belly = {x=43, y=29},
 	head = {x=21, y=9},
 }
 tiles["npc/humanoid_yeek_yeek_wayist.png"] = { base=64,
 	feet = {x=37, y=59},
 	hand1 = {x=14, y=34},
 	hand2 = {x=58, y=36},
-	belly = {x=37, y=35},
 	back = {x=37, y=24},
+	belly = {x=37, y=35},
 	head = {x=38, y=13},
 }
 tiles["npc/humanoid_dwarf_ziguranth_warrior.png"] = { base=64,
 	feet = {x=34, y=59},
 	hand1 = {x=18, y=43},
 	hand2 = {x=50, y=44},
-	back = {x=35, y=22},
 	belly = {x=35, y=36},
+	back = {x=35, y=22},
 	head = {x=35, y=7},
 }
 tiles["npc/humanoid_human_high_slinger.png"] = { base=64,
 	feet = {x=29, y=59},
 	hand1 = {x=15, y=36},
 	hand2 = {x=57, y=18},
-	back = {x=31, y=15},
 	belly = {x=30, y=27},
+	back = {x=31, y=15},
 	head = {x=33, y=6},
 }
 tiles["npc/humanoid_human_thief.png"] = { base=64,
 	feet = {x=27, y=60},
 	hand1 = {x=8, y=27},
 	hand2 = {x=43, y=30},
-	belly = {x=27, y=30},
 	back = {x=24, y=19},
+	belly = {x=27, y=30},
 	head = {x=18, y=7},
 }
 tiles["npc/humanoid_shalore_mean_looking_elven_guard.png"] = { base=64,
 	feet = {x=33, y=60},
+	back = {x=31, y=14},
 	belly = {x=32, y=27},
 	hand1 = {x=14, y=31},
-	back = {x=31, y=14},
 	head = {x=31, y=6},
 }
-tiles["npc/humanoid_human_arcane_blade.png"] = { base=64,
-	feet = {x=26, y=61},
-	hand1 = {x=17, y=3},
-	hand2 = {x=38, y=35},
-	back = {x=27, y=22},
-	belly = {x=27, y=29},
-	head = {x=29, y=13},
+tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=14, y=39},
+	hand2 = {x=48, y=38},
+	back = {x=30, y=19},
+	belly = {x=33, y=32},
+	head = {x=30, y=10},
 }
 tiles["npc/humanoid_orc_orc_baby.png"] = { base=64,
 	feet = {x=41, y=40},
 	hand1 = {x=12, y=43},
 	hand2 = {x=30, y=44},
-	belly = {x=39, y=26},
 	back = {x=31, y=21},
+	belly = {x=39, y=26},
 	head = {x=19, y=22},
 }
-tiles["npc/humanoid_human_shadowblade.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=8, y=15},
-	hand2 = {x=56, y=40},
-	belly = {x=28, y=31},
-	back = {x=34, y=21},
-	head = {x=37, y=9},
+tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=14, y=39},
+	hand2 = {x=48, y=36},
+	back = {x=31, y=21},
+	belly = {x=33, y=34},
+	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_last_hope_guard.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=15, y=32},
 	hand2 = {x=45, y=28},
-	belly = {x=30, y=26},
 	back = {x=31, y=15},
+	belly = {x=30, y=26},
 	head = {x=31, y=5},
 }
-tiles["npc/humanoid_orc_young_orc.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=14, y=10},
-	hand2 = {x=52, y=40},
-	belly = {x=35, y=32},
-	back = {x=32, y=19},
-	head = {x=30, y=8},
+tiles["npc/humanoid_orc_orc_child.png"] = { base=64,
+	feet = {x=31, y=55},
+	hand1 = {x=8, y=36},
+	hand2 = {x=48, y=35},
+	back = {x=29, y=24},
+	belly = {x=30, y=32},
+	head = {x=25, y=12},
 }
-tiles["npc/humanoid_halfling_halfling_guard.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=8, y=28},
-	hand2 = {x=54, y=43},
-	back = {x=33, y=24},
-	belly = {x=36, y=36},
-	head = {x=30, y=10},
+tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { base=64,
+	feet = {x=33, y=57},
+	hand1 = {x=11, y=28},
+	hand2 = {x=53, y=38},
+	back = {x=33, y=20},
+	belly = {x=33, y=33},
+	head = {x=30, y=7},
 }
-tiles["npc/humanoid_human_slinger.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=10, y=18},
-	hand2 = {x=50, y=36},
-	belly = {x=37, y=27},
-	back = {x=34, y=17},
-	head = {x=34, y=5},
+tiles["npc/humanoid_halfling_master_slinger.png"] = { base=64,
+	feet = {x=39, y=59},
+	hand1 = {x=15, y=42},
+	hand2 = {x=47, y=10},
+	belly = {x=32, y=38},
+	back = {x=31, y=27},
+	head = {x=28, y=14},
 }
 tiles["npc/humanoid_dwarf_dwarven_paddlestriker.png"] = { base=64,
 	feet = {x=39, y=60},
 	hand1 = {x=15, y=37},
 	hand2 = {x=57, y=33},
-	belly = {x=35, y=35},
 	back = {x=33, y=22},
+	belly = {x=35, y=35},
 	head = {x=33, y=6},
 }
-tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { base=64,
-	feet = {x=33, y=57},
-	hand1 = {x=11, y=28},
-	hand2 = {x=53, y=38},
-	belly = {x=33, y=33},
-	back = {x=33, y=20},
-	head = {x=30, y=7},
+tiles["npc/humanoid_human_necromancer.png"] = { base=64,
+	feet = {x=27, y=61},
+	hand1 = {x=18, y=16},
+	hand2 = {x=40, y=41},
+	back = {x=34, y=17},
+	belly = {x=32, y=32},
+	head = {x=36, y=3},
 }
-tiles["npc/humanoid_human_alchemist.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=10, y=32},
-	hand2 = {x=51, y=34},
-	back = {x=33, y=19},
-	belly = {x=34, y=32},
-	head = {x=33, y=5},
+tiles["npc/humanoid_human_gladiator.png"] = { base=64,
+	feet = {x=35, y=58},
+	hand1 = {x=13, y=35},
+	hand2 = {x=53, y=36},
+	belly = {x=35, y=31},
+	back = {x=34, y=19},
+	head = {x=32, y=7},
 }
 tiles["npc/humanoid_human_apprentice_mage.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=15, y=38},
 	hand2 = {x=42, y=34},
-	back = {x=29, y=16},
 	belly = {x=29, y=29},
+	back = {x=29, y=16},
 	head = {x=29, y=5},
 }
-tiles["npc/humanoid_orc_orc_greatmother.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=4, y=-4},
-	hand2 = {x=58, y=2},
-	belly = {x=30, y=-3},
-	back = {x=32, y=-40},
-	head = {x=33, y=-55},
+tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=6, y=34},
+	hand2 = {x=57, y=31},
+	back = {x=28, y=20},
+	belly = {x=29, y=32},
+	head = {x=27, y=8},
 }
 tiles["npc/humanoid_human_townsfolk_aimless_looking_merchant01_64.png"] = { base=64,
 	feet = {x=37, y=58},
 	hand1 = {x=14, y=48},
 	hand2 = {x=52, y=23},
-	belly = {x=35, y=38},
 	back = {x=31, y=24},
+	belly = {x=35, y=38},
 	head = {x=29, y=6},
 }
-tiles["npc/humanoid_shalore_elven_blood_mage.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=15, y=36},
-	hand2 = {x=46, y=36},
-	belly = {x=30, y=33},
-	back = {x=30, y=17},
-	head = {x=30, y=7},
+tiles["npc/humanoid_human_ice_wyrmic.png"] = { base=64,
+	feet = {x=30, y=61},
+	back = {x=32, y=19},
+	hand2 = {x=58, y=17},
+	belly = {x=32, y=33},
+	hand1 = {x=9, y=36},
+	head = {x=36, y=11},
 }
 tiles["npc/humanoid_dwarf_lumberjack.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=17, y=16},
-	hand2 = {x=49, y=41},
-	belly = {x=35, y=38},
-	back = {x=34, y=27},
-	head = {x=34, y=8},
-}
-tiles["npc/humanoid_human_necromancer.png"] = { base=64,
-	feet = {x=27, y=61},
-	hand1 = {x=18, y=16},
-	hand2 = {x=40, y=41},
-	belly = {x=32, y=32},
-	back = {x=34, y=17},
-	head = {x=36, y=3},
-}
-tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { base=64,
-	feet = {x=31, y=59},
-	hand1 = {x=10, y=20},
-	hand2 = {x=23, y=35},
-	belly = {x=32, y=35},
-	back = {x=30, y=21},
-	head = {x=31, y=11},
+	hand2 = {x=49, y=41},
+	back = {x=34, y=27},
+	belly = {x=35, y=38},
+	head = {x=34, y=8},
 }
-tiles["npc/humanoid_human_lost_merchant.png"] = { base=64,
-	feet = {x=35, y=59},
-	belly = {x=35, y=36},
-	hand1 = {x=16, y=47},
-	back = {x=32, y=24},
-	head = {x=30, y=5},
+tiles["npc/humanoid_human_fire_wyrmic.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=12, y=30},
+	hand2 = {x=49, y=36},
+	belly = {x=28, y=28},
+	back = {x=28, y=19},
+	head = {x=24, y=9},
 }
-tiles["npc/humanoid_orc_orc_fighter.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=7, y=8},
-	hand2 = {x=57, y=39},
-	belly = {x=31, y=34},
-	back = {x=35, y=20},
+tiles["npc/humanoid_human_linaniil_supreme_archmage.png"] = { base=64,
+	feet = {x=38, y=60},
+	hand1 = {x=10, y=7},
+	hand2 = {x=49, y=29},
+	belly = {x=37, y=19},
+	back = {x=35, y=1},
+	head = {x=31, y=-13},
+}
+tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { base=64,
+	feet = {x=29, y=60},
+	hand1 = {x=9, y=32},
+	hand2 = {x=58, y=18},
+	back = {x=30, y=20},
+	belly = {x=28, y=33},
 	head = {x=39, y=10},
 }
+tiles["npc/humanoid_orc_orc_soldier.png"] = { base=64,
+	feet = {x=36, y=62},
+	hand1 = {x=9, y=39},
+	hand2 = {x=58, y=36},
+	back = {x=29, y=21},
+	belly = {x=34, y=34},
+	head = {x=25, y=9},
+}
 tiles["npc/humanoid_human_valfred_loren.png"] = { base=64,
 	feet = {x=29, y=57},
 	hand1 = {x=19, y=36},
 	hand2 = {x=45, y=22},
-	belly = {x=29, y=25},
 	back = {x=29, y=17},
+	belly = {x=29, y=25},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_elf_anorithil.png"] = { base=64,
 	feet = {x=39, y=60},
 	hand1 = {x=12, y=15},
 	hand2 = {x=55, y=30},
-	back = {x=38, y=18},
 	belly = {x=40, y=29},
+	back = {x=38, y=18},
 	head = {x=29, y=4},
 }
 tiles["npc/humanoid_orc_golbug_the_destroyer.png"] = { base=64,
 	feet = {x=29, y=58},
 	hand1 = {x=9, y=35},
 	hand2 = {x=51, y=33},
-	belly = {x=29, y=25},
 	back = {x=30, y=12},
+	belly = {x=29, y=25},
 	head = {x=32, y=-1},
 }
-tiles["npc/humanoid_orc_orc_blood_mage.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=11, y=36},
-	hand2 = {x=57, y=37},
-	belly = {x=34, y=32},
-	back = {x=33, y=17},
-	head = {x=32, y=5},
+tiles["npc/humanoid_orc_orc_pyromancer.png"] = { base=64,
+	feet = {x=28, y=61},
+	hand1 = {x=6, y=30},
+	hand2 = {x=59, y=15},
+	back = {x=30, y=17},
+	belly = {x=28, y=30},
+	head = {x=40, y=5},
 }
-tiles["npc/humanoid_human_human_farmer.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=11, y=20},
-	hand2 = {x=44, y=38},
-	back = {x=29, y=18},
-	belly = {x=31, y=31},
-	head = {x=29, y=5},
+tiles["npc/humanoid_human_lumberjack.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=17, y=37},
+	hand2 = {x=44, y=37},
+	back = {x=32, y=17},
+	belly = {x=33, y=31},
+	head = {x=32, y=4},
 }
-tiles["npc/humanoid_orc_orc_assassin.png"] = { base=64,
-	feet = {x=36, y=60},
-	hand1 = {x=4, y=30},
-	hand2 = {x=40, y=3},
-	belly = {x=42, y=29},
-	back = {x=33, y=20},
-	head = {x=24, y=11},
+tiles["npc/humanoid_thalore_thalore_hunter.png"] = { base=64,
+	feet = {x=31, y=59},
+	hand1 = {x=18, y=38},
+	hand2 = {x=52, y=31},
+	back = {x=33, y=18},
+	belly = {x=33, y=30},
+	head = {x=32, y=8},
 }
-tiles["npc/humanoid_human_spectator.png"] = { base=64,
-	feet = {x=37, y=59},
-	belly = {x=36, y=29},
-	hand1 = {x=50, y=37},
-	back = {x=35, y=17},
-	head = {x=34, y=5},
+tiles["npc/humanoid_human_harno__herald_of_last_hope.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=16, y=37},
+	hand2 = {x=45, y=36},
+	belly = {x=31, y=31},
+	back = {x=30, y=15},
+	head = {x=29, y=4},
 }
-tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { base=64,
-	feet = {x=36, y=57},
-	hand1 = {x=17, y=23},
-	hand2 = {x=18, y=35},
-	belly = {x=36, y=31},
-	back = {x=32, y=18},
-	head = {x=28, y=5},
+tiles["npc/humanoid_orc_orc_grand_summoner.png"] = { base=64,
+	feet = {x=29, y=60},
+	hand1 = {x=9, y=8},
+	hand2 = {x=55, y=35},
+	back = {x=34, y=18},
+	belly = {x=32, y=30},
+	head = {x=36, y=7},
 }
 tiles["npc/humanoid_orc_rak_shor__grand_necromancer_of_the_pride.png"] = { base=64,
 	feet = {x=29, y=60},
 	hand1 = {x=6, y=39},
 	hand2 = {x=54, y=32},
-	belly = {x=28, y=35},
 	back = {x=28, y=20},
+	belly = {x=28, y=35},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_human_high_sun_paladin_aeryn.png"] = { base=64,
 	feet = {x=33, y=58},
 	hand1 = {x=15, y=19},
 	hand2 = {x=45, y=25},
-	back = {x=32, y=1},
 	belly = {x=33, y=16},
+	back = {x=32, y=1},
 	head = {x=31, y=-12},
 }
 tiles["npc/humanoid_human_ben_cruthdar__the_cursed.png"] = { base=64,
 	feet = {x=36, y=61},
 	hand1 = {x=17, y=33},
 	hand2 = {x=46, y=19},
-	back = {x=29, y=17},
 	belly = {x=30, y=32},
+	back = {x=29, y=17},
 	head = {x=28, y=4},
 }
-tiles["npc/humanoid_thalore_thalore_hunter.png"] = { base=64,
-	feet = {x=31, y=59},
-	hand1 = {x=18, y=38},
-	hand2 = {x=52, y=31},
-	belly = {x=33, y=30},
-	back = {x=33, y=18},
-	head = {x=32, y=8},
+tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { base=64,
+	feet = {x=30, y=61},
+	hand1 = {x=10, y=22},
+	hand2 = {x=23, y=36},
+	back = {x=31, y=22},
+	belly = {x=31, y=36},
+	head = {x=30, y=13},
 }
-tiles["npc/humanoid_human_lumberjack.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=17, y=37},
-	hand2 = {x=44, y=37},
-	belly = {x=33, y=31},
-	back = {x=32, y=17},
-	head = {x=32, y=4},
+tiles["npc/humanoid_human_riala_shalarak.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=17, y=7},
+	hand2 = {x=58, y=30},
+	back = {x=35, y=17},
+	belly = {x=34, y=27},
+	head = {x=33, y=5},
 }
 dolls.race_elf = dolls.race_elf or {}
 dolls.race_elf.female = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=19, y=33},
 	hand2 = {x=46, y=33},
-	belly = {x=34, y=27},
 	back = {x=33, y=14},
+	belly = {x=34, y=27},
 	head = {x=31, y=3},
 }
 tiles["npc/humanoid_naga_naga_nereid.png"] = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=25, y=40},
 	hand2 = {x=59, y=31},
-	belly = {x=38, y=28},
 	back = {x=37, y=17},
+	belly = {x=38, y=28},
 	head = {x=35, y=5},
 }
-tiles["npc/humanoid_human_martyr.png"] = { base=64,
-	feet = {x=37, y=60},
-	hand1 = {x=17, y=29},
-	hand2 = {x=46, y=31},
-	belly = {x=30, y=27},
-	back = {x=29, y=14},
-	head = {x=28, y=3},
+tiles["npc/humanoid_yaech_yaech_hunter.png"] = { base=64,
+	feet = {x=6, y=7},
+	hand1 = {x=33, y=50},
+	hand2 = {x=59, y=37},
+	back = {x=34, y=29},
+	belly = {x=23, y=29},
+	head = {x=46, y=19},
 }
 tiles["npc/humanoid_human_homeless_fighter.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=6, y=34},
 	hand2 = {x=57, y=34},
-	back = {x=33, y=25},
 	belly = {x=33, y=34},
+	back = {x=33, y=25},
 	head = {x=32, y=9},
 }
-tiles["npc/humanoid_human_ice_wyrmic.png"] = { base=64,
-	feet = {x=30, y=61},
-	back = {x=32, y=19},
-	hand2 = {x=58, y=17},
-	hand1 = {x=9, y=36},
-	belly = {x=32, y=33},
-	head = {x=36, y=11},
+tiles["npc/humanoid_human_human_farmer.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=11, y=20},
+	hand2 = {x=44, y=38},
+	belly = {x=31, y=31},
+	back = {x=29, y=18},
+	head = {x=29, y=5},
 }
 tiles["npc/humanoid_orc_orc_berserker.png"] = { base=64,
 	feet = {x=45, y=60},
 	hand1 = {x=11, y=36},
 	hand2 = {x=40, y=17},
-	belly = {x=30, y=31},
 	back = {x=20, y=19},
+	belly = {x=30, y=31},
 	head = {x=17, y=9},
 }
 tiles["npc/humanoid_yaech_yaech_diver.png"] = { base=64,
 	feet = {x=52, y=3},
 	hand1 = {x=9, y=56},
 	hand2 = {x=40, y=57},
-	belly = {x=39, y=31},
 	back = {x=30, y=36},
+	belly = {x=39, y=31},
 	head = {x=16, y=39},
 }
-tiles["npc/humanoid_human_reaver.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=8, y=37},
-	hand2 = {x=52, y=31},
-	belly = {x=29, y=29},
-	back = {x=29, y=17},
-	head = {x=28, y=6},
+tiles["npc/humanoid_human_martyr.png"] = { base=64,
+	feet = {x=37, y=60},
+	hand1 = {x=17, y=29},
+	hand2 = {x=46, y=31},
+	back = {x=29, y=14},
+	belly = {x=30, y=27},
+	head = {x=28, y=3},
 }
 tiles["npc/humanoid_female_sluttymaid.png"] = { base=64,
 	feet = {x=31, y=59},
 	hand1 = {x=24, y=30},
 	hand2 = {x=41, y=20},
-	back = {x=35, y=12},
 	belly = {x=35, y=23},
+	back = {x=35, y=12},
 	head = {x=36, y=0},
 }
 tiles["npc/humanoid_halfling_derth_guard.png"] = { base=64,
 	feet = {x=28, y=60},
 	hand1 = {x=22, y=13},
 	hand2 = {x=47, y=44},
-	back = {x=34, y=31},
 	belly = {x=33, y=40},
+	back = {x=34, y=31},
 	head = {x=37, y=16},
 }
 tiles["npc/humanoid_orc_massok_the_dragonslayer.png"] = { base=64,
 	feet = {x=34, y=58},
 	hand1 = {x=13, y=33},
 	hand2 = {x=55, y=35},
-	belly = {x=33, y=28},
 	back = {x=32, y=12},
+	belly = {x=33, y=28},
 	head = {x=29, y=-3},
 }
-tiles["npc/humanoid_human_spectator03.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=16, y=38},
-	hand2 = {x=44, y=38},
-	belly = {x=30, y=30},
-	back = {x=30, y=19},
-	head = {x=30, y=4},
+tiles["npc/humanoid_human_slinger.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=10, y=18},
+	hand2 = {x=50, y=36},
+	back = {x=34, y=17},
+	belly = {x=37, y=27},
+	head = {x=34, y=5},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=14, y=39},
-	hand2 = {x=48, y=36},
-	belly = {x=33, y=34},
-	back = {x=31, y=21},
-	head = {x=31, y=11},
+tiles["npc/humanoid_human_alchemist.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=10, y=32},
+	hand2 = {x=51, y=34},
+	belly = {x=34, y=32},
+	back = {x=33, y=19},
+	head = {x=33, y=5},
 }
-tiles["npc/humanoid_human_spectator02.png"] = { base=64,
-	feet = {x=30, y=59},
-	hand1 = {x=18, y=37},
-	hand2 = {x=41, y=37},
-	belly = {x=31, y=30},
-	back = {x=30, y=16},
-	head = {x=30, y=5},
+tiles["npc/humanoid_halfling_halfling_citizen.png"] = { base=64,
+	feet = {x=31, y=58},
+	hand1 = {x=13, y=38},
+	hand2 = {x=48, y=41},
+	belly = {x=31, y=33},
+	back = {x=30, y=22},
+	head = {x=30, y=8},
 }
 tiles["npc/humanoid_human_sun_paladin_guren.png"] = { base=64,
 	feet = {x=35, y=60},
+	back = {x=30, y=15},
 	belly = {x=31, y=29},
 	hand1 = {x=21, y=35},
-	back = {x=30, y=15},
 	head = {x=30, y=3},
 }
diff --git a/game/modules/tome/data/zones/town-elvala/npcs.lua b/game/modules/tome/data/zones/town-elvala/npcs.lua
index 7e4f9c00a7b84645ed5302fa291bd1e49bfcc960..0063473fe03c8e5f132aced919f8c6ed77234372 100644
--- a/game/modules/tome/data/zones/town-elvala/npcs.lua
+++ b/game/modules/tome/data/zones/town-elvala/npcs.lua
@@ -73,3 +73,48 @@ newEntity{ base = "BASE_NPC_ELVALA_TOWN",
 	autolevel = "caster",
 	resolvers.inscriptions(3, {"heat beam rune", "frozen spear rune", "acid wave rune", "lightning rune"}),
 }
+
+
+newEntity{
+	define_as = "BASE_NPC_ELVALA_OGRE_TOWN",
+	type = "giant", subtype = "ogre",
+	display = "O", color=colors.WHITE,
+	faction = "shalore",
+	anger_emote = "Catch @himher@!",
+
+	combat = { dam=resolvers.rngavg(1,2), atk=2, apr=0, dammod={str=0.4} },
+
+	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+	lite = 3,
+
+	life_rating = 10,
+	rank = 2,
+	size_category = 3,
+
+	open_door = true,
+
+	resolvers.racial(),
+	resolvers.inscriptions(2, "rune"),
+
+	autolevel = "warrior",
+	ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=3, },
+	stats = { str=12, dex=8, mag=6, con=10 },
+
+	emote_random = resolvers.emote_random{allow_backup_guardian=true},
+}
+
+newEntity{ base = "BASE_NPC_ELVALA_OGRE_TOWN",
+	name = "ogre rune-spinner", color=colors.LIGHT_UMBER,
+	desc = [[A towering ogre guard, his skin covered in runes.]],
+	level_range = {1, nil}, exp_worth = 1,
+	rarity = 3,
+
+	resolvers.inscriptions(4, "rune"),
+	max_life = resolvers.rngavg(70,80),
+	resolvers.equip{
+		{type="weapon", subtype="longsword", autoreq=true},
+		{type="armor", subtype="shield", autoreq=true},
+	},
+	combat_armor = 2, combat_def = 0,
+	resolvers.talents{ [Talents.T_RUSH]=1, [Talents.T_PERFECT_STRIKE]=1, },
+}
diff --git a/game/modules/tome/resolvers.lua b/game/modules/tome/resolvers.lua
index c7c387d2568b9563c2723bd5eca6493694075912..859859f10569247df34c43bf0b358dcf702ea4c3 100644
--- a/game/modules/tome/resolvers.lua
+++ b/game/modules/tome/resolvers.lua
@@ -849,6 +849,12 @@ local racials = {
 		T_QUICKENED = {last=10, base=0, every=4, max=5},
 		T_WAYIST = {last=20, base=0, every=4, max=5},
 	},
+	ogre = {
+		T_OGRE_WRATH = {base=0, every=4, max=5},
+		T_GRISLY_CONSTITUTION = {last=10, base=0, every=4, max=5},
+		T_SCAR_SCRIPTED_FLESH = {last=20, base=0, every=4, max=5},
+		T_WRIT_LARGE = {last=30, base=0, every=4, max=5},
+	},
 	dwarf = {
 		T_POWER_IS_MONEY = {last=20, base=0, every=4, max=5},
 		T_STONESKIN = {base=0, every=4, max=5},