summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE8
-rw-r--r--graphics/sprites/equipment/weapons/chopper.pngbin0 -> 9656 bytes
-rw-r--r--graphics/sprites/equipment/weapons/chopper.xml11
-rw-r--r--graphics/sprites/equipment/weapons/halberd.pngbin0 -> 20199 bytes
-rw-r--r--graphics/sprites/equipment/weapons/halberd.xml11
-rw-r--r--graphics/sprites/equipment/weapons/staff-warped.pngbin0 -> 12062 bytes
-rw-r--r--graphics/sprites/equipment/weapons/staff-warped.xml11
-rw-r--r--graphics/sprites/equipment/weapons/staff-wizard.pngbin0 -> 21973 bytes
-rw-r--r--graphics/sprites/equipment/weapons/staff-wizard.xml11
-rw-r--r--graphics/sprites/equipment/weapons/sword-bronze.pngbin0 -> 9676 bytes
-rw-r--r--graphics/sprites/equipment/weapons/sword-bronze.xml11
-rw-r--r--graphics/sprites/equipment/weapons/sword-iron-long.pngbin0 -> 9699 bytes
-rw-r--r--graphics/sprites/equipment/weapons/sword-iron-long.xml11
-rw-r--r--graphics/sprites/equipment/weapons/sword-iron.pngbin0 -> 9690 bytes
-rw-r--r--graphics/sprites/equipment/weapons/sword-iron.xml11
-rw-r--r--graphics/sprites/equipment/weapons/trainingwand.pngbin0 -> 29165 bytes
-rw-r--r--graphics/sprites/equipment/weapons/trainingwand.xml11
-rw-r--r--items.xml23
18 files changed, 108 insertions, 11 deletions
diff --git a/LICENSE b/LICENSE
index da457a36..ced2d7cd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1594,7 +1594,9 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/equipment/weapons/backsword.png (Alige, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/weapons/bow.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/weapons/bugslayer.png (Alige, Reid) (CC BY-SA 3.0) (-)
+ graphics/sprites/equipment/weapons/chopper.png (Micksha) (CC BY-SA 4.0, GPLv3) (-)
graphics/sprites/equipment/weapons/gun.png (Skipy) (GPLv2) (jesusalva)
+ graphics/sprites/equipment/weapons/halberd.png (Micksha) (CC BY-SA 4.0) (-)
graphics/sprites/equipment/weapons/heavyaxe.png (?) (GPLv2) (TMW-Br, LoF)
graphics/sprites/equipment/weapons/immortal.png (dangerDuck) (CC BY-SA 4.0) (-)
graphics/sprites/equipment/weapons/jackal.png (?) (GPLv2) (TMW-Br)
@@ -1606,6 +1608,12 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/equipment/weapons/scorpionkinglance.png (?) (?) (TMW-BR)
graphics/sprites/equipment/weapons/scythe.png (?) (?) (TMW.org)
graphics/sprites/equipment/weapons/shortgladius.png (Alige, Reid) (CC BY-SA 3.0) (-)
+ graphics/sprites/equipment/weapons/staff-warped.png (Micksha) (CC BY-SA 4.0, GPLv3) (-)
+ graphics/sprites/equipment/weapons/staff-wizard.png (Micksha) (CC BY-SA 4.0, GPLv3) (-)
+ graphics/sprites/equipment/weapons/sword-bronze.png (Micksha) (CC BY-SA 4.0, GPLv3) (-)
+ graphics/sprites/equipment/weapons/sword-iron.png (Micksha) (CC BY-SA 4.0, GPLv3) (-)
+ graphics/sprites/equipment/weapons/sword-iron-long.png (Micksha) (CC BY-SA 4.0, GPLv3) (-)
+ graphics/sprites/equipment/weapons/trainingwand.png (Micksha) (CC BY-SA 4.0) (-)
graphics/sprites/equipment/weapons/weapon-staff.png (?) (GPLv2) (TMW-BR)
graphics/sprites/equipment/weapons/weapon-staff-blue.png (?) (GPLv2) (TMW-BR)
graphics/sprites/equipment/weapons/weapon-staff-red.png (?) (GPLv2) (TMW-BR)
diff --git a/graphics/sprites/equipment/weapons/chopper.png b/graphics/sprites/equipment/weapons/chopper.png
new file mode 100644
index 00000000..3fcc0f35
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/chopper.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/chopper.xml b/graphics/sprites/equipment/weapons/chopper.xml
new file mode 100644
index 00000000..0cf68b69
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/chopper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/chopper.png"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/halberd.png b/graphics/sprites/equipment/weapons/halberd.png
new file mode 100644
index 00000000..14815f8b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/halberd.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/halberd.xml b/graphics/sprites/equipment/weapons/halberd.xml
new file mode 100644
index 00000000..27c5725d
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/halberd.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/halberd.png"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/staff-warped.png b/graphics/sprites/equipment/weapons/staff-warped.png
new file mode 100644
index 00000000..504355fd
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/staff-warped.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/staff-warped.xml b/graphics/sprites/equipment/weapons/staff-warped.xml
new file mode 100644
index 00000000..6e68855a
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/staff-warped.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 - 2020 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/staff-warped.png"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/staff-wizard.png b/graphics/sprites/equipment/weapons/staff-wizard.png
new file mode 100644
index 00000000..326f5194
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/staff-wizard.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/staff-wizard.xml b/graphics/sprites/equipment/weapons/staff-wizard.xml
new file mode 100644
index 00000000..9338ef12
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/staff-wizard.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 - 2020 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/staff-wizard.png|W"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-bronze.png b/graphics/sprites/equipment/weapons/sword-bronze.png
new file mode 100644
index 00000000..fd7f12aa
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-bronze.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/sword-bronze.xml b/graphics/sprites/equipment/weapons/sword-bronze.xml
new file mode 100644
index 00000000..58caaabd
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-bronze.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/sword-bronze.png"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-iron-long.png b/graphics/sprites/equipment/weapons/sword-iron-long.png
new file mode 100644
index 00000000..f65ef653
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-iron-long.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/sword-iron-long.xml b/graphics/sprites/equipment/weapons/sword-iron-long.xml
new file mode 100644
index 00000000..b4e80af1
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-iron-long.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/sword-iron-long.png"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-iron.png b/graphics/sprites/equipment/weapons/sword-iron.png
new file mode 100644
index 00000000..888fb11f
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-iron.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/sword-iron.xml b/graphics/sprites/equipment/weapons/sword-iron.xml
new file mode 100644
index 00000000..5e78d97f
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-iron.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/sword-iron.png"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png
new file mode 100644
index 00000000..70f55459
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/trainingwand.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/trainingwand.xml b/graphics/sprites/equipment/weapons/trainingwand.xml
new file mode 100644
index 00000000..aa5d766b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/trainingwand.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2011-2015 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/trainingwand.png|W"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/items.xml b/items.xml
index fc17d850..640bb140 100644
--- a/items.xml
+++ b/items.xml
@@ -6487,7 +6487,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
hit-effect-id="813"
critical-hit-effect-id="35"
weight="1400">
- <sprite>equipment/weapons/knife.xml</sprite>
+ <sprite>equipment/weapons/sword-iron.xml</sprite>
<sound event="hit">weapons/knife/hit1.ogg</sound>
<sound event="miss">weapons/knife/miss1.ogg</sound>
</item>
@@ -6534,7 +6534,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="811"
weight="610">
- <sprite>equipment/weapons/bugslayer.xml</sprite>
+ <sprite>equipment/weapons/chopper.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
@@ -6552,7 +6552,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="813"
weight="1200">
- <sprite>equipment/weapons/bugslayer.xml</sprite>
+ <sprite>equipment/weapons/sword-iron-long.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
</item>
@@ -6598,7 +6598,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="813"
weight="1100">
- <sprite>equipment/weapons/bugslayer.xml</sprite>
+ <sprite>equipment/weapons/sword-iron-long.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
@@ -6673,7 +6673,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="810"
weight="340">
- <sprite>equipment/weapons/shortgladius.xml</sprite>
+ <sprite>equipment/weapons/sword-bronze.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
</item>
@@ -6730,7 +6730,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="811"
weight="900">
- <sprite>equipment/weapons/heavyaxe.xml</sprite>
+ <sprite>equipment/weapons/chopper.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
@@ -6805,7 +6805,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="811"
weight="958">
- <sprite>equipment/weapons/shortgladius.xml</sprite>
+ <sprite>equipment/weapons/sword-iron.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
@@ -6821,7 +6821,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="811"
weight="840">
- <sprite>equipment/weapons/shortgladius.xml</sprite>
+ <sprite>equipment/weapons/sword-bronze.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
@@ -6935,7 +6935,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="812"
weight="1500">
- <sprite>equipment/weapons/heavyaxe.xml</sprite>
+ <sprite>equipment/weapons/halberd.xml</sprite>
<sound event="hit">weapons/knife/hit1.ogg</sound>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
<sound event="hit">weapons/piouslayer/hit2.ogg</sound>
@@ -7060,6 +7060,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
hit-effect-id="801"
critical-hit-effect-id="35"
weight="3000">
+ <sprite>equipment/weapons/staff-wizard.xml</sprite>
</item>
<item id="3604"
image="equipment/shields/saviorshield.png"
@@ -7890,7 +7891,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
type="equip-2hand"
attack-action="attack"
weight="158">
- <sprite>equipment/weapons/weapon-staff.xml</sprite>
+ <sprite>equipment/weapons/trainingwand.xml</sprite>
</item>
<item id="7001"
image="equipment/weapons/woodenstaff.png"
@@ -7929,7 +7930,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
type="equip-2hand"
attack-action="attack"
weight="158">
- <sprite>equipment/weapons/weapon-staff.xml</sprite>
+ <sprite>equipment/weapons/staff-warped.xml</sprite>
</item>
<item id="7004"
image="equipment/weapons/legendwand.png"