From 05b01438a17c96a771df6046013b974124e8610f Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Sat, 30 Apr 2011 20:03:00 +0200
Subject: Started reorganising graphics folder. Started with graphics/items
 folder. Shields, neck, weapons and ammo equipments are now done.

---
 graphics/items/armor-hands-scarabarmlet.png        | Bin 1499 -> 0 bytes
 graphics/items/armor-neck-enchanter.png            | Bin 1445 -> 0 bytes
 graphics/items/armor-neck-silver4leaf.png          | Bin 822 -> 0 bytes
 graphics/items/armor-shield-bladeshield.png        | Bin 1924 -> 0 bytes
 graphics/items/armor-shield-britshield.png         | Bin 1323 -> 0 bytes
 graphics/items/armor-shield-knightshield.png       | Bin 1430 -> 0 bytes
 graphics/items/armor-shield-leathershield.png      | Bin 711 -> 0 bytes
 graphics/items/armor-shield-steelshield.png        | Bin 1772 -> 0 bytes
 graphics/items/armor-shield-woodenshield.png       | Bin 850 -> 0 bytes
 graphics/items/equipment/ammo/arrow-arrow.png      | Bin 0 -> 385 bytes
 graphics/items/equipment/ammo/arrow-iron.png       | Bin 0 -> 402 bytes
 graphics/items/equipment/ammo/bonedarts.png        | Bin 0 -> 894 bytes
 graphics/items/equipment/neck/enchanter.png        | Bin 0 -> 1445 bytes
 graphics/items/equipment/neck/silverfourleaf.png   | Bin 0 -> 822 bytes
 graphics/items/equipment/shield/blade.png          | Bin 0 -> 1924 bytes
 graphics/items/equipment/shield/brass.png          | Bin 0 -> 1331 bytes
 graphics/items/equipment/shield/brassshield.png    | Bin 1331 -> 0 bytes
 graphics/items/equipment/shield/brit.png           | Bin 0 -> 1323 bytes
 graphics/items/equipment/shield/knight.png         | Bin 0 -> 1430 bytes
 graphics/items/equipment/shield/leather.png        | Bin 0 -> 711 bytes
 graphics/items/equipment/shield/scarabarmlet.png   | Bin 0 -> 1499 bytes
 graphics/items/equipment/shield/steel.png          | Bin 0 -> 1772 bytes
 graphics/items/equipment/shield/wooden.png         | Bin 0 -> 850 bytes
 graphics/items/equipment/weapon/axe-axe.png        | Bin 0 -> 977 bytes
 .../items/equipment/weapon/axe-blacksmithsaxe.png  | Bin 0 -> 1105 bytes
 .../items/equipment/weapon/axe-butcherscleaver.png | Bin 0 -> 1133 bytes
 graphics/items/equipment/weapon/axe-hatchet.png    | Bin 0 -> 722 bytes
 .../items/equipment/weapon/axe-meatcleaver.png     | Bin 0 -> 1019 bytes
 graphics/items/equipment/weapon/axe-tomahawk.png   | Bin 0 -> 1095 bytes
 graphics/items/equipment/weapon/bow-bow.png        | Bin 0 -> 666 bytes
 graphics/items/equipment/weapon/bow-desertbow.png  | Bin 0 -> 886 bytes
 graphics/items/equipment/weapon/bow-forestbow.png  | Bin 0 -> 758 bytes
 graphics/items/equipment/weapon/bow-shortbow.png   | Bin 0 -> 461 bytes
 .../items/equipment/weapon/dagger-boneknife.png    | Bin 0 -> 999 bytes
 graphics/items/equipment/weapon/dagger-dagger.png  | Bin 0 -> 582 bytes
 graphics/items/equipment/weapon/dagger-knive.png   | Bin 0 -> 335 bytes
 .../items/equipment/weapon/dagger-rockknive.png    | Bin 0 -> 732 bytes
 graphics/items/equipment/weapon/dagger-setzer.png  | Bin 0 -> 1387 bytes
 .../items/equipment/weapon/dagger-sharpknife.png   | Bin 0 -> 564 bytes
 .../items/equipment/weapon/dagger-shortsword.png   | Bin 0 -> 673 bytes
 .../items/equipment/weapon/dagger-stiletto.png     | Bin 0 -> 405 bytes
 graphics/items/equipment/weapon/mace-club.png      | Bin 0 -> 507 bytes
 .../items/equipment/weapon/polearm-bardiche.png    | Bin 0 -> 454 bytes
 .../items/equipment/weapon/polearm-dualspear.png   | Bin 0 -> 635 bytes
 .../items/equipment/weapon/polearm-halberd.png     | Bin 0 -> 516 bytes
 .../items/equipment/weapon/polearm-heavypike.png   | Bin 0 -> 485 bytes
 .../items/equipment/weapon/polearm-heavyspear.png  | Bin 0 -> 498 bytes
 graphics/items/equipment/weapon/polearm-pike.png   | Bin 0 -> 447 bytes
 .../items/equipment/weapon/polearm-scorpion.png    | Bin 0 -> 699 bytes
 graphics/items/equipment/weapon/polearm-scythe.png | Bin 0 -> 657 bytes
 graphics/items/equipment/weapon/polearm-spear.png  | Bin 0 -> 449 bytes
 .../items/equipment/weapon/polearm-trident.png     | Bin 0 -> 481 bytes
 .../items/equipment/weapon/staff-crescentrod.png   | Bin 0 -> 654 bytes
 .../items/equipment/weapon/staff-staffoffire.png   | Bin 0 -> 921 bytes
 .../items/equipment/weapon/staff-staffofice.png    | Bin 0 -> 954 bytes
 .../items/equipment/weapon/staff-staffoflife.png   | Bin 0 -> 762 bytes
 .../items/equipment/weapon/staff-woodstaff.png     | Bin 0 -> 321 bytes
 graphics/items/equipment/weapon/sword-baselard.png | Bin 0 -> 735 bytes
 .../items/equipment/weapon/sword-bastardsword.png  | Bin 0 -> 757 bytes
 graphics/items/equipment/weapon/sword-beheader.png | Bin 0 -> 896 bytes
 .../items/equipment/weapon/sword-broadsword.png    | Bin 0 -> 1286 bytes
 .../items/equipment/weapon/sword-bronzesword.png   | Bin 0 -> 878 bytes
 graphics/items/equipment/weapon/sword-falchion.png | Bin 0 -> 980 bytes
 .../items/equipment/weapon/sword-firesword.png     | Bin 0 -> 988 bytes
 graphics/items/equipment/weapon/sword-jackal.png   | Bin 0 -> 653 bytes
 .../items/equipment/weapon/sword-longsword.png     | Bin 0 -> 730 bytes
 graphics/items/equipment/weapon/sword-rapier.png   | Bin 0 -> 393 bytes
 graphics/items/equipment/weapon/sword-sabre.png    | Bin 0 -> 1712 bytes
 .../items/equipment/weapon/sword-sandcutter.png    | Bin 0 -> 934 bytes
 graphics/items/equipment/weapon/sword-scimitar.png | Bin 0 -> 1054 bytes
 graphics/items/equipment/weapon/sword-sword.png    | Bin 0 -> 827 bytes
 graphics/items/weapon-arrow-arrow.png              | Bin 385 -> 0 bytes
 graphics/items/weapon-arrow-iron.png               | Bin 402 -> 0 bytes
 graphics/items/weapon-axe-axe.png                  | Bin 977 -> 0 bytes
 graphics/items/weapon-axe-blacksmithsaxe.png       | Bin 1105 -> 0 bytes
 graphics/items/weapon-axe-butcherscleaver.png      | Bin 1133 -> 0 bytes
 graphics/items/weapon-axe-hatchet.png              | Bin 722 -> 0 bytes
 graphics/items/weapon-axe-meatcleaver.png          | Bin 1019 -> 0 bytes
 graphics/items/weapon-axe-tomahawk.png             | Bin 1095 -> 0 bytes
 graphics/items/weapon-bow-bow.png                  | Bin 666 -> 0 bytes
 graphics/items/weapon-bow-desertbow.png            | Bin 886 -> 0 bytes
 graphics/items/weapon-bow-forestbow.png            | Bin 758 -> 0 bytes
 graphics/items/weapon-bow-shortbow.png             | Bin 461 -> 0 bytes
 graphics/items/weapon-dagger-boneknife.png         | Bin 999 -> 0 bytes
 graphics/items/weapon-dagger-dagger.png            | Bin 582 -> 0 bytes
 graphics/items/weapon-dagger-knive.png             | Bin 335 -> 0 bytes
 graphics/items/weapon-dagger-rockknive.png         | Bin 732 -> 0 bytes
 graphics/items/weapon-dagger-setzer.png            | Bin 1387 -> 0 bytes
 graphics/items/weapon-dagger-sharpknife.png        | Bin 564 -> 0 bytes
 graphics/items/weapon-dagger-shortsword.png        | Bin 673 -> 0 bytes
 graphics/items/weapon-dagger-stiletto.png          | Bin 405 -> 0 bytes
 graphics/items/weapon-mace-club.png                | Bin 507 -> 0 bytes
 graphics/items/weapon-polearm-bardiche.png         | Bin 454 -> 0 bytes
 graphics/items/weapon-polearm-dualspear.png        | Bin 635 -> 0 bytes
 graphics/items/weapon-polearm-halberd.png          | Bin 516 -> 0 bytes
 graphics/items/weapon-polearm-heavypike.png        | Bin 485 -> 0 bytes
 graphics/items/weapon-polearm-heavyspear.png       | Bin 498 -> 0 bytes
 graphics/items/weapon-polearm-pike.png             | Bin 447 -> 0 bytes
 graphics/items/weapon-polearm-scorpion.png         | Bin 699 -> 0 bytes
 graphics/items/weapon-polearm-scythe.png           | Bin 657 -> 0 bytes
 graphics/items/weapon-polearm-spear.png            | Bin 449 -> 0 bytes
 graphics/items/weapon-polearm-trident.png          | Bin 481 -> 0 bytes
 graphics/items/weapon-staff-crescentrod.png        | Bin 654 -> 0 bytes
 graphics/items/weapon-staff-staffoffire.png        | Bin 921 -> 0 bytes
 graphics/items/weapon-staff-staffofice.png         | Bin 954 -> 0 bytes
 graphics/items/weapon-staff-staffoflife.png        | Bin 762 -> 0 bytes
 graphics/items/weapon-staff-woodstaff.png          | Bin 321 -> 0 bytes
 graphics/items/weapon-sword-baselard.png           | Bin 735 -> 0 bytes
 graphics/items/weapon-sword-bastardsword.png       | Bin 757 -> 0 bytes
 graphics/items/weapon-sword-beheader.png           | Bin 896 -> 0 bytes
 graphics/items/weapon-sword-broadsword.png         | Bin 1286 -> 0 bytes
 graphics/items/weapon-sword-bronzesword.png        | Bin 878 -> 0 bytes
 graphics/items/weapon-sword-falchion.png           | Bin 980 -> 0 bytes
 graphics/items/weapon-sword-firesword.png          | Bin 988 -> 0 bytes
 graphics/items/weapon-sword-jackal.png             | Bin 653 -> 0 bytes
 graphics/items/weapon-sword-longsword.png          | Bin 730 -> 0 bytes
 graphics/items/weapon-sword-rapier.png             | Bin 393 -> 0 bytes
 graphics/items/weapon-sword-sabre.png              | Bin 1712 -> 0 bytes
 graphics/items/weapon-sword-sandcutter.png         | Bin 934 -> 0 bytes
 graphics/items/weapon-sword-scimitar.png           | Bin 1054 -> 0 bytes
 graphics/items/weapon-sword-sword.png              | Bin 827 -> 0 bytes
 graphics/items/weapon-thrown-bonedarts.png         | Bin 894 -> 0 bytes
 graphics/sprites/weapon-axe-blacksmith.xml         |   2 +-
 items.xml                                          | 122 ++++++++++-----------
 124 files changed, 62 insertions(+), 62 deletions(-)
 delete mode 100644 graphics/items/armor-hands-scarabarmlet.png
 delete mode 100644 graphics/items/armor-neck-enchanter.png
 delete mode 100644 graphics/items/armor-neck-silver4leaf.png
 delete mode 100644 graphics/items/armor-shield-bladeshield.png
 delete mode 100644 graphics/items/armor-shield-britshield.png
 delete mode 100644 graphics/items/armor-shield-knightshield.png
 delete mode 100755 graphics/items/armor-shield-leathershield.png
 delete mode 100644 graphics/items/armor-shield-steelshield.png
 delete mode 100755 graphics/items/armor-shield-woodenshield.png
 create mode 100644 graphics/items/equipment/ammo/arrow-arrow.png
 create mode 100644 graphics/items/equipment/ammo/arrow-iron.png
 create mode 100644 graphics/items/equipment/ammo/bonedarts.png
 create mode 100644 graphics/items/equipment/neck/enchanter.png
 create mode 100644 graphics/items/equipment/neck/silverfourleaf.png
 create mode 100644 graphics/items/equipment/shield/blade.png
 create mode 100644 graphics/items/equipment/shield/brass.png
 delete mode 100644 graphics/items/equipment/shield/brassshield.png
 create mode 100644 graphics/items/equipment/shield/brit.png
 create mode 100644 graphics/items/equipment/shield/knight.png
 create mode 100755 graphics/items/equipment/shield/leather.png
 create mode 100644 graphics/items/equipment/shield/scarabarmlet.png
 create mode 100644 graphics/items/equipment/shield/steel.png
 create mode 100755 graphics/items/equipment/shield/wooden.png
 create mode 100644 graphics/items/equipment/weapon/axe-axe.png
 create mode 100644 graphics/items/equipment/weapon/axe-blacksmithsaxe.png
 create mode 100644 graphics/items/equipment/weapon/axe-butcherscleaver.png
 create mode 100644 graphics/items/equipment/weapon/axe-hatchet.png
 create mode 100644 graphics/items/equipment/weapon/axe-meatcleaver.png
 create mode 100644 graphics/items/equipment/weapon/axe-tomahawk.png
 create mode 100644 graphics/items/equipment/weapon/bow-bow.png
 create mode 100644 graphics/items/equipment/weapon/bow-desertbow.png
 create mode 100644 graphics/items/equipment/weapon/bow-forestbow.png
 create mode 100644 graphics/items/equipment/weapon/bow-shortbow.png
 create mode 100644 graphics/items/equipment/weapon/dagger-boneknife.png
 create mode 100644 graphics/items/equipment/weapon/dagger-dagger.png
 create mode 100644 graphics/items/equipment/weapon/dagger-knive.png
 create mode 100644 graphics/items/equipment/weapon/dagger-rockknive.png
 create mode 100644 graphics/items/equipment/weapon/dagger-setzer.png
 create mode 100644 graphics/items/equipment/weapon/dagger-sharpknife.png
 create mode 100644 graphics/items/equipment/weapon/dagger-shortsword.png
 create mode 100644 graphics/items/equipment/weapon/dagger-stiletto.png
 create mode 100644 graphics/items/equipment/weapon/mace-club.png
 create mode 100644 graphics/items/equipment/weapon/polearm-bardiche.png
 create mode 100644 graphics/items/equipment/weapon/polearm-dualspear.png
 create mode 100644 graphics/items/equipment/weapon/polearm-halberd.png
 create mode 100644 graphics/items/equipment/weapon/polearm-heavypike.png
 create mode 100644 graphics/items/equipment/weapon/polearm-heavyspear.png
 create mode 100644 graphics/items/equipment/weapon/polearm-pike.png
 create mode 100644 graphics/items/equipment/weapon/polearm-scorpion.png
 create mode 100644 graphics/items/equipment/weapon/polearm-scythe.png
 create mode 100644 graphics/items/equipment/weapon/polearm-spear.png
 create mode 100644 graphics/items/equipment/weapon/polearm-trident.png
 create mode 100644 graphics/items/equipment/weapon/staff-crescentrod.png
 create mode 100644 graphics/items/equipment/weapon/staff-staffoffire.png
 create mode 100644 graphics/items/equipment/weapon/staff-staffofice.png
 create mode 100644 graphics/items/equipment/weapon/staff-staffoflife.png
 create mode 100644 graphics/items/equipment/weapon/staff-woodstaff.png
 create mode 100644 graphics/items/equipment/weapon/sword-baselard.png
 create mode 100644 graphics/items/equipment/weapon/sword-bastardsword.png
 create mode 100644 graphics/items/equipment/weapon/sword-beheader.png
 create mode 100644 graphics/items/equipment/weapon/sword-broadsword.png
 create mode 100644 graphics/items/equipment/weapon/sword-bronzesword.png
 create mode 100644 graphics/items/equipment/weapon/sword-falchion.png
 create mode 100644 graphics/items/equipment/weapon/sword-firesword.png
 create mode 100644 graphics/items/equipment/weapon/sword-jackal.png
 create mode 100644 graphics/items/equipment/weapon/sword-longsword.png
 create mode 100644 graphics/items/equipment/weapon/sword-rapier.png
 create mode 100644 graphics/items/equipment/weapon/sword-sabre.png
 create mode 100644 graphics/items/equipment/weapon/sword-sandcutter.png
 create mode 100644 graphics/items/equipment/weapon/sword-scimitar.png
 create mode 100644 graphics/items/equipment/weapon/sword-sword.png
 delete mode 100644 graphics/items/weapon-arrow-arrow.png
 delete mode 100644 graphics/items/weapon-arrow-iron.png
 delete mode 100644 graphics/items/weapon-axe-axe.png
 delete mode 100644 graphics/items/weapon-axe-blacksmithsaxe.png
 delete mode 100644 graphics/items/weapon-axe-butcherscleaver.png
 delete mode 100644 graphics/items/weapon-axe-hatchet.png
 delete mode 100644 graphics/items/weapon-axe-meatcleaver.png
 delete mode 100644 graphics/items/weapon-axe-tomahawk.png
 delete mode 100644 graphics/items/weapon-bow-bow.png
 delete mode 100644 graphics/items/weapon-bow-desertbow.png
 delete mode 100644 graphics/items/weapon-bow-forestbow.png
 delete mode 100644 graphics/items/weapon-bow-shortbow.png
 delete mode 100644 graphics/items/weapon-dagger-boneknife.png
 delete mode 100644 graphics/items/weapon-dagger-dagger.png
 delete mode 100644 graphics/items/weapon-dagger-knive.png
 delete mode 100644 graphics/items/weapon-dagger-rockknive.png
 delete mode 100644 graphics/items/weapon-dagger-setzer.png
 delete mode 100644 graphics/items/weapon-dagger-sharpknife.png
 delete mode 100644 graphics/items/weapon-dagger-shortsword.png
 delete mode 100644 graphics/items/weapon-dagger-stiletto.png
 delete mode 100644 graphics/items/weapon-mace-club.png
 delete mode 100644 graphics/items/weapon-polearm-bardiche.png
 delete mode 100644 graphics/items/weapon-polearm-dualspear.png
 delete mode 100644 graphics/items/weapon-polearm-halberd.png
 delete mode 100644 graphics/items/weapon-polearm-heavypike.png
 delete mode 100644 graphics/items/weapon-polearm-heavyspear.png
 delete mode 100644 graphics/items/weapon-polearm-pike.png
 delete mode 100644 graphics/items/weapon-polearm-scorpion.png
 delete mode 100644 graphics/items/weapon-polearm-scythe.png
 delete mode 100644 graphics/items/weapon-polearm-spear.png
 delete mode 100644 graphics/items/weapon-polearm-trident.png
 delete mode 100644 graphics/items/weapon-staff-crescentrod.png
 delete mode 100644 graphics/items/weapon-staff-staffoffire.png
 delete mode 100644 graphics/items/weapon-staff-staffofice.png
 delete mode 100644 graphics/items/weapon-staff-staffoflife.png
 delete mode 100644 graphics/items/weapon-staff-woodstaff.png
 delete mode 100644 graphics/items/weapon-sword-baselard.png
 delete mode 100644 graphics/items/weapon-sword-bastardsword.png
 delete mode 100644 graphics/items/weapon-sword-beheader.png
 delete mode 100644 graphics/items/weapon-sword-broadsword.png
 delete mode 100644 graphics/items/weapon-sword-bronzesword.png
 delete mode 100644 graphics/items/weapon-sword-falchion.png
 delete mode 100644 graphics/items/weapon-sword-firesword.png
 delete mode 100644 graphics/items/weapon-sword-jackal.png
 delete mode 100644 graphics/items/weapon-sword-longsword.png
 delete mode 100644 graphics/items/weapon-sword-rapier.png
 delete mode 100644 graphics/items/weapon-sword-sabre.png
 delete mode 100644 graphics/items/weapon-sword-sandcutter.png
 delete mode 100644 graphics/items/weapon-sword-scimitar.png
 delete mode 100644 graphics/items/weapon-sword-sword.png
 delete mode 100644 graphics/items/weapon-thrown-bonedarts.png

