summaryrefslogtreecommitdiff
path: root/graphics/sprites/npcs/xml/richard.xml
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/sprites/npcs/xml/richard.xml')
-rw-r--r--graphics/sprites/npcs/xml/richard.xml11
1 files changed, 2 insertions, 9 deletions
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index c3a3f843..6c0bc46d 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,13 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
-<!-- Author: Micksha
-=======
-<!-- Author: Reid
->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
-=======
+
<!-- Author: Micksha
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
Copyright (C) 2015 Evol Online -->
<sprite>
@@ -20,7 +13,7 @@ Copyright (C) 2015 Evol Online -->
<animation direction="default">
<label name="start"/>
<goto label="static" rand="95"/>
- <goto label="winking" rand="5"/>
+ <goto label="winking" rand="100"/>
<!-- winking -->
<label name="winking"/>
<sequence start="0" end="2" delay="160"/>