From f2fb0e2dcdee9025216b52ad5d0c7108c5aa3335 Mon Sep 17 00:00:00 2001 From: Saulc Date: Sat, 25 Apr 2020 08:39:08 +0000 Subject: Change Training gladius into Short gladius --- LICENSE | 8 ++++---- graphics/items/equipment/weapons/bugslayer.png | Bin 0 -> 446 bytes graphics/items/equipment/weapons/piouslayer.png | Bin 446 -> 0 bytes graphics/items/equipment/weapons/shortgladius.png | Bin 0 -> 484 bytes graphics/items/equipment/weapons/traininggladius.png | Bin 484 -> 0 bytes graphics/sprites/equipment/weapons/shortgladius.png | Bin 0 -> 7506 bytes graphics/sprites/equipment/weapons/traininggladius.png | Bin 7506 -> 0 bytes items.xml | 6 +++--- 8 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 graphics/items/equipment/weapons/bugslayer.png delete mode 100644 graphics/items/equipment/weapons/piouslayer.png create mode 100644 graphics/items/equipment/weapons/shortgladius.png delete mode 100644 graphics/items/equipment/weapons/traininggladius.png create mode 100644 graphics/sprites/equipment/weapons/shortgladius.png delete mode 100644 graphics/sprites/equipment/weapons/traininggladius.png 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/bugslayer.png b/graphics/items/equipment/weapons/bugslayer.png new file mode 100644 index 00000000..aed0ecd1 Binary files /dev/null and b/graphics/items/equipment/weapons/bugslayer.png differ diff --git a/graphics/items/equipment/weapons/piouslayer.png b/graphics/items/equipment/weapons/piouslayer.png deleted file mode 100644 index aed0ecd1..00000000 Binary files a/graphics/items/equipment/weapons/piouslayer.png and /dev/null differ diff --git a/graphics/items/equipment/weapons/shortgladius.png b/graphics/items/equipment/weapons/shortgladius.png new file mode 100644 index 00000000..86b7d3bf Binary files /dev/null and b/graphics/items/equipment/weapons/shortgladius.png differ diff --git a/graphics/items/equipment/weapons/traininggladius.png b/graphics/items/equipment/weapons/traininggladius.png deleted file mode 100644 index 86b7d3bf..00000000 Binary files a/graphics/items/equipment/weapons/traininggladius.png and /dev/null differ diff --git a/graphics/sprites/equipment/weapons/shortgladius.png b/graphics/sprites/equipment/weapons/shortgladius.png new file mode 100644 index 00000000..a2641dc8 Binary files /dev/null and b/graphics/sprites/equipment/weapons/shortgladius.png differ diff --git a/graphics/sprites/equipment/weapons/traininggladius.png b/graphics/sprites/equipment/weapons/traininggladius.png deleted file mode 100644 index a2641dc8..00000000 Binary files a/graphics/sprites/equipment/weapons/traininggladius.png and /dev/null 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. weapons/knife/miss1.ogg weapons/piouslayer/miss1.ogg - equipment/weapons/traininggladius.xml + equipment/weapons/shortgladius.xml weapons/piouslayer/hit1.ogg weapons/piouslayer/hit2.ogg weapons/piouslayer/miss1.ogg -- cgit v1.2.3-60-g2f50