summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE8
-rw-r--r--graphics/items/equipment/weapons/bugslayer.png (renamed from graphics/items/equipment/weapons/piouslayer.png)bin446 -> 446 bytes
-rw-r--r--graphics/items/equipment/weapons/shortgladius.png (renamed from graphics/items/equipment/weapons/traininggladius.png)bin484 -> 484 bytes
-rw-r--r--graphics/sprites/equipment/weapons/shortgladius.png (renamed from graphics/sprites/equipment/weapons/traininggladius.png)bin7506 -> 7506 bytes
-rw-r--r--items.xml6
5 files changed, 7 insertions, 7 deletions
diff --git a/LICENSE b/LICENSE
index f3aaa753..665cd907 100644
--- a/LICENSE
+++ b/LICENSE
@@ -448,6 +448,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/equipment/weapons/boneknife.png (Adarias) (GPLv2) (-)
graphics/items/equipment/weapons/broadsword.png (Irukard) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/bronzegladius.png (Irukard) (CC BY-SA 3.0) (-)
+ graphics/items/equipment/weapons/bugslayer.png (Reid) (CC BY-SA 3.0) (Enchilado)
graphics/items/equipment/weapons/butcherknife.png (Irukard) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/championshipbow.png (Saulc, ?) (GPLv2) (TMW-Br)
graphics/items/equipment/weapons/dagger.png (?) (GPLv2) (tmw.org)
@@ -467,7 +468,6 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/equipment/weapons/miere.png (?) (CCO) (LoF)
graphics/items/equipment/weapons/minerknife.png (Saulc) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/pickaxe.png (Irukard) (CC BY-SA 3.0) (-)
- graphics/items/equipment/weapons/piouslayer.png (Reid) (CC BY-SA 3.0) (Enchilado)
graphics/items/equipment/weapons/redlightsaber.png (?) (GPLv2) (TMW-Br)
graphics/items/equipment/weapons/reinboowand.png (?, Enchilado) (GPLv2) (tmw.org)
graphics/items/equipment/weapons/rockknife.png (Adarias) (GPLv2) (-)
@@ -477,11 +477,11 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/equipment/weapons/setzer.png (Adarias) (GPLv2) (-)
graphics/items/equipment/weapons/sharpknife.png (EJlol) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/shortbow.png (?) (GPLv2) (tmw.org)
+ graphics/items/equipment/weapons/shortgladius.png (Reid) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/smallknife.png (?) (GPLv2) (tmw.org)
graphics/items/equipment/weapons/staffoflife.png (Adarias) (GPLv2) (-)
graphics/items/equipment/weapons/sword.png (Irukard) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/trainingbow.png (?) (GPLv2) (tmw.org)
- graphics/items/equipment/weapons/traininggladius.png (Reid) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/woodenbow.png (Reid) (CC BY-SA 3.0) (-)
graphics/items/equipment/weapons/woodenstaff.png (?) (GPLv2) (tmw.org)
graphics/items/equipment/weapons/woodensword.png (Len) (CC BY-SA 3.0) (Reid)
@@ -1492,6 +1492,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/equipment/shields/masterbola.png (Saulc) (GPLv2) (Aline/TMW-Br)
#### Weapons
graphics/sprites/equipment/weapons/backsword.png (Alige, Reid) (CC BY-SA 3.0) (-)
+ graphics/sprites/equipment/weapons/bugslayer.png (Alige, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/weapons/heavyaxe.png (?) (GPLv2) (TMW-Br, LoF)
graphics/sprites/equipment/weapons/jackal.png (?) (GPLv2) (TMW-Br)
graphics/sprites/equipment/weapons/kanabo.png (?) (GPLv2) (TMW-Br, LoF)
@@ -1499,10 +1500,9 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/equipment/weapons/kurogane.png (Arqueiro) (GPL 3.0) (TMW-BR)
graphics/sprites/equipment/weapons/lidersword.png (?) (GPL 3.0) (TMW-BR)
graphics/sprites/equipment/weapons/pickaxe.png (?) (GPL 3.0) (TMW-BR)
- graphics/sprites/equipment/weapons/piouslayer.png (Alige, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/weapons/scorpionkinglance.png (?) (?) (TMW-BR)
graphics/sprites/equipment/weapons/scythe.png (?) (?) (TMW.org)
- graphics/sprites/equipment/weapons/traininggladius.png (Alige, Reid) (CC BY-SA 3.0) (-)
+ graphics/sprites/equipment/weapons/shortgladius.png (Alige, Reid) (CC BY-SA 3.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/items/equipment/weapons/piouslayer.png b/graphics/items/equipment/weapons/bugslayer.png
index aed0ecd1..aed0ecd1 100644
--- a/graphics/items/equipment/weapons/piouslayer.png
+++ b/graphics/items/equipment/weapons/bugslayer.png
Binary files differ
diff --git a/graphics/items/equipment/weapons/traininggladius.png b/graphics/items/equipment/weapons/shortgladius.png
index 86b7d3bf..86b7d3bf 100644
--- a/graphics/items/equipment/weapons/traininggladius.png
+++ b/graphics/items/equipment/weapons/shortgladius.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/traininggladius.png b/graphics/sprites/equipment/weapons/shortgladius.png
index a2641dc8..a2641dc8 100644
--- a/graphics/sprites/equipment/weapons/traininggladius.png
+++ b/graphics/sprites/equipment/weapons/shortgladius.png
Binary files differ
diff --git a/items.xml b/items.xml
index 00f95da7..6174ad9d 100644
--- a/items.xml
+++ b/items.xml
@@ -6051,7 +6051,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sound event="miss">weapons/knife/miss1.ogg</sound>
</item>
<item id="3501"
- image="equipment/weapons/piouslayer.png"
+ image="equipment/weapons/bugslayer.png"
name="Bug Slayer"
description="Jesusalva introduced another bug!! We must slay it!"
attack="190"
@@ -6066,7 +6066,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
</item>
<item id="3502"
- image="equipment/weapons/traininggladius.png"
+ image="equipment/weapons/shortgladius.png"
name="Short Gladius"
description="A short sword made for close combat."
attack="230"
@@ -6076,7 +6076,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack"
hit-effect-id="811"
weight="550">
- <sprite>equipment/weapons/traininggladius.xml</sprite>
+ <sprite>equipment/weapons/shortgladius.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>