Merge branch 'flag' into 'master'

Flag

See merge request evol/clientdata!95

6 files changed, 147 insertions, 6 deletions

diff --git a/LICENSE b/LICENSE
index 64205c5b..4c404b4b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -520,6 +520,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/npcs/sprite/elmo.png (Reid)                            (CC BY-SA 3.0)        (Modanung, Talaroc)
     graphics/sprites/npcs/sprite/eugene.png (Reid)                          (CC BY-SA 3.0)        (Kansu)
     graphics/sprites/npcs/sprite/elmo-artis.png (Reid)                      (CC BY-SA 3.0)        (Modanung, Talaroc)
+    graphics/sprites/npcs/sprite/flag-small.png (Micksha)                   (CC BY-SA 3.0)        (-)
     graphics/sprites/npcs/sprite/flask.png (Hal9000)                        (CC BY-SA 3.0)        (Reid)
     graphics/sprites/npcs/sprite/galimatia.png (Micksha)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/npcs/sprite/gugli.png (Reid)                           (CC BY-SA 3.0)        (Modanung, Talaroc)
diff --git a/graphics/sprites/npcs/sprite/flag-small.png b/graphics/sprites/npcs/sprite/flag-small.png
new file mode 100644
index 00000000..31d82f21
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/flag-small.png
diff --git a/graphics/sprites/npcs/xml/flag-small-l.xml b/graphics/sprites/npcs/xml/flag-small-l.xml
new file mode 100644
index 00000000..20326f1c
--- /dev/null
+++ b/graphics/sprites/npcs/xml/flag-small-l.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/flag-small.png"
+              width="32"
+              height="64"/>
+    <action name="stand" imageset="npc">    
+        <animation direction="default">
+            <label name="start"/>
+            <goto label="static" rand="80"/>
+            <goto label="semistatic" rand="50"/>
+            <goto label="blowup" rand="100"/>
+            <!-- go from static to blowing -->
+            <label name="blowup"/>
+                <sequence start="0" end="11" delay="150"/>
+            <goto label="blowing"/>
+            <!-- blowing -->
+            <label name="blowing"/>
+                <sequence start="6" end="11" delay="150" repeat="10"/>
+            <goto label="blowdown" rand="10"/>
+            <goto label="blowing-strong" rand="40"/>
+            <!-- blowing strong-->
+            <label name="blowing-strong"/>
+                <sequence start="6" end="11" delay="90" repeat="10"/>
+            <goto label="blowing" rand="75"/>
+            <!-- go from blowing to blowdown -->
+            <label name="blowdown"/>
+                <frame index="5" delay="150"/>
+                <frame index="4" delay="150"/>
+                <frame index="3" delay="150"/>
+                <frame index="0" delay="500"/>
+            <goto label="static" rand="95"/>
+            <goto label="blowup" rand="100"/>
+            <!-- Static Animation - flag semi-start blowing-->
+            <label name="semistatic"/>
+                <frame index="0" delay="1500"/>
+                <frame index="1" delay="150"/>
+                <frame index="2" delay="150"/>
+                <frame index="3" delay="150"/>
+                <frame index="2" delay="150"/>
+                <frame index="1" delay="150"/>
+                <frame index="2" delay="150"/>
+                <frame index="3" delay="150"/>
+                <frame index="4" delay="150"/>
+                <frame index="3" delay="150"/>
+                <frame index="2" delay="150"/>
+                <frame index="1" delay="150"/>
+            <goto label="blowup" rand="50"/>
+            <goto label="static" rand="10"/>
+            <goto label="start" rand="50"/>
+            <!-- Static Animation - flag hanging-->
+            <label name="static"/>
+                <frame index="0" delay="2500"/>
+                <frame index="1" delay="150"/>
+                <frame index="2" delay="150"/>
+                <frame index="1" delay="150"/>
+            <goto label="blowup" rand="20"/>
+            <goto label="semistatic" rand="50"/>
+            <goto label="start" rand="50"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/flag-small-r.xml b/graphics/sprites/npcs/xml/flag-small-r.xml
new file mode 100644
index 00000000..15a5f7ee
--- /dev/null
+++ b/graphics/sprites/npcs/xml/flag-small-r.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/flag-small.png"
+              width="32"
+              height="64"/>
+    <action name="stand" imageset="npc">    
+        <animation direction="default">
+            <label name="start"/>
+            <goto label="static" rand="80"/>
+            <goto label="semistatic" rand="50"/>
+            <goto label="blowup" rand="100"/>
+            <!-- go from static to blowing -->
+            <label name="blowup"/>
+                <sequence start="12" end="23" delay="150"/>
+            <goto label="blowing"/>
+            <!-- blowing -->
+            <label name="blowing"/>
+                <sequence start="18" end="23" delay="150" repeat="10"/>
+            <goto label="blowdown" rand="10"/>
+            <goto label="blowing-strong" rand="40"/>
+            <!-- blowing strong-->
+            <label name="blowing-strong"/>
+                <sequence start="18" end="23" delay="90" repeat="10"/>
+            <goto label="blowing" rand="75"/>
+            <!-- go from blowing to blowdown -->
+            <label name="blowdown"/>
+                <frame index="17" delay="150"/>
+                <frame index="16" delay="150"/>
+                <frame index="15" delay="150"/>
+                <frame index="14" delay="500"/>
+            <goto label="static" rand="95"/>
+            <goto label="blowup" rand="100"/>
+            <!-- Static Animation - flag semi-start blowing-->
+            <label name="semistatic"/>
+                <frame index="12" delay="1500"/>
+                <frame index="13" delay="150"/>
+                <frame index="14" delay="150"/>
+                <frame index="15" delay="150"/>
+                <frame index="14" delay="150"/>
+                <frame index="13" delay="150"/>
+                <frame index="14" delay="150"/>
+                <frame index="15" delay="150"/>
+                <frame index="16" delay="150"/>
+                <frame index="15" delay="150"/>
+                <frame index="14" delay="150"/>
+                <frame index="13" delay="150"/>
+            <goto label="blowup" rand="50"/>
+            <goto label="static" rand="10"/>
+            <goto label="start" rand="50"/>
+            <!-- Static Animation - flag hanging-->
+            <label name="static"/>
+                <frame index="12" delay="2500"/>
+                <frame index="13" delay="150"/>
+                <frame index="14" delay="150"/>
+                <frame index="13" delay="150"/>
+            <goto label="blowup" rand="20"/>
+            <goto label="semistatic" rand="50"/>
+            <goto label="start" rand="50"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index ad5c9e00..909ca248 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" infinite="0" nextobjectid="118">
+<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" infinite="0" nextobjectid="119">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -1650,7 +1650,7 @@
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2667,2667,2667,0,0,0,0,0,0,2665,0,0,2665,0,0,2665,0,0,0,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,2668,2668,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2666,2667,2667,2667,2667,2666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,2665,2665,0,0,0,2665,2665,0,0,2665,0,0,0,2665,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2667,2667,2667,2667,0,0,0,0,0,2665,2665,2668,2668,2665,0,0,0,0,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2666,0,2665,0,0,0,0,0,2665,2665,2665,2665,2665,0,0,0,0,0,2665,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2666,2667,2667,2667,2667,2666,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,2665,2665,2665,2665,0,2665,0,0,0,0,0,0,0,2665,2665,0,0,2665,2665,2665,0,2665,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,0,0,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,2665,2666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2666,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,2665,0,2666,2667,2667,2667,2666,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,2665,2665,0,0,0,0,0,0,2665,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
-2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,0,0,2665,2665,2665,2665,2665,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2666,2666,0,0,0,0,0,0,0,0,0,0,2666,2665,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2666,2667,2667,2667,2666,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,2665,2665,0,2665,0,0,0,0,2665,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
+2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,2665,0,2665,2665,2665,2665,2665,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2666,2666,0,0,0,0,0,0,0,0,0,0,2666,2665,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2666,2667,2667,2667,2666,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,2665,2665,0,2665,0,0,0,0,2665,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,2667,0,2665,0,0,0,0,0,0,0,0,0,2665,0,0,2665,2665,2665,2665,2665,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,2665,2665,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2666,2667,2667,2667,2666,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,0,0,0,0,2665,2665,2665,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,2665,2665,2665,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,2667,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2666,2666,2666,2666,2666,2665,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,2666,2667,2667,2667,2666,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,0,0,2665,2665,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,2667,2667,2665,2665,2665,2665,0,0,0,2665,0,0,2665,0,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,2665,0,0,0,0,0,0,2666,2667,2667,2667,2666,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,0,0,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,0,2665,0,0,0,0,2665,2665,2665,2665,2665,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
@@ -1688,10 +1688,10 @@
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2665,0,0,2665,0,0,0,2665,2665,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2665,2665,2665,0,0,0,2665,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2665,2665,2667,2667,2667,2667,2667,2667,2667,2667,2667,2665,0,0,2665,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2665,2665,0,2665,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2666,2666,2666,2666,2666,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2666,2666,2666,2666,2667,2667,2667,2667,2667,2667,2667,2667,2667,2665,2665,2665,2665,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2666,2666,2666,2666,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2666,2666,2666,2666,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
-2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
+2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,2665,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
-2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
-2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
+2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
+2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2667,2667,2667,2667,2667,2667,2667,2667,2667,2667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
 2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,2665,
@@ -1905,7 +1905,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Library" type="warp" x="1632" y="2560" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
diff --git a/npcs.xml b/npcs.xml
index 433d25a9..33e5390b 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -841,6 +841,16 @@ IDs 900-999 = Special
         <sprite>equipment/feet/boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+    <npc id="464">
+        <!-- Flag, blowing to the left, for rowboat scripts -->
+        <sprite>npcs/xml/flag-small-l.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
+    <npc id="465">
+        <!-- Flag, blowing to the right, for rowboat scripts -->
+        <sprite>npcs/xml/flag-small-r.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
 
     <!-- Test NPCs -->
     <npc id="800" allowDelete="false">