From c1a2c762667bdb3eee92e2eb920b4d67e2aef097 Mon Sep 17 00:00:00 2001
From: Enchilado <crunchy@crunchy-Satellite-L300.(none)>
Date: Tue, 14 Jun 2011 07:53:57 +1000
Subject: Remove stray pixel in Woodland_village_x2.png

---
 graphics/tiles/Woodland_village_x2.png | Bin 21769 -> 21759 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/tiles/Woodland_village_x2.png b/graphics/tiles/Woodland_village_x2.png
index e0f067a0..9d853b0b 100644
Binary files a/graphics/tiles/Woodland_village_x2.png and b/graphics/tiles/Woodland_village_x2.png differ
-- 
cgit v1.2.3-60-g2f50


From 7cd95cb068f91ad398af0b565e010628d391c3b4 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Tue, 14 Jun 2011 10:42:28 +0200
Subject: Added earth scorpion and earth spider. Removed the particle effect of
 the scorpion.

---
 monsters.xml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/monsters.xml b/monsters.xml
index c0df98b5..ed4eec44 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -19,9 +19,6 @@
         <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
         <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
         <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
-        <attack id="1"
-                particle-effect="graphics/particles/attack.particle.xml"
-                />
     </monster>
 
     <monster id="2" name="Red Scorpion">
@@ -340,19 +337,24 @@
         <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
         <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
     </monster>
+
     <monster id="59" name="Moggun">
         <sprite>monsters/monster-moggun.xml</sprite>
     </monster>
+
     <monster id="60" name="Terranite">
     <sprite>monsters/monster-terranite.xml</sprite>
     </monster>
+
     <monster id="61" name="Pumpkin">
         <sprite>resource-pumpkin.xml</sprite>
     </monster>
+
     <monster id="62" name="Bandit">
     <sprite>monsters/monster-bandit.xml</sprite>
     <sprite>monsters/weapon-dagger.xml</sprite>
     </monster>
+
     <monster id="63" name="Bandit Lord">
     <sprite>monsters/monster-bandit-lord.xml</sprite>
     <sprite>monsters/weapon-bow.xml</sprite>
@@ -361,6 +363,7 @@
             action="attack"
             />
     </monster>
+
     <monster id="64" name="Vampire Bat">
         <sprite>monsters/monster-vampire-bat.xml</sprite>
         <sound event="die">monsters/bat/bat-dying1.ogg</sound>
@@ -447,4 +450,23 @@
     <monster id="80" name="Serqet">
 		<sprite>monsters/monster-serqet.xml</sprite>
     </monster>
+
+    <monster id="81" name="Earth Spider">
+        <sprite>monsters/monster-spider.xml|#1a160f,93774a,d2c3aa,ffffff;#a00000</sprite>
+        <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
+        <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
+    </monster>
+
+    <monster id="82" name="Earth Scorpion">
+        <sprite>monsters/monster-scorpion.xml|#211b0e,5c3e20,a68d42,ffffff</sprite>
+        <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
+        <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
+    </monster>
+
 </monsters>
-- 
cgit v1.2.3-60-g2f50


From 8271cb5f0794e35d0092b7a2cd4b7394e95ef765 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Tue, 14 Jun 2011 20:33:49 +0200
Subject: Added updated version of the thermin tilesets.

---
 graphics/tiles/thermin-cave.png | Bin 0 -> 23884 bytes
 graphics/tiles/thermin-town.png | Bin 0 -> 91358 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 graphics/tiles/thermin-cave.png
 create mode 100755 graphics/tiles/thermin-town.png

diff --git a/graphics/tiles/thermin-cave.png b/graphics/tiles/thermin-cave.png
new file mode 100755
index 00000000..2fa926c5
Binary files /dev/null and b/graphics/tiles/thermin-cave.png differ
diff --git a/graphics/tiles/thermin-town.png b/graphics/tiles/thermin-town.png
new file mode 100755
index 00000000..34bc9a08
Binary files /dev/null and b/graphics/tiles/thermin-town.png differ
-- 
cgit v1.2.3-60-g2f50


From 3e565300a297a7f88b3fe05432cd7eba91020b91 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Tue, 14 Jun 2011 21:25:40 +0200
Subject: Added the Ice Skull.

---
 graphics/sprites/monsters/monster-skull-ice.png | Bin 0 -> 20129 bytes
 graphics/sprites/monsters/monster-skull-ice.xml |  75 ++++++++++++++++++++++++
 monsters.xml                                    |   4 ++
 3 files changed, 79 insertions(+)
 create mode 100644 graphics/sprites/monsters/monster-skull-ice.png
 create mode 100644 graphics/sprites/monsters/monster-skull-ice.xml

diff --git a/graphics/sprites/monsters/monster-skull-ice.png b/graphics/sprites/monsters/monster-skull-ice.png
new file mode 100644
index 00000000..dcc66922
Binary files /dev/null and b/graphics/sprites/monsters/monster-skull-ice.png differ
diff --git a/graphics/sprites/monsters/monster-skull-ice.xml b/graphics/sprites/monsters/monster-skull-ice.xml
new file mode 100644
index 00000000..14375a0d
--- /dev/null
+++ b/graphics/sprites/monsters/monster-skull-ice.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monsters/monster-skull-ice.png" width="45" height="60" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" delay="350" />
+		  <frame index="1" delay="350" />
+		</animation>
+		<animation direction="left">
+		  <frame index="12" delay="350" />
+		  <frame index="13" delay="350" />
+		</animation>
+		<animation direction="up">
+		  <frame index="24" delay="350" />
+		  <frame index="25" delay="350" />
+		</animation>
+		<animation direction="right">
+		  <frame index="36" delay="350" />
+		  <frame index="37" delay="350" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="0" end="4" delay="150" />
+		</animation>
+		<animation direction="left">
+			<sequence start="12" end="16" delay="150" />
+		</animation>
+		<animation direction="up">
+			<sequence start="24" end="28" delay="150" />
+		</animation>
+		<animation direction="right">
+			<sequence start="36" end="40" delay="150" />
+		</animation>
+	</action>
+
+
+	<action name="dead" imageset="base">
+		<animation direction="right">
+		<sequence start="44" end="46" delay="150" />
+		<frame index="47" delay="0" />
+		</animation>
+		<animation direction="down">
+		<sequence start="8" end="10" delay="150" />
+		<frame index="11" delay="0" />
+		</animation>
+		<animation direction="left">
+		<sequence start="20" end="22" delay="150" />
+		<frame index="23" delay="0" />
+		</animation>
+		<animation direction="up">
+		<sequence start="32" end="34" delay="150" />
+		<frame index="35" delay="0" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="5" end="7" delay="100" />
+		</animation>
+		<animation direction="left">
+			<sequence start="17" end="19" delay="100" />
+		</animation>
+		<animation direction="up">
+			<sequence start="29" end="31" delay="100" />
+		</animation>
+		<animation direction="right">
+			<sequence start="41" end="43" delay="100" />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index ed4eec44..79352d6d 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -469,4 +469,8 @@
         <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
     </monster>
 
+    <monster id="83" name="Ice Skull">
+        <sprite>monsters/monster-skull-ice.xml</sprite>
+    </monster>
+
 </monsters>
-- 
cgit v1.2.3-60-g2f50