diff --git a/graphics/items/armor-hands-scarabarmlet.png b/graphics/items/armor-hands-scarabarmlet.png
deleted file mode 100644
index c0a597b9..00000000
Binary files a/graphics/items/armor-hands-scarabarmlet.png and /dev/null differ
diff --git a/graphics/items/armor-neck-enchanter.png b/graphics/items/armor-neck-enchanter.png
deleted file mode 100644
index 3023715e..00000000
Binary files a/graphics/items/armor-neck-enchanter.png and /dev/null differ
diff --git a/graphics/items/armor-neck-silver4leaf.png b/graphics/items/armor-neck-silver4leaf.png
deleted file mode 100644
index a02c76e4..00000000
Binary files a/graphics/items/armor-neck-silver4leaf.png and /dev/null differ
diff --git a/graphics/items/armor-shield-bladeshield.png b/graphics/items/armor-shield-bladeshield.png
deleted file mode 100644
index dde2ecbd..00000000
Binary files a/graphics/items/armor-shield-bladeshield.png and /dev/null differ
diff --git a/graphics/items/armor-shield-britshield.png b/graphics/items/armor-shield-britshield.png
deleted file mode 100644
index c3a8f1d7..00000000
Binary files a/graphics/items/armor-shield-britshield.png and /dev/null differ
diff --git a/graphics/items/armor-shield-knightshield.png b/graphics/items/armor-shield-knightshield.png
deleted file mode 100644
index 0cb742c3..00000000
Binary files a/graphics/items/armor-shield-knightshield.png and /dev/null differ
diff --git a/graphics/items/armor-shield-leathershield.png b/graphics/items/armor-shield-leathershield.png
deleted file mode 100755
index af688611..00000000
Binary files a/graphics/items/armor-shield-leathershield.png and /dev/null differ
diff --git a/graphics/items/armor-shield-steelshield.png b/graphics/items/armor-shield-steelshield.png
deleted file mode 100644
index 04d26199..00000000
Binary files a/graphics/items/armor-shield-steelshield.png and /dev/null differ
diff --git a/graphics/items/armor-shield-woodenshield.png b/graphics/items/armor-shield-woodenshield.png
deleted file mode 100755
index 7b409d4f..00000000
Binary files a/graphics/items/armor-shield-woodenshield.png and /dev/null differ
diff --git a/graphics/items/equipment/ammo/arrow-arrow.png b/graphics/items/equipment/ammo/arrow-arrow.png
new file mode 100644
index 00000000..fd1836c9
Binary files /dev/null and b/graphics/items/equipment/ammo/arrow-arrow.png differ
diff --git a/graphics/items/equipment/ammo/arrow-iron.png b/graphics/items/equipment/ammo/arrow-iron.png
new file mode 100644
index 00000000..2c87a12b
Binary files /dev/null and b/graphics/items/equipment/ammo/arrow-iron.png differ
diff --git a/graphics/items/equipment/ammo/bonedarts.png b/graphics/items/equipment/ammo/bonedarts.png
new file mode 100644
index 00000000..f8536d3b
Binary files /dev/null and b/graphics/items/equipment/ammo/bonedarts.png differ
diff --git a/graphics/items/equipment/neck/enchanter.png b/graphics/items/equipment/neck/enchanter.png
new file mode 100644
index 00000000..3023715e
Binary files /dev/null and b/graphics/items/equipment/neck/enchanter.png differ
diff --git a/graphics/items/equipment/neck/silverfourleaf.png b/graphics/items/equipment/neck/silverfourleaf.png
new file mode 100644
index 00000000..a02c76e4
Binary files /dev/null and b/graphics/items/equipment/neck/silverfourleaf.png differ
diff --git a/graphics/items/equipment/shield/blade.png b/graphics/items/equipment/shield/blade.png
new file mode 100644
index 00000000..dde2ecbd
Binary files /dev/null and b/graphics/items/equipment/shield/blade.png differ
diff --git a/graphics/items/equipment/shield/brass.png b/graphics/items/equipment/shield/brass.png
new file mode 100644
index 00000000..5753148a
Binary files /dev/null and b/graphics/items/equipment/shield/brass.png differ
diff --git a/graphics/items/equipment/shield/brassshield.png b/graphics/items/equipment/shield/brassshield.png
deleted file mode 100644
index 5753148a..00000000
Binary files a/graphics/items/equipment/shield/brassshield.png and /dev/null differ
diff --git a/graphics/items/equipment/shield/brit.png b/graphics/items/equipment/shield/brit.png
new file mode 100644
index 00000000..c3a8f1d7
Binary files /dev/null and b/graphics/items/equipment/shield/brit.png differ
diff --git a/graphics/items/equipment/shield/knight.png b/graphics/items/equipment/shield/knight.png
new file mode 100644
index 00000000..0cb742c3
Binary files /dev/null and b/graphics/items/equipment/shield/knight.png differ
diff --git a/graphics/items/equipment/shield/leather.png b/graphics/items/equipment/shield/leather.png
new file mode 100755
index 00000000..af688611
Binary files /dev/null and b/graphics/items/equipment/shield/leather.png differ
diff --git a/graphics/items/equipment/shield/scarabarmlet.png b/graphics/items/equipment/shield/scarabarmlet.png
new file mode 100644
index 00000000..c0a597b9
Binary files /dev/null and b/graphics/items/equipment/shield/scarabarmlet.png differ
diff --git a/graphics/items/equipment/shield/steel.png b/graphics/items/equipment/shield/steel.png
new file mode 100644
index 00000000..04d26199
Binary files /dev/null and b/graphics/items/equipment/shield/steel.png differ
diff --git a/graphics/items/equipment/shield/wooden.png b/graphics/items/equipment/shield/wooden.png
new file mode 100755
index 00000000..7b409d4f
Binary files /dev/null and b/graphics/items/equipment/shield/wooden.png differ
diff --git a/graphics/items/equipment/weapon/axe-axe.png b/graphics/items/equipment/weapon/axe-axe.png
new file mode 100644
index 00000000..007c4ec8
Binary files /dev/null and b/graphics/items/equipment/weapon/axe-axe.png differ
diff --git a/graphics/items/equipment/weapon/axe-blacksmithsaxe.png b/graphics/items/equipment/weapon/axe-blacksmithsaxe.png
new file mode 100644
index 00000000..b1236488
Binary files /dev/null and b/graphics/items/equipment/weapon/axe-blacksmithsaxe.png differ
diff --git a/graphics/items/equipment/weapon/axe-butcherscleaver.png b/graphics/items/equipment/weapon/axe-butcherscleaver.png
new file mode 100644
index 00000000..08a608e8
Binary files /dev/null and b/graphics/items/equipment/weapon/axe-butcherscleaver.png differ
diff --git a/graphics/items/equipment/weapon/axe-hatchet.png b/graphics/items/equipment/weapon/axe-hatchet.png
new file mode 100644
index 00000000..a32f4949
Binary files /dev/null and b/graphics/items/equipment/weapon/axe-hatchet.png differ
diff --git a/graphics/items/equipment/weapon/axe-meatcleaver.png b/graphics/items/equipment/weapon/axe-meatcleaver.png
new file mode 100644
index 00000000..ebb910c0
Binary files /dev/null and b/graphics/items/equipment/weapon/axe-meatcleaver.png differ
diff --git a/graphics/items/equipment/weapon/axe-tomahawk.png b/graphics/items/equipment/weapon/axe-tomahawk.png
new file mode 100644
index 00000000..d552ddce
Binary files /dev/null and b/graphics/items/equipment/weapon/axe-tomahawk.png differ
diff --git a/graphics/items/equipment/weapon/bow-bow.png b/graphics/items/equipment/weapon/bow-bow.png
new file mode 100644
index 00000000..2ab672dc
Binary files /dev/null and b/graphics/items/equipment/weapon/bow-bow.png differ
diff --git a/graphics/items/equipment/weapon/bow-desertbow.png b/graphics/items/equipment/weapon/bow-desertbow.png
new file mode 100644
index 00000000..9ed99df9
Binary files /dev/null and b/graphics/items/equipment/weapon/bow-desertbow.png differ
diff --git a/graphics/items/equipment/weapon/bow-forestbow.png b/graphics/items/equipment/weapon/bow-forestbow.png
new file mode 100644
index 00000000..fb3580b8
Binary files /dev/null and b/graphics/items/equipment/weapon/bow-forestbow.png differ
diff --git a/graphics/items/equipment/weapon/bow-shortbow.png b/graphics/items/equipment/weapon/bow-shortbow.png
new file mode 100644
index 00000000..8ceec1ca
Binary files /dev/null and b/graphics/items/equipment/weapon/bow-shortbow.png differ
diff --git a/graphics/items/equipment/weapon/dagger-boneknife.png b/graphics/items/equipment/weapon/dagger-boneknife.png
new file mode 100644
index 00000000..1e32aeee
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-boneknife.png differ
diff --git a/graphics/items/equipment/weapon/dagger-dagger.png b/graphics/items/equipment/weapon/dagger-dagger.png
new file mode 100644
index 00000000..cdfc3708
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-dagger.png differ
diff --git a/graphics/items/equipment/weapon/dagger-knive.png b/graphics/items/equipment/weapon/dagger-knive.png
new file mode 100644
index 00000000..52c1294f
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-knive.png differ
diff --git a/graphics/items/equipment/weapon/dagger-rockknive.png b/graphics/items/equipment/weapon/dagger-rockknive.png
new file mode 100644
index 00000000..423171aa
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-rockknive.png differ
diff --git a/graphics/items/equipment/weapon/dagger-setzer.png b/graphics/items/equipment/weapon/dagger-setzer.png
new file mode 100644
index 00000000..7b03ed33
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-setzer.png differ
diff --git a/graphics/items/equipment/weapon/dagger-sharpknife.png b/graphics/items/equipment/weapon/dagger-sharpknife.png
new file mode 100644
index 00000000..eed9780f
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-sharpknife.png differ
diff --git a/graphics/items/equipment/weapon/dagger-shortsword.png b/graphics/items/equipment/weapon/dagger-shortsword.png
new file mode 100644
index 00000000..2808f989
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-shortsword.png differ
diff --git a/graphics/items/equipment/weapon/dagger-stiletto.png b/graphics/items/equipment/weapon/dagger-stiletto.png
new file mode 100644
index 00000000..aabce433
Binary files /dev/null and b/graphics/items/equipment/weapon/dagger-stiletto.png differ
diff --git a/graphics/items/equipment/weapon/mace-club.png b/graphics/items/equipment/weapon/mace-club.png
new file mode 100644
index 00000000..30d64215
Binary files /dev/null and b/graphics/items/equipment/weapon/mace-club.png differ
diff --git a/graphics/items/equipment/weapon/polearm-bardiche.png b/graphics/items/equipment/weapon/polearm-bardiche.png
new file mode 100644
index 00000000..8b950254
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-bardiche.png differ
diff --git a/graphics/items/equipment/weapon/polearm-dualspear.png b/graphics/items/equipment/weapon/polearm-dualspear.png
new file mode 100644
index 00000000..2aa78c1a
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-dualspear.png differ
diff --git a/graphics/items/equipment/weapon/polearm-halberd.png b/graphics/items/equipment/weapon/polearm-halberd.png
new file mode 100644
index 00000000..7cc83788
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-halberd.png differ
diff --git a/graphics/items/equipment/weapon/polearm-heavypike.png b/graphics/items/equipment/weapon/polearm-heavypike.png
new file mode 100644
index 00000000..29a3a884
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-heavypike.png differ
diff --git a/graphics/items/equipment/weapon/polearm-heavyspear.png b/graphics/items/equipment/weapon/polearm-heavyspear.png
new file mode 100644
index 00000000..2e9e1945
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-heavyspear.png differ
diff --git a/graphics/items/equipment/weapon/polearm-pike.png b/graphics/items/equipment/weapon/polearm-pike.png
new file mode 100644
index 00000000..15b80076
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-pike.png differ
diff --git a/graphics/items/equipment/weapon/polearm-scorpion.png b/graphics/items/equipment/weapon/polearm-scorpion.png
new file mode 100644
index 00000000..54be14f5
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-scorpion.png differ
diff --git a/graphics/items/equipment/weapon/polearm-scythe.png b/graphics/items/equipment/weapon/polearm-scythe.png
new file mode 100644
index 00000000..61bff6dd
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-scythe.png differ
diff --git a/graphics/items/equipment/weapon/polearm-spear.png b/graphics/items/equipment/weapon/polearm-spear.png
new file mode 100644
index 00000000..2a36cfbb
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-spear.png differ
diff --git a/graphics/items/equipment/weapon/polearm-trident.png b/graphics/items/equipment/weapon/polearm-trident.png
new file mode 100644
index 00000000..f950b9b9
Binary files /dev/null and b/graphics/items/equipment/weapon/polearm-trident.png differ
diff --git a/graphics/items/equipment/weapon/staff-crescentrod.png b/graphics/items/equipment/weapon/staff-crescentrod.png
new file mode 100644
index 00000000..2f8c87df
Binary files /dev/null and b/graphics/items/equipment/weapon/staff-crescentrod.png differ
diff --git a/graphics/items/equipment/weapon/staff-staffoffire.png b/graphics/items/equipment/weapon/staff-staffoffire.png
new file mode 100644
index 00000000..ad6b5e60
Binary files /dev/null and b/graphics/items/equipment/weapon/staff-staffoffire.png differ
diff --git a/graphics/items/equipment/weapon/staff-staffofice.png b/graphics/items/equipment/weapon/staff-staffofice.png
new file mode 100644
index 00000000..01db15d3
Binary files /dev/null and b/graphics/items/equipment/weapon/staff-staffofice.png differ
diff --git a/graphics/items/equipment/weapon/staff-staffoflife.png b/graphics/items/equipment/weapon/staff-staffoflife.png
new file mode 100644
index 00000000..a0e7dee7
Binary files /dev/null and b/graphics/items/equipment/weapon/staff-staffoflife.png differ
diff --git a/graphics/items/equipment/weapon/staff-woodstaff.png b/graphics/items/equipment/weapon/staff-woodstaff.png
new file mode 100644
index 00000000..3e1f0674
Binary files /dev/null and b/graphics/items/equipment/weapon/staff-woodstaff.png differ
diff --git a/graphics/items/equipment/weapon/sword-baselard.png b/graphics/items/equipment/weapon/sword-baselard.png
new file mode 100644
index 00000000..42347057
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-baselard.png differ
diff --git a/graphics/items/equipment/weapon/sword-bastardsword.png b/graphics/items/equipment/weapon/sword-bastardsword.png
new file mode 100644
index 00000000..25738b8b
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-bastardsword.png differ
diff --git a/graphics/items/equipment/weapon/sword-beheader.png b/graphics/items/equipment/weapon/sword-beheader.png
new file mode 100644
index 00000000..3017bd31
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-beheader.png differ
diff --git a/graphics/items/equipment/weapon/sword-broadsword.png b/graphics/items/equipment/weapon/sword-broadsword.png
new file mode 100644
index 00000000..0ef7af43
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-broadsword.png differ
diff --git a/graphics/items/equipment/weapon/sword-bronzesword.png b/graphics/items/equipment/weapon/sword-bronzesword.png
new file mode 100644
index 00000000..0c6cadd8
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-bronzesword.png differ
diff --git a/graphics/items/equipment/weapon/sword-falchion.png b/graphics/items/equipment/weapon/sword-falchion.png
new file mode 100644
index 00000000..87f7943d
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-falchion.png differ
diff --git a/graphics/items/equipment/weapon/sword-firesword.png b/graphics/items/equipment/weapon/sword-firesword.png
new file mode 100644
index 00000000..eecb529a
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-firesword.png differ
diff --git a/graphics/items/equipment/weapon/sword-jackal.png b/graphics/items/equipment/weapon/sword-jackal.png
new file mode 100644
index 00000000..f1f0a76a
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-jackal.png differ
diff --git a/graphics/items/equipment/weapon/sword-longsword.png b/graphics/items/equipment/weapon/sword-longsword.png
new file mode 100644
index 00000000..05241f17
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-longsword.png differ
diff --git a/graphics/items/equipment/weapon/sword-rapier.png b/graphics/items/equipment/weapon/sword-rapier.png
new file mode 100644
index 00000000..3bed4aaf
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-rapier.png differ
diff --git a/graphics/items/equipment/weapon/sword-sabre.png b/graphics/items/equipment/weapon/sword-sabre.png
new file mode 100644
index 00000000..60dec1e0
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-sabre.png differ
diff --git a/graphics/items/equipment/weapon/sword-sandcutter.png b/graphics/items/equipment/weapon/sword-sandcutter.png
new file mode 100644
index 00000000..98b8351e
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-sandcutter.png differ
diff --git a/graphics/items/equipment/weapon/sword-scimitar.png b/graphics/items/equipment/weapon/sword-scimitar.png
new file mode 100644
index 00000000..6b68186a
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-scimitar.png differ
diff --git a/graphics/items/equipment/weapon/sword-sword.png b/graphics/items/equipment/weapon/sword-sword.png
new file mode 100644
index 00000000..571fb40e
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-sword.png differ
diff --git a/graphics/items/weapon-arrow-arrow.png b/graphics/items/weapon-arrow-arrow.png
deleted file mode 100644
index fd1836c9..00000000
Binary files a/graphics/items/weapon-arrow-arrow.png and /dev/null differ
diff --git a/graphics/items/weapon-arrow-iron.png b/graphics/items/weapon-arrow-iron.png
deleted file mode 100644
index 2c87a12b..00000000
Binary files a/graphics/items/weapon-arrow-iron.png and /dev/null differ
diff --git a/graphics/items/weapon-axe-axe.png b/graphics/items/weapon-axe-axe.png
deleted file mode 100644
index 007c4ec8..00000000
Binary files a/graphics/items/weapon-axe-axe.png and /dev/null differ
diff --git a/graphics/items/weapon-axe-blacksmithsaxe.png b/graphics/items/weapon-axe-blacksmithsaxe.png
deleted file mode 100644
index b1236488..00000000
Binary files a/graphics/items/weapon-axe-blacksmithsaxe.png and /dev/null differ
diff --git a/graphics/items/weapon-axe-butcherscleaver.png b/graphics/items/weapon-axe-butcherscleaver.png
deleted file mode 100644
index 08a608e8..00000000
Binary files a/graphics/items/weapon-axe-butcherscleaver.png and /dev/null differ
diff --git a/graphics/items/weapon-axe-hatchet.png b/graphics/items/weapon-axe-hatchet.png
deleted file mode 100644
index a32f4949..00000000
Binary files a/graphics/items/weapon-axe-hatchet.png and /dev/null differ
diff --git a/graphics/items/weapon-axe-meatcleaver.png b/graphics/items/weapon-axe-meatcleaver.png
deleted file mode 100644
index ebb910c0..00000000
Binary files a/graphics/items/weapon-axe-meatcleaver.png and /dev/null differ
diff --git a/graphics/items/weapon-axe-tomahawk.png b/graphics/items/weapon-axe-tomahawk.png
deleted file mode 100644
index d552ddce..00000000
Binary files a/graphics/items/weapon-axe-tomahawk.png and /dev/null differ
diff --git a/graphics/items/weapon-bow-bow.png b/graphics/items/weapon-bow-bow.png
deleted file mode 100644
index 2ab672dc..00000000
Binary files a/graphics/items/weapon-bow-bow.png and /dev/null differ
diff --git a/graphics/items/weapon-bow-desertbow.png b/graphics/items/weapon-bow-desertbow.png
deleted file mode 100644
index 9ed99df9..00000000
Binary files a/graphics/items/weapon-bow-desertbow.png and /dev/null differ
diff --git a/graphics/items/weapon-bow-forestbow.png b/graphics/items/weapon-bow-forestbow.png
deleted file mode 100644
index fb3580b8..00000000
Binary files a/graphics/items/weapon-bow-forestbow.png and /dev/null differ
diff --git a/graphics/items/weapon-bow-shortbow.png b/graphics/items/weapon-bow-shortbow.png
deleted file mode 100644
index 8ceec1ca..00000000
Binary files a/graphics/items/weapon-bow-shortbow.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-boneknife.png b/graphics/items/weapon-dagger-boneknife.png
deleted file mode 100644
index 1e32aeee..00000000
Binary files a/graphics/items/weapon-dagger-boneknife.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-dagger.png b/graphics/items/weapon-dagger-dagger.png
deleted file mode 100644
index cdfc3708..00000000
Binary files a/graphics/items/weapon-dagger-dagger.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-knive.png b/graphics/items/weapon-dagger-knive.png
deleted file mode 100644
index 52c1294f..00000000
Binary files a/graphics/items/weapon-dagger-knive.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-rockknive.png b/graphics/items/weapon-dagger-rockknive.png
deleted file mode 100644
index 423171aa..00000000
Binary files a/graphics/items/weapon-dagger-rockknive.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-setzer.png b/graphics/items/weapon-dagger-setzer.png
deleted file mode 100644
index 7b03ed33..00000000
Binary files a/graphics/items/weapon-dagger-setzer.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-sharpknife.png b/graphics/items/weapon-dagger-sharpknife.png
deleted file mode 100644
index eed9780f..00000000
Binary files a/graphics/items/weapon-dagger-sharpknife.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-shortsword.png b/graphics/items/weapon-dagger-shortsword.png
deleted file mode 100644
index 2808f989..00000000
Binary files a/graphics/items/weapon-dagger-shortsword.png and /dev/null differ
diff --git a/graphics/items/weapon-dagger-stiletto.png b/graphics/items/weapon-dagger-stiletto.png
deleted file mode 100644
index aabce433..00000000
Binary files a/graphics/items/weapon-dagger-stiletto.png and /dev/null differ
diff --git a/graphics/items/weapon-mace-club.png b/graphics/items/weapon-mace-club.png
deleted file mode 100644
index 30d64215..00000000
Binary files a/graphics/items/weapon-mace-club.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-bardiche.png b/graphics/items/weapon-polearm-bardiche.png
deleted file mode 100644
index 8b950254..00000000
Binary files a/graphics/items/weapon-polearm-bardiche.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-dualspear.png b/graphics/items/weapon-polearm-dualspear.png
deleted file mode 100644
index 2aa78c1a..00000000
Binary files a/graphics/items/weapon-polearm-dualspear.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-halberd.png b/graphics/items/weapon-polearm-halberd.png
deleted file mode 100644
index 7cc83788..00000000
Binary files a/graphics/items/weapon-polearm-halberd.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-heavypike.png b/graphics/items/weapon-polearm-heavypike.png
deleted file mode 100644
index 29a3a884..00000000
Binary files a/graphics/items/weapon-polearm-heavypike.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-heavyspear.png b/graphics/items/weapon-polearm-heavyspear.png
deleted file mode 100644
index 2e9e1945..00000000
Binary files a/graphics/items/weapon-polearm-heavyspear.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-pike.png b/graphics/items/weapon-polearm-pike.png
deleted file mode 100644
index 15b80076..00000000
Binary files a/graphics/items/weapon-polearm-pike.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-scorpion.png b/graphics/items/weapon-polearm-scorpion.png
deleted file mode 100644
index 54be14f5..00000000
Binary files a/graphics/items/weapon-polearm-scorpion.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-scythe.png b/graphics/items/weapon-polearm-scythe.png
deleted file mode 100644
index 61bff6dd..00000000
Binary files a/graphics/items/weapon-polearm-scythe.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-spear.png b/graphics/items/weapon-polearm-spear.png
deleted file mode 100644
index 2a36cfbb..00000000
Binary files a/graphics/items/weapon-polearm-spear.png and /dev/null differ
diff --git a/graphics/items/weapon-polearm-trident.png b/graphics/items/weapon-polearm-trident.png
deleted file mode 100644
index f950b9b9..00000000
Binary files a/graphics/items/weapon-polearm-trident.png and /dev/null differ
diff --git a/graphics/items/weapon-staff-crescentrod.png b/graphics/items/weapon-staff-crescentrod.png
deleted file mode 100644
index 2f8c87df..00000000
Binary files a/graphics/items/weapon-staff-crescentrod.png and /dev/null differ
diff --git a/graphics/items/weapon-staff-staffoffire.png b/graphics/items/weapon-staff-staffoffire.png
deleted file mode 100644
index ad6b5e60..00000000
Binary files a/graphics/items/weapon-staff-staffoffire.png and /dev/null differ
diff --git a/graphics/items/weapon-staff-staffofice.png b/graphics/items/weapon-staff-staffofice.png
deleted file mode 100644
index 01db15d3..00000000
Binary files a/graphics/items/weapon-staff-staffofice.png and /dev/null differ
diff --git a/graphics/items/weapon-staff-staffoflife.png b/graphics/items/weapon-staff-staffoflife.png
deleted file mode 100644
index a0e7dee7..00000000
Binary files a/graphics/items/weapon-staff-staffoflife.png and /dev/null differ
diff --git a/graphics/items/weapon-staff-woodstaff.png b/graphics/items/weapon-staff-woodstaff.png
deleted file mode 100644
index 3e1f0674..00000000
Binary files a/graphics/items/weapon-staff-woodstaff.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-baselard.png b/graphics/items/weapon-sword-baselard.png
deleted file mode 100644
index 42347057..00000000
Binary files a/graphics/items/weapon-sword-baselard.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-bastardsword.png b/graphics/items/weapon-sword-bastardsword.png
deleted file mode 100644
index 25738b8b..00000000
Binary files a/graphics/items/weapon-sword-bastardsword.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-beheader.png b/graphics/items/weapon-sword-beheader.png
deleted file mode 100644
index 3017bd31..00000000
Binary files a/graphics/items/weapon-sword-beheader.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-broadsword.png b/graphics/items/weapon-sword-broadsword.png
deleted file mode 100644
index 0ef7af43..00000000
Binary files a/graphics/items/weapon-sword-broadsword.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-bronzesword.png b/graphics/items/weapon-sword-bronzesword.png
deleted file mode 100644
index 0c6cadd8..00000000
Binary files a/graphics/items/weapon-sword-bronzesword.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-falchion.png b/graphics/items/weapon-sword-falchion.png
deleted file mode 100644
index 87f7943d..00000000
Binary files a/graphics/items/weapon-sword-falchion.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-firesword.png b/graphics/items/weapon-sword-firesword.png
deleted file mode 100644
index eecb529a..00000000
Binary files a/graphics/items/weapon-sword-firesword.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-jackal.png b/graphics/items/weapon-sword-jackal.png
deleted file mode 100644
index f1f0a76a..00000000
Binary files a/graphics/items/weapon-sword-jackal.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-longsword.png b/graphics/items/weapon-sword-longsword.png
deleted file mode 100644
index 05241f17..00000000
Binary files a/graphics/items/weapon-sword-longsword.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-rapier.png b/graphics/items/weapon-sword-rapier.png
deleted file mode 100644
index 3bed4aaf..00000000
Binary files a/graphics/items/weapon-sword-rapier.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-sabre.png b/graphics/items/weapon-sword-sabre.png
deleted file mode 100644
index 60dec1e0..00000000
Binary files a/graphics/items/weapon-sword-sabre.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-sandcutter.png b/graphics/items/weapon-sword-sandcutter.png
deleted file mode 100644
index 98b8351e..00000000
Binary files a/graphics/items/weapon-sword-sandcutter.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-scimitar.png b/graphics/items/weapon-sword-scimitar.png
deleted file mode 100644
index 6b68186a..00000000
Binary files a/graphics/items/weapon-sword-scimitar.png and /dev/null differ
diff --git a/graphics/items/weapon-sword-sword.png b/graphics/items/weapon-sword-sword.png
deleted file mode 100644
index 571fb40e..00000000
Binary files a/graphics/items/weapon-sword-sword.png and /dev/null differ
diff --git a/graphics/items/weapon-thrown-bonedarts.png b/graphics/items/weapon-thrown-bonedarts.png
deleted file mode 100644
index f8536d3b..00000000
Binary files a/graphics/items/weapon-thrown-bonedarts.png and /dev/null differ
diff --git a/graphics/sprites/weapon-axe-blacksmith.xml b/graphics/sprites/weapon-axe-blacksmith.xml
index 61806b50..6df37aeb 100755
--- a/graphics/sprites/weapon-axe-blacksmith.xml
+++ b/graphics/sprites/weapon-axe-blacksmith.xml
@@ -23,4 +23,4 @@
 		 	<end />
 		</animation>
 	</action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/items.xml b/items.xml
