summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-08-24 20:18:38 -0500
committerWushin <pasekei@gmail.com>2014-08-24 20:18:38 -0500
commitdf6bddeda84cdde69fe0c25a738e5dabe50d5c17 (patch)
treeb117c13379567819acfba410e472766a4212049a
parent74a66659bf3da508e94d701fbe8f618157dcf969 (diff)
parent32f7e5020fd5a17e691bc2853c9b1f8985727796 (diff)
downloadclientdata-df6bddeda84cdde69fe0c25a738e5dabe50d5c17.tar.gz
clientdata-df6bddeda84cdde69fe0c25a738e5dabe50d5c17.tar.bz2
clientdata-df6bddeda84cdde69fe0c25a738e5dabe50d5c17.tar.xz
clientdata-df6bddeda84cdde69fe0c25a738e5dabe50d5c17.zip
Merge pull request #156 from mekolat/emblems
make koga non-spammy
-rw-r--r--effects.xml1
-rw-r--r--graphics/sprites/model/city-emblems.pngbin0 -> 14238 bytes
-rw-r--r--graphics/sprites/model/city-emblems.xml9
-rw-r--r--license.txt1
-rw-r--r--npcs/_include.xml8
-rw-r--r--npcs/npc410.xml6
-rw-r--r--npcs/npc411.xml6
-rw-r--r--npcs/npc412.xml6
-rw-r--r--npcs/npc413.xml6
-rw-r--r--npcs/npc414.xml6
-rw-r--r--npcs/npc415.xml6
-rw-r--r--npcs/npc416.xml6
-rw-r--r--npcs/npc417.xml6
-rw-r--r--sfx/system/ship-bell2.oggbin0 -> 29622 bytes
14 files changed, 67 insertions, 0 deletions
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
--- /dev/null
+++ b/graphics/sprites/model/city-emblems.png
Binary files 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/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)
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
--- /dev/null
+++ b/sfx/system/ship-bell2.ogg
Binary files differ