From 045d685a46a50775027f836ef58f01ac61e8901d Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Fri, 22 Aug 2014 14:43:35 -0400
Subject: make the ferry less spammy

---
 effects.xml                             |   1 +
 graphics/sprites/model/city-emblems.png | Bin 0 -> 14238 bytes
 graphics/sprites/model/city-emblems.xml |   9 +++++++++
 npcs/_include.xml                       |   8 ++++++++
 npcs/npc410.xml                         |   6 ++++++
 npcs/npc411.xml                         |   6 ++++++
 npcs/npc412.xml                         |   6 ++++++
 npcs/npc413.xml                         |   6 ++++++
 npcs/npc414.xml                         |   6 ++++++
 npcs/npc415.xml                         |   6 ++++++
 npcs/npc416.xml                         |   6 ++++++
 npcs/npc417.xml                         |   6 ++++++
 sfx/system/ship-bell2.ogg               | Bin 0 -> 29622 bytes
 13 files changed, 66 insertions(+)
 create mode 100644 graphics/sprites/model/city-emblems.png
 create mode 100644 graphics/sprites/model/city-emblems.xml
 create mode 100644 npcs/npc410.xml
 create mode 100644 npcs/npc411.xml
 create mode 100644 npcs/npc412.xml
 create mode 100644 npcs/npc413.xml
 create mode 100644 npcs/npc414.xml
 create mode 100644 npcs/npc415.xml
 create mode 100644 npcs/npc416.xml
 create mode 100644 npcs/npc417.xml
 create mode 100644 sfx/system/ship-bell2.ogg

diff --git a/effects.xml b/effects.xml
index cc6c6f71..47bdeb3b 100644
--- a/effects.xml
+++ b/effects.xml
@@ -87,4 +87,5 @@
   <effect id="400" particle="graphics/particles/monster-goblin-firebreath.particle.xml"/>
   <effect id="401" particle="graphics/particles/monster-lizard-firebreath.particle.xml"/>
   <!-- Add the data needed for the electricity boss battle. -->
+  <effect id="402" audio="sfx/system/ship-bell2.ogg"/>
 </being-effects>
diff --git a/graphics/sprites/model/city-emblems.png b/graphics/sprites/model/city-emblems.png
new file mode 100644
index 00000000..c747b339
Binary files /dev/null and b/graphics/sprites/model/city-emblems.png differ
diff --git a/graphics/sprites/model/city-emblems.xml b/graphics/sprites/model/city-emblems.xml
new file mode 100644
index 00000000..14a72f4a
--- /dev/null
+++ b/graphics/sprites/model/city-emblems.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite variants="8" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/model/city-emblems.png" width="32" height="96"/>
+  <action name="stand" imageset="base">
+    <animation direction="default">
+      <frame index="0"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/npcs/_include.xml b/npcs/_include.xml
index 72517be5..c57ea766 100644
--- a/npcs/_include.xml
+++ b/npcs/_include.xml
@@ -197,4 +197,12 @@
   <include name="npcs/npc407.xml"/>
   <include name="npcs/npc408.xml"/>
   <include name="npcs/npc409.xml"/>
+  <include name="npcs/npc410.xml"/>
+  <include name="npcs/npc411.xml"/>
+  <include name="npcs/npc412.xml"/>
+  <include name="npcs/npc413.xml"/>
+  <include name="npcs/npc414.xml"/>
+  <include name="npcs/npc415.xml"/>
+  <include name="npcs/npc416.xml"/>
+  <include name="npcs/npc417.xml"/>
 </npcs>
diff --git a/npcs/npc410.xml b/npcs/npc410.xml
new file mode 100644
index 00000000..c0832b61
--- /dev/null
+++ b/npcs/npc410.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="410" targetSelection="false">
+    <sprite variant="0">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/npcs/npc411.xml b/npcs/npc411.xml
new file mode 100644
index 00000000..cb0da557
--- /dev/null
+++ b/npcs/npc411.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="411" targetSelection="false">
+    <sprite variant="4">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/npcs/npc412.xml b/npcs/npc412.xml
new file mode 100644
index 00000000..e90cbe13
--- /dev/null
+++ b/npcs/npc412.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="412" targetSelection="false">
+    <sprite variant="1">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/npcs/npc413.xml b/npcs/npc413.xml
new file mode 100644
index 00000000..2d3175aa
--- /dev/null
+++ b/npcs/npc413.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="413" targetSelection="false">
+    <sprite variant="5">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/npcs/npc414.xml b/npcs/npc414.xml
new file mode 100644
index 00000000..bc72f1c3
--- /dev/null
+++ b/npcs/npc414.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="414" targetSelection="false">
+    <sprite variant="2">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/npcs/npc415.xml b/npcs/npc415.xml
new file mode 100644
index 00000000..a69a37c8
--- /dev/null
+++ b/npcs/npc415.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="415" targetSelection="false">
+    <sprite variant="6">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/npcs/npc416.xml b/npcs/npc416.xml
new file mode 100644
index 00000000..e6a77fee
--- /dev/null
+++ b/npcs/npc416.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="416" targetSelection="false">
+    <sprite variant="3">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/npcs/npc417.xml b/npcs/npc417.xml
new file mode 100644
index 00000000..2e65fb2b
--- /dev/null
+++ b/npcs/npc417.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="417" targetSelection="false">
+    <sprite variant="7">model/city-emblems.xml</sprite>
+  </npc>
+</npcs>
diff --git a/sfx/system/ship-bell2.ogg b/sfx/system/ship-bell2.ogg
new file mode 100644
index 00000000..89c4b307
Binary files /dev/null and b/sfx/system/ship-bell2.ogg differ
-- 
cgit v1.2.3-70-g09d2


From 903ae73f19dbdae86e067c521391d008884911db Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Sat, 23 Aug 2014 16:02:03 -0500
Subject: Liscense file for art

---
 license.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/license.txt b/license.txt
index 6bab2244..4de4b99e 100644
--- a/license.txt
+++ b/license.txt
@@ -576,6 +576,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
 ## Base
     graphics/sprites/base/female.png (Modanung, Skipy, Talaroc, Wombat)                                       (GPLv2)
     graphics/sprites/base/male.png (Modanung, Skipy, Talaroc, Wombat)                                         (GPLv2)
+    graphics/sprites/model/city-emblems.png (Alige, Wushin)                                                   (GPLv2)
 ## Equipment
 ### Weapons
     graphics/sprites/equipment/weapons/axe-chop.png (????, Wombat, Wushin)                                    (GPLv2)
-- 
cgit v1.2.3-70-g09d2