index 6d27df64..c6ddb5ba 100644
--- a/items.xml
+++ b/items.xml
@@ -277,7 +277,7 @@
         hp="100"
         weight="1"/>
     <item id="521"
-        image="weapon-dagger-dagger.png"
+        image="equipment/weapon/dagger-dagger.png"
         name="Dagger"
         description="A simple dagger."
         effect="+15 Damage, 1 Range"
@@ -295,7 +295,7 @@
         <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
     </item>
     <item id="522"
-        image="weapon-dagger-sharpknife.png"
+        image="equipment/weapon/dagger-sharpknife.png"
         name="Sharp Knife"
         description="A really sharp knife. Don't hurt yourself!"
         effect="+10 Damage, 1 Range"
@@ -375,7 +375,7 @@
         <sprite gender="female">equipment/feet/boots-female.xml|#623a34,f0c2b4</sprite>
     </item>
     <item id="529"
-        image="weapon-arrow-iron.png"
+        image="equipment/ammo/arrow-iron.png"
         name="Iron Arrow"
         description="A hard arrow made of iron."
         effect="+40 Damage"
@@ -383,7 +383,7 @@
         weight="1"
         max-per-slot="100"/>
     <item id="530"
-        image="weapon-bow-shortbow.png"
+        image="equipment/weapon/bow-shortbow.png"
         name="Short Bow"
         description="A bow for short distances."
         effect="+50 Damage, 5 Range"
