diff options
-rw-r--r-- | README | 3 | ||||
-rw-r--r-- | docs/manaserv.xml.example | 3 | ||||
-rw-r--r-- | example/attributes.xml (renamed from example/clientdata/attributes.xml) | 0 | ||||
-rw-r--r-- | example/effects.xml (renamed from example/clientdata/effects.xml) | 0 | ||||
-rw-r--r-- | example/emotes.xml (renamed from example/clientdata/emotes.xml) | 0 | ||||
-rw-r--r-- | example/equip.xml (renamed from example/clientdata/equip.xml) | 0 | ||||
-rw-r--r-- | example/graphics/items/crafting/generic-ingot.png (renamed from example/clientdata/graphics/items/crafting/generic-ingot.png) | bin | 1615 -> 1615 bytes | |||
-rw-r--r-- | example/graphics/items/crafting/generic-rawlog.png (renamed from example/clientdata/graphics/items/crafting/generic-rawlog.png) | bin | 1719 -> 1719 bytes | |||
-rw-r--r-- | example/graphics/items/equipment/chest/chest-leathershirt.png (renamed from example/clientdata/graphics/items/equipment/chest/chest-leathershirt.png) | bin | 684 -> 684 bytes | |||
-rw-r--r-- | example/graphics/items/equipment/feet/boots.png (renamed from example/clientdata/graphics/items/equipment/feet/boots.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | example/graphics/items/equipment/legs/pants.png (renamed from example/clientdata/graphics/items/equipment/legs/pants.png) | bin | 855 -> 855 bytes | |||
-rw-r--r-- | example/graphics/items/equipment/weapons/weapon-bow-bow.png (renamed from example/clientdata/graphics/items/equipment/weapons/weapon-bow-bow.png) | bin | 666 -> 666 bytes | |||
-rw-r--r-- | example/graphics/items/equipment/weapons/weapon-dagger-dagger.png (renamed from example/clientdata/graphics/items/equipment/weapons/weapon-dagger-dagger.png) | bin | 582 -> 582 bytes | |||
-rw-r--r-- | example/graphics/items/equipment/weapons/weapon-sword-sword.png (renamed from example/clientdata/graphics/items/equipment/weapons/weapon-sword-sword.png) | bin | 827 -> 827 bytes | |||
-rw-r--r-- | example/graphics/items/unknown.png (renamed from example/clientdata/graphics/items/unknown.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | example/graphics/items/usable/usable-candy.png (renamed from example/clientdata/graphics/items/usable/usable-candy.png) | bin | 562 -> 562 bytes | |||
-rw-r--r-- | example/graphics/items/usable/usable-minor-health-potion.png (renamed from example/clientdata/graphics/items/usable/usable-minor-health-potion.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | example/graphics/items/usable/usable-regenerative-trinket.png (renamed from example/clientdata/graphics/items/usable/usable-regenerative-trinket.png) | bin | 840 -> 840 bytes | |||
-rw-r--r-- | example/graphics/items/usable/usable-token-of-speed.png (renamed from example/clientdata/graphics/items/usable/usable-token-of-speed.png) | bin | 1103 -> 1103 bytes | |||
-rw-r--r-- | example/graphics/particles/arrow-down.png (renamed from example/clientdata/graphics/particles/arrow-down.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | example/graphics/particles/arrow-hail.xml (renamed from example/clientdata/graphics/particles/arrow-hail.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/arrow.particle.xml (renamed from example/clientdata/graphics/particles/arrow.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/arrowh.png (renamed from example/clientdata/graphics/particles/arrowh.png) | bin | 1372 -> 1372 bytes | |||
-rw-r--r-- | example/graphics/particles/attack.particle.xml (renamed from example/clientdata/graphics/particles/attack.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/angel.png (renamed from example/clientdata/graphics/particles/emotes/angel.png) | bin | 1960 -> 1960 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/blah.png (renamed from example/clientdata/graphics/particles/emotes/blah.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/blush.png (renamed from example/clientdata/graphics/particles/emotes/blush.png) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/disgust.png (renamed from example/clientdata/graphics/particles/emotes/disgust.png) | bin | 1924 -> 1924 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/emote-angel.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-angel.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-blah.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-blah.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-blush.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-blush.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-disgust.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-disgust.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-evil.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-evil.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-grin.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-grin.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-happy.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-happy.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-perturbed.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-perturbed.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-sad.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-sad.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-speech.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-speech.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-surprise.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-surprise.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-tongue.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-tongue.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-upset.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-upset.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/emote-wink.particle.xml (renamed from example/clientdata/graphics/particles/emotes/emote-wink.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/emotes/evil.png (renamed from example/clientdata/graphics/particles/emotes/evil.png) | bin | 1925 -> 1925 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/grin.png (renamed from example/clientdata/graphics/particles/emotes/grin.png) | bin | 2047 -> 2047 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/happy.png (renamed from example/clientdata/graphics/particles/emotes/happy.png) | bin | 1734 -> 1734 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/perturbed.png (renamed from example/clientdata/graphics/particles/emotes/perturbed.png) | bin | 1763 -> 1763 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/sad.png (renamed from example/clientdata/graphics/particles/emotes/sad.png) | bin | 1918 -> 1918 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/speech.png (renamed from example/clientdata/graphics/particles/emotes/speech.png) | bin | 796 -> 796 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/surprise.png (renamed from example/clientdata/graphics/particles/emotes/surprise.png) | bin | 2086 -> 2086 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/tongue.png (renamed from example/clientdata/graphics/particles/emotes/tongue.png) | bin | 1753 -> 1753 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/upset.png (renamed from example/clientdata/graphics/particles/emotes/upset.png) | bin | 1632 -> 1632 bytes | |||
-rw-r--r-- | example/graphics/particles/emotes/wink.png (renamed from example/clientdata/graphics/particles/emotes/wink.png) | bin | 1680 -> 1680 bytes | |||
-rw-r--r-- | example/graphics/particles/fullbubble-16px.png (renamed from example/clientdata/graphics/particles/fullbubble-16px.png) | bin | 659 -> 659 bytes | |||
-rw-r--r-- | example/graphics/particles/green-bubbles.particle.xml (renamed from example/clientdata/graphics/particles/green-bubbles.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/hit.particle.xml (renamed from example/clientdata/graphics/particles/hit.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/levelup.particle.xml (renamed from example/clientdata/graphics/particles/levelup.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/magic.white.xml (renamed from example/clientdata/graphics/particles/magic.white.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/orb-medium.png (renamed from example/clientdata/graphics/particles/orb-medium.png) | bin | 320 -> 320 bytes | |||
-rw-r--r-- | example/graphics/particles/orb-small.png (renamed from example/clientdata/graphics/particles/orb-small.png) | bin | 269 -> 269 bytes | |||
-rw-r--r-- | example/graphics/particles/skillup.particle.xml (renamed from example/clientdata/graphics/particles/skillup.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/particles/sparkle.png (renamed from example/clientdata/graphics/particles/sparkle.png) | bin | 537 -> 537 bytes | |||
-rw-r--r-- | example/graphics/particles/star-medium.png (renamed from example/clientdata/graphics/particles/star-medium.png) | bin | 965 -> 965 bytes | |||
-rw-r--r-- | example/graphics/particles/star-small.png (renamed from example/clientdata/graphics/particles/star-small.png) | bin | 387 -> 387 bytes | |||
-rw-r--r-- | example/graphics/particles/warparea.particle.xml (renamed from example/clientdata/graphics/particles/warparea.particle.xml) | 0 | ||||
-rw-r--r-- | example/graphics/skills/axe.png (renamed from example/clientdata/graphics/skills/axe.png) | bin | 1736 -> 1736 bytes | |||
-rw-r--r-- | example/graphics/skills/bow.png (renamed from example/clientdata/graphics/skills/bow.png) | bin | 1791 -> 1791 bytes | |||
-rw-r--r-- | example/graphics/skills/knife.png (renamed from example/clientdata/graphics/skills/knife.png) | bin | 1386 -> 1386 bytes | |||
-rw-r--r-- | example/graphics/skills/mace.png (renamed from example/clientdata/graphics/skills/mace.png) | bin | 1838 -> 1838 bytes | |||
-rw-r--r-- | example/graphics/skills/magic.png (renamed from example/clientdata/graphics/skills/magic.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | example/graphics/skills/polearm.png (renamed from example/clientdata/graphics/skills/polearm.png) | bin | 1823 -> 1823 bytes | |||
-rw-r--r-- | example/graphics/skills/shooting.png (renamed from example/clientdata/graphics/skills/shooting.png) | bin | 1853 -> 1853 bytes | |||
-rw-r--r-- | example/graphics/skills/staff.png (renamed from example/clientdata/graphics/skills/staff.png) | bin | 1308 -> 1308 bytes | |||
-rw-r--r-- | example/graphics/skills/sword.png (renamed from example/clientdata/graphics/skills/sword.png) | bin | 1641 -> 1641 bytes | |||
-rw-r--r-- | example/graphics/skills/thrown.png (renamed from example/clientdata/graphics/skills/thrown.png) | bin | 1583 -> 1583 bytes | |||
-rw-r--r-- | example/graphics/skills/unarmed.png (renamed from example/clientdata/graphics/skills/unarmed.png) | bin | 2263 -> 2263 bytes | |||
-rw-r--r-- | example/graphics/skills/unknown.png (renamed from example/clientdata/graphics/skills/unknown.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | example/graphics/skills/whip.png (renamed from example/clientdata/graphics/skills/whip.png) | bin | 2700 -> 2700 bytes | |||
-rw-r--r-- | example/graphics/sprites/equipment/chest/chest-leather-female.png (renamed from example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.png) | bin | 11692 -> 11692 bytes | |||
-rw-r--r-- | example/graphics/sprites/equipment/chest/chest-leather-female.xml (renamed from example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/equipment/chest/chest-leather-male.png (renamed from example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.png) | bin | 19688 -> 19688 bytes | |||
-rw-r--r-- | example/graphics/sprites/equipment/chest/chest-leather-male.xml (renamed from example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/equipment/feet/boots-female.png (renamed from example/clientdata/graphics/sprites/equipment/feet/boots-female.png) | bin | 8734 -> 8734 bytes | |||
-rw-r--r-- | example/graphics/sprites/equipment/feet/boots-female.xml (renamed from example/clientdata/graphics/sprites/equipment/feet/boots-female.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/equipment/feet/boots-male.png (renamed from example/clientdata/graphics/sprites/equipment/feet/boots-male.png) | bin | 8662 -> 8662 bytes | |||
-rw-r--r-- | example/graphics/sprites/equipment/feet/boots-male.xml (renamed from example/clientdata/graphics/sprites/equipment/feet/boots-male.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/equipment/legs/pants-female.png (renamed from example/clientdata/graphics/sprites/equipment/legs/pants-female.png) | bin | 19817 -> 19817 bytes | |||
-rw-r--r-- | example/graphics/sprites/equipment/legs/pants-female.xml (renamed from example/clientdata/graphics/sprites/equipment/legs/pants-female.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/equipment/legs/pants-male.png (renamed from example/clientdata/graphics/sprites/equipment/legs/pants-male.png) | bin | 55222 -> 55222 bytes | |||
-rw-r--r-- | example/graphics/sprites/equipment/legs/pants-male.xml (renamed from example/clientdata/graphics/sprites/equipment/legs/pants-male.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/error.png (renamed from example/clientdata/graphics/sprites/error.png) | bin | 347 -> 347 bytes | |||
-rw-r--r-- | example/graphics/sprites/error.xml (renamed from example/clientdata/graphics/sprites/error.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/icons/icon-feather.png (renamed from example/clientdata/graphics/sprites/icons/icon-feather.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | example/graphics/sprites/icons/icon-feather.xml (renamed from example/clientdata/graphics/sprites/icons/icon-feather.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/icons/icon-poison.png (renamed from example/clientdata/graphics/sprites/icons/icon-poison.png) | bin | 1832 -> 1832 bytes | |||
-rw-r--r-- | example/graphics/sprites/icons/icon-poison.xml (renamed from example/clientdata/graphics/sprites/icons/icon-poison.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/monsters/monster-maggot.png (renamed from example/clientdata/graphics/sprites/monsters/monster-maggot.png) | bin | 4541 -> 4541 bytes | |||
-rw-r--r-- | example/graphics/sprites/monsters/monster-maggot.xml (renamed from example/clientdata/graphics/sprites/monsters/monster-maggot.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/monsters/monster-scorpion.png (renamed from example/clientdata/graphics/sprites/monsters/monster-scorpion.png) | bin | 7855 -> 7855 bytes | |||
-rw-r--r-- | example/graphics/sprites/monsters/monster-scorpion.xml (renamed from example/clientdata/graphics/sprites/monsters/monster-scorpion.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/monsters/monster-slime.png (renamed from example/clientdata/graphics/sprites/monsters/monster-slime.png) | bin | 13722 -> 13722 bytes | |||
-rw-r--r-- | example/graphics/sprites/monsters/monster-slime.xml (renamed from example/clientdata/graphics/sprites/monsters/monster-slime.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/npcs/static-npcs.png (renamed from example/clientdata/graphics/sprites/npcs/static-npcs.png) | bin | 29932 -> 29932 bytes | |||
-rw-r--r-- | example/graphics/sprites/npcs/static-npcs.xml (renamed from example/clientdata/graphics/sprites/npcs/static-npcs.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle0.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle1.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.png) | bin | 733 -> 733 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle1.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle10.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.png) | bin | 3127 -> 3127 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle10.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle11.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.png) | bin | 3708 -> 3708 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle11.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle12.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.png) | bin | 1668 -> 1668 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle12.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle13.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.png) | bin | 1525 -> 1525 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle13.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle14.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.png) | bin | 2905 -> 2905 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle14.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle15.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.png) | bin | 3217 -> 3217 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle15.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle16.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.png) | bin | 2302 -> 2302 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle16.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle2.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.png) | bin | 1073 -> 1073 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle2.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle3.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.png) | bin | 1121 -> 1121 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle3.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle4.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.png) | bin | 1312 -> 1312 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle4.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle5.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.png) | bin | 1872 -> 1872 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle5.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle6.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.png) | bin | 1092 -> 1092 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle6.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle7.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.png) | bin | 1017 -> 1017 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle7.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle8.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.png) | bin | 2532 -> 2532 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle8.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle9.png (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.png) | bin | 2280 -> 2280 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/hairstyles/hairstyle9.xml (renamed from example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/human_female_base.png (renamed from example/clientdata/graphics/sprites/races/humans/human_female_base.png) | bin | 60055 -> 60055 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/human_female_base.xml (renamed from example/clientdata/graphics/sprites/races/humans/human_female_base.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/races/humans/human_male_base.png (renamed from example/clientdata/graphics/sprites/races/humans/human_male_base.png) | bin | 55885 -> 55885 bytes | |||
-rw-r--r-- | example/graphics/sprites/races/humans/human_male_base.xml (renamed from example/clientdata/graphics/sprites/races/humans/human_male_base.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/weapons/weapon-bow.png (renamed from example/clientdata/graphics/sprites/weapons/weapon-bow.png) | bin | 5751 -> 5751 bytes | |||
-rw-r--r-- | example/graphics/sprites/weapons/weapon-bow.xml (renamed from example/clientdata/graphics/sprites/weapons/weapon-bow.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/weapons/weapon-dagger.xml (renamed from example/clientdata/graphics/sprites/weapons/weapon-dagger.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/weapons/weapon-fist.xml (renamed from example/clientdata/graphics/sprites/weapons/weapon-fist.xml) | 0 | ||||
-rw-r--r-- | example/graphics/sprites/weapons/weapon-sword.png (renamed from example/clientdata/graphics/sprites/weapons/weapon-sword.png) | bin | 2016 -> 2016 bytes | |||
-rw-r--r-- | example/graphics/sprites/weapons/weapon-sword.xml (renamed from example/clientdata/graphics/sprites/weapons/weapon-sword.xml) | 0 | ||||
-rw-r--r-- | example/hair.xml (renamed from example/clientdata/hair.xml) | 0 | ||||
-rw-r--r-- | example/items.xml (renamed from example/clientdata/items.xml) | 0 | ||||
-rw-r--r-- | example/maps.xml (renamed from example/serverdata/maps.xml) | 0 | ||||
-rw-r--r-- | example/maps/desert.tmx (renamed from example/clientdata/maps/desert.tmx) | 0 | ||||
-rw-r--r-- | example/monsters.xml (renamed from example/clientdata/monsters.xml) | 0 | ||||
-rw-r--r-- | example/npcs.xml (renamed from example/clientdata/npcs.xml) | 0 | ||||
-rw-r--r-- | example/paths.xml (renamed from example/clientdata/paths.xml) | 0 | ||||
-rw-r--r-- | example/permissions.xml (renamed from example/serverdata/permissions.xml) | 0 | ||||
-rw-r--r-- | example/scripts/bomtest.lua (renamed from example/serverdata/scripts/bomtest.lua) | 0 | ||||
-rw-r--r-- | example/scripts/crafting.lua (renamed from example/serverdata/scripts/crafting.lua) | 0 | ||||
-rw-r--r-- | example/scripts/global_events.lua (renamed from example/serverdata/scripts/global_events.lua) | 0 | ||||
-rw-r--r-- | example/scripts/items/candy.lua (renamed from example/serverdata/scripts/items/candy.lua) | 0 | ||||
-rw-r--r-- | example/scripts/main.lua (renamed from example/serverdata/scripts/main.lua) | 0 | ||||
-rw-r--r-- | example/scripts/maps/desert.lua (renamed from example/serverdata/scripts/maps/desert.lua) | 2 | ||||
-rw-r--r-- | example/scripts/monster/testmonster.lua (renamed from example/serverdata/scripts/monster/testmonster.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/banker.lua (renamed from example/serverdata/scripts/npcs/banker.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/barber.lua (renamed from example/serverdata/scripts/npcs/barber.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/debugger.lua (renamed from example/serverdata/scripts/npcs/debugger.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/emotemaker.lua (renamed from example/serverdata/scripts/npcs/emotemaker.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/healer.lua (renamed from example/serverdata/scripts/npcs/healer.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/merchant.lua (renamed from example/serverdata/scripts/npcs/merchant.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/postman.lua (renamed from example/serverdata/scripts/npcs/postman.lua) | 0 | ||||
-rw-r--r-- | example/scripts/npcs/shaker.lua (renamed from example/serverdata/scripts/npcs/shaker.lua) | 0 | ||||
-rw-r--r-- | example/scripts/special_actions.lua (renamed from example/serverdata/scripts/special_actions.lua) | 0 | ||||
-rw-r--r-- | example/scripts/status/jump.lua (renamed from example/serverdata/scripts/status/jump.lua) | 0 | ||||
-rw-r--r-- | example/scripts/status/plague.lua (renamed from example/serverdata/scripts/status/plague.lua) | 0 | ||||
-rw-r--r-- | example/sfx/fist-swish.ogg (renamed from example/clientdata/sfx/fist-swish.ogg) | bin | 6723 -> 6723 bytes | |||
-rw-r--r-- | example/sfx/monsters/maggot/maggot-dying1.ogg (renamed from example/clientdata/sfx/monsters/maggot/maggot-dying1.ogg) | bin | 17448 -> 17448 bytes | |||
-rw-r--r-- | example/sfx/monsters/maggot/maggot-hit1.ogg (renamed from example/clientdata/sfx/monsters/maggot/maggot-hit1.ogg) | bin | 19610 -> 19610 bytes | |||
-rw-r--r-- | example/sfx/monsters/maggot/maggot-hit2.ogg (renamed from example/clientdata/sfx/monsters/maggot/maggot-hit2.ogg) | bin | 15514 -> 15514 bytes | |||
-rw-r--r-- | example/sfx/monsters/maggot/maggot-miss1.ogg (renamed from example/clientdata/sfx/monsters/maggot/maggot-miss1.ogg) | bin | 14317 -> 14317 bytes | |||
-rw-r--r-- | example/sfx/monsters/scorpion/scorpion-hit1.ogg (renamed from example/clientdata/sfx/monsters/scorpion/scorpion-hit1.ogg) | bin | 6626 -> 6626 bytes | |||
-rw-r--r-- | example/sfx/monsters/scorpion/scorpion-hit2.ogg (renamed from example/clientdata/sfx/monsters/scorpion/scorpion-hit2.ogg) | bin | 6486 -> 6486 bytes | |||
-rw-r--r-- | example/sfx/monsters/scorpion/scorpion-hit3.ogg (renamed from example/clientdata/sfx/monsters/scorpion/scorpion-hit3.ogg) | bin | 6638 -> 6638 bytes | |||
-rw-r--r-- | example/sfx/monsters/scorpion/scorpion-hit4.ogg (renamed from example/clientdata/sfx/monsters/scorpion/scorpion-hit4.ogg) | bin | 7410 -> 7410 bytes | |||
-rw-r--r-- | example/sfx/monsters/scorpion/scorpion-miss1.ogg (renamed from example/clientdata/sfx/monsters/scorpion/scorpion-miss1.ogg) | bin | 6692 -> 6692 bytes | |||
-rw-r--r-- | example/sfx/monsters/slime/slime-hit1.ogg (renamed from example/clientdata/sfx/monsters/slime/slime-hit1.ogg) | bin | 12943 -> 12943 bytes | |||
-rw-r--r-- | example/skills.xml (renamed from example/clientdata/skills.xml) | 0 | ||||
-rw-r--r-- | example/specials.xml (renamed from example/clientdata/specials.xml) | 0 | ||||
-rw-r--r-- | example/status-effects.xml (renamed from example/clientdata/status-effects.xml) | 0 | ||||
-rw-r--r-- | example/tilesets/collision.png (renamed from example/clientdata/tilesets/collision.png) | bin | 234 -> 234 bytes | |||
-rw-r--r-- | example/tilesets/tmw_desert_spacing.png (renamed from example/clientdata/tilesets/tmw_desert_spacing.png) | bin | 37830 -> 37830 bytes | |||
-rw-r--r-- | example/units.xml (renamed from example/clientdata/units.xml) | 0 | ||||
-rw-r--r-- | src/common/resourcemanager.cpp | 9 |
190 files changed, 6 insertions, 11 deletions
@@ -55,8 +55,7 @@ Default option values: gameServerPort 9604 serverPath . - serverDataPath example/serverdata - clientDataPath example/clientdata + worldDataPath example RUNNING diff --git a/docs/manaserv.xml.example b/docs/manaserv.xml.example index fdb872e1..b742c467 100644 --- a/docs/manaserv.xml.example +++ b/docs/manaserv.xml.example @@ -66,8 +66,7 @@ --> <!-- Paths to data files --> <option name="serverPath" value="." /> - <option name="clientDataPath" value="example/clientdata" /> - <option name="serverDataPath" value="example/serverdata" /> + <option name="worldDataPath" value="example" /> <!-- end of paths configuration ******************************************* --> diff --git a/example/clientdata/attributes.xml b/example/attributes.xml index 69346e58..69346e58 100644 --- a/example/clientdata/attributes.xml +++ b/example/attributes.xml diff --git a/example/clientdata/effects.xml b/example/effects.xml index 90de57e2..90de57e2 100644 --- a/example/clientdata/effects.xml +++ b/example/effects.xml diff --git a/example/clientdata/emotes.xml b/example/emotes.xml index 0136b13c..0136b13c 100644 --- a/example/clientdata/emotes.xml +++ b/example/emotes.xml diff --git a/example/clientdata/equip.xml b/example/equip.xml index 0a53a9ac..0a53a9ac 100644 --- a/example/clientdata/equip.xml +++ b/example/equip.xml diff --git a/example/clientdata/graphics/items/crafting/generic-ingot.png b/example/graphics/items/crafting/generic-ingot.png Binary files differindex 0dc7b1e7..0dc7b1e7 100644 --- a/example/clientdata/graphics/items/crafting/generic-ingot.png +++ b/example/graphics/items/crafting/generic-ingot.png diff --git a/example/clientdata/graphics/items/crafting/generic-rawlog.png b/example/graphics/items/crafting/generic-rawlog.png Binary files differindex 038d5a5f..038d5a5f 100644 --- a/example/clientdata/graphics/items/crafting/generic-rawlog.png +++ b/example/graphics/items/crafting/generic-rawlog.png diff --git a/example/clientdata/graphics/items/equipment/chest/chest-leathershirt.png b/example/graphics/items/equipment/chest/chest-leathershirt.png Binary files differindex 761b9bf6..761b9bf6 100644 --- a/example/clientdata/graphics/items/equipment/chest/chest-leathershirt.png +++ b/example/graphics/items/equipment/chest/chest-leathershirt.png diff --git a/example/clientdata/graphics/items/equipment/feet/boots.png b/example/graphics/items/equipment/feet/boots.png Binary files differindex 9f9913ff..9f9913ff 100644 --- a/example/clientdata/graphics/items/equipment/feet/boots.png +++ b/example/graphics/items/equipment/feet/boots.png diff --git a/example/clientdata/graphics/items/equipment/legs/pants.png b/example/graphics/items/equipment/legs/pants.png Binary files differindex c50daf22..c50daf22 100644 --- a/example/clientdata/graphics/items/equipment/legs/pants.png +++ b/example/graphics/items/equipment/legs/pants.png diff --git a/example/clientdata/graphics/items/equipment/weapons/weapon-bow-bow.png b/example/graphics/items/equipment/weapons/weapon-bow-bow.png Binary files differindex 2ab672dc..2ab672dc 100644 --- a/example/clientdata/graphics/items/equipment/weapons/weapon-bow-bow.png +++ b/example/graphics/items/equipment/weapons/weapon-bow-bow.png diff --git a/example/clientdata/graphics/items/equipment/weapons/weapon-dagger-dagger.png b/example/graphics/items/equipment/weapons/weapon-dagger-dagger.png Binary files differindex cdfc3708..cdfc3708 100644 --- a/example/clientdata/graphics/items/equipment/weapons/weapon-dagger-dagger.png +++ b/example/graphics/items/equipment/weapons/weapon-dagger-dagger.png diff --git a/example/clientdata/graphics/items/equipment/weapons/weapon-sword-sword.png b/example/graphics/items/equipment/weapons/weapon-sword-sword.png Binary files differindex 571fb40e..571fb40e 100644 --- a/example/clientdata/graphics/items/equipment/weapons/weapon-sword-sword.png +++ b/example/graphics/items/equipment/weapons/weapon-sword-sword.png diff --git a/example/clientdata/graphics/items/unknown.png b/example/graphics/items/unknown.png Binary files differindex 9201d688..9201d688 100644 --- a/example/clientdata/graphics/items/unknown.png +++ b/example/graphics/items/unknown.png diff --git a/example/clientdata/graphics/items/usable/usable-candy.png b/example/graphics/items/usable/usable-candy.png Binary files differindex e3d75c21..e3d75c21 100644 --- a/example/clientdata/graphics/items/usable/usable-candy.png +++ b/example/graphics/items/usable/usable-candy.png diff --git a/example/clientdata/graphics/items/usable/usable-minor-health-potion.png b/example/graphics/items/usable/usable-minor-health-potion.png Binary files differindex a404d6f6..a404d6f6 100644 --- a/example/clientdata/graphics/items/usable/usable-minor-health-potion.png +++ b/example/graphics/items/usable/usable-minor-health-potion.png diff --git a/example/clientdata/graphics/items/usable/usable-regenerative-trinket.png b/example/graphics/items/usable/usable-regenerative-trinket.png Binary files differindex ba69b570..ba69b570 100644 --- a/example/clientdata/graphics/items/usable/usable-regenerative-trinket.png +++ b/example/graphics/items/usable/usable-regenerative-trinket.png diff --git a/example/clientdata/graphics/items/usable/usable-token-of-speed.png b/example/graphics/items/usable/usable-token-of-speed.png Binary files differindex 25c712f9..25c712f9 100644 --- a/example/clientdata/graphics/items/usable/usable-token-of-speed.png +++ b/example/graphics/items/usable/usable-token-of-speed.png diff --git a/example/clientdata/graphics/particles/arrow-down.png b/example/graphics/particles/arrow-down.png Binary files differindex da94afcf..da94afcf 100644 --- a/example/clientdata/graphics/particles/arrow-down.png +++ b/example/graphics/particles/arrow-down.png diff --git a/example/clientdata/graphics/particles/arrow-hail.xml b/example/graphics/particles/arrow-hail.xml index 5372e9a3..5372e9a3 100644 --- a/example/clientdata/graphics/particles/arrow-hail.xml +++ b/example/graphics/particles/arrow-hail.xml diff --git a/example/clientdata/graphics/particles/arrow.particle.xml b/example/graphics/particles/arrow.particle.xml index e19e2205..e19e2205 100644 --- a/example/clientdata/graphics/particles/arrow.particle.xml +++ b/example/graphics/particles/arrow.particle.xml diff --git a/example/clientdata/graphics/particles/arrowh.png b/example/graphics/particles/arrowh.png Binary files differindex 11826070..11826070 100644 --- a/example/clientdata/graphics/particles/arrowh.png +++ b/example/graphics/particles/arrowh.png diff --git a/example/clientdata/graphics/particles/attack.particle.xml b/example/graphics/particles/attack.particle.xml index c8dc5f3e..c8dc5f3e 100644 --- a/example/clientdata/graphics/particles/attack.particle.xml +++ b/example/graphics/particles/attack.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/angel.png b/example/graphics/particles/emotes/angel.png Binary files differindex 043d0755..043d0755 100644 --- a/example/clientdata/graphics/particles/emotes/angel.png +++ b/example/graphics/particles/emotes/angel.png diff --git a/example/clientdata/graphics/particles/emotes/blah.png b/example/graphics/particles/emotes/blah.png Binary files differindex 3eae88a2..3eae88a2 100644 --- a/example/clientdata/graphics/particles/emotes/blah.png +++ b/example/graphics/particles/emotes/blah.png diff --git a/example/clientdata/graphics/particles/emotes/blush.png b/example/graphics/particles/emotes/blush.png Binary files differindex 22172ae0..22172ae0 100644 --- a/example/clientdata/graphics/particles/emotes/blush.png +++ b/example/graphics/particles/emotes/blush.png diff --git a/example/clientdata/graphics/particles/emotes/disgust.png b/example/graphics/particles/emotes/disgust.png Binary files differindex 9965f89d..9965f89d 100644 --- a/example/clientdata/graphics/particles/emotes/disgust.png +++ b/example/graphics/particles/emotes/disgust.png diff --git a/example/clientdata/graphics/particles/emotes/emote-angel.particle.xml b/example/graphics/particles/emotes/emote-angel.particle.xml index a4bb1b53..a4bb1b53 100644 --- a/example/clientdata/graphics/particles/emotes/emote-angel.particle.xml +++ b/example/graphics/particles/emotes/emote-angel.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-blah.particle.xml b/example/graphics/particles/emotes/emote-blah.particle.xml index 38cb327a..38cb327a 100644 --- a/example/clientdata/graphics/particles/emotes/emote-blah.particle.xml +++ b/example/graphics/particles/emotes/emote-blah.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-blush.particle.xml b/example/graphics/particles/emotes/emote-blush.particle.xml index 11d2689d..11d2689d 100644 --- a/example/clientdata/graphics/particles/emotes/emote-blush.particle.xml +++ b/example/graphics/particles/emotes/emote-blush.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-disgust.particle.xml b/example/graphics/particles/emotes/emote-disgust.particle.xml index b04d18dd..b04d18dd 100644 --- a/example/clientdata/graphics/particles/emotes/emote-disgust.particle.xml +++ b/example/graphics/particles/emotes/emote-disgust.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-evil.particle.xml b/example/graphics/particles/emotes/emote-evil.particle.xml index 433aef30..433aef30 100644 --- a/example/clientdata/graphics/particles/emotes/emote-evil.particle.xml +++ b/example/graphics/particles/emotes/emote-evil.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-grin.particle.xml b/example/graphics/particles/emotes/emote-grin.particle.xml index 5c50aa98..5c50aa98 100644 --- a/example/clientdata/graphics/particles/emotes/emote-grin.particle.xml +++ b/example/graphics/particles/emotes/emote-grin.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-happy.particle.xml b/example/graphics/particles/emotes/emote-happy.particle.xml index fa43997f..fa43997f 100644 --- a/example/clientdata/graphics/particles/emotes/emote-happy.particle.xml +++ b/example/graphics/particles/emotes/emote-happy.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-perturbed.particle.xml b/example/graphics/particles/emotes/emote-perturbed.particle.xml index 47f92e30..47f92e30 100644 --- a/example/clientdata/graphics/particles/emotes/emote-perturbed.particle.xml +++ b/example/graphics/particles/emotes/emote-perturbed.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-sad.particle.xml b/example/graphics/particles/emotes/emote-sad.particle.xml index 0e0b7dc8..0e0b7dc8 100644 --- a/example/clientdata/graphics/particles/emotes/emote-sad.particle.xml +++ b/example/graphics/particles/emotes/emote-sad.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-speech.particle.xml b/example/graphics/particles/emotes/emote-speech.particle.xml index 7d6350b0..7d6350b0 100644 --- a/example/clientdata/graphics/particles/emotes/emote-speech.particle.xml +++ b/example/graphics/particles/emotes/emote-speech.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-surprise.particle.xml b/example/graphics/particles/emotes/emote-surprise.particle.xml index 29498c8f..29498c8f 100644 --- a/example/clientdata/graphics/particles/emotes/emote-surprise.particle.xml +++ b/example/graphics/particles/emotes/emote-surprise.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-tongue.particle.xml b/example/graphics/particles/emotes/emote-tongue.particle.xml index 2796ac6c..2796ac6c 100644 --- a/example/clientdata/graphics/particles/emotes/emote-tongue.particle.xml +++ b/example/graphics/particles/emotes/emote-tongue.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-upset.particle.xml b/example/graphics/particles/emotes/emote-upset.particle.xml index 4b10d9f2..4b10d9f2 100644 --- a/example/clientdata/graphics/particles/emotes/emote-upset.particle.xml +++ b/example/graphics/particles/emotes/emote-upset.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/emote-wink.particle.xml b/example/graphics/particles/emotes/emote-wink.particle.xml index b217a649..b217a649 100644 --- a/example/clientdata/graphics/particles/emotes/emote-wink.particle.xml +++ b/example/graphics/particles/emotes/emote-wink.particle.xml diff --git a/example/clientdata/graphics/particles/emotes/evil.png b/example/graphics/particles/emotes/evil.png Binary files differindex 7c417ec6..7c417ec6 100644 --- a/example/clientdata/graphics/particles/emotes/evil.png +++ b/example/graphics/particles/emotes/evil.png diff --git a/example/clientdata/graphics/particles/emotes/grin.png b/example/graphics/particles/emotes/grin.png Binary files differindex 0c21cfe8..0c21cfe8 100644 --- a/example/clientdata/graphics/particles/emotes/grin.png +++ b/example/graphics/particles/emotes/grin.png diff --git a/example/clientdata/graphics/particles/emotes/happy.png b/example/graphics/particles/emotes/happy.png Binary files differindex 8ca2930e..8ca2930e 100644 --- a/example/clientdata/graphics/particles/emotes/happy.png +++ b/example/graphics/particles/emotes/happy.png diff --git a/example/clientdata/graphics/particles/emotes/perturbed.png b/example/graphics/particles/emotes/perturbed.png Binary files differindex 0a33e0ad..0a33e0ad 100644 --- a/example/clientdata/graphics/particles/emotes/perturbed.png +++ b/example/graphics/particles/emotes/perturbed.png diff --git a/example/clientdata/graphics/particles/emotes/sad.png b/example/graphics/particles/emotes/sad.png Binary files differindex 3ceb3caf..3ceb3caf 100644 --- a/example/clientdata/graphics/particles/emotes/sad.png +++ b/example/graphics/particles/emotes/sad.png diff --git a/example/clientdata/graphics/particles/emotes/speech.png b/example/graphics/particles/emotes/speech.png Binary files differindex 72044719..72044719 100644 --- a/example/clientdata/graphics/particles/emotes/speech.png +++ b/example/graphics/particles/emotes/speech.png diff --git a/example/clientdata/graphics/particles/emotes/surprise.png b/example/graphics/particles/emotes/surprise.png Binary files differindex e1649a63..e1649a63 100644 --- a/example/clientdata/graphics/particles/emotes/surprise.png +++ b/example/graphics/particles/emotes/surprise.png diff --git a/example/clientdata/graphics/particles/emotes/tongue.png b/example/graphics/particles/emotes/tongue.png Binary files differindex 0d5bc959..0d5bc959 100644 --- a/example/clientdata/graphics/particles/emotes/tongue.png +++ b/example/graphics/particles/emotes/tongue.png diff --git a/example/clientdata/graphics/particles/emotes/upset.png b/example/graphics/particles/emotes/upset.png Binary files differindex b2f0ce2b..b2f0ce2b 100644 --- a/example/clientdata/graphics/particles/emotes/upset.png +++ b/example/graphics/particles/emotes/upset.png diff --git a/example/clientdata/graphics/particles/emotes/wink.png b/example/graphics/particles/emotes/wink.png Binary files differindex 13488bb8..13488bb8 100644 --- a/example/clientdata/graphics/particles/emotes/wink.png +++ b/example/graphics/particles/emotes/wink.png diff --git a/example/clientdata/graphics/particles/fullbubble-16px.png b/example/graphics/particles/fullbubble-16px.png Binary files differindex 93e3b57f..93e3b57f 100644 --- a/example/clientdata/graphics/particles/fullbubble-16px.png +++ b/example/graphics/particles/fullbubble-16px.png diff --git a/example/clientdata/graphics/particles/green-bubbles.particle.xml b/example/graphics/particles/green-bubbles.particle.xml index e272d85c..e272d85c 100644 --- a/example/clientdata/graphics/particles/green-bubbles.particle.xml +++ b/example/graphics/particles/green-bubbles.particle.xml diff --git a/example/clientdata/graphics/particles/hit.particle.xml b/example/graphics/particles/hit.particle.xml index c5c295fc..c5c295fc 100644 --- a/example/clientdata/graphics/particles/hit.particle.xml +++ b/example/graphics/particles/hit.particle.xml diff --git a/example/clientdata/graphics/particles/levelup.particle.xml b/example/graphics/particles/levelup.particle.xml index 0c80626b..0c80626b 100644 --- a/example/clientdata/graphics/particles/levelup.particle.xml +++ b/example/graphics/particles/levelup.particle.xml diff --git a/example/clientdata/graphics/particles/magic.white.xml b/example/graphics/particles/magic.white.xml index 5304b77f..5304b77f 100644 --- a/example/clientdata/graphics/particles/magic.white.xml +++ b/example/graphics/particles/magic.white.xml diff --git a/example/clientdata/graphics/particles/orb-medium.png b/example/graphics/particles/orb-medium.png Binary files differindex eb896c85..eb896c85 100644 --- a/example/clientdata/graphics/particles/orb-medium.png +++ b/example/graphics/particles/orb-medium.png diff --git a/example/clientdata/graphics/particles/orb-small.png b/example/graphics/particles/orb-small.png Binary files differindex 47cf957f..47cf957f 100644 --- a/example/clientdata/graphics/particles/orb-small.png +++ b/example/graphics/particles/orb-small.png diff --git a/example/clientdata/graphics/particles/skillup.particle.xml b/example/graphics/particles/skillup.particle.xml index 91d79e7a..91d79e7a 100644 --- a/example/clientdata/graphics/particles/skillup.particle.xml +++ b/example/graphics/particles/skillup.particle.xml diff --git a/example/clientdata/graphics/particles/sparkle.png b/example/graphics/particles/sparkle.png Binary files differindex 7cfbbb26..7cfbbb26 100644 --- a/example/clientdata/graphics/particles/sparkle.png +++ b/example/graphics/particles/sparkle.png diff --git a/example/clientdata/graphics/particles/star-medium.png b/example/graphics/particles/star-medium.png Binary files differindex 667d2334..667d2334 100644 --- a/example/clientdata/graphics/particles/star-medium.png +++ b/example/graphics/particles/star-medium.png diff --git a/example/clientdata/graphics/particles/star-small.png b/example/graphics/particles/star-small.png Binary files differindex 4c3bf365..4c3bf365 100644 --- a/example/clientdata/graphics/particles/star-small.png +++ b/example/graphics/particles/star-small.png diff --git a/example/clientdata/graphics/particles/warparea.particle.xml b/example/graphics/particles/warparea.particle.xml index f4984232..f4984232 100644 --- a/example/clientdata/graphics/particles/warparea.particle.xml +++ b/example/graphics/particles/warparea.particle.xml diff --git a/example/clientdata/graphics/skills/axe.png b/example/graphics/skills/axe.png Binary files differindex b2af0347..b2af0347 100644 --- a/example/clientdata/graphics/skills/axe.png +++ b/example/graphics/skills/axe.png diff --git a/example/clientdata/graphics/skills/bow.png b/example/graphics/skills/bow.png Binary files differindex 78c4319a..78c4319a 100644 --- a/example/clientdata/graphics/skills/bow.png +++ b/example/graphics/skills/bow.png diff --git a/example/clientdata/graphics/skills/knife.png b/example/graphics/skills/knife.png Binary files differindex 61f834c6..61f834c6 100644 --- a/example/clientdata/graphics/skills/knife.png +++ b/example/graphics/skills/knife.png diff --git a/example/clientdata/graphics/skills/mace.png b/example/graphics/skills/mace.png Binary files differindex 7958d32f..7958d32f 100644 --- a/example/clientdata/graphics/skills/mace.png +++ b/example/graphics/skills/mace.png diff --git a/example/clientdata/graphics/skills/magic.png b/example/graphics/skills/magic.png Binary files differindex 9201d688..9201d688 100644 --- a/example/clientdata/graphics/skills/magic.png +++ b/example/graphics/skills/magic.png diff --git a/example/clientdata/graphics/skills/polearm.png b/example/graphics/skills/polearm.png Binary files differindex 52c8449d..52c8449d 100644 --- a/example/clientdata/graphics/skills/polearm.png +++ b/example/graphics/skills/polearm.png diff --git a/example/clientdata/graphics/skills/shooting.png b/example/graphics/skills/shooting.png Binary files differindex e7b0806c..e7b0806c 100644 --- a/example/clientdata/graphics/skills/shooting.png +++ b/example/graphics/skills/shooting.png diff --git a/example/clientdata/graphics/skills/staff.png b/example/graphics/skills/staff.png Binary files differindex e5c071e0..e5c071e0 100644 --- a/example/clientdata/graphics/skills/staff.png +++ b/example/graphics/skills/staff.png diff --git a/example/clientdata/graphics/skills/sword.png b/example/graphics/skills/sword.png Binary files differindex 9b6db914..9b6db914 100644 --- a/example/clientdata/graphics/skills/sword.png +++ b/example/graphics/skills/sword.png diff --git a/example/clientdata/graphics/skills/thrown.png b/example/graphics/skills/thrown.png Binary files differindex 3fc35de7..3fc35de7 100644 --- a/example/clientdata/graphics/skills/thrown.png +++ b/example/graphics/skills/thrown.png diff --git a/example/clientdata/graphics/skills/unarmed.png b/example/graphics/skills/unarmed.png Binary files differindex adb139ed..adb139ed 100644 --- a/example/clientdata/graphics/skills/unarmed.png +++ b/example/graphics/skills/unarmed.png diff --git a/example/clientdata/graphics/skills/unknown.png b/example/graphics/skills/unknown.png Binary files differindex 9201d688..9201d688 100644 --- a/example/clientdata/graphics/skills/unknown.png +++ b/example/graphics/skills/unknown.png diff --git a/example/clientdata/graphics/skills/whip.png b/example/graphics/skills/whip.png Binary files differindex e5734e5d..e5734e5d 100644 --- a/example/clientdata/graphics/skills/whip.png +++ b/example/graphics/skills/whip.png diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.png b/example/graphics/sprites/equipment/chest/chest-leather-female.png Binary files differindex a6efbf9b..a6efbf9b 100644 --- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.png +++ b/example/graphics/sprites/equipment/chest/chest-leather-female.png diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.xml b/example/graphics/sprites/equipment/chest/chest-leather-female.xml index b44be8ab..b44be8ab 100644 --- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-female.xml +++ b/example/graphics/sprites/equipment/chest/chest-leather-female.xml diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.png b/example/graphics/sprites/equipment/chest/chest-leather-male.png Binary files differindex bc5a3c65..bc5a3c65 100644 --- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.png +++ b/example/graphics/sprites/equipment/chest/chest-leather-male.png diff --git a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.xml b/example/graphics/sprites/equipment/chest/chest-leather-male.xml index fd46be28..fd46be28 100644 --- a/example/clientdata/graphics/sprites/equipment/chest/chest-leather-male.xml +++ b/example/graphics/sprites/equipment/chest/chest-leather-male.xml diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-female.png b/example/graphics/sprites/equipment/feet/boots-female.png Binary files differindex ba984324..ba984324 100644 --- a/example/clientdata/graphics/sprites/equipment/feet/boots-female.png +++ b/example/graphics/sprites/equipment/feet/boots-female.png diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-female.xml b/example/graphics/sprites/equipment/feet/boots-female.xml index 4bb2fffe..4bb2fffe 100644 --- a/example/clientdata/graphics/sprites/equipment/feet/boots-female.xml +++ b/example/graphics/sprites/equipment/feet/boots-female.xml diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-male.png b/example/graphics/sprites/equipment/feet/boots-male.png Binary files differindex f441c5b0..f441c5b0 100644 --- a/example/clientdata/graphics/sprites/equipment/feet/boots-male.png +++ b/example/graphics/sprites/equipment/feet/boots-male.png diff --git a/example/clientdata/graphics/sprites/equipment/feet/boots-male.xml b/example/graphics/sprites/equipment/feet/boots-male.xml index 7edbcef6..7edbcef6 100644 --- a/example/clientdata/graphics/sprites/equipment/feet/boots-male.xml +++ b/example/graphics/sprites/equipment/feet/boots-male.xml diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-female.png b/example/graphics/sprites/equipment/legs/pants-female.png Binary files differindex ad8c2e0e..ad8c2e0e 100644 --- a/example/clientdata/graphics/sprites/equipment/legs/pants-female.png +++ b/example/graphics/sprites/equipment/legs/pants-female.png diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-female.xml b/example/graphics/sprites/equipment/legs/pants-female.xml index 4f5dbcdf..4f5dbcdf 100644 --- a/example/clientdata/graphics/sprites/equipment/legs/pants-female.xml +++ b/example/graphics/sprites/equipment/legs/pants-female.xml diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-male.png b/example/graphics/sprites/equipment/legs/pants-male.png Binary files differindex f8415753..f8415753 100644 --- a/example/clientdata/graphics/sprites/equipment/legs/pants-male.png +++ b/example/graphics/sprites/equipment/legs/pants-male.png diff --git a/example/clientdata/graphics/sprites/equipment/legs/pants-male.xml b/example/graphics/sprites/equipment/legs/pants-male.xml index 3a90c6aa..3a90c6aa 100644 --- a/example/clientdata/graphics/sprites/equipment/legs/pants-male.xml +++ b/example/graphics/sprites/equipment/legs/pants-male.xml diff --git a/example/clientdata/graphics/sprites/error.png b/example/graphics/sprites/error.png Binary files differindex 108ad0e4..108ad0e4 100644 --- a/example/clientdata/graphics/sprites/error.png +++ b/example/graphics/sprites/error.png diff --git a/example/clientdata/graphics/sprites/error.xml b/example/graphics/sprites/error.xml index 3504bd01..3504bd01 100644 --- a/example/clientdata/graphics/sprites/error.xml +++ b/example/graphics/sprites/error.xml diff --git a/example/clientdata/graphics/sprites/icons/icon-feather.png b/example/graphics/sprites/icons/icon-feather.png Binary files differindex 425fb286..425fb286 100644 --- a/example/clientdata/graphics/sprites/icons/icon-feather.png +++ b/example/graphics/sprites/icons/icon-feather.png diff --git a/example/clientdata/graphics/sprites/icons/icon-feather.xml b/example/graphics/sprites/icons/icon-feather.xml index 715a2f82..715a2f82 100644 --- a/example/clientdata/graphics/sprites/icons/icon-feather.xml +++ b/example/graphics/sprites/icons/icon-feather.xml diff --git a/example/clientdata/graphics/sprites/icons/icon-poison.png b/example/graphics/sprites/icons/icon-poison.png Binary files differindex b7803cd9..b7803cd9 100644 --- a/example/clientdata/graphics/sprites/icons/icon-poison.png +++ b/example/graphics/sprites/icons/icon-poison.png diff --git a/example/clientdata/graphics/sprites/icons/icon-poison.xml b/example/graphics/sprites/icons/icon-poison.xml index 0a8f751a..0a8f751a 100644 --- a/example/clientdata/graphics/sprites/icons/icon-poison.xml +++ b/example/graphics/sprites/icons/icon-poison.xml diff --git a/example/clientdata/graphics/sprites/monsters/monster-maggot.png b/example/graphics/sprites/monsters/monster-maggot.png Binary files differindex 64474f94..64474f94 100644 --- a/example/clientdata/graphics/sprites/monsters/monster-maggot.png +++ b/example/graphics/sprites/monsters/monster-maggot.png diff --git a/example/clientdata/graphics/sprites/monsters/monster-maggot.xml b/example/graphics/sprites/monsters/monster-maggot.xml index f603b8db..f603b8db 100644 --- a/example/clientdata/graphics/sprites/monsters/monster-maggot.xml +++ b/example/graphics/sprites/monsters/monster-maggot.xml diff --git a/example/clientdata/graphics/sprites/monsters/monster-scorpion.png b/example/graphics/sprites/monsters/monster-scorpion.png Binary files differindex 0bd693fd..0bd693fd 100644 --- a/example/clientdata/graphics/sprites/monsters/monster-scorpion.png +++ b/example/graphics/sprites/monsters/monster-scorpion.png diff --git a/example/clientdata/graphics/sprites/monsters/monster-scorpion.xml b/example/graphics/sprites/monsters/monster-scorpion.xml index ab1986a3..ab1986a3 100644 --- a/example/clientdata/graphics/sprites/monsters/monster-scorpion.xml +++ b/example/graphics/sprites/monsters/monster-scorpion.xml diff --git a/example/clientdata/graphics/sprites/monsters/monster-slime.png b/example/graphics/sprites/monsters/monster-slime.png Binary files differindex ab14bbb5..ab14bbb5 100644 --- a/example/clientdata/graphics/sprites/monsters/monster-slime.png +++ b/example/graphics/sprites/monsters/monster-slime.png diff --git a/example/clientdata/graphics/sprites/monsters/monster-slime.xml b/example/graphics/sprites/monsters/monster-slime.xml index 220a8e25..220a8e25 100644 --- a/example/clientdata/graphics/sprites/monsters/monster-slime.xml +++ b/example/graphics/sprites/monsters/monster-slime.xml diff --git a/example/clientdata/graphics/sprites/npcs/static-npcs.png b/example/graphics/sprites/npcs/static-npcs.png Binary files differindex 812c88d5..812c88d5 100644 --- a/example/clientdata/graphics/sprites/npcs/static-npcs.png +++ b/example/graphics/sprites/npcs/static-npcs.png diff --git a/example/clientdata/graphics/sprites/npcs/static-npcs.xml b/example/graphics/sprites/npcs/static-npcs.xml index 2cb4d08c..2cb4d08c 100644 --- a/example/clientdata/graphics/sprites/npcs/static-npcs.xml +++ b/example/graphics/sprites/npcs/static-npcs.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle0.xml index 5f06bb2c..5f06bb2c 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle0.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.png Binary files differindex 6bb2657e..6bb2657e 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.xml index 44b1d4e7..44b1d4e7 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle1.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle1.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.png Binary files differindex d52924be..d52924be 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.xml index 6460d09f..6460d09f 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle10.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.png Binary files differindex 284772de..284772de 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.xml index dc73a464..dc73a464 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle11.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.png Binary files differindex 03096379..03096379 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.xml index f4bea1f9..f4bea1f9 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle12.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.png Binary files differindex 0421089a..0421089a 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.xml index 56caee00..56caee00 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle13.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle13.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.png Binary files differindex 7b4cddd0..7b4cddd0 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.xml index bc329d02..bc329d02 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle14.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.png Binary files differindex cd77639c..cd77639c 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.xml index 0ce52c6c..0ce52c6c 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle15.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.png Binary files differindex fc13907b..fc13907b 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.xml index 9ce2d53a..9ce2d53a 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle16.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.png Binary files differindex f80ad787..f80ad787 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.xml index c2caf497..c2caf497 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle2.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.png Binary files differindex b04df515..b04df515 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.xml index f0f0bcda..f0f0bcda 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle3.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.png Binary files differindex b004080f..b004080f 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.xml index 7943d685..7943d685 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle4.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.png Binary files differindex d034fe67..d034fe67 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.xml index 5a02327b..5a02327b 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle5.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.png Binary files differindex b8710253..b8710253 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.xml index 0ad652c2..0ad652c2 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle6.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.png Binary files differindex c3a27ddc..c3a27ddc 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.xml index aa385f74..aa385f74 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle7.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.png Binary files differindex 3c81a1a8..3c81a1a8 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.xml index c2be3b02..c2be3b02 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle8.xml diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.png b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.png Binary files differindex 01bc3606..01bc3606 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.png +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.png diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.xml index 787df6d4..787df6d4 100644 --- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml +++ b/example/graphics/sprites/races/humans/hairstyles/hairstyle9.xml diff --git a/example/clientdata/graphics/sprites/races/humans/human_female_base.png b/example/graphics/sprites/races/humans/human_female_base.png Binary files differindex c4c0a80b..c4c0a80b 100644 --- a/example/clientdata/graphics/sprites/races/humans/human_female_base.png +++ b/example/graphics/sprites/races/humans/human_female_base.png diff --git a/example/clientdata/graphics/sprites/races/humans/human_female_base.xml b/example/graphics/sprites/races/humans/human_female_base.xml index 1d0ffeaa..1d0ffeaa 100644 --- a/example/clientdata/graphics/sprites/races/humans/human_female_base.xml +++ b/example/graphics/sprites/races/humans/human_female_base.xml diff --git a/example/clientdata/graphics/sprites/races/humans/human_male_base.png b/example/graphics/sprites/races/humans/human_male_base.png Binary files differindex 72b9b375..72b9b375 100644 --- a/example/clientdata/graphics/sprites/races/humans/human_male_base.png +++ b/example/graphics/sprites/races/humans/human_male_base.png diff --git a/example/clientdata/graphics/sprites/races/humans/human_male_base.xml b/example/graphics/sprites/races/humans/human_male_base.xml index fe495ddc..fe495ddc 100644 --- a/example/clientdata/graphics/sprites/races/humans/human_male_base.xml +++ b/example/graphics/sprites/races/humans/human_male_base.xml diff --git a/example/clientdata/graphics/sprites/weapons/weapon-bow.png b/example/graphics/sprites/weapons/weapon-bow.png Binary files differindex b5f8a68e..b5f8a68e 100644 --- a/example/clientdata/graphics/sprites/weapons/weapon-bow.png +++ b/example/graphics/sprites/weapons/weapon-bow.png diff --git a/example/clientdata/graphics/sprites/weapons/weapon-bow.xml b/example/graphics/sprites/weapons/weapon-bow.xml index 7580776c..7580776c 100644 --- a/example/clientdata/graphics/sprites/weapons/weapon-bow.xml +++ b/example/graphics/sprites/weapons/weapon-bow.xml diff --git a/example/clientdata/graphics/sprites/weapons/weapon-dagger.xml b/example/graphics/sprites/weapons/weapon-dagger.xml index 1909aff6..1909aff6 100644 --- a/example/clientdata/graphics/sprites/weapons/weapon-dagger.xml +++ b/example/graphics/sprites/weapons/weapon-dagger.xml diff --git a/example/clientdata/graphics/sprites/weapons/weapon-fist.xml b/example/graphics/sprites/weapons/weapon-fist.xml index 324dfd5b..324dfd5b 100644 --- a/example/clientdata/graphics/sprites/weapons/weapon-fist.xml +++ b/example/graphics/sprites/weapons/weapon-fist.xml diff --git a/example/clientdata/graphics/sprites/weapons/weapon-sword.png b/example/graphics/sprites/weapons/weapon-sword.png Binary files differindex f691ef3f..f691ef3f 100644 --- a/example/clientdata/graphics/sprites/weapons/weapon-sword.png +++ b/example/graphics/sprites/weapons/weapon-sword.png diff --git a/example/clientdata/graphics/sprites/weapons/weapon-sword.xml b/example/graphics/sprites/weapons/weapon-sword.xml index 1909aff6..1909aff6 100644 --- a/example/clientdata/graphics/sprites/weapons/weapon-sword.xml +++ b/example/graphics/sprites/weapons/weapon-sword.xml diff --git a/example/clientdata/hair.xml b/example/hair.xml index b24d9adb..b24d9adb 100644 --- a/example/clientdata/hair.xml +++ b/example/hair.xml diff --git a/example/clientdata/items.xml b/example/items.xml index 18e3889e..18e3889e 100644 --- a/example/clientdata/items.xml +++ b/example/items.xml diff --git a/example/serverdata/maps.xml b/example/maps.xml index 94673852..94673852 100644 --- a/example/serverdata/maps.xml +++ b/example/maps.xml diff --git a/example/clientdata/maps/desert.tmx b/example/maps/desert.tmx index f07aaebf..f07aaebf 100644 --- a/example/clientdata/maps/desert.tmx +++ b/example/maps/desert.tmx diff --git a/example/clientdata/monsters.xml b/example/monsters.xml index ba882cc8..ba882cc8 100644 --- a/example/clientdata/monsters.xml +++ b/example/monsters.xml diff --git a/example/clientdata/npcs.xml b/example/npcs.xml index 8fe40030..8fe40030 100644 --- a/example/clientdata/npcs.xml +++ b/example/npcs.xml diff --git a/example/clientdata/paths.xml b/example/paths.xml index 21d1fc23..21d1fc23 100644 --- a/example/clientdata/paths.xml +++ b/example/paths.xml diff --git a/example/serverdata/permissions.xml b/example/permissions.xml index a13d5577..a13d5577 100644 --- a/example/serverdata/permissions.xml +++ b/example/permissions.xml diff --git a/example/serverdata/scripts/bomtest.lua b/example/scripts/bomtest.lua index d4b02124..d4b02124 100644 --- a/example/serverdata/scripts/bomtest.lua +++ b/example/scripts/bomtest.lua diff --git a/example/serverdata/scripts/crafting.lua b/example/scripts/crafting.lua index eae26a41..eae26a41 100644 --- a/example/serverdata/scripts/crafting.lua +++ b/example/scripts/crafting.lua diff --git a/example/serverdata/scripts/global_events.lua b/example/scripts/global_events.lua index 548351a8..548351a8 100644 --- a/example/serverdata/scripts/global_events.lua +++ b/example/scripts/global_events.lua diff --git a/example/serverdata/scripts/items/candy.lua b/example/scripts/items/candy.lua index a740ce6a..a740ce6a 100644 --- a/example/serverdata/scripts/items/candy.lua +++ b/example/scripts/items/candy.lua diff --git a/example/serverdata/scripts/main.lua b/example/scripts/main.lua index d5d8bd03..d5d8bd03 100644 --- a/example/serverdata/scripts/main.lua +++ b/example/scripts/main.lua diff --git a/example/serverdata/scripts/maps/desert.lua b/example/scripts/maps/desert.lua index 976a949c..c3302477 100644 --- a/example/serverdata/scripts/maps/desert.lua +++ b/example/scripts/maps/desert.lua @@ -12,7 +12,7 @@ -- From scripts/ require "scripts/lua/npclib" --- From example/serverdata/scripts +-- From example/scripts require "scripts/npcs/banker" require "scripts/npcs/barber" require "scripts/npcs/merchant" diff --git a/example/serverdata/scripts/monster/testmonster.lua b/example/scripts/monster/testmonster.lua index 9938943b..9938943b 100644 --- a/example/serverdata/scripts/monster/testmonster.lua +++ b/example/scripts/monster/testmonster.lua diff --git a/example/serverdata/scripts/npcs/banker.lua b/example/scripts/npcs/banker.lua index 4e048653..4e048653 100644 --- a/example/serverdata/scripts/npcs/banker.lua +++ b/example/scripts/npcs/banker.lua diff --git a/example/serverdata/scripts/npcs/barber.lua b/example/scripts/npcs/barber.lua index fbb2862c..fbb2862c 100644 --- a/example/serverdata/scripts/npcs/barber.lua +++ b/example/scripts/npcs/barber.lua diff --git a/example/serverdata/scripts/npcs/debugger.lua b/example/scripts/npcs/debugger.lua index 142c3fd8..142c3fd8 100644 --- a/example/serverdata/scripts/npcs/debugger.lua +++ b/example/scripts/npcs/debugger.lua diff --git a/example/serverdata/scripts/npcs/emotemaker.lua b/example/scripts/npcs/emotemaker.lua index 83d2f56f..83d2f56f 100644 --- a/example/serverdata/scripts/npcs/emotemaker.lua +++ b/example/scripts/npcs/emotemaker.lua diff --git a/example/serverdata/scripts/npcs/healer.lua b/example/scripts/npcs/healer.lua index 88335c23..88335c23 100644 --- a/example/serverdata/scripts/npcs/healer.lua +++ b/example/scripts/npcs/healer.lua diff --git a/example/serverdata/scripts/npcs/merchant.lua b/example/scripts/npcs/merchant.lua index 92eeea30..92eeea30 100644 --- a/example/serverdata/scripts/npcs/merchant.lua +++ b/example/scripts/npcs/merchant.lua diff --git a/example/serverdata/scripts/npcs/postman.lua b/example/scripts/npcs/postman.lua index 712ea993..712ea993 100644 --- a/example/serverdata/scripts/npcs/postman.lua +++ b/example/scripts/npcs/postman.lua diff --git a/example/serverdata/scripts/npcs/shaker.lua b/example/scripts/npcs/shaker.lua index 9d7bafb7..9d7bafb7 100644 --- a/example/serverdata/scripts/npcs/shaker.lua +++ b/example/scripts/npcs/shaker.lua diff --git a/example/serverdata/scripts/special_actions.lua b/example/scripts/special_actions.lua index 135ad351..135ad351 100644 --- a/example/serverdata/scripts/special_actions.lua +++ b/example/scripts/special_actions.lua diff --git a/example/serverdata/scripts/status/jump.lua b/example/scripts/status/jump.lua index 3410747a..3410747a 100644 --- a/example/serverdata/scripts/status/jump.lua +++ b/example/scripts/status/jump.lua diff --git a/example/serverdata/scripts/status/plague.lua b/example/scripts/status/plague.lua index 5f98268e..5f98268e 100644 --- a/example/serverdata/scripts/status/plague.lua +++ b/example/scripts/status/plague.lua diff --git a/example/clientdata/sfx/fist-swish.ogg b/example/sfx/fist-swish.ogg Binary files differindex 757d0f77..757d0f77 100644 --- a/example/clientdata/sfx/fist-swish.ogg +++ b/example/sfx/fist-swish.ogg diff --git a/example/clientdata/sfx/monsters/maggot/maggot-dying1.ogg b/example/sfx/monsters/maggot/maggot-dying1.ogg Binary files differindex e05a5235..e05a5235 100644 --- a/example/clientdata/sfx/monsters/maggot/maggot-dying1.ogg +++ b/example/sfx/monsters/maggot/maggot-dying1.ogg diff --git a/example/clientdata/sfx/monsters/maggot/maggot-hit1.ogg b/example/sfx/monsters/maggot/maggot-hit1.ogg Binary files differindex 695cb483..695cb483 100644 --- a/example/clientdata/sfx/monsters/maggot/maggot-hit1.ogg +++ b/example/sfx/monsters/maggot/maggot-hit1.ogg diff --git a/example/clientdata/sfx/monsters/maggot/maggot-hit2.ogg b/example/sfx/monsters/maggot/maggot-hit2.ogg Binary files differindex 12d92bb9..12d92bb9 100644 --- a/example/clientdata/sfx/monsters/maggot/maggot-hit2.ogg +++ b/example/sfx/monsters/maggot/maggot-hit2.ogg diff --git a/example/clientdata/sfx/monsters/maggot/maggot-miss1.ogg b/example/sfx/monsters/maggot/maggot-miss1.ogg Binary files differindex a251bf97..a251bf97 100644 --- a/example/clientdata/sfx/monsters/maggot/maggot-miss1.ogg +++ b/example/sfx/monsters/maggot/maggot-miss1.ogg diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit1.ogg b/example/sfx/monsters/scorpion/scorpion-hit1.ogg Binary files differindex d0cf8d03..d0cf8d03 100644 --- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit1.ogg +++ b/example/sfx/monsters/scorpion/scorpion-hit1.ogg diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit2.ogg b/example/sfx/monsters/scorpion/scorpion-hit2.ogg Binary files differindex 04521d63..04521d63 100644 --- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit2.ogg +++ b/example/sfx/monsters/scorpion/scorpion-hit2.ogg diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit3.ogg b/example/sfx/monsters/scorpion/scorpion-hit3.ogg Binary files differindex 283efff2..283efff2 100644 --- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit3.ogg +++ b/example/sfx/monsters/scorpion/scorpion-hit3.ogg diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-hit4.ogg b/example/sfx/monsters/scorpion/scorpion-hit4.ogg Binary files differindex bef67872..bef67872 100644 --- a/example/clientdata/sfx/monsters/scorpion/scorpion-hit4.ogg +++ b/example/sfx/monsters/scorpion/scorpion-hit4.ogg diff --git a/example/clientdata/sfx/monsters/scorpion/scorpion-miss1.ogg b/example/sfx/monsters/scorpion/scorpion-miss1.ogg Binary files differindex 264fe44e..264fe44e 100644 --- a/example/clientdata/sfx/monsters/scorpion/scorpion-miss1.ogg +++ b/example/sfx/monsters/scorpion/scorpion-miss1.ogg diff --git a/example/clientdata/sfx/monsters/slime/slime-hit1.ogg b/example/sfx/monsters/slime/slime-hit1.ogg Binary files differindex decf40ae..decf40ae 100644 --- a/example/clientdata/sfx/monsters/slime/slime-hit1.ogg +++ b/example/sfx/monsters/slime/slime-hit1.ogg diff --git a/example/clientdata/skills.xml b/example/skills.xml index 340d9033..340d9033 100644 --- a/example/clientdata/skills.xml +++ b/example/skills.xml diff --git a/example/clientdata/specials.xml b/example/specials.xml index c234f667..c234f667 100644 --- a/example/clientdata/specials.xml +++ b/example/specials.xml diff --git a/example/clientdata/status-effects.xml b/example/status-effects.xml index 7b613c4f..7b613c4f 100644 --- a/example/clientdata/status-effects.xml +++ b/example/status-effects.xml diff --git a/example/clientdata/tilesets/collision.png b/example/tilesets/collision.png Binary files differindex 9640aa80..9640aa80 100644 --- a/example/clientdata/tilesets/collision.png +++ b/example/tilesets/collision.png diff --git a/example/clientdata/tilesets/tmw_desert_spacing.png b/example/tilesets/tmw_desert_spacing.png Binary files differindex 4e9995c0..4e9995c0 100644 --- a/example/clientdata/tilesets/tmw_desert_spacing.png +++ b/example/tilesets/tmw_desert_spacing.png diff --git a/example/clientdata/units.xml b/example/units.xml index 265318f2..265318f2 100644 --- a/example/clientdata/units.xml +++ b/example/units.xml diff --git a/src/common/resourcemanager.cpp b/src/common/resourcemanager.cpp index 5c177f72..edff1e0a 100644 --- a/src/common/resourcemanager.cpp +++ b/src/common/resourcemanager.cpp @@ -44,14 +44,11 @@ void ResourceManager::initialize() const std::string serverPath = Configuration::getValue("serverPath", "."); - const std::string clientDataPath = - Configuration::getValue("clientDataPath", "example/clientdata"); - const std::string serverDataPath = - Configuration::getValue("serverDataPath", "example/serverdata"); + const std::string worldDataPath = + Configuration::getValue("worldDataPath", "example"); PHYSFS_addToSearchPath(serverPath.c_str(), 1); - PHYSFS_addToSearchPath(clientDataPath.c_str(), 1); - PHYSFS_addToSearchPath(serverDataPath.c_str(), 1); + PHYSFS_addToSearchPath(worldDataPath.c_str(), 1); } /** |