diff options
Diffstat (limited to 'graphics')
75 files changed, 71 insertions, 15 deletions
diff --git a/graphics/minimaps/001-1.png b/graphics/minimaps/001-1.png Binary files differindex eb03f691..57a1f22b 100644 --- a/graphics/minimaps/001-1.png +++ b/graphics/minimaps/001-1.png diff --git a/graphics/minimaps/001-2.png b/graphics/minimaps/001-2.png Binary files differindex f0729dc7..20d95de4 100644 --- a/graphics/minimaps/001-2.png +++ b/graphics/minimaps/001-2.png diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png Binary files differindex 2f00532d..7ec7d480 100644 --- a/graphics/minimaps/002-1.png +++ b/graphics/minimaps/002-1.png diff --git a/graphics/minimaps/002-2.png b/graphics/minimaps/002-2.png Binary files differindex 9a2b02b7..87f961e3 100644 --- a/graphics/minimaps/002-2.png +++ b/graphics/minimaps/002-2.png diff --git a/graphics/minimaps/002-3.png b/graphics/minimaps/002-3.png Binary files differindex d446ad81..2b0ccdba 100644 --- a/graphics/minimaps/002-3.png +++ b/graphics/minimaps/002-3.png diff --git a/graphics/minimaps/003-1.png b/graphics/minimaps/003-1.png Binary files differdeleted file mode 100644 index 61faf67a..00000000 --- a/graphics/minimaps/003-1.png +++ /dev/null diff --git a/graphics/minimaps/003-2.png b/graphics/minimaps/003-2.png Binary files differdeleted file mode 100644 index b7e51b51..00000000 --- a/graphics/minimaps/003-2.png +++ /dev/null diff --git a/graphics/minimaps/004-1.png b/graphics/minimaps/004-1.png Binary files differdeleted file mode 100644 index a49441c1..00000000 --- a/graphics/minimaps/004-1.png +++ /dev/null diff --git a/graphics/minimaps/004-2.png b/graphics/minimaps/004-2.png Binary files differdeleted file mode 100644 index 934a3768..00000000 --- a/graphics/minimaps/004-2.png +++ /dev/null diff --git a/graphics/minimaps/005-1.png b/graphics/minimaps/005-1.png Binary files differdeleted file mode 100644 index 2a867a3f..00000000 --- a/graphics/minimaps/005-1.png +++ /dev/null diff --git a/graphics/minimaps/005-3.png b/graphics/minimaps/005-3.png Binary files differindex f5107888..b4c53b36 100644 --- a/graphics/minimaps/005-3.png +++ b/graphics/minimaps/005-3.png diff --git a/graphics/minimaps/005-4.png b/graphics/minimaps/005-4.png Binary files differdeleted file mode 100644 index 7fdf7747..00000000 --- a/graphics/minimaps/005-4.png +++ /dev/null diff --git a/graphics/minimaps/006-1.png b/graphics/minimaps/006-1.png Binary files differindex 796e12b4..8e402d8d 100644 --- a/graphics/minimaps/006-1.png +++ b/graphics/minimaps/006-1.png diff --git a/graphics/minimaps/006-3.png b/graphics/minimaps/006-3.png Binary files differindex bb5f8166..274e40e0 100644 --- a/graphics/minimaps/006-3.png +++ b/graphics/minimaps/006-3.png diff --git a/graphics/minimaps/008-1.png b/graphics/minimaps/008-1.png Binary files differindex db43a3f4..f67bcf8f 100644 --- a/graphics/minimaps/008-1.png +++ b/graphics/minimaps/008-1.png diff --git a/graphics/minimaps/009-1.png b/graphics/minimaps/009-1.png Binary files differindex 97b21887..daa115d2 100644 --- a/graphics/minimaps/009-1.png +++ b/graphics/minimaps/009-1.png diff --git a/graphics/minimaps/017-1.png b/graphics/minimaps/017-1.png Binary files differindex de0e7ac3..9206e0f5 100644 --- a/graphics/minimaps/017-1.png +++ b/graphics/minimaps/017-1.png diff --git a/graphics/minimaps/017-3.png b/graphics/minimaps/017-3.png Binary files differindex 1eeac62f..45f3784d 100644 --- a/graphics/minimaps/017-3.png +++ b/graphics/minimaps/017-3.png diff --git a/graphics/minimaps/019-1.png b/graphics/minimaps/019-1.png Binary files differindex 79ce1dc2..cec1cf5b 100644 --- a/graphics/minimaps/019-1.png +++ b/graphics/minimaps/019-1.png diff --git a/graphics/minimaps/019-3.png b/graphics/minimaps/019-3.png Binary files differindex b83e2d06..d4e1df2d 100644 --- a/graphics/minimaps/019-3.png +++ b/graphics/minimaps/019-3.png diff --git a/graphics/minimaps/019-4.png b/graphics/minimaps/019-4.png Binary files differindex 8aa846c8..c561a502 100644 --- a/graphics/minimaps/019-4.png +++ b/graphics/minimaps/019-4.png diff --git a/graphics/minimaps/020-1.png b/graphics/minimaps/020-1.png Binary files differindex 43205219..e3e8af6e 100644 --- a/graphics/minimaps/020-1.png +++ b/graphics/minimaps/020-1.png diff --git a/graphics/minimaps/021-1.png b/graphics/minimaps/021-1.png Binary files differdeleted file mode 100644 index 8ece6247..00000000 --- a/graphics/minimaps/021-1.png +++ /dev/null diff --git a/graphics/minimaps/021-2.png b/graphics/minimaps/021-2.png Binary files differdeleted file mode 100644 index 78f568f8..00000000 --- a/graphics/minimaps/021-2.png +++ /dev/null diff --git a/graphics/minimaps/022-1.png b/graphics/minimaps/022-1.png Binary files differdeleted file mode 100644 index b988c2fd..00000000 --- a/graphics/minimaps/022-1.png +++ /dev/null diff --git a/graphics/minimaps/023-1.png b/graphics/minimaps/023-1.png Binary files differdeleted file mode 100644 index 030b24e7..00000000 --- a/graphics/minimaps/023-1.png +++ /dev/null diff --git a/graphics/minimaps/023-2.png b/graphics/minimaps/023-2.png Binary files differdeleted file mode 100644 index 4d6b7b87..00000000 --- a/graphics/minimaps/023-2.png +++ /dev/null diff --git a/graphics/minimaps/023-3.png b/graphics/minimaps/023-3.png Binary files differdeleted file mode 100644 index fc1bb56c..00000000 --- a/graphics/minimaps/023-3.png +++ /dev/null diff --git a/graphics/minimaps/024-1.png b/graphics/minimaps/024-1.png Binary files differdeleted file mode 100644 index d90d514b..00000000 --- a/graphics/minimaps/024-1.png +++ /dev/null diff --git a/graphics/minimaps/024-2.png b/graphics/minimaps/024-2.png Binary files differdeleted file mode 100644 index c35ab9c0..00000000 --- a/graphics/minimaps/024-2.png +++ /dev/null diff --git a/graphics/minimaps/024-3.png b/graphics/minimaps/024-3.png Binary files differdeleted file mode 100644 index b242fb14..00000000 --- a/graphics/minimaps/024-3.png +++ /dev/null diff --git a/graphics/minimaps/024-4.png b/graphics/minimaps/024-4.png Binary files differdeleted file mode 100644 index 10bfe432..00000000 --- a/graphics/minimaps/024-4.png +++ /dev/null diff --git a/graphics/minimaps/029-1.png b/graphics/minimaps/029-1.png Binary files differindex cf6c3bbf..cfd09786 100644 --- a/graphics/minimaps/029-1.png +++ b/graphics/minimaps/029-1.png diff --git a/graphics/minimaps/029-2.png b/graphics/minimaps/029-2.png Binary files differnew file mode 100644 index 00000000..c41bdd19 --- /dev/null +++ b/graphics/minimaps/029-2.png diff --git a/graphics/minimaps/029-3.png b/graphics/minimaps/029-3.png Binary files differindex 589c4b0c..145208c7 100644 --- a/graphics/minimaps/029-3.png +++ b/graphics/minimaps/029-3.png diff --git a/graphics/minimaps/030-1.png b/graphics/minimaps/030-1.png Binary files differdeleted file mode 100644 index acd2a02f..00000000 --- a/graphics/minimaps/030-1.png +++ /dev/null diff --git a/graphics/minimaps/030-2.png b/graphics/minimaps/030-2.png Binary files differindex 6724a1c3..357c46a3 100644 --- a/graphics/minimaps/030-2.png +++ b/graphics/minimaps/030-2.png diff --git a/graphics/minimaps/031-1.png b/graphics/minimaps/031-1.png Binary files differindex 4a0a7f5e..0c82f94a 100644 --- a/graphics/minimaps/031-1.png +++ b/graphics/minimaps/031-1.png diff --git a/graphics/minimaps/032-1.png b/graphics/minimaps/032-1.png Binary files differdeleted file mode 100644 index f2f87c92..00000000 --- a/graphics/minimaps/032-1.png +++ /dev/null diff --git a/graphics/minimaps/034-1.png b/graphics/minimaps/034-1.png Binary files differindex e5805c00..5bbc7ff1 100644 --- a/graphics/minimaps/034-1.png +++ b/graphics/minimaps/034-1.png diff --git a/graphics/minimaps/041-1.png b/graphics/minimaps/041-1.png Binary files differdeleted file mode 100644 index 3e659a3e..00000000 --- a/graphics/minimaps/041-1.png +++ /dev/null diff --git a/graphics/minimaps/042-1.png b/graphics/minimaps/042-1.png Binary files differdeleted file mode 100644 index 15aaab3d..00000000 --- a/graphics/minimaps/042-1.png +++ /dev/null diff --git a/graphics/minimaps/042-2.png b/graphics/minimaps/042-2.png Binary files differdeleted file mode 100644 index 071618f5..00000000 --- a/graphics/minimaps/042-2.png +++ /dev/null diff --git a/graphics/minimaps/042-3.png b/graphics/minimaps/042-3.png Binary files differdeleted file mode 100644 index 84f66b55..00000000 --- a/graphics/minimaps/042-3.png +++ /dev/null diff --git a/graphics/minimaps/043-1.png b/graphics/minimaps/043-1.png Binary files differdeleted file mode 100644 index 4371ce55..00000000 --- a/graphics/minimaps/043-1.png +++ /dev/null diff --git a/graphics/minimaps/043-3.png b/graphics/minimaps/043-3.png Binary files differindex 5106ca85..8345833d 100644 --- a/graphics/minimaps/043-3.png +++ b/graphics/minimaps/043-3.png diff --git a/graphics/minimaps/044-1.png b/graphics/minimaps/044-1.png Binary files differdeleted file mode 100644 index ede0cde5..00000000 --- a/graphics/minimaps/044-1.png +++ /dev/null diff --git a/graphics/minimaps/044-3.png b/graphics/minimaps/044-3.png Binary files differdeleted file mode 100644 index 941f108b..00000000 --- a/graphics/minimaps/044-3.png +++ /dev/null diff --git a/graphics/minimaps/045-1.png b/graphics/minimaps/045-1.png Binary files differindex 41b5d5c8..a5e1b28c 100644 --- a/graphics/minimaps/045-1.png +++ b/graphics/minimaps/045-1.png diff --git a/graphics/minimaps/046-1.png b/graphics/minimaps/046-1.png Binary files differindex b654c1fd..814535c6 100644 --- a/graphics/minimaps/046-1.png +++ b/graphics/minimaps/046-1.png diff --git a/graphics/minimaps/046-3.png b/graphics/minimaps/046-3.png Binary files differindex 0245bdaa..b4f822a7 100644 --- a/graphics/minimaps/046-3.png +++ b/graphics/minimaps/046-3.png diff --git a/graphics/minimaps/047-1.png b/graphics/minimaps/047-1.png Binary files differindex 55494fd5..bd7e29c1 100644 --- a/graphics/minimaps/047-1.png +++ b/graphics/minimaps/047-1.png diff --git a/graphics/minimaps/047-3.png b/graphics/minimaps/047-3.png Binary files differnew file mode 100644 index 00000000..6f8a6cf8 --- /dev/null +++ b/graphics/minimaps/047-3.png diff --git a/graphics/minimaps/048-1.png b/graphics/minimaps/048-1.png Binary files differdeleted file mode 100644 index eca379b5..00000000 --- a/graphics/minimaps/048-1.png +++ /dev/null diff --git a/graphics/minimaps/048-2.png b/graphics/minimaps/048-2.png Binary files differindex 85e9b21b..bb3e04a9 100644 --- a/graphics/minimaps/048-2.png +++ b/graphics/minimaps/048-2.png diff --git a/graphics/minimaps/055-1.png b/graphics/minimaps/055-1.png Binary files differindex bb864499..44926d34 100644 --- a/graphics/minimaps/055-1.png +++ b/graphics/minimaps/055-1.png diff --git a/graphics/minimaps/056-1.png b/graphics/minimaps/056-1.png Binary files differdeleted file mode 100644 index 45f2aa9c..00000000 --- a/graphics/minimaps/056-1.png +++ /dev/null diff --git a/graphics/minimaps/056-2.png b/graphics/minimaps/056-2.png Binary files differindex 1425feb6..a0f4164d 100644 --- a/graphics/minimaps/056-2.png +++ b/graphics/minimaps/056-2.png diff --git a/graphics/minimaps/068-1.png b/graphics/minimaps/068-1.png Binary files differdeleted file mode 100644 index 43c8a6dc..00000000 --- a/graphics/minimaps/068-1.png +++ /dev/null diff --git a/graphics/minimaps/068-2.png b/graphics/minimaps/068-2.png Binary files differdeleted file mode 100644 index cffd5e94..00000000 --- a/graphics/minimaps/068-2.png +++ /dev/null diff --git a/graphics/minimaps/069-1.png b/graphics/minimaps/069-1.png Binary files differdeleted file mode 100644 index 4b2376af..00000000 --- a/graphics/minimaps/069-1.png +++ /dev/null diff --git a/graphics/minimaps/069-2.png b/graphics/minimaps/069-2.png Binary files differdeleted file mode 100644 index ffef641a..00000000 --- a/graphics/minimaps/069-2.png +++ /dev/null diff --git a/graphics/particles/soulmenhir.particle.xml b/graphics/particles/soulmenhir.particle.xml index 42d5302f..7ec06263 100644 --- a/graphics/particles/soulmenhir.particle.xml +++ b/graphics/particles/soulmenhir.particle.xml @@ -17,21 +17,21 @@ character some magical aura. <property name="gravity" value="-0.2"/> <property name="momentum" value="0.9"/> <property name="image" value="graphics/particles/gloworb-medium.png|W:#00ffff"/> - <property name="lifetime" value="100"/> + <property name="lifetime" value="50"/> <property name="fade-in" value="10"/> - <property name="fade-out" value="90"/> + <property name="fade-out" value="40"/> <property name="output" min="0" max="1"/> - <property name="randomness" value="200"/> + <property name="output-pause" min="5" max="15"/> </emitter> <emitter> <property name="gravity" value="-0.2"/> <property name="momentum" value="0.9"/> <property name="image" value="graphics/particles/orb-small.png|W:#00ffff"/> - <property name="lifetime" value="100"/> + <property name="lifetime" value="50"/> <property name="fade-in" value="10"/> - <property name="fade-out" value="90"/> + <property name="fade-out" value="40"/> <property name="output" min="0" max="1"/> - <property name="randomness" value="200"/> + <property name="output-pause" min="5" max="15"/> </emitter> </emitter> </particle> diff --git a/graphics/particles/warparea.particle.xml b/graphics/particles/warparea.particle.xml index dfbce40f..d3988c1d 100644 --- a/graphics/particles/warparea.particle.xml +++ b/graphics/particles/warparea.particle.xml @@ -8,12 +8,12 @@ Fancy fireworks effect which fills the whole screen. <property name="position-x" min="0" max="32"/> <property name="position-y" min="0" max="48"/> <property name="image" value="graphics/particles/star-medium.png"/> - <property name="gravity" value="-0.003"/> - <property name="lifetime" value="90"/> + <property name="gravity" value="-0.03"/> + <property name="lifetime" value="50"/> <property name="output" min="0" max="1"/> - <property name="output-pause" min="0" max="10"/> - <property name="fade-in" value="30"/> - <property name="fade-out" value="30"/> + <property name="output-pause" min="10" max="15"/> + <property name="fade-in" value="10"/> + <property name="fade-out" value="10"/> </emitter> </particle> </effect> diff --git a/graphics/sprites/equipment/legs/silkpants-female.png b/graphics/sprites/equipment/legs/silkpants-female.png Binary files differindex b073d599..91d59499 100644 --- a/graphics/sprites/equipment/legs/silkpants-female.png +++ b/graphics/sprites/equipment/legs/silkpants-female.png diff --git a/graphics/sprites/equipment/legs/silkpants-male.png b/graphics/sprites/equipment/legs/silkpants-male.png Binary files differindex 5400b50d..fd46f3da 100644 --- a/graphics/sprites/equipment/legs/silkpants-male.png +++ b/graphics/sprites/equipment/legs/silkpants-male.png diff --git a/graphics/sprites/equipment/weapons/sword-long-female.xml b/graphics/sprites/equipment/weapons/sword-long-female.xml index ab5c5273..b7ded47d 100644 --- a/graphics/sprites/equipment/weapons/sword-long-female.xml +++ b/graphics/sprites/equipment/weapons/sword-long-female.xml @@ -44,6 +44,20 @@ <frame offsetY="32" index="61"/> </animation> </action> + <action name="dead" imageset="sword-long"> + <animation direction="down"> + <frame offsetY="32" index="8"/> + </animation> + <animation direction="left"> + <frame offsetY="32" index="26"/> + </animation> + <animation direction="up"> + <frame offsetY="32" index="44"/> + </animation> + <animation direction="right"> + <frame offsetY="32" index="62"/> + </animation> + </action> <action name="attack_sword_stab" imageset="sword-long"> <animation direction="down"> <sequence offsetY="32" start="9" end="12" delay="100"/> diff --git a/graphics/sprites/equipment/weapons/sword-long-male.xml b/graphics/sprites/equipment/weapons/sword-long-male.xml index ab5c5273..b7ded47d 100644 --- a/graphics/sprites/equipment/weapons/sword-long-male.xml +++ b/graphics/sprites/equipment/weapons/sword-long-male.xml @@ -44,6 +44,20 @@ <frame offsetY="32" index="61"/> </animation> </action> + <action name="dead" imageset="sword-long"> + <animation direction="down"> + <frame offsetY="32" index="8"/> + </animation> + <animation direction="left"> + <frame offsetY="32" index="26"/> + </animation> + <animation direction="up"> + <frame offsetY="32" index="44"/> + </animation> + <animation direction="right"> + <frame offsetY="32" index="62"/> + </animation> + </action> <action name="attack_sword_stab" imageset="sword-long"> <animation direction="down"> <sequence offsetY="32" start="9" end="12" delay="100"/> diff --git a/graphics/sprites/equipment/weapons/sword-short-female.xml b/graphics/sprites/equipment/weapons/sword-short-female.xml index c1616de5..04cc7fe6 100644 --- a/graphics/sprites/equipment/weapons/sword-short-female.xml +++ b/graphics/sprites/equipment/weapons/sword-short-female.xml @@ -44,6 +44,20 @@ <frame offsetY="32" index="61"/> </animation> </action> + <action name="dead" imageset="sword-short"> + <animation direction="down"> + <frame offsetY="32" index="8"/> + </animation> + <animation direction="left"> + <frame offsetY="32" index="26"/> + </animation> + <animation direction="up"> + <frame offsetY="32" index="44"/> + </animation> + <animation direction="right"> + <frame offsetY="32" index="62"/> + </animation> + </action> <action name="attack" imageset="sword-short"> <animation direction="down"> <sequence offsetY="32" start="9" end="12" delay="75"/> diff --git a/graphics/sprites/equipment/weapons/sword-short-male.xml b/graphics/sprites/equipment/weapons/sword-short-male.xml index c1616de5..04cc7fe6 100644 --- a/graphics/sprites/equipment/weapons/sword-short-male.xml +++ b/graphics/sprites/equipment/weapons/sword-short-male.xml @@ -44,6 +44,20 @@ <frame offsetY="32" index="61"/> </animation> </action> + <action name="dead" imageset="sword-short"> + <animation direction="down"> + <frame offsetY="32" index="8"/> + </animation> + <animation direction="left"> + <frame offsetY="32" index="26"/> + </animation> + <animation direction="up"> + <frame offsetY="32" index="44"/> + </animation> + <animation direction="right"> + <frame offsetY="32" index="62"/> + </animation> + </action> <action name="attack" imageset="sword-short"> <animation direction="down"> <sequence offsetY="32" start="9" end="12" delay="75"/> diff --git a/graphics/sprites/monsters/troll.xml b/graphics/sprites/monsters/troll.xml index c2c67503..f8ab7ea6 100644 --- a/graphics/sprites/monsters/troll.xml +++ b/graphics/sprites/monsters/troll.xml @@ -89,16 +89,16 @@ </action> <action name="dead" imageset="base"> <animation direction="down"> - <sequence start="144" end="149" delay="5250"/> + <sequence start="144" end="149" delay="100"/> </animation> <animation direction="right"> - <sequence start="150" end="155" delay="5250"/> + <sequence start="150" end="155" delay="100"/> </animation> <animation direction="up"> - <sequence start="156" end="161" delay="5250"/> + <sequence start="156" end="161" delay="100"/> </animation> <animation direction="left"> - <sequence start="162" end="167" delay="5250"/> + <sequence start="162" end="167" delay="100"/> </animation> </action> </sprite> diff --git a/graphics/tiles/desert2.png b/graphics/tiles/desert2.png Binary files differindex bfcb3acf..3e1f194e 100644 --- a/graphics/tiles/desert2.png +++ b/graphics/tiles/desert2.png diff --git a/graphics/tiles/desert_x2.png b/graphics/tiles/desert_x2.png Binary files differindex ab867c3f..b33b89ac 100644 --- a/graphics/tiles/desert_x2.png +++ b/graphics/tiles/desert_x2.png diff --git a/graphics/tiles/desert_x3.png b/graphics/tiles/desert_x3.png Binary files differindex 47dfcc04..d6a84916 100644 --- a/graphics/tiles/desert_x3.png +++ b/graphics/tiles/desert_x3.png diff --git a/graphics/tiles/mountain.png b/graphics/tiles/mountain.png Binary files differindex c29de4ca..38834548 100644 --- a/graphics/tiles/mountain.png +++ b/graphics/tiles/mountain.png |