@@ -450,7 +450,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="536"
-        image="weapon-dagger-shortsword.png"
+        image="equipment/weapon/dagger-shortsword.png"
         name="Short Sword"
         description="A small but sharp sword."
         effect="+100 Damage, 1 Range"
@@ -538,7 +538,7 @@
         <sprite>head-silkheadband.xml</sprite>
     </item>
     <item id="545"
-        image="weapon-bow-forestbow.png"
+        image="equipment/weapon/bow-forestbow.png"
         name="Forest Bow"
         description="A bow usually used for hunting."
         effect="+70 Damage, 5 Range"
@@ -566,7 +566,7 @@
         <sprite gender="female">chest-leather-female.xml|#251e06,443c21,71653b,a0945e;#b6574a</sprite>
     </item>
     <item id="547"
-        image="weapon-polearm-bardiche.png"
+        image="equipment/weapon/polearm-bardiche.png"
         name="Bardiche"
         description="A Bardiche."
         effect="??? Damage, ??? Range"
@@ -577,7 +577,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="548"
-        image="weapon-polearm-halberd.png"
+        image="equipment/weapon/polearm-halberd.png"
         name="Halberd"
         description="A weapon usually carried by guards."
         effect="??? Damage, ??? Range"
@@ -587,7 +587,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="549"
-        image="weapon-axe-axe.png"
+        image="equipment/weapon/axe-axe.png"
         name="Axe"
         description="An axe."
         effect="??? Damage, ??? Range"
