From ec3266539a40191dea8860ad72477e847e5e0ab5 Mon Sep 17 00:00:00 2001 From: mekolat Date: Tue, 5 Jan 2016 13:01:16 -0500 Subject: prepare for new races, fix random things update colors fix race ids and names add new tritan styles various fixes add female equipment equip-head equip-1hand equip-2hand equip-arms equip-feet equip-legs equip-torso add female model once again manaplus being dumb (no fallback support) make Rouge use the bra item use male model as base model otherwise the neutral tank top shows on some npcs fix pirates fix hairstyles for char creation (class 0) Fix F hairstyle 8 and 12 Fix Errant reds in N back FIX more headstyles --- items/equip-2hand/item1200_Bow.xml | 4 +++- items/equip-2hand/item530_ShortBow.xml | 4 +++- items/equip-2hand/item545_ForestBow.xml | 4 +++- items/equip-2hand/item548_Halberd.xml | 4 +++- items/equip-2hand/item588_BastardSword.xml | 4 +++- items/equip-2hand/item594_Spear.xml | 4 +++- items/equip-2hand/item595_HeavySpear.xml | 4 +++- items/equip-2hand/item596_Pike.xml | 4 +++- items/equip-2hand/item597_HeavyPike.xml | 4 +++- items/equip-2hand/item623_Scythe.xml | 4 +++- items/equip-2hand/item758_WoodenStaff.xml | 4 +++- items/equip-2hand/item878_BansheeBow.xml | 4 +++- items/equip-2hand/item903_SlingShot.xml | 4 +++- items/equip-2hand/item906_KidBook.xml | 2 +- 14 files changed, 40 insertions(+), 14 deletions(-) (limited to 'items/equip-2hand') diff --git a/items/equip-2hand/item1200_Bow.xml b/items/equip-2hand/item1200_Bow.xml index b61e073f..95113537 100644 --- a/items/equip-2hand/item1200_Bow.xml +++ b/items/equip-2hand/item1200_Bow.xml @@ -7,6 +7,8 @@ - equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item530_ShortBow.xml b/items/equip-2hand/item530_ShortBow.xml index af377a5c..d8b8f5df 100644 --- a/items/equip-2hand/item530_ShortBow.xml +++ b/items/equip-2hand/item530_ShortBow.xml @@ -7,6 +7,8 @@ - equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item545_ForestBow.xml b/items/equip-2hand/item545_ForestBow.xml index b0c70476..d2a78357 100644 --- a/items/equip-2hand/item545_ForestBow.xml +++ b/items/equip-2hand/item545_ForestBow.xml @@ -7,6 +7,8 @@ - equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item548_Halberd.xml b/items/equip-2hand/item548_Halberd.xml index 25fdf6b3..d46bb05e 100644 --- a/items/equip-2hand/item548_Halberd.xml +++ b/items/equip-2hand/item548_Halberd.xml @@ -7,6 +7,8 @@ - equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item588_BastardSword.xml b/items/equip-2hand/item588_BastardSword.xml index 0d124cec..81734b9a 100644 --- a/items/equip-2hand/item588_BastardSword.xml +++ b/items/equip-2hand/item588_BastardSword.xml @@ -7,6 +7,8 @@ - equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff diff --git a/items/equip-2hand/item594_Spear.xml b/items/equip-2hand/item594_Spear.xml index 6f6d2dea..61c43565 100644 --- a/items/equip-2hand/item594_Spear.xml +++ b/items/equip-2hand/item594_Spear.xml @@ -7,6 +7,8 @@ - equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item595_HeavySpear.xml b/items/equip-2hand/item595_HeavySpear.xml index e2ebf0fb..ab76d192 100644 --- a/items/equip-2hand/item595_HeavySpear.xml +++ b/items/equip-2hand/item595_HeavySpear.xml @@ -7,6 +7,8 @@ - equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item596_Pike.xml b/items/equip-2hand/item596_Pike.xml index 7faaffc9..a5de2393 100644 --- a/items/equip-2hand/item596_Pike.xml +++ b/items/equip-2hand/item596_Pike.xml @@ -7,6 +7,8 @@ - equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item597_HeavyPike.xml b/items/equip-2hand/item597_HeavyPike.xml index 873f28ae..2417046e 100644 --- a/items/equip-2hand/item597_HeavyPike.xml +++ b/items/equip-2hand/item597_HeavyPike.xml @@ -7,6 +7,8 @@ - equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item623_Scythe.xml b/items/equip-2hand/item623_Scythe.xml index 321c7f45..1d7a85de 100644 --- a/items/equip-2hand/item623_Scythe.xml +++ b/items/equip-2hand/item623_Scythe.xml @@ -7,6 +7,8 @@ - equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item758_WoodenStaff.xml b/items/equip-2hand/item758_WoodenStaff.xml index 95c5fcca..c251d583 100644 --- a/items/equip-2hand/item758_WoodenStaff.xml +++ b/items/equip-2hand/item758_WoodenStaff.xml @@ -7,6 +7,8 @@ - equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item878_BansheeBow.xml b/items/equip-2hand/item878_BansheeBow.xml index 14f8a008..f10d755c 100644 --- a/items/equip-2hand/item878_BansheeBow.xml +++ b/items/equip-2hand/item878_BansheeBow.xml @@ -7,6 +7,8 @@ - equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1 + equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1 + equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1 + equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1 diff --git a/items/equip-2hand/item903_SlingShot.xml b/items/equip-2hand/item903_SlingShot.xml index c54eaa0e..9b718860 100644 --- a/items/equip-2hand/item903_SlingShot.xml +++ b/items/equip-2hand/item903_SlingShot.xml @@ -7,6 +7,8 @@ - equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item906_KidBook.xml index 286bfb75..477c89ae 100644 --- a/items/equip-2hand/item906_KidBook.xml +++ b/items/equip-2hand/item906_KidBook.xml @@ -9,7 +9,7 @@ - + -- cgit v1.2.3-70-g09d2