From ac6c5c41924cc1bc7fbb52780f0afd08f689019f Mon Sep 17 00:00:00 2001 From: Vasily <danilka.pro@gmail.com> Date: Sat, 31 Oct 2015 00:29:27 +0300 Subject: Fixed missing Rumly renamings --- LICENSE | 2 +- graphics/sprites/npcs/sprite/rumli.png | Bin 12533 -> 0 bytes graphics/sprites/npcs/sprite/rumly.png | Bin 0 -> 12533 bytes graphics/sprites/npcs/xml/rumli.xml | 43 --------------------------------- graphics/sprites/npcs/xml/rumly.xml | 43 +++++++++++++++++++++++++++++++++ npcs.xml | 2 +- 6 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 graphics/sprites/npcs/sprite/rumli.png create mode 100644 graphics/sprites/npcs/sprite/rumly.png delete mode 100644 graphics/sprites/npcs/xml/rumli.xml create mode 100644 graphics/sprites/npcs/xml/rumly.xml diff --git a/LICENSE b/LICENSE index 13e1b036..7ef1e3c0 100644 --- a/LICENSE +++ b/LICENSE @@ -298,7 +298,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/npcs/sprite/piourocket.png (Reid) (CC BY-SA 3.0) (Fother_J) graphics/sprites/npcs/sprite/qonan.png (Reid) (CC BY-SA 3.0) (Modanung) graphics/sprites/npcs/sprite/rattosailor.png (Reid) (CC BY-SA 3.0) (Coolkid782, Modanung, Talaroc) - graphics/sprites/npcs/sprite/rumli.png (Reid) (CC BY-SA 3.0) (Crush, Modanung, Talaroc) + graphics/sprites/npcs/sprite/rumly.png (Reid) (CC BY-SA 3.0) (Crush, Modanung, Talaroc) graphics/sprites/npcs/sprite/sailors.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) graphics/sprites/npcs/sprite/sapartan.png (Reid) (CC BY-SA 3.0) (Modanung) graphics/sprites/npcs/sprite/silvio.png (Reid) (CC BY-SA 3.0) (-) diff --git a/graphics/sprites/npcs/sprite/rumli.png b/graphics/sprites/npcs/sprite/rumli.png deleted file mode 100644 index 9e8bcc30..00000000 Binary files a/graphics/sprites/npcs/sprite/rumli.png and /dev/null differ diff --git a/graphics/sprites/npcs/sprite/rumly.png b/graphics/sprites/npcs/sprite/rumly.png new file mode 100644 index 00000000..9e8bcc30 Binary files /dev/null and b/graphics/sprites/npcs/sprite/rumly.png differ diff --git a/graphics/sprites/npcs/xml/rumli.xml b/graphics/sprites/npcs/xml/rumli.xml deleted file mode 100644 index 9988cca4..00000000 --- a/graphics/sprites/npcs/xml/rumli.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0"?> -<!-- Author : Reid -Copyright (C) 2010-2015 Evol Online --> -<sprite> - <imageset name="npc" src="graphics/sprites/npcs/sprite/rumli.png" width="30" height="60"/> - - <action name="stand" imageset="npc"> - <!-- Open eyes animation --> - <animation direction="left"> - <frame index="5" delay="100"/> - <frame index="6" delay="150"/> - </animation> - - <!-- Close eyes animation --> - <animation direction="up"> - <frame index="1" delay="300"/> - <frame index="0" delay="800"/> - <frame index="1" delay="700"/> - </animation> - - <!-- Opened eyes --> - <animation direction="right"> - <frame index="0"/> - </animation> - - <!-- Closed eyes --> - <animation direction="down"> - <frame index="2" delay="1000"/> - <frame index="3" delay="400"/> - <frame index="4" delay="200"/> - <frame index="3" delay="600"/> - <frame index="4" delay="200"/> - <frame index="3" delay="500"/> - <frame index="4" delay="150"/> - <frame index="3" delay="300"/> - <frame index="4" delay="200"/> - <frame index="3" delay="250"/> - <frame index="4" delay="200"/> - <frame index="3" delay="250"/> - <frame index="4" delay="400"/> - </animation> - </action> -</sprite> diff --git a/graphics/sprites/npcs/xml/rumly.xml b/graphics/sprites/npcs/xml/rumly.xml new file mode 100644 index 00000000..1aabefd2 --- /dev/null +++ b/graphics/sprites/npcs/xml/rumly.xml @@ -0,0 +1,43 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2010-2015 Evol Online --> +<sprite> + <imageset name="npc" src="graphics/sprites/npcs/sprite/rumly.png" width="30" height="60"/> + + <action name="stand" imageset="npc"> + <!-- Open eyes animation --> + <animation direction="left"> + <frame index="5" delay="100"/> + <frame index="6" delay="150"/> + </animation> + + <!-- Close eyes animation --> + <animation direction="up"> + <frame index="1" delay="300"/> + <frame index="0" delay="800"/> + <frame index="1" delay="700"/> + </animation> + + <!-- Opened eyes --> + <animation direction="right"> + <frame index="0"/> + </animation> + + <!-- Closed eyes --> + <animation direction="down"> + <frame index="2" delay="1000"/> + <frame index="3" delay="400"/> + <frame index="4" delay="200"/> + <frame index="3" delay="600"/> + <frame index="4" delay="200"/> + <frame index="3" delay="500"/> + <frame index="4" delay="150"/> + <frame index="3" delay="300"/> + <frame index="4" delay="200"/> + <frame index="3" delay="250"/> + <frame index="4" delay="200"/> + <frame index="3" delay="250"/> + <frame index="4" delay="400"/> + </animation> + </action> +</sprite> diff --git a/npcs.xml b/npcs.xml index ef36132d..46e35693 100644 --- a/npcs.xml +++ b/npcs.xml @@ -432,7 +432,7 @@ IDs 990-999 = Special </npc> <npc id="444"> <!-- Demon Male, Stat reseter NPC --> - <sprite>npcs/xml/rumli.xml</sprite> + <sprite>npcs/xml/rumly.xml</sprite> <menu name="Talk" command="talk 'NAME'"/> </npc> -- cgit v1.2.3-70-g09d2