@@ -598,7 +598,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="550"
-        image="weapon-axe-blacksmithsaxe.png"
+        image="equipment/weapon/axe-blacksmithsaxe.png"
         name="Blacksmith's Axe"
         description="An axe usually used by blacksmiths."
         effect="+80 Damage, 1 Range"
@@ -694,7 +694,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="561"
-        image="weapon-sword-sabre.png"
+        image="equipment/weapon/sword-sabre.png"
         name="Sabre"
         description="A sword with a very sharp, curved, single-edged blade."
         effect="??? Damage, ??? Range"
@@ -780,7 +780,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="570"
-        image="weapon-dagger-boneknife.png"
+        image="equipment/weapon/dagger-boneknife.png"
         name="Bone Knife"
         description="A knife masterly carved out of a bone."
         effect="+115 Damage, 1 Range"
@@ -793,7 +793,7 @@
         attack-range="32"
         view="521"/>
     <item id="571"
-        image="weapon-dagger-setzer.png"
+        image="equipment/weapon/dagger-setzer.png"
         name="Setzer"
         description="A sharp knife, named after a famous gambler."
         effect="+110 Damage, 1 Range"
@@ -806,7 +806,7 @@
         attack-range="32"
         view="521"/>
     <item id="572"
-        image="weapon-sword-scimitar.png"
+        image="equipment/weapon/sword-scimitar.png"
         name="Scimitar"
         description="A sword with a heavy, curved, single-edged blade."
         effect="??? Damage, ??? Range"
