From 1304cffc259ef5cf85d6e4bd7ac9eb855aacb7b0 Mon Sep 17 00:00:00 2001 From: Micksha Date: Thu, 29 Jul 2021 13:40:53 +0000 Subject: Add Pike and Desert Bow --- graphics/items/equipment/weapon/bow-desert.png | Bin 0 -> 1712 bytes graphics/items/equipment/weapon/pike.png | Bin 0 -> 889 bytes graphics/sprites/equipment/head/beaniecopter.xml | 47 +++++++++++++++++ graphics/sprites/equipment/head/blinkingevil.xml | 39 ++++++++++++++ graphics/sprites/equipment/weapons/bow-desert.png | Bin 0 -> 10787 bytes graphics/sprites/equipment/weapons/bow-desert.xml | 15 ++++++ graphics/sprites/equipment/weapons/pike.png | Bin 0 -> 10425 bytes graphics/sprites/equipment/weapons/pike.xml | 15 ++++++ graphics/sprites/hairstyles/hairstyle00.xml | 34 +++++++++++++ graphics/sprites/hairstyles/hairstyle13.xml | 35 +++++++++++++ graphics/sprites/model/base.xml | 38 ++++++++++++++ graphics/sprites/model/headmodel-ani.xml | 40 +++++++++++++++ graphics/sprites/model/headmodel.xml | 34 +++++++++++++ items/equip-2hand.xml | 59 +++++++++++++++++----- license.md | 4 ++ 15 files changed, 346 insertions(+), 14 deletions(-) create mode 100644 graphics/items/equipment/weapon/bow-desert.png create mode 100644 graphics/items/equipment/weapon/pike.png create mode 100644 graphics/sprites/equipment/weapons/bow-desert.png create mode 100644 graphics/sprites/equipment/weapons/bow-desert.xml create mode 100644 graphics/sprites/equipment/weapons/pike.png create mode 100644 graphics/sprites/equipment/weapons/pike.xml diff --git a/graphics/items/equipment/weapon/bow-desert.png b/graphics/items/equipment/weapon/bow-desert.png new file mode 100644 index 00000000..082ffd20 Binary files /dev/null and b/graphics/items/equipment/weapon/bow-desert.png differ diff --git a/graphics/items/equipment/weapon/pike.png b/graphics/items/equipment/weapon/pike.png new file mode 100644 index 00000000..e5ba0dc9 Binary files /dev/null and b/graphics/items/equipment/weapon/pike.png differ diff --git a/graphics/sprites/equipment/head/beaniecopter.xml b/graphics/sprites/equipment/head/beaniecopter.xml index e38e09fd..f70084b0 100644 --- a/graphics/sprites/equipment/head/beaniecopter.xml +++ b/graphics/sprites/equipment/head/beaniecopter.xml @@ -349,6 +349,53 @@ Copyright (C) 2021 The Mana World--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/head/blinkingevil.xml b/graphics/sprites/equipment/head/blinkingevil.xml index bebca7e8..0d71d73a 100644 --- a/graphics/sprites/equipment/head/blinkingevil.xml +++ b/graphics/sprites/equipment/head/blinkingevil.xml @@ -323,6 +323,45 @@ Copyright (C) 2021 The Mana World--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/hairstyles/hairstyle13.xml b/graphics/sprites/hairstyles/hairstyle13.xml index 639e1ca7..62fe7411 100644 --- a/graphics/sprites/hairstyles/hairstyle13.xml +++ b/graphics/sprites/hairstyles/hairstyle13.xml @@ -252,6 +252,41 @@ Copyright (C) 2021 The Mana World --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/model/base.xml b/graphics/sprites/model/base.xml index 5b32f189..b689c8e4 100644 --- a/graphics/sprites/model/base.xml +++ b/graphics/sprites/model/base.xml @@ -224,6 +224,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/model/headmodel-ani.xml b/graphics/sprites/model/headmodel-ani.xml index d1b02443..77baa122 100644 --- a/graphics/sprites/model/headmodel-ani.xml +++ b/graphics/sprites/model/headmodel-ani.xml @@ -317,6 +317,46 @@ Copyright (C) 2021 The Mana World--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/model/headmodel.xml b/graphics/sprites/model/headmodel.xml index 9f909ffd..64221225 100644 --- a/graphics/sprites/model/headmodel.xml +++ b/graphics/sprites/model/headmodel.xml @@ -249,6 +249,40 @@ Copyright (C) 2021 The Mana World--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/items/equip-2hand.xml b/items/equip-2hand.xml index 5328c33e..5897fb81 100644 --- a/items/equip-2hand.xml +++ b/items/equip-2hand.xml @@ -1,19 +1,5 @@ - - equipment/weapons/bow.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-desert.xml + weapons/bows/bow-miss1.ogg + weapons/bows/bow-hit1.ogg + + + equipment/weapons/pike.xml + 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/bow.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/license.md b/license.md index bc98c822..9af34e6c 100644 --- a/license.md +++ b/license.md @@ -333,6 +333,7 @@ File | Artists | Licenses `graphics/items/equipment/weapon/axe-meatcleaver.png` | Irukard | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/axe-tomahawk.png` | Modanung | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/bow-bansheebow.png` | Adarias, V0id | GPLv2 +`graphics/items/equipment/weapon/bow-desert.png` | Micksha | MIT `graphics/items/equipment/weapon/bow-desertbow.png` | Adarias | GPLv2 `graphics/items/equipment/weapon/dagger-boneknife.png` | Adarias | GPLv2 `graphics/items/equipment/weapon/dagger-rockknive.png` | Adarias | GPLv2 @@ -342,6 +343,7 @@ File | Artists | Licenses `graphics/items/equipment/weapon/dagger-stiletto.png` | Irukard | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/mace-club.png` | Irukard | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/kidbook.png` | Wombat, Salmondine, Enchilado | GPLv2 +`graphics/items/equipment/weapon/pike.png` | Micksha | MIT `graphics/items/equipment/weapon/polearm-bardiche.png` | Irukard | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/polearm-dualspear.png` | Irukard | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/polearm-halberd.png` | Irukard | GPLv2, CC BY-SA 3.0 @@ -684,7 +686,9 @@ File | Artists | Licenses `graphics/sprites/equipment/weapons/axe-chop.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/axe-stab.png` | :grey_question:, Wombat, Wushin, Varuna | GPLv2 `graphics/sprites/equipment/weapons/bow-banshee.png` | V0id | GPLv2 +`graphics/sprites/equipment/weapons/bow-desert.png` | Micksha | MIT `graphics/sprites/equipment/weapons/bow-slingshot.png` | Chef Chelios, wushin | GPLv2 +`graphics/sprites/equipment/weapons/pike.png` | Micksha | MIT `graphics/sprites/equipment/weapons/polearm-blunt.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/polearm-chop.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/polearm-spear.png` | :grey_question:, Wombat, Wushin | GPLv2 -- cgit v1.2.3-60-g2f50