summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-28 20:28:03 +0000
committerJesusaves <cpntb1@ymail.com>2020-04-28 20:28:03 +0000
commitb03bef636c35a15fc2ecb2816fc4ab959f4aa087 (patch)
treeae38d318079509e00892d10c9581fc0bf4a97c9c
parent0207fba135b1521eaf1796f7cd419abbe140c454 (diff)
parent13c5c7e5590c0a15cd22f36f06dadf2457088fc1 (diff)
downloadclientdata-b03bef636c35a15fc2ecb2816fc4ab959f4aa087.tar.gz
clientdata-b03bef636c35a15fc2ecb2816fc4ab959f4aa087.tar.bz2
clientdata-b03bef636c35a15fc2ecb2816fc4ab959f4aa087.tar.xz
clientdata-b03bef636c35a15fc2ecb2816fc4ab959f4aa087.zip
Merge branch 'guilddungeon' into 'master'
Guild dungeon bosses, Guild coin See merge request TMW2/clientdata!64
-rw-r--r--LICENSE1
-rw-r--r--graphics/items/generic/guildcoin.pngbin0 -> 807 bytes
-rw-r--r--graphics/sprites/monsters/skeleton.xml2
-rw-r--r--items.xml2
-rw-r--r--monsters.xml34
5 files changed, 37 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 2cff843d..948fa168 100644
--- a/LICENSE
+++ b/LICENSE
@@ -554,6 +554,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/generic/grassliner.png (Salmondine) (GPLv2) (Enchilado)
graphics/items/generic/grassseeds.png (Coolkid782) (CC BY-SA 3.0) (Enchilado)
graphics/items/generic/guildcertification.png (Reid) (CC BY-SA 3.0) (-)
+ graphics/items/generic/guildcoin.png (Micksha) (CC BY-SA 3.0) (Enchilado)
graphics/items/generic/halfeggshell.png (Reid) (CC BY-SA 3.0) (-)
graphics/items/generic/hardspike.png (Crush) (CC BY-SA 3.0) (Enchilado)
graphics/items/generic/herocoin.png (?) (GPLv2) (TMW-Br)
diff --git a/graphics/items/generic/guildcoin.png b/graphics/items/generic/guildcoin.png
new file mode 100644
index 00000000..54f3d145
--- /dev/null
+++ b/graphics/items/generic/guildcoin.png
Binary files differ
diff --git a/graphics/sprites/monsters/skeleton.xml b/graphics/sprites/monsters/skeleton.xml
index 80698ec9..9f70357e 100644
--- a/graphics/sprites/monsters/skeleton.xml
+++ b/graphics/sprites/monsters/skeleton.xml
@@ -2,7 +2,7 @@
<!-- Author: Saulc -->
<sprite>
<imageset name="base"
- src="graphics/sprites/monsters/skeleton.png"
+ src="graphics/sprites/monsters/skeleton.png|W"
width="64"
height="64"/>
diff --git a/items.xml b/items.xml
index bbef792f..c7ebdbac 100644
--- a/items.xml
+++ b/items.xml
@@ -2921,7 +2921,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
type="generic"
weight="1"/>
<item id="915"
- image="generic/strangecoin.png"
+ image="generic/guildcoin.png"
name="Guild Coin"
description="A guild issued coin. Possibilities are endless."
type="generic"
diff --git a/monsters.xml b/monsters.xml
index e2e11177..2d07217f 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1368,4 +1368,38 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or s
<sound event="miss">monsters/flower/miss.ogg</sound>
<sound event="die">system/warp.ogg</sound>
</monster>
+ <monster id="1503" name="General Krukan">
+ <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
+ <sprite>equipment/legs/jeanschaps-male.xml</sprite>
+ <sprite>equipment/chest/warlordplate-male.xml</sprite>
+ <sprite>equipment/head/bull.xml</sprite>
+ <sound event="hit">monsters/frostiana/hit1.ogg</sound>
+ <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+ <sound event="miss">monsters/flower/miss.ogg</sound>
+ <sound event="die">system/warp.ogg</sound>
+ </monster>
+ <monster id="1504" name="General Razha">
+ <sprite>races/redy-male.xml</sprite>
+ <sprite>equipment/head/bull.xml</sprite>
+ <sprite>equipment/feet/warlordboots-male.xml|#333333,878787</sprite>
+ <sprite>equipment/chest/warlordplate-male.xml|#ea0000,979797</sprite>
+ <sprite>equipment/hands/cottongloves-male.xml|#242424,626262</sprite>
+ <sprite>equipment/weapons/knife.xml</sprite>
+ <sound event="hit">monsters/frostiana/hit1.ogg</sound>
+ <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+ <sound event="miss">monsters/flower/miss.ogg</sound>
+ <sound event="die">system/warp.ogg</sound>
+ <!--particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx-->
+ </monster>
+ <monster id="1505" name="General Terogan">
+ <sprite>monsters/skeleton.xml|#aca379</sprite>
+ <sprite>equipment/head/phylactery.xml</sprite>
+ <sprite>equipment/chest/silkrobe-male.xml|#ea0000,333333</sprite>
+ <sprite>equipment/hands/cottongloves-male.xml|#581a1a,a41111,c03a3a,ff6060</sprite>
+ <sound event="hit">monsters/frostiana/hit1.ogg</sound>
+ <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+ <sound event="miss">monsters/flower/miss.ogg</sound>
+ <sound event="die">system/warp.ogg</sound>
+ <!--attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/-->
+ </monster>
</monsters>