@@ -817,7 +817,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="573"
-        image="weapon-sword-falchion.png"
+        image="equipment/weapon/sword-falchion.png"
         name="Falchion"
         description="A heavy one-handed, single-edged sword."
         effect="??? Damage, ??? Range"
@@ -828,7 +828,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="574"
-        image="weapon-polearm-scorpion.png"
+        image="equipment/weapon/polearm-scorpion.png"
         name="Scorpion"
         description="A well crafted glaive."
         effect="??? Damage, ??? Range"
@@ -839,7 +839,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="575"
-        image="weapon-bow-desertbow.png"
+        image="equipment/weapon/bow-desertbow.png"
         name="Desert Bow"
         description="A tonorian short bow."
         effect="??? Damage, ??? Range"
@@ -851,7 +851,7 @@
         missile-particle="graphics/particles/arrow.particle.xml"
         max-per-slot="1"/>
     <item id="576"
-        image="weapon-sword-beheader.png"
+        image="equipment/weapon/sword-beheader.png"
         name="Beheader"
         description="An oddly designed sword especially made for beheading enemies."
         effect="??? Damage, ??? Range"
@@ -862,7 +862,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="577"
-        image="weapon-thrown-bonedarts.png"
+        image="equipment/ammo/bonedarts.png"
         name="Bone Darts"
         description="Darts made of bones."
         effect="??? Damage, ??? Range"
@@ -873,7 +873,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="578"
-        image="weapon-sword-sandcutter.png"
+        image="equipment/weapon/sword-sandcutter.png"
         name="Sand Cutter"
         description="A sand cutter."
         effect="??? Damage, ??? Range"
@@ -884,7 +884,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="579"
-        image="weapon-dagger-rockknive.png"
+        image="equipment/weapon/dagger-rockknive.png"
         name="Rock Knife"
         description="A knife made of stone."
         effect="+110 Damage, +3 Vitality"
