From 9b4173887fbd4deb84093e37489bbbec9d2b8ebd Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 25 May 2021 10:15:21 -0300 Subject: Merge equip-2hand --- items.xml | 2 +- items/convert.sh | 1 + items/equip-2hand.xml | 238 +++++++++++++++++++++++++++++ items/equip-2hand/_include.xml | 17 --- items/equip-2hand/item1200_Bow.xml | 9 -- items/equip-2hand/item530_ShortBow.xml | 9 -- items/equip-2hand/item545_ForestBow.xml | 9 -- items/equip-2hand/item548_Halberd.xml | 13 -- items/equip-2hand/item588_BastardSword.xml | 7 - items/equip-2hand/item594_Spear.xml | 7 - items/equip-2hand/item595_HeavySpear.xml | 7 - items/equip-2hand/item596_Pike.xml | 7 - items/equip-2hand/item597_HeavyPike.xml | 7 - items/equip-2hand/item623_Scythe.xml | 13 -- items/equip-2hand/item758_WoodenStaff.xml | 13 -- items/equip-2hand/item878_BansheeBow.xml | 13 -- items/equip-2hand/item903_SlingShot.xml | 7 - items/equip-2hand/item906_KidBook.xml | 9 -- 18 files changed, 240 insertions(+), 148 deletions(-) create mode 100644 items/equip-2hand.xml delete mode 100644 items/equip-2hand/_include.xml delete mode 100644 items/equip-2hand/item1200_Bow.xml delete mode 100644 items/equip-2hand/item530_ShortBow.xml delete mode 100644 items/equip-2hand/item545_ForestBow.xml delete mode 100644 items/equip-2hand/item548_Halberd.xml delete mode 100644 items/equip-2hand/item588_BastardSword.xml delete mode 100644 items/equip-2hand/item594_Spear.xml delete mode 100644 items/equip-2hand/item595_HeavySpear.xml delete mode 100644 items/equip-2hand/item596_Pike.xml delete mode 100644 items/equip-2hand/item597_HeavyPike.xml delete mode 100644 items/equip-2hand/item623_Scythe.xml delete mode 100644 items/equip-2hand/item758_WoodenStaff.xml delete mode 100644 items/equip-2hand/item878_BansheeBow.xml delete mode 100644 items/equip-2hand/item903_SlingShot.xml delete mode 100644 items/equip-2hand/item906_KidBook.xml diff --git a/items.xml b/items.xml index 2af56a3b..0cecb285 100644 --- a/items.xml +++ b/items.xml @@ -9,7 +9,7 @@ - + diff --git a/items/convert.sh b/items/convert.sh index 81b67959..9475ecf8 100755 --- a/items/convert.sh +++ b/items/convert.sh @@ -3,6 +3,7 @@ TARGET="equip-2hand" cd $TARGET +rm _include.xml sed -i '/xml version/d' *.xml sed -i '/items/d' *.xml echo "" > ../$TARGET.xml diff --git a/items/equip-2hand.xml b/items/equip-2hand.xml new file mode 100644 index 00000000..4e0902ef --- /dev/null +++ b/items/equip-2hand.xml @@ -0,0 +1,238 @@ + + + + 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 + weapons/bows/bow-miss1.ogg + weapons/bows/bow-hit1.ogg + + + 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 + + weapons/bows/short/short-miss1.ogg + weapons/bows/short/short-hit1.ogg + + + 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 + + weapons/bows/forest/forest-miss1.ogg + weapons/bows/forest/forest-hit1.ogg + + + 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 + + weapons/other/halberd/halberd-hit1.ogg + + weapons/other/halberd/halberd-hit2.ogg + + weapons/other/halberd/halberd-hit3.ogg + + weapons/other/staff/staff-miss1.ogg + + weapons/other/staff/staff-miss2.ogg + + weapons/other/staff/staff-miss3.ogg + + + 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/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-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-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-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-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d + + weapons/other/staff/staff-miss1.ogg + + weapons/other/staff/staff-miss2.ogg + + weapons/other/staff/staff-miss3.ogg + weapons/other/scythe/scythe-hit1.ogg + weapons/other/scythe/scythe-hit2.ogg + weapons/other/scythe/scythe-hit3.ogg + + + equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + + weapons/other/staff/staff-miss1.ogg + + weapons/other/staff/staff-miss2.ogg + + weapons/other/staff/staff-miss3.ogg + weapons/other/staff/staff-hit1.ogg + weapons/other/staff/staff-hit2.ogg + weapons/other/staff/staff-hit3.ogg + + + equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1 + equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1 + + weapons/bows/banshee/banshee-miss1.ogg + + weapons/bows/banshee/banshee-miss2.ogg + + weapons/bows/banshee/banshee-miss3.ogg + + weapons/bows/banshee/banshee-hit1.ogg + + weapons/bows/banshee/banshee-hit2.ogg + + weapons/bows/banshee/banshee-hit3.ogg + + + + 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 + + + + + + + + diff --git a/items/equip-2hand/_include.xml b/items/equip-2hand/_include.xml deleted file mode 100644 index 0b2c61f6..00000000 --- a/items/equip-2hand/_include.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/items/equip-2hand/item1200_Bow.xml b/items/equip-2hand/item1200_Bow.xml deleted file mode 100644 index 2e44d2e3..00000000 --- a/items/equip-2hand/item1200_Bow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 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 - weapons/bows/bow-miss1.ogg - weapons/bows/bow-hit1.ogg - - diff --git a/items/equip-2hand/item530_ShortBow.xml b/items/equip-2hand/item530_ShortBow.xml deleted file mode 100644 index 0defa8af..00000000 --- a/items/equip-2hand/item530_ShortBow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 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 - weapons/bows/short/short-miss1.ogg - weapons/bows/short/short-hit1.ogg - - diff --git a/items/equip-2hand/item545_ForestBow.xml b/items/equip-2hand/item545_ForestBow.xml deleted file mode 100644 index 791ba3a4..00000000 --- a/items/equip-2hand/item545_ForestBow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 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 - weapons/bows/forest/forest-miss1.ogg - weapons/bows/forest/forest-hit1.ogg - - diff --git a/items/equip-2hand/item548_Halberd.xml b/items/equip-2hand/item548_Halberd.xml deleted file mode 100644 index 5df9008f..00000000 --- a/items/equip-2hand/item548_Halberd.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - 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 - weapons/other/halberd/halberd-hit1.ogg - weapons/other/halberd/halberd-hit2.ogg - weapons/other/halberd/halberd-hit3.ogg - weapons/other/staff/staff-miss1.ogg - weapons/other/staff/staff-miss2.ogg - weapons/other/staff/staff-miss3.ogg - - diff --git a/items/equip-2hand/item588_BastardSword.xml b/items/equip-2hand/item588_BastardSword.xml deleted file mode 100644 index 2e49acca..00000000 --- a/items/equip-2hand/item588_BastardSword.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 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 - - diff --git a/items/equip-2hand/item594_Spear.xml b/items/equip-2hand/item594_Spear.xml deleted file mode 100644 index 985f39e6..00000000 --- a/items/equip-2hand/item594_Spear.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 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 - - diff --git a/items/equip-2hand/item595_HeavySpear.xml b/items/equip-2hand/item595_HeavySpear.xml deleted file mode 100644 index af46c51d..00000000 --- a/items/equip-2hand/item595_HeavySpear.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 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 - - diff --git a/items/equip-2hand/item596_Pike.xml b/items/equip-2hand/item596_Pike.xml deleted file mode 100644 index 8e24ec34..00000000 --- a/items/equip-2hand/item596_Pike.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 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 - - diff --git a/items/equip-2hand/item597_HeavyPike.xml b/items/equip-2hand/item597_HeavyPike.xml deleted file mode 100644 index 88e50e66..00000000 --- a/items/equip-2hand/item597_HeavyPike.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 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 - - diff --git a/items/equip-2hand/item623_Scythe.xml b/items/equip-2hand/item623_Scythe.xml deleted file mode 100644 index fc1f0098..00000000 --- a/items/equip-2hand/item623_Scythe.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - 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 - weapons/other/staff/staff-miss1.ogg - weapons/other/staff/staff-miss2.ogg - weapons/other/staff/staff-miss3.ogg - weapons/other/scythe/scythe-hit1.ogg - weapons/other/scythe/scythe-hit2.ogg - weapons/other/scythe/scythe-hit3.ogg - - diff --git a/items/equip-2hand/item758_WoodenStaff.xml b/items/equip-2hand/item758_WoodenStaff.xml deleted file mode 100644 index 596d6b19..00000000 --- a/items/equip-2hand/item758_WoodenStaff.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d - equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d - weapons/other/staff/staff-miss1.ogg - weapons/other/staff/staff-miss2.ogg - weapons/other/staff/staff-miss3.ogg - weapons/other/staff/staff-hit1.ogg - weapons/other/staff/staff-hit2.ogg - weapons/other/staff/staff-hit3.ogg - - diff --git a/items/equip-2hand/item878_BansheeBow.xml b/items/equip-2hand/item878_BansheeBow.xml deleted file mode 100644 index b4cdf370..00000000 --- a/items/equip-2hand/item878_BansheeBow.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1 - equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1 - weapons/bows/banshee/banshee-miss1.ogg - weapons/bows/banshee/banshee-miss2.ogg - weapons/bows/banshee/banshee-miss3.ogg - weapons/bows/banshee/banshee-hit1.ogg - weapons/bows/banshee/banshee-hit2.ogg - weapons/bows/banshee/banshee-hit3.ogg - - diff --git a/items/equip-2hand/item903_SlingShot.xml b/items/equip-2hand/item903_SlingShot.xml deleted file mode 100644 index a17ca411..00000000 --- a/items/equip-2hand/item903_SlingShot.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 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 - - diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item906_KidBook.xml deleted file mode 100644 index ab0f4178..00000000 --- a/items/equip-2hand/item906_KidBook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - -- cgit v1.2.3-60-g2f50