diff options
108 files changed, 338 insertions, 737 deletions
diff --git a/effects.xml b/effects.xml index eba8ddf4..047625e4 100644 --- a/effects.xml +++ b/effects.xml @@ -73,6 +73,10 @@ <effect id="42" particle="graphics/particles/magic-dark-explosion.particle.xml"/> <effect id="43" particle="graphics/particles/monster-pumpkin-explosion.particle.xml"/> <effect id="44" particle="graphics/particles/object-getitem.particle.xml"/> + <effect id="45" sprite="icons/quest-start.xml"/> + <effect id="46" sprite="icons/quest-continue.xml"/> + <effect id="47" particle="graphics/particles/questup.particle.xml"/> + <effect id="48" particle="graphics/particles/questdone.particle.xml"/> <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/> <!-- <effect id="112" particle="graphics/particles/magic.haste-ends.xml"/>--> <!-- <effect id="113" particle="graphics/particles/magic.barrier-ends.xml"/> --> diff --git a/graphics/emotes/afraid.png b/graphics/emotes/afraid.png Binary files differdeleted file mode 100644 index b79a7a76..00000000 --- a/graphics/emotes/afraid.png +++ /dev/null diff --git a/graphics/emotes/afraid.xml b/graphics/emotes/afraid.xml deleted file mode 100644 index 004f8ee7..00000000 --- a/graphics/emotes/afraid.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/afraid.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/alien.png b/graphics/emotes/alien.png Binary files differdeleted file mode 100644 index c6df714f..00000000 --- a/graphics/emotes/alien.png +++ /dev/null diff --git a/graphics/emotes/alien.xml b/graphics/emotes/alien.xml deleted file mode 100644 index 3ce5e859..00000000 --- a/graphics/emotes/alien.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/alien.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/angel.png b/graphics/emotes/angel.png Binary files differdeleted file mode 100644 index 1046e9ce..00000000 --- a/graphics/emotes/angel.png +++ /dev/null diff --git a/graphics/emotes/angel.xml b/graphics/emotes/angel.xml deleted file mode 100644 index 142e0569..00000000 --- a/graphics/emotes/angel.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/angel.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/angry.png b/graphics/emotes/angry.png Binary files differdeleted file mode 100644 index e98e2c33..00000000 --- a/graphics/emotes/angry.png +++ /dev/null diff --git a/graphics/emotes/angry.xml b/graphics/emotes/angry.xml deleted file mode 100644 index 69d730fe..00000000 --- a/graphics/emotes/angry.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/angry.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/blah.png b/graphics/emotes/blah.png Binary files differdeleted file mode 100644 index 5009b534..00000000 --- a/graphics/emotes/blah.png +++ /dev/null diff --git a/graphics/emotes/blah.xml b/graphics/emotes/blah.xml deleted file mode 100644 index fb3142c4..00000000 --- a/graphics/emotes/blah.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/blah.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/blush.png b/graphics/emotes/blush.png Binary files differdeleted file mode 100644 index 76ce80f7..00000000 --- a/graphics/emotes/blush.png +++ /dev/null diff --git a/graphics/emotes/blush.xml b/graphics/emotes/blush.xml deleted file mode 100644 index 4c5c89f4..00000000 --- a/graphics/emotes/blush.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/blush.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/bored.png b/graphics/emotes/bored.png Binary files differdeleted file mode 100644 index cc225e4b..00000000 --- a/graphics/emotes/bored.png +++ /dev/null diff --git a/graphics/emotes/bored.xml b/graphics/emotes/bored.xml deleted file mode 100644 index a86735f6..00000000 --- a/graphics/emotes/bored.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/bored.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/bothered.png b/graphics/emotes/bothered.png Binary files differdeleted file mode 100644 index 6b0f05d9..00000000 --- a/graphics/emotes/bothered.png +++ /dev/null diff --git a/graphics/emotes/bothered.xml b/graphics/emotes/bothered.xml deleted file mode 100644 index bcbb2dbc..00000000 --- a/graphics/emotes/bothered.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/bothered.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/cheerful.png b/graphics/emotes/cheerful.png Binary files differdeleted file mode 100644 index f5cf2cc5..00000000 --- a/graphics/emotes/cheerful.png +++ /dev/null diff --git a/graphics/emotes/cheerful.xml b/graphics/emotes/cheerful.xml deleted file mode 100644 index 4bbaf847..00000000 --- a/graphics/emotes/cheerful.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/cheerful.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/clever.png b/graphics/emotes/clever.png Binary files differdeleted file mode 100644 index 0cbaf2e9..00000000 --- a/graphics/emotes/clever.png +++ /dev/null diff --git a/graphics/emotes/clever.xml b/graphics/emotes/clever.xml deleted file mode 100644 index 8ec120a0..00000000 --- a/graphics/emotes/clever.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/clever.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/curious.png b/graphics/emotes/curious.png Binary files differdeleted file mode 100644 index 8fefd6cb..00000000 --- a/graphics/emotes/curious.png +++ /dev/null diff --git a/graphics/emotes/curious.xml b/graphics/emotes/curious.xml deleted file mode 100644 index 9abb2e70..00000000 --- a/graphics/emotes/curious.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/curious.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/dead.png b/graphics/emotes/dead.png Binary files differdeleted file mode 100644 index e3e4fae6..00000000 --- a/graphics/emotes/dead.png +++ /dev/null diff --git a/graphics/emotes/dead.xml b/graphics/emotes/dead.xml deleted file mode 100644 index eb90ec45..00000000 --- a/graphics/emotes/dead.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/dead.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/disgust.png b/graphics/emotes/disgust.png Binary files differdeleted file mode 100644 index 0bfcec54..00000000 --- a/graphics/emotes/disgust.png +++ /dev/null diff --git a/graphics/emotes/disgust.xml b/graphics/emotes/disgust.xml deleted file mode 100644 index 420c4b30..00000000 --- a/graphics/emotes/disgust.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/disgust.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/empty.png b/graphics/emotes/empty.png Binary files differdeleted file mode 100644 index 12cf2bf6..00000000 --- a/graphics/emotes/empty.png +++ /dev/null diff --git a/graphics/emotes/empty.xml b/graphics/emotes/empty.xml deleted file mode 100644 index 7b5d6abb..00000000 --- a/graphics/emotes/empty.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/empty.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/evil.png b/graphics/emotes/evil.png Binary files differdeleted file mode 100644 index c5b42f98..00000000 --- a/graphics/emotes/evil.png +++ /dev/null diff --git a/graphics/emotes/evil.xml b/graphics/emotes/evil.xml deleted file mode 100644 index 40fe50e5..00000000 --- a/graphics/emotes/evil.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/evil.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/facepalm.png b/graphics/emotes/facepalm.png Binary files differdeleted file mode 100644 index 1f936f95..00000000 --- a/graphics/emotes/facepalm.png +++ /dev/null diff --git a/graphics/emotes/facepalm.xml b/graphics/emotes/facepalm.xml deleted file mode 100644 index d1951633..00000000 --- a/graphics/emotes/facepalm.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/facepalm.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/grin.png b/graphics/emotes/grin.png Binary files differdeleted file mode 100644 index b99b6303..00000000 --- a/graphics/emotes/grin.png +++ /dev/null diff --git a/graphics/emotes/grin.xml b/graphics/emotes/grin.xml deleted file mode 100644 index 70765acc..00000000 --- a/graphics/emotes/grin.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/grin.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/halloween.png b/graphics/emotes/halloween.png Binary files differdeleted file mode 100644 index bd8bd9d1..00000000 --- a/graphics/emotes/halloween.png +++ /dev/null diff --git a/graphics/emotes/halloween.xml b/graphics/emotes/halloween.xml deleted file mode 100644 index 215548da..00000000 --- a/graphics/emotes/halloween.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/halloween.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/happy.png b/graphics/emotes/happy.png Binary files differdeleted file mode 100644 index eb4ff755..00000000 --- a/graphics/emotes/happy.png +++ /dev/null diff --git a/graphics/emotes/happy.xml b/graphics/emotes/happy.xml deleted file mode 100644 index 07dd24cf..00000000 --- a/graphics/emotes/happy.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/happy.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/headache.png b/graphics/emotes/headache.png Binary files differdeleted file mode 100644 index 46f13e20..00000000 --- a/graphics/emotes/headache.png +++ /dev/null diff --git a/graphics/emotes/headache.xml b/graphics/emotes/headache.xml deleted file mode 100644 index 7eb7f8ac..00000000 --- a/graphics/emotes/headache.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/headache.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/heart.png b/graphics/emotes/heart.png Binary files differdeleted file mode 100644 index b1118eb8..00000000 --- a/graphics/emotes/heart.png +++ /dev/null diff --git a/graphics/emotes/heart.xml b/graphics/emotes/heart.xml deleted file mode 100644 index 019e3b19..00000000 --- a/graphics/emotes/heart.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/heart.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/joyful.png b/graphics/emotes/joyful.png Binary files differdeleted file mode 100644 index eb45c5cc..00000000 --- a/graphics/emotes/joyful.png +++ /dev/null diff --git a/graphics/emotes/joyful.xml b/graphics/emotes/joyful.xml deleted file mode 100644 index ee06fe45..00000000 --- a/graphics/emotes/joyful.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/joyful.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/laugh.png b/graphics/emotes/laugh.png Binary files differdeleted file mode 100644 index af123ad5..00000000 --- a/graphics/emotes/laugh.png +++ /dev/null diff --git a/graphics/emotes/laugh.xml b/graphics/emotes/laugh.xml deleted file mode 100644 index a670966b..00000000 --- a/graphics/emotes/laugh.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/laugh.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/love.png b/graphics/emotes/love.png Binary files differdeleted file mode 100644 index b4cf3826..00000000 --- a/graphics/emotes/love.png +++ /dev/null diff --git a/graphics/emotes/love.xml b/graphics/emotes/love.xml deleted file mode 100644 index 2cb5ff49..00000000 --- a/graphics/emotes/love.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/love.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/melancholy.png b/graphics/emotes/melancholy.png Binary files differdeleted file mode 100644 index 30a2c480..00000000 --- a/graphics/emotes/melancholy.png +++ /dev/null diff --git a/graphics/emotes/melancholy.xml b/graphics/emotes/melancholy.xml deleted file mode 100644 index b86b06b4..00000000 --- a/graphics/emotes/melancholy.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/melancholy.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/meow.png b/graphics/emotes/meow.png Binary files differdeleted file mode 100644 index 01dc9c49..00000000 --- a/graphics/emotes/meow.png +++ /dev/null diff --git a/graphics/emotes/meow.xml b/graphics/emotes/meow.xml deleted file mode 100644 index 0327464f..00000000 --- a/graphics/emotes/meow.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/meow.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/money.png b/graphics/emotes/money.png Binary files differdeleted file mode 100644 index ca73ae53..00000000 --- a/graphics/emotes/money.png +++ /dev/null diff --git a/graphics/emotes/money.xml b/graphics/emotes/money.xml deleted file mode 100644 index 7773b4c9..00000000 --- a/graphics/emotes/money.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/money.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/pain.png b/graphics/emotes/pain.png Binary files differdeleted file mode 100644 index f2743ea7..00000000 --- a/graphics/emotes/pain.png +++ /dev/null diff --git a/graphics/emotes/pain.xml b/graphics/emotes/pain.xml deleted file mode 100644 index c20710be..00000000 --- a/graphics/emotes/pain.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/pain.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/perturbed.png b/graphics/emotes/perturbed.png Binary files differdeleted file mode 100644 index 8b18197f..00000000 --- a/graphics/emotes/perturbed.png +++ /dev/null diff --git a/graphics/emotes/perturbed.xml b/graphics/emotes/perturbed.xml deleted file mode 100644 index 3b72327b..00000000 --- a/graphics/emotes/perturbed.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/perturbed.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/rest.png b/graphics/emotes/rest.png Binary files differdeleted file mode 100644 index 231fd267..00000000 --- a/graphics/emotes/rest.png +++ /dev/null diff --git a/graphics/emotes/rest.xml b/graphics/emotes/rest.xml deleted file mode 100644 index 6198c87b..00000000 --- a/graphics/emotes/rest.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/rest.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/sad.png b/graphics/emotes/sad.png Binary files differdeleted file mode 100644 index 3870b0db..00000000 --- a/graphics/emotes/sad.png +++ /dev/null diff --git a/graphics/emotes/sad.xml b/graphics/emotes/sad.xml deleted file mode 100644 index 10bb6b3c..00000000 --- a/graphics/emotes/sad.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/sad.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/shy.png b/graphics/emotes/shy.png Binary files differdeleted file mode 100644 index bf1415e8..00000000 --- a/graphics/emotes/shy.png +++ /dev/null diff --git a/graphics/emotes/shy.xml b/graphics/emotes/shy.xml deleted file mode 100644 index dcd5e94e..00000000 --- a/graphics/emotes/shy.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/shy.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/sleep.png b/graphics/emotes/sleep.png Binary files differdeleted file mode 100644 index 8d8b04e1..00000000 --- a/graphics/emotes/sleep.png +++ /dev/null diff --git a/graphics/emotes/sleep.xml b/graphics/emotes/sleep.xml deleted file mode 100644 index 8892e0de..00000000 --- a/graphics/emotes/sleep.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/sleep.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/speech.png b/graphics/emotes/speech.png Binary files differdeleted file mode 100644 index 2a1068be..00000000 --- a/graphics/emotes/speech.png +++ /dev/null diff --git a/graphics/emotes/speech.xml b/graphics/emotes/speech.xml deleted file mode 100644 index eeff9ccd..00000000 --- a/graphics/emotes/speech.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/speech.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/surprise.png b/graphics/emotes/surprise.png Binary files differdeleted file mode 100644 index 51ff9202..00000000 --- a/graphics/emotes/surprise.png +++ /dev/null diff --git a/graphics/emotes/surprise.xml b/graphics/emotes/surprise.xml deleted file mode 100644 index 4829b53f..00000000 --- a/graphics/emotes/surprise.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/surprise.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/suspicious.png b/graphics/emotes/suspicious.png Binary files differdeleted file mode 100644 index c74409a4..00000000 --- a/graphics/emotes/suspicious.png +++ /dev/null diff --git a/graphics/emotes/suspicious.xml b/graphics/emotes/suspicious.xml deleted file mode 100644 index 9d40f892..00000000 --- a/graphics/emotes/suspicious.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/suspicious.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/swear.png b/graphics/emotes/swear.png Binary files differdeleted file mode 100644 index 94783f78..00000000 --- a/graphics/emotes/swear.png +++ /dev/null diff --git a/graphics/emotes/swear.xml b/graphics/emotes/swear.xml deleted file mode 100644 index 66eeab6c..00000000 --- a/graphics/emotes/swear.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/swear.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/tears.png b/graphics/emotes/tears.png Binary files differdeleted file mode 100644 index 2cb5de81..00000000 --- a/graphics/emotes/tears.png +++ /dev/null diff --git a/graphics/emotes/tears.xml b/graphics/emotes/tears.xml deleted file mode 100644 index 5aeb1eff..00000000 --- a/graphics/emotes/tears.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/tears.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/tongue.png b/graphics/emotes/tongue.png Binary files differdeleted file mode 100644 index beda1eaf..00000000 --- a/graphics/emotes/tongue.png +++ /dev/null diff --git a/graphics/emotes/tongue.xml b/graphics/emotes/tongue.xml deleted file mode 100644 index 9993fd73..00000000 --- a/graphics/emotes/tongue.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/tongue.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/upset.png b/graphics/emotes/upset.png Binary files differdeleted file mode 100644 index 7fd12127..00000000 --- a/graphics/emotes/upset.png +++ /dev/null diff --git a/graphics/emotes/upset.xml b/graphics/emotes/upset.xml deleted file mode 100644 index 74d820c1..00000000 --- a/graphics/emotes/upset.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/upset.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/vicious.png b/graphics/emotes/vicious.png Binary files differdeleted file mode 100644 index 111e2022..00000000 --- a/graphics/emotes/vicious.png +++ /dev/null diff --git a/graphics/emotes/vicious.xml b/graphics/emotes/vicious.xml deleted file mode 100644 index bbc0e32b..00000000 --- a/graphics/emotes/vicious.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/vicious.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/emotes/wink.png b/graphics/emotes/wink.png Binary files differdeleted file mode 100644 index 1bc3bd10..00000000 --- a/graphics/emotes/wink.png +++ /dev/null diff --git a/graphics/emotes/wink.xml b/graphics/emotes/wink.xml deleted file mode 100644 index bd56b912..00000000 --- a/graphics/emotes/wink.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<effect> - <particle position-x="0" position-y="0" position-z="105" lifetime="5"> - <emitter> - <property name="position-x" value="0"/> - <property name="position-y" value="0"/> - <property name="position-z" value="-32"/> - <property name="lifetime" value="150"/> - <property name="fade-out" value="80"/> - <property name="gravity" value="-0.005"/> - <animation imageset="graphics/emotes/wink.png" width="30" height="32"> - <frame index="0"/> - </animation> - <property name="follow-parent"/> - </emitter> - </particle> -</effect> diff --git a/graphics/particles/questdone.particle.xml b/graphics/particles/questdone.particle.xml new file mode 100644 index 00000000..c8b003c1 --- /dev/null +++ b/graphics/particles/questdone.particle.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<!-- +Green stars which are supposed to engulf a character +--> +<effect> + <particle position-x="0" position-y="0" position-z="0" lifetime="128"> + <emitter> + <property name="image" value="graphics/particles/star-medium.png|W:#000000,ffffff"/> + <property name="vertical-angle" value="90"/> + <property name="power" value="2"/> + <property name="lifetime" value="36"/> + <property name="output" min="-5" max="1"/> + <property name="position-x" min="-16" max="16"/> + <property name="position-y" min="-16" max="16"/> + <property name="position-z" min="0" max="32"/> + </emitter> + </particle> +</effect> diff --git a/graphics/particles/questup.particle.xml b/graphics/particles/questup.particle.xml new file mode 100644 index 00000000..d4a59a75 --- /dev/null +++ b/graphics/particles/questup.particle.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<!-- +Green stars which are supposed to engulf a character +--> +<effect> + <particle position-x="0" position-y="0" position-z="0" lifetime="128"> + <emitter> + <property name="image" value="graphics/particles/star-medium.png|W:#009600,ffffff"/> + <property name="vertical-angle" value="90"/> + <property name="power" value="2"/> + <property name="lifetime" value="36"/> + <property name="output" min="-5" max="1"/> + <property name="position-x" min="-16" max="16"/> + <property name="position-y" min="-16" max="16"/> + <property name="position-z" min="0" max="32"/> + </emitter> + </particle> +</effect> diff --git a/graphics/sprites/emote.png b/graphics/sprites/emote.png Binary files differindex 6698c91c..fc993621 100644 --- a/graphics/sprites/emote.png +++ b/graphics/sprites/emote.png diff --git a/graphics/sprites/emote.xml b/graphics/sprites/emote.xml index 4f483fb9..6a5653c2 100644 --- a/graphics/sprites/emote.xml +++ b/graphics/sprites/emote.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<sprite variants="42" variant_offset="1"> +<sprite variants="18" variant_offset="1"> <imageset name="emotes" src="graphics/sprites/emote.png" width="30" height="32"/> <action name="stand" imageset="emotes"> <animation direction="default"> diff --git a/graphics/sprites/icons/quest-continue.xml b/graphics/sprites/icons/quest-continue.xml new file mode 100644 index 00000000..265eda76 --- /dev/null +++ b/graphics/sprites/icons/quest-continue.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite variants="1" variant_offset="1"> + <imageset name="base" src="graphics/sprites/icons/quest-indicators.png" width="32" height="32"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="1"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/icons/quest-indicators.png b/graphics/sprites/icons/quest-indicators.png Binary files differnew file mode 100644 index 00000000..a660c101 --- /dev/null +++ b/graphics/sprites/icons/quest-indicators.png diff --git a/graphics/sprites/icons/quest-start.xml b/graphics/sprites/icons/quest-start.xml new file mode 100644 index 00000000..485cbb65 --- /dev/null +++ b/graphics/sprites/icons/quest-start.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite variants="2" variant_offset="1"> + <imageset name="base" src="graphics/sprites/icons/quest-indicators.png" width="32" height="32"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0"/> + </animation> + </action> +</sprite> diff --git a/graphics/tiles/christmastree.png b/graphics/tiles/christmastree.png Binary files differdeleted file mode 100644 index 6255a4b1..00000000 --- a/graphics/tiles/christmastree.png +++ /dev/null diff --git a/graphics/tiles/snow_x3.png b/graphics/tiles/snow_x3.png Binary files differindex 1d48fe48..f03b9b51 100644 --- a/graphics/tiles/snow_x3.png +++ b/graphics/tiles/snow_x3.png diff --git a/license.txt b/license.txt index 1b72191d..d9d149d5 100644 --- a/license.txt +++ b/license.txt @@ -61,28 +61,28 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/guiicons/toggle.png (wushin) (GPLv2), (CC BY-SA 3.0) # Images - graphics/images/axe.png (????) (GPLv2) - graphics/images/bow.png (????) (GPLv2) - graphics/images/craft.png (????) (GPLv2) - graphics/images/knife.png (????) (GPLv2) - graphics/images/mace.png (????) (GPLv2) - graphics/images/magic.png (????) (GPLv2) - graphics/images/polearm.png (????) (GPLv2) - graphics/images/shooting.png (????) (GPLv2) + graphics/images/axe.png (Othello) (GPLv2) + graphics/images/bow.png (Othello) (GPLv2) + graphics/images/craft.png (Othello) (GPLv2) + graphics/images/knife.png (Othello) (GPLv2) + graphics/images/mace.png (Othello) (GPLv2) + graphics/images/magic.png (Othello) (GPLv2) + graphics/images/polearm.png (Othello) (GPLv2) + graphics/images/shooting.png (Othello) (GPLv2) graphics/images/spit23loginwallpaper_800x600.png (????, Irukard) (GPLv2) - graphics/images/staff.png (????) (GPLv2) - graphics/images/sword.png (????) (GPLv2) - graphics/images/thrown.png (????) (GPLv2) - graphics/images/unarmed.png (????) (GPLv2) - graphics/images/unknown.png (????) (GPLv2) - graphics/images/whip.png (????) (GPLv2) + graphics/images/staff.png (Othello) (GPLv2) + graphics/images/sword.png (Othello) (GPLv2) + graphics/images/thrown.png (Othello) (GPLv2) + graphics/images/unarmed.png (Othello) (GPLv2) + graphics/images/unknown.png (Othello) (GPLv2) + graphics/images/whip.png (Othello) (GPLv2) ## Ambient Effects graphics/images/ambient/clouds.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/images/ambient/fog.png (Crush) (GPLv2), (CC BY-SA 3.0) - graphics/images/ambient/night.png (????) (GPLv2) + graphics/images/ambient/night.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/images/ambient/sandstorm.png (Crush) (GPLv2), (CC BY-SA 3.0) graphics/images/ambient/snow.png (Dark_Mage) (GPLv2) - graphics/images/ambient/spotlight.png (????) (GPLv2) + graphics/images/ambient/spotlight.png (Crush) (GPLv2), (CC BY-SA 3.0) ## Help graphics/images/help/tmwdyepallet.png (Wombat) (GPLv2), (CC BY-SA 3.0) @@ -93,7 +93,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/equipment/ammo/ironarrow.png (Irukard) (GPLv2), (CC BY-SA 3.0) graphics/items/equipment/ammo/arrow.png (Irukard) (GPLv2), (CC BY-SA 3.0) ### Charms - graphics/items/equipment/charms/clover.png (????) (GPLv2) + graphics/items/equipment/charms/clover.png (5t3v3) (GPLv2) graphics/items/equipment/charms/enchanter.png (Fate) (GPLv2), (CC BY-SA 3.0) graphics/items/equipment/charms/fourleaf-amulet.png (Fate) (GPLv2), (CC BY-SA 3.0) graphics/items/equipment/charms/heart-of-isis.png (V0id) (GPLv2), (CC BY-SA 3.0) @@ -149,7 +149,6 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/items/equipment/head/captain_hat.png (Black Don) (GPLv2) graphics/items/equipment/head/catears.png (Angeliex) (GPLv2) graphics/items/equipment/head/chefhat.png (Nami) (GPLv2), (CC BY-SA 3.0) - graphics/items/equipment/head/christmastree.png (????) (GPLv2) graphics/items/equipment/head/circlet.png (VictorSan) (GPLv2) graphics/items/equipment/head/cowboyblack.png (Black Don) (GPLv2) graphics/items/equipment/head/cowboywhite.png (Black Don) (GPLv2) @@ -575,6 +574,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/icons/poison.png (FotherJ) (GPLv2), (CC BY-SA 3.0) graphics/sprites/icons/potion-b.png (????) (GPLv2) graphics/sprites/icons/potion-c.png (????) (GPLv2) + graphics/sprites/icons/quest-indicators.png (Modanung, Wushin) (GPLv2), (CC BY-SA 3.0) graphics/sprites/icons/slow-poison.png (Freeyorp101) (GPLv2), (CC BY-SA 3.0) graphics/sprites/icons/spell-attack-generic.png (????) (GPLv2) graphics/sprites/icons/spell-haste.png (Graingert) (GPLv2) @@ -994,7 +994,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/tiles/snow_village_x3.png (bagzie, mekolat, ????) (GPLv2) graphics/tiles/snow_village_x4.png (bagzie, mekolat, ????) (GPLv2) graphics/tiles/snow_village2.png (bagzie, mekolat, ????) (GPLv2) - graphics/tiles/snow_x2.png (????, Nami, Salmondine, Arkhen) (GPLv2), (CC BY 4.0) + graphics/tiles/snow_x2.png (Nami, Salmondine, Arkhen) (GPLv2), (CC BY 4.0) graphics/tiles/snow_x3.png (????) (GPLv2) graphics/tiles/snow_x4.png (mekolat) (GPLv2) graphics/tiles/snow.png (bagzie, mekolat, wushin, ????) (GPLv2) diff --git a/npcs/_include.xml b/npcs/_include.xml index 3acd15f1..e96d755c 100644 --- a/npcs/_include.xml +++ b/npcs/_include.xml @@ -213,4 +213,5 @@ <include name="npcs/npc416.xml"/> <include name="npcs/npc417.xml"/> <include name="npcs/npc418.xml"/> + <include name="npcs/npc419.xml"/> </npcs> diff --git a/npcs/npc419.xml b/npcs/npc419.xml new file mode 100644 index 00000000..da321496 --- /dev/null +++ b/npcs/npc419.xml @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<npcs> + <npc id="419"> + <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>equipment/head/knighthelm-male.xml</sprite> + <sprite>equipment/chest/chainmail-male.xml|#eef1c5,ffffff</sprite> + <sprite>equipment/legs/pants-male.xml|#001720,001b25,003e55,035776</sprite> + <sprite>equipment/chest/vnecksweater-male.xml|#001720,001b25,003e55,035776</sprite> + <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite> + </npc> +</npcs> @@ -42,13 +42,15 @@ Also, don't forget to add the '/' path separator at the end of folder values. <option name="minimaps" value="graphics/minimaps/"/> <option name="maps" value="maps/"/> <option name="sfx" value="sfx/"/> - <option name="newQuestSfx" value="system/levelup.ogg"/> - <option name="completeQuestSfx" value="system/levelup.ogg"/> + <!-- option name="newQuestSfx" value="system/levelup.ogg"/ --> + <!-- option name="completeQuestSfx" value="system/levelup.ogg"/ --> <option name="attackSfxFile" value="weapons/knives/knife-hit1.ogg"/> <option name="missSfxFile" value="fist-swish.ogg"/> <option name="music" value="music/"/> <option name="wallpapers" value="graphics/images/"/> <option name="wallpaperFile" value="login_wallpaper.png"/> + <option name="newQuestEffectId" value="47"/> + <option name="completeQuestEffectId" value="48"/> <!-- ManaPlus tries to load skillsFile first, then skillsFile2 if it failed. In old versions, ea-skills.xml before skills.xml, now it is swapped. diff --git a/quests.xml b/quests.xml new file mode 100644 index 00000000..1128db97 --- /dev/null +++ b/quests.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + See here for documentation: http://manaplus.org/quests.xml +--> +<quests> + <include name="quests/_include.xml"/> +</quests> diff --git a/quests/_include.xml b/quests/_include.xml new file mode 100644 index 00000000..e037d993 --- /dev/null +++ b/quests/_include.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <include name="quests/candor/_include.xml"/> + <!-- include name="quests/argeas/_include.xml"/ --> + <!-- include name="quests/tonori/_include.xml"/ --> + <!-- include name="quests/kaizei/_include.xml"/ --> +</quests> diff --git a/quests/candor/_include.xml b/quests/candor/_include.xml new file mode 100644 index 00000000..eb9ecade --- /dev/null +++ b/quests/candor/_include.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <include name="quests/candor/tutorial.xml"/> + <include name="quests/candor/hasan.xml"/> + <include name="quests/candor/valon.xml"/> + <include name="quests/candor/zegas.xml"/> + <include name="quests/candor/vincent.xml"/> + <include name="quests/candor/hide-n-seek.xml"/> +</quests> diff --git a/quests/candor/hasan.xml b/quests/candor/hasan.xml new file mode 100644 index 00000000..e480da0a --- /dev/null +++ b/quests/candor/hasan.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//var/quest/@name" translate="yes"/> + <its:translateRule selector="//var/quest/name" translate="yes"/> + <its:translateRule selector="//var/quest/text" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + <var id="1"> + <quest name="Bully" group="Candor Island" incomplete="9"> + <name>Bully</name> + <text>Hasan sounds like a nasty fellow. You need to find out more about this bully.</text> + <text>Asking around town would probably be fruitful...</text> + </quest> + <quest name="Bully" group="Candor Island" incomplete="10"> + <name>Finding the Weakness</name> + <text>Hasan needs to be taught a lesson!</text> + <text>Talk to Sorfina about giving Hasan what he deserves.</text> + <text>Sorfina is located at (27,27) in Candor Island Indoor.</text> + </quest> + <quest name="Bully" group="Candor Island" incomplete="11"> + <name>Stinging the Heel</name> + <text>It seems as though Hasan is afraid of scorpions. Perhaps this could be his downfall...</text> + <text>You should go talk to Kaan at (46,95) on Candor Island and tell him what you've learned.</text> + </quest> + <quest name="Bully" group="Candor Island" incomplete="12"> + <name>Surprise Scorpion</name> + <text>Approach Hasan and have Kaan summon a scorpion.</text> + <text>Hasan is holding a hostage at (33,33) on Candor Island.</text> + </quest> + <quest name="Bully" group="Candor Island" incomplete="13"> + <name>An Unconventional Savior</name> + <text>You killed the scorpion and "saved" Hasan from his childhood fear.</text> + <text>Talk to him and see what he has to say.</text> + </quest> + <quest name="Bully" group="Candor Island" complete="14"> + <name>A Changed Man</name> + <text>Thankfully, Hasan seems to have changed his ways for the better.</text> + </quest> + </var> +</quests> diff --git a/quests/candor/hide-n-seek.xml b/quests/candor/hide-n-seek.xml new file mode 100644 index 00000000..9fe047cf --- /dev/null +++ b/quests/candor/hide-n-seek.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//var/quest/@name" translate="yes"/> + <its:translateRule selector="//var/quest/name" translate="yes"/> + <its:translateRule selector="//var/quest/text" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + <var id="6"> + <effect map="029-1.tmx" npc="258" value="0" effect="45"/> + <effect map="029-1.tmx" npc="258" value="1,11,13,15,17,19,21,23,25,27,29,3,31,33,35,37,39,41,43,45,47,49,5,51,53,55,57,59,61,7,9,63" effect="46"/> + <effect map="029-1.tmx" npc="262" value="1,5,9,17,33,13,21,37,25,41,49,29,45,53,57,61" effect="46"/> + <effect map="029-1.tmx" npc="260" value="1,3,9,17,33,11,19,35,25,41,49,27,43,51,57,59" effect="46"/> + <effect map="029-1.tmx" npc="259" value="1,3,5,17,33,7,21,37,19,35,49,23,39,53,51,55" effect="46"/> + <effect map="029-1.tmx" npc="263" value="1,3,5,9,33,7,13,37,11,35,41,15,39,45,43,47" effect="46"/> + <effect map="029-1.tmx" npc="265" value="1,3,5,9,17,7,13,21,11,19,25,15,23,29,27,31" effect="46"/> + <quest name="Hide-n-seek" group="Candor Island" incomplete="1,11,13,15,17,19,21,23,25,27,29,3,31,33,35,37,39,41,43,45,47,49,5,51,53,55,57,59,61,7,9"> + <name>Hide and Seek</name> + <text>Ayasha has recruited you in a game of Hide and Seek! Find all five of her friends hidden around Candor Island.</text> + </quest> + <quest name="Hide-n-seek" group="Candor Island" incomplete="63"> + <name>Hide and Seek</name> + <text>You found all of Ayasha's friends! You should go talk to Ayasha to let her know.</text> + </quest> + <quest name="Hide-n-seek" group="Candor Island" complete="127"> + <name>Hide and Seek</name> + <text>You finished playing Hide and Seek with Ayasha and her friends.</text> + </quest> + </var> +</quests> diff --git a/quests/candor/tutorial.xml b/quests/candor/tutorial.xml new file mode 100644 index 00000000..8a60962b --- /dev/null +++ b/quests/candor/tutorial.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//var/quest/@name" translate="yes"/> + <its:translateRule selector="//var/quest/name" translate="yes"/> + <its:translateRule selector="//var/quest/text" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + <var id="1"> + <!-- SORFINA --> + <effect map="029-2.tmx" npc="154" value="0" effect="45"/> + <effect map="029-2.tmx" npc="154" value="1,2,3" effect="46"/> + <quest name="Tutorial" group="Candor Island" incomplete="1"> + <name>Introduction</name> + <text>Sorfina wants to ensure that you still possess basic motor skills. Walk over to the carpet to put her worries to rest.</text> + <text>The carpet is located at (33,27) in Candor Island Indoor.</text> + </quest> + <quest name="Tutorial" group="Candor Island" incomplete="2"> + <name>Introduction</name> + <text>Sorfina remains skeptical and has instructed you to grab some clothes out of a nearby dresser.</text> + <text>The dresser is located at (29,24) in Candor Island Indoor.</text> + </quest> + <quest name="Tutorial" group="Candor Island" incomplete="3"> + <name>Introduction</name> + <text>Sorfina wants to make sure that you can dress yourself. Open up your inventory and equip the clothes you took from the dresser.</text> + <text>You can equip items irregardless of your location, but you may prefer to change in the privacy of the corner at (26,23) in Candor Island Indoor.</text> + </quest> + <!-- TANISHA --> + <effect map="029-2.tmx" npc="114" value="4,5,6,7" effect="46"/> + <quest name="Tutorial" group="Candor Island" incomplete="4"> + <name>Introduction</name> + <text>To repay your debt, Sorfina has requested that you assist her niece, Tanisha.</text> + <text>Tanisha is located at (110,88) in Candor Island Indoor.</text> + </quest> + <quest name="Tutorial" group="Candor Island" incomplete="5"> + <name>Introduction</name> + <text>Tanisha, despite her job, is disgusted by maggots and wants you to squash them for her.</text> + <text>The maggots seem to be infesting near (102,88) in Candor Island Indoor.</text> + </quest> + <quest name="Tutorial" group="Candor Island" incomplete="6"> + <name>Introduction</name> + <text>Tanisha has given you some useful equipment for squashing maggots. You'd better get to work!</text> + <text>The maggots seem to be infesting near (102,88) in Candor Island Indoor.</text> + </quest> + <quest name="Tutorial" group="Candor Island" incomplete="7"> + <name>Introduction</name> + <text>You killed the maggots for Tanisha, so you should report back to her and see what she has to say.</text> + <text>Tanisha is located at (110,88) in Candor Island Indoor.</text> + </quest> + <quest name="Tutorial" group="Candor Island" complete="8"> + <name>Introduction</name> + <text>You finished all the work that Sorfina and Tanisha had for you. They still seem happy to talk to you though.</text> + <text>Sorfina is located at (27,27) and Tanisha is located at (110,88) – both are in Candor Island Indoor.</text> + </quest> + </var> +</quests> diff --git a/quests/candor/valon.xml b/quests/candor/valon.xml new file mode 100644 index 00000000..a9328d8c --- /dev/null +++ b/quests/candor/valon.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//var/quest/@name" translate="yes"/> + <its:translateRule selector="//var/quest/name" translate="yes"/> + <its:translateRule selector="//var/quest/text" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + <var id="2"> + <effect map="029-1.tmx" npc="156" value="0" effect="45"/> + <effect map="029-1.tmx" npc="156" value="1,2,3,4,5,6" effect="46"/> + <quest name="Valon" group="Candor Island" incomplete="1"> + <name>By Order of the Council</name> + <text>The Council of Wizards has offered an incentive to those willing to help cull Candor's unruly wildlife population.</text> + </quest> + <quest name="Valon" group="Candor Island" incomplete="2"> + <name>By Order of the Council: Maggots</name> + <text>The Council wants you to kill 10 Maggots.</text> + </quest> + <quest name="Valon" group="Candor Island" incomplete="3"> + <name>By Order of the Council: House Maggots</name> + <text>The Council wants you to kill 5 House Maggots.</text> + </quest> + <quest name="Valon" group="Candor Island" incomplete="4"> + <name>By Order of the Council: Tame Scorpion</name> + <text>The Council wants you to kill 3 Tame Scorpions.</text> + </quest> + <quest name="Valon" group="Candor Island" incomplete="5"> + <name>By Order of the Council: Scorpion</name> + <text>The Council wants you to kill 1 Scorpion.</text> + </quest> + <quest name="Valon" group="Candor Island" complete="6"> + <name>By Order of the Council</name> + <text>You finished killing all the monsters.</text> + <text>Go talk to Valon at (72,86) on Candor Island.</text> + </quest> + <quest name="Valon" group="Candor Island" complete="7"> + <name>By Order of the Council</name> + <text>You filled your quota of monsters and completed the Council's request.</text> + <text>Other monsters that you kill will go towards your monster points, which Ishi will redeem at (47,97) on Candor Island.</text> + </quest> + </var> +</quests> diff --git a/quests/candor/vincent.xml b/quests/candor/vincent.xml new file mode 100644 index 00000000..6854eaf4 --- /dev/null +++ b/quests/candor/vincent.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//var/quest/@name" translate="yes"/> + <its:translateRule selector="//var/quest/name" translate="yes"/> + <its:translateRule selector="//var/quest/text" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + <var id="5"> + <effect map="029-1.tmx" npc="113" value="0" effect="45"/> + <effect map="029-1.tmx" npc="113" value="1" effect="46"/> + <quest name="Bugman" group="Candor Island" incomplete="1"> + <name>The Adventures of Action Bug</name> + <text>Vincent needs you to bring him some bug legs so he can make an action figure.</text> + </quest> + <quest name="Bugman" group="Candor Island" complete="2"> + <name>The Adventures of Action Bug</name> + <text>You got Vincent all the bug legs that he needed to make his action figure!</text> + </quest> + </var> +</quests> diff --git a/quests/candor/zegas.xml b/quests/candor/zegas.xml new file mode 100644 index 00000000..c85afc0e --- /dev/null +++ b/quests/candor/zegas.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<quests> + <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> + <its:translateRule selector="//var/quest/@name" translate="yes"/> + <its:translateRule selector="//var/quest/name" translate="yes"/> + <its:translateRule selector="//var/quest/text" translate="yes"/> + <its:translateRule selector="//*" translate="no"/> + </its:rules> + <var id="4"> + <effect map="029-1.tmx" npc="165" value="0" effect="45"/> + <effect map="029-1.tmx" npc="165" value="1,2,3" effect="46"/> + <quest name="Bug Bomb" group="Candor Island" incomplete="1"> + <name>Buggy</name> + <text>Zegas needs some help. As an aspiring adventure, you should see if you can assist her.</text> + </quest> + <quest name="Bug Bomb" group="Candor Island" incomplete="2"> + <name>A what bomb?</name> + <text>Zegas has lost her bug bomb inside one of her storage barrels. Find it and set it off to kill the remaining bugs.</text> + </quest> + <quest name="Bug Bomb" group="Candor Island" incomplete="3"> + <name>Bug Bomb Goes Boom</name> + <text>You found the bug bomb and killed the bugs! You should tell Zegas about it.</text> + </quest> + <quest name="Bug Bomb" group="Candor Island" complete="4"> + <name>Buggy</name> + <text>You finished helping Zegas with her bug infestation.</text> + </quest> + </var> +</quests> diff --git a/tilesets/snow_x3.tsx b/tilesets/snow_x3.tsx index 7bd67be4..df57224a 100644 --- a/tilesets/snow_x3.tsx +++ b/tilesets/snow_x3.tsx @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <tileset name="snow_x3" tilewidth="32" tileheight="96"> - <image source="../graphics/tiles/snow_x3.png" width="512" height="96"/> + <image source="../graphics/tiles/snow_x3.png" width="128" height="96"/> </tileset> |