@@ -895,7 +895,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="580"
-        image="weapon-staff-staffoflife.png"
+        image="equipment/weapon/staff-staffoflife.png"
         name="Staff of Life"
         description="A staff that increases healing magic."
         effect="??? Damage, ??? Range"
@@ -906,7 +906,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="581"
-        image="weapon-staff-crescentrod.png"
+        image="equipment/weapon/staff-crescentrod.png"
         name="Crescent Rod"
         description="A crescent rod."
         effect="+50 Damage, ??? Range"
@@ -917,7 +917,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="582"
-        image="weapon-staff-staffoffire.png"
+        image="equipment/weapon/staff-staffoffire.png"
         name="Staff of Fire"
         description="A staff that increases fire magic."
         effect="??? Damage, ??? Range"
@@ -928,7 +928,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="583"
-        image="weapon-staff-staffofice.png"
+        image="equipment/weapon/staff-staffofice.png"
         name="Staff of Ice"
         description="A staff that increases ice magic."
         effect="??? Damage, ??? Range"
@@ -939,7 +939,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="584"
-        image="weapon-sword-jackal.png"
+        image="equipment/weapon/sword-jackal.png"
         name="Jackal"
         description="A jackal."
         effect="??? Damage, ??? Range"
@@ -950,7 +950,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="585"
-        image="armor-hands-scarabarmlet.png"
+        image="equipment/shield/scarabarmlet.png"
         name="Scarab Armlet"
         description="A scarab armlet."
         effect="+0% Defense"
@@ -972,7 +972,7 @@
 
 
     <item id="587"
-        image="weapon-sword-sword.png"
+        image="equipment/weapon/sword-sword.png"
         name="Sword"
         description="A simple but reliable sword."
         effect="+25 Damage, 1 Range"
@@ -989,7 +989,7 @@
 	</item>
     <!--
 	<item id="588"
-        image="weapon-sword-bastardsword.png"
+        image="equipment/weapon/sword-bastardsword.png"
         name="Bastard Sword"
         description="A large two handed sword."
         effect="??? Damage, ??? Range"
@@ -998,7 +998,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="589"
-        image="weapon-sword-broadsword.png"
+        image="equipment/weapon/sword-broadsword.png"
         name="Broad Sword"
         description="A two handed sword with a very broad blade."
         effect="??? Damage, ??? Range"
@@ -1009,7 +1009,7 @@
         <sound event="hit">weapons/swords/broadsword-hit1.ogg</sound>
     </item>
     <item id="590"
-        image="weapon-sword-baselard.png"
+        image="equipment/weapon/sword-baselard.png"
         name="Baselard"
         description="A short and powerful sword."
         effect="??? Damage, ??? Range"
@@ -1018,7 +1018,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="591"
-        image="weapon-sword-longsword.png"
+        image="equipment/weapon/sword-longsword.png"
         name="Long Sword"
         description="A sword with a long and agile blade."
         effect="??? Damage, ??? Range"
@@ -1031,7 +1031,7 @@
         <sound event="strike">weapons/swords/longsword-miss1.ogg</sound>
     </item>
     <item id="592"
-        image="weapon-dagger-stiletto.png"
+        image="equipment/weapon/dagger-stiletto.png"
         name="Stiletto"
         description="A dagger with a long and thin blade."
         effect="??? Damage, ??? Range"
@@ -1040,7 +1040,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="593"
-        image="weapon-sword-rapier.png"
+        image="equipment/weapon/sword-rapier.png"
         name="Rapier"
         description="A light sword made for duels."
         effect="??? Damage, ??? Range"
@@ -1052,7 +1052,7 @@
     </item>
 	-->
     <item id="594"
-        image="weapon-polearm-spear.png"
+        image="equipment/weapon/polearm-spear.png"
         name="Spear"
         description="A light spear with a wooden pole."
         effect="+40 Damage, 1 Range"
@@ -1069,7 +1069,7 @@
 		</item>
     <!--
 	<item id="595"
-        image="weapon-polearm-heavyspear.png"
+        image="equipment/weapon/polearm-heavyspear.png"
         name="Heavy Spear"
         description="A heavy spear with a wooden pole."
         effect="??? Damage, ??? Range"
@@ -1078,7 +1078,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="596"
-        image="weapon-polearm-pike.png"
+        image="equipment/weapon/polearm-pike.png"
         name="Pike"
         description="A light spear with an iron pole."
         effect="??? Damage, ??? Range"
@@ -1087,7 +1087,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="597"
-        image="weapon-polearm-heavypike.png"
+        image="equipment/weapon/polearm-heavypike.png"
         name="Heavy Pike"
         description="A heavy spear with an iron pole."
         effect="??? Damage, ??? Range"
@@ -1096,7 +1096,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="598"
-        image="weapon-polearm-dualspear.png"
+        image="equipment/weapon/polearm-dualspear.png"
         name="Dual Spear"
         description="A spear with two tops."
         effect="??? Damage, ??? Range"
@@ -1105,7 +1105,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="599"
-        image="weapon-sword-firesword.png"
+        image="equipment/weapon/sword-firesword.png"
         name="Fire Sword"
         description="A magical sword enchanted with the power of fire."
         effect="??? Damage, ??? Range"
@@ -1116,7 +1116,7 @@
         <sound event="strike">weapons/swords/firesword-miss1.ogg</sound>
     </item>
     <item id="600"
-        image="armor-shield-britshield.png"
+        image="equipment/shield/brit.png"
         name="Brit Shield"
         description="A legendary shield that is said to save queens and rule waves."
         effect="-50 Cooking"
@@ -1126,7 +1126,7 @@
     -->
 
     <item id="601"
-        image="armor-shield-steelshield.png"
+        image="equipment/shield/steel.png"
         name="Steel Shield"
         description="A shield made of steel."
         effect="+20% Defense"
@@ -1134,7 +1134,7 @@
         weight="2500"
         max-per-slot="1"/>
     <item id="602"
-        image="armor-shield-woodenshield.png"
+        image="equipment/shield/wooden.png"
         name="Wooden Shield"
         description="A shield made of wood."
         effect="+14% Defense"
@@ -1142,7 +1142,7 @@
         weight="1500"
         max-per-slot="1"/>
     <item id="603"
-        image="armor-shield-leathershield.png"
+        image="equipment/shield/leather.png"
         name="Leather Shield"
         description="A shield made of leather on a wooden frame."
         effect="+7% Defense"
@@ -1152,7 +1152,7 @@
 
     <!--
     <item id="604"
-        image="armor-shield-knightshield.png"
+        image="equipment/shield/knight.png"
         name="Knight Shield"
         description="A high quality shield used by knights."
         effect="??? Defense"
@@ -1160,7 +1160,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="605"
-        image="weapon-axe-meatcleaver.png"
+        image="equipment/weapon/axe-meatcleaver.png"
         name="Meat Cleaver"
         description="A butcher's tool that also makes a nice one handed battle axe."
         effect="??? Damage, ??? Range"
@@ -1169,7 +1169,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="606"
-        image="weapon-axe-hatchet.png"
+        image="equipment/weapon/axe-hatchet.png"
         name="Hatchet"
         description="A short one handed axe."
         effect="??? Damage, ??? Range"
@@ -1178,7 +1178,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="607"
-        image="weapon-polearm-trident.png"
+        image="equipment/weapon/polearm-trident.png"
         name="Trident"
         description="A spear with three heads."
         effect="??? Damage, ??? Range"
@@ -1187,7 +1187,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="608"
-        image="armor-shield-bladeshield.png"
+        image="equipment/shield/blade.png"
         name="Blade Shield"
         description="A shield made of blades."
         effect=""
@@ -1195,7 +1195,7 @@
         weight="10"
         max-per-slot="1"/>
     <item id="609"
-        image="weapon-mace-club.png"
+        image="equipment/weapon/mace-club.png"
         name="Club"
         description="A primitive wooden club."
         effect="??? Damage, ??? Range"
@@ -1338,7 +1338,7 @@
         <sprite>head-bandana.xml</sprite>
     </item>
     <item id="623"
-        image="weapon-polearm-scythe.png"
+        image="equipment/weapon/polearm-scythe.png"
         name="Scythe"
         description="Usually used for farming but also usable as a weapon. Slow but deadly."
         effect="+75 Damage, 1 Range"
@@ -2537,7 +2537,7 @@
         <sprite gender="female">equipment/feet/assassin-boots-female.xml</sprite>
     </item>
     <item id="758"
-        image="weapon-staff-woodstaff.png"
+        image="equipment/weapon/staff-woodstaff.png"
         name="Wooden Staff"
         description="A basic wooden staff."
         effect="+50 Damage, 1 Range"
@@ -2586,7 +2586,7 @@
         <sprite>head-desert-helmet.xml</sprite>
     </item>
     <item id="762"
-        image="weapon-arrow-arrow.png|W:#8B4513"
+        image="equipment/ammo/arrow-arrow.png|W:#8B4513"
         name="Terranite Arrow"
         description="A terranite arrow."
         effect="+50 Damage +10 Critical"
@@ -2931,7 +2931,7 @@
         <sprite gender="female">equipment/leg/brasspants-female.xml</sprite>
     </item>
     <item id="797"
-        image="equipment/shield/brassshield.png"
+        image="equipment/shield/brass.png"
         name="Brass Shield"
         description="A shield made of brass."
         effect="+20% Defense"
@@ -3152,7 +3152,7 @@
         type="generic"
         weight="1"/>
     <item id="1199"
-        image="weapon-arrow-arrow.png"
+        image="equipment/ammo/arrow-arrow.png"
         name="Arrow"
         description="A standard arrow."
         effect="+20 Damage"
@@ -3160,7 +3160,7 @@
         weight="1"
         max-per-slot="100"/>
     <item id="1200"
-        image="weapon-bow-bow.png"
+        image="equipment/weapon/bow-bow.png"
         name="Bow"
         description="A distance weapon."
         effect="+15 Damage, 5 Range"
@@ -3178,7 +3178,7 @@
         <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
     </item>
     <item id="1201"
-        image="weapon-dagger-knive.png"
+        image="equipment/weapon/dagger-knive.png"
         name="Knife"
         description="A small knife; the perfect weapon for a beginner."
         effect="+5 Damage, 1 Range"
@@ -3315,7 +3315,7 @@
         <sprite>head-bunnyears.xml</sprite>
     </item>
     <item id="1215"
-        image="weapon-sword-sabre.png"
+        image="equipment/weapon/sword-sabre.png"
         name="Toy Sabre"
         description="A toy item, doesn't do much damage."
         effect="+1 Damage, 1 Range"
@@ -3431,7 +3431,7 @@
         weight="25"
         max-per-slot="3"/>
     <item id="1227"
-        image="armor-neck-enchanter.png"
+        image="neck/enchanter.png"
         name="Enchanter's Amulet"
         description="An amulet made for true enchanters."
         effect="+5 Intelligence"
@@ -3440,7 +3440,7 @@
         max-per-slot="1"
         intelligence="5"/>
     <item id="1228"
-        image="armor-neck-silver4leaf.png"
+        image="neck/silverfourleaf.png"
         name="Silver Four-Leaf Amulet"
         description="An amulet made for people bringing luck wherever they go."
         effect="+5 Luck"
@@ -3739,7 +3739,7 @@
         type="usable"
         weight="5"/>
      <item id="1282"
-        image="weapon-thrown-bonedarts.png"
+        image="equipment/ammo/bonedarts.png"
         name="Bone Arrows"
         description="Arrows made from bone. Not much different from the normal variety, but are much lighter."
         effect="+55 Damage"
-- 
cgit v1.2.3-70-g09d2


From a44de3d94523c8b91ec4def07bb6383416438bbf Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Sun, 1 May 2011 02:30:48 +0200
Subject: Fixed the effects.xml backward compatibility.

Based on 4144's good advice, xml files should not have more
than one root node, and as we don't know whether the clients
will handle that (depending on the platform and the libxml version).

I'm removing the future definition.
---
 effects.xml | 61 +------------------------------------------------------------
 1 file changed, 1 insertion(+), 60 deletions(-)

diff --git a/effects.xml b/effects.xml
index 160d77fd..5ae1b939 100644
--- a/effects.xml
+++ b/effects.xml
@@ -66,63 +66,4 @@
     <effect id="10013" particle="graphics/particles/emotes/emote-blah.particle.xml"/>
 </being-effects>
 
-<!-- Effects definition for client version superior or equal to 1.x -->
-<!-- Other changes are currently planned -->
-<effects>
-    <effect id="0" audio="sfx/system/levelup.ogg" particle="graphics/particles/levelup.particle.xml" />
-    <effect id="1" audio="sfx/system/levelup.ogg" particle="graphics/particles/skillup.particle.xml" />
-    <effect id="2" particle="graphics/particles/magic.generic.xml"/>
-    <effect id="3" particle="graphics/particles/magic.white.xml"/> <!-- life -->
-    <effect id="4" particle="graphics/particles/magic.black.xml"/> <!-- war -->
-    <effect id="5" particle="graphics/particles/magic.red.xml"/> <!-- transmute -->
-    <effect id="6" particle="graphics/particles/magic.green.xml"/> <!-- nature -->
-    <effect id="7" particle="graphics/particles/magic.blue.xml"/> <!-- astral -->
-    <effect id="10" particle="graphics/particles/magic.default.xml"/>
-    <effect id="11" particle="graphics/particles/magic.shield.xml"/>
-    <!--  <effect id="12" particle="graphics/particles/magic.haste.xml"/>-->
-    <effect id="13" particle="graphics/particles/magic.hit.xml"/>
-    <effect id="14" particle="graphics/particles/magic.hit.evil.xml"/>
-    <effect id="15" particle="graphics/particles/fire-burst.xml"/>
-    <effect id="16" particle="graphics/particles/fire-explosion.xml"/>
-    <effect id="17" particle="graphics/particles/lightning1.xml"/>
-    <effect id="18" particle="graphics/particles/lightning2.xml"/>
-    <effect id="19" particle="graphics/particles/lightning3.xml"/>
-    <effect id="20" particle="graphics/particles/magic.teleport.xml"/>
-    <!--  <effect id="20" particle="graphics/particles/magic.barrier.xml"/> -->
-    <effect id="21" particle="graphics/particles/pentagram-buildup-short.xml"/>
-    <effect id="22" particle="graphics/particles/pentagram-burst.xml"/>
-    <effect id="24" particle="graphics/particles/magic.teleport.xml"/>
-    <effect id="25" particle="graphics/particles/rain.xml"/>
-    <effect id="26" particle="graphics/particles/hit.particle.xml" />
-    <effect id="27" particle="graphics/particles/arrow-hail.xml" />
-    <effect id="28" particle="graphics/particles/crit.particle.xml" />
-    <effect id="30" particle="graphics/particles/large-explosion.xml"/>
-    <effect id="31" particle="graphics/particles/medium-explosion.xml"/>
-    <effect id="32" particle="graphics/particles/medium-smoke.xml"/>
-
-    <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/>
-    <!--  <effect id="112" particle="graphics/particles/magic.haste-ends.xml"/>-->
-    <!--  <effect id="120" particle="graphics/particles/magic.barrier-ends.xml"/> -->
-
-    <!-- Interactive Object Animations -->
-    <effect id="300" particle="graphics/particles/gate-opening.xml"/>
-    <effect id="301" particle="graphics/particles/casket-lid.xml"/>
-    <effect id="302" particle="graphics/particles/casket-monster.xml"/>
-
-    <!-- Emotion Effects -->
-    <effect id="10000" particle="graphics/particles/emotes/emote-disgust.particle.xml"/>
-    <effect id="10001" particle="graphics/particles/emotes/emote-surprise.particle.xml"/>
-    <effect id="10002" particle="graphics/particles/emotes/emote-happy.particle.xml"/>
-    <effect id="10003" particle="graphics/particles/emotes/emote-sad.particle.xml"/>
-    <effect id="10004" particle="graphics/particles/emotes/emote-evil.particle.xml"/>
-    <effect id="10005" particle="graphics/particles/emotes/emote-wink.particle.xml"/>
-    <effect id="10006" particle="graphics/particles/emotes/emote-angel.particle.xml"/>
-    <effect id="10007" particle="graphics/particles/emotes/emote-blush.particle.xml"/>
-    <effect id="10008" particle="graphics/particles/emotes/emote-tongue.particle.xml"/>
-    <effect id="10009" particle="graphics/particles/emotes/emote-grin.particle.xml"/>
-    <effect id="10010" particle="graphics/particles/emotes/emote-upset.particle.xml"/>
-    <effect id="10011" particle="graphics/particles/emotes/emote-perturbed.particle.xml"/>
-    <effect id="10012" particle="graphics/particles/emotes/emote-speech.particle.xml"/>
-    <effect id="10013" particle="graphics/particles/emotes/emote-blah.particle.xml"/>
-</effects>
-
+<!-- Note: Effects definition for client version superior or equal to 0.6.x will handle effects root tag instead. -->
-- 
cgit v1.2.3-70-g09d2


From 699af6cc4a26c6583b63d0d492337db03fca25fb Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Sun, 1 May 2011 02:54:49 +0200
Subject: Fixed a comment ending on effects.xml

---
 effects.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/effects.xml b/effects.xml
index 5ae1b939..87da087f 100644
--- a/effects.xml
+++ b/effects.xml
@@ -3,6 +3,7 @@
     Copyright 2011 - The Mana World Development Team
     Effects definition file.
     See documentation at: http://doc.manasource.org/effects.xml
+-->
 
 <!-- Effects definition for client version : 0.0.29.1 and 0.5.x -->
 <being-effects>
@@ -66,4 +67,7 @@
     <effect id="10013" particle="graphics/particles/emotes/emote-blah.particle.xml"/>
 </being-effects>
 
-<!-- Note: Effects definition for client version superior or equal to 0.6.x will handle effects root tag instead. -->
+<!-- 
+     Note: Effects definition for client version superior or equal to 0.6.x will prefer
+     the 'effects' root tag when possible.
+-->
-- 
cgit v1.2.3-70-g09d2


From ff8a180dc9691b5027bd458bab495cfb1f9f4305 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Sat, 30 Apr 2011 22:02:55 +0200
Subject: Lightened the gem on the gem ring since it was too dark and we
 couldn't distinguish what color the gem used was.

---
 graphics/items/armor-ring-gem-generic.png | Bin 804 -> 1102 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/items/armor-ring-gem-generic.png b/graphics/items/armor-ring-gem-generic.png
index d771f49c..228f00e0 100644
Binary files a/graphics/items/armor-ring-gem-generic.png and b/graphics/items/armor-ring-gem-generic.png differ
-- 
cgit v1.2.3-70-g09d2