Merge branch 'master' of git@gitorious.org:tmwdata/mainline

15 files changed, 185 insertions, 30 deletions

diff --git a/graphics/sprites/icon-feather.png b/graphics/sprites/icon-feather.png
new file mode 100644
index 00000000..4651e224
--- /dev/null
+++ b/graphics/sprites/icon-feather.png
diff --git a/graphics/sprites/icon-feather.xml b/graphics/sprites/icon-feather.xml
new file mode 100644
index 00000000..0346a031
--- /dev/null
+++ b/graphics/sprites/icon-feather.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>

+<sprite>

+	<imageset name="base" src="graphics/sprites/icon-feather.png" width="24" height="24" />

+	

+	<action name="default" imageset="base">

+		<animation direction="default">

+			<frame index="0" offsetY="-12" delay="100"/>

+		</animation>

+	</action>

+</sprite>

diff --git a/graphics/sprites/icon-green-barrier.png b/graphics/sprites/icon-green-barrier.png
new file mode 100644
index 00000000..19c53b9a
--- /dev/null
+++ b/graphics/sprites/icon-green-barrier.png
diff --git a/graphics/sprites/icon-green-barrier.xml b/graphics/sprites/icon-green-barrier.xml
new file mode 100644
index 00000000..4613c612
--- /dev/null
+++ b/graphics/sprites/icon-green-barrier.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>

+<sprite>

+	<imageset name="base" src="graphics/sprites/icon-green-barrier.png" width="16" height="24" />

+	

+	<action name="default" imageset="base">

+		<animation direction="default">

+			<frame index="0" offsetY="-10" delay="100"/>

+			<frame index="1" offsetY="-10" delay="100"/>

+			<frame index="2" offsetY="-10" delay="100"/>

+		</animation>

+	</action>

+</sprite>

diff --git a/graphics/sprites/icon-hidden.png b/graphics/sprites/icon-hidden.png
new file mode 100644
index 00000000..b95792c1
--- /dev/null
+++ b/graphics/sprites/icon-hidden.png
diff --git a/graphics/sprites/icon-hidden.xml b/graphics/sprites/icon-hidden.xml
new file mode 100644
index 00000000..5bd03204
--- /dev/null
+++ b/graphics/sprites/icon-hidden.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>

+<sprite>

+	<imageset name="base" src="graphics/sprites/icon-hidden.png" width="24" height="24" />

+	

+	<action name="default" imageset="base">

+		<animation direction="default">

+			<frame index="0" offsetY="-12" delay="100"/>

+		</animation>

+	</action>

+</sprite>

diff --git a/graphics/sprites/icon-red-rotating-hex.xml b/graphics/sprites/icon-red-rotating-hex.xml
new file mode 100644
index 00000000..15fd7354
--- /dev/null
+++ b/graphics/sprites/icon-red-rotating-hex.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>

+<sprite>

+	<imageset name="base" src="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11" />

+	

+	<action name="default" imageset="base">

+		<animation direction="default">

+			<frame index="0" offsetY="-10" delay="200"/>

+			<frame index="1" offsetY="-10" delay="200"/>

+			<frame index="2" offsetY="-10" delay="200"/>

+			<frame index="3" offsetY="-10" delay="200"/>

+			<frame index="4" offsetY="-10" delay="200"/>

+			<frame index="5" offsetY="-10" delay="200"/>

+			<frame index="6" offsetY="-10" delay="200"/>

+			<frame index="7" offsetY="-10" delay="200"/>

+		</animation>

+	</action>

+</sprite>

diff --git a/graphics/sprites/monster-zombie.png b/graphics/sprites/monster-zombie.png
new file mode 100644
index 00000000..51a9c5be
--- /dev/null
+++ b/graphics/sprites/monster-zombie.png
diff --git a/graphics/sprites/monster-zombie.xml b/graphics/sprites/monster-zombie.xml
new file mode 100644
index 00000000..244ba926
--- /dev/null
+++ b/graphics/sprites/monster-zombie.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monster-zombie.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="7"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="21"/>
+		</animation>
+		<animation direction="left">
+		  <frame index="14"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="200"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="8" end="13" delay="200"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="21" end="27" delay="200"/>
+		</animation>
+		<animation direction="left">
+			<sequence start="14" end="20" delay="200"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+			<sequence start="44" end="55" delay="100"/>
+			<frame index="55" delay="0" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="28" end="31" delay="100"/>
+		  	<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="32" end="35" delay="100"/>
+		  	<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="40" end="43" delay="100"/>
+		  	<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="36" end="39" delay="100"/>
+		  	<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/npc-creepysurgeon.xml b/graphics/sprites/npc-creepysurgeon.xml
index 9542317d..ec63ae25 100644
--- a/graphics/sprites/npc-creepysurgeon.xml
+++ b/graphics/sprites/npc-creepysurgeon.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>

-<sprite>

-	<imageset name="base" src="graphics/sprites/npc-creepysurgeon.png" width="50" height="70" />

-	<action name="stand" imageset="base">

-		<animation direction="default">

-			<!-- Scissor demonstration -->

-			<sequence start="1" end="9" delay="200" />

-			<frame index="10" delay="500"/>

-			<frame index="11" delay="500"/>

-			<frame index="10" delay="500"/>

-			<frame index="11" delay="500"/>

-			<frame index="10" delay="500"/>

-			<frame index="11" delay="500"/>

-			<frame index="10" delay="500"/>

-			<frame index="12" delay="300"/>

-			<frame index="13" delay="1000"/>

-			<sequence start="14" end="16" delay="400" />

-			<frame index="0" delay="3000"/>

-			<!-- blinking -->

-			<frame index="19" delay="500"/>

-			<frame index="0" delay="3000"/>

-			<!-- checking pocket -->

-			<frame index="12" delay="1000"/>

-			<sequence start="14" end="16" delay="400" />

-			<frame index="0" delay="3000"/>

-		</animation>

-	</action>

-</sprite>
\ No newline at end of file
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/npc-creepysurgeon.png" width="50" height="70" />
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<!-- Scissor demonstration -->
+			<sequence start="1" end="9" delay="200" />
+			<frame index="10" delay="500"/>
+			<frame index="11" delay="500"/>
+			<frame index="10" delay="500"/>
+			<frame index="11" delay="500"/>
+			<frame index="10" delay="500"/>
+			<frame index="11" delay="500"/>
+			<frame index="10" delay="500"/>
+			<frame index="12" delay="300"/>
+			<frame index="13" delay="1000"/>
+			<sequence start="14" end="16" delay="400" />
+			<frame index="0" delay="3000"/>
+			<!-- blinking -->
+			<frame index="19" delay="500"/>
+			<frame index="0" delay="3000"/>
+			<!-- checking pocket -->
+			<frame index="12" delay="1000"/>
+			<sequence start="14" end="16" delay="400" />
+			<frame index="0" delay="3000"/>
+		</animation>
+	</action>
+</sprite>
diff --git a/graphics/sprites/npcs.png b/graphics/sprites/npcs.png
index d1916384..2b1e7048 100644
--- a/graphics/sprites/npcs.png
+++ b/graphics/sprites/npcs.png
diff --git a/items.xml b/items.xml
index 0a4d0c65..c6859e61 100644
--- a/items.xml
+++ b/items.xml
@@ -99,7 +99,7 @@
         image="use-potion-a.png|G:#ff2222"
         name="Cactus Potion"
         description="A fresh potion."
-        effect="+25 HP, +10 MP"
+        effect="+25 HP"
         type="usable"
         hp="25"
         weight="40"
@@ -403,7 +403,7 @@
         image="use-food-orangecupcake.png"
         name="Orange Cupcake"
         description="A very soft orange cupcake."
-        effect="+100 HP, +10 MP"
+        effect="+100 HP"
         type="usable"
         hp="150"
         weight="185"
@@ -2186,6 +2186,15 @@
         effect=""
         type="generic"
         weight="2"/>
+    <item id="733"
+        image="use-potion-e.png|R:#fff0ff;G:#d0c09f"
+        name="Purification Potion"
+        description="A transparent, odorless liquid that feels strangely lighter than water."
+        effect=""
+        type="usable"
+        mp="0"
+        weight="5"
+        max-per-slot="10"/>
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
diff --git a/monsters.xml b/monsters.xml
index 67ed3a76..ebe9ac63 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -843,4 +843,21 @@
             />
     </monster>
 
+    <monster id="34" name="Zombie">
+        <sprite>monster-zombie.xml</sprite>
+        <attributes
+            hp="20"
+            size="4"
+            speed="64"
+            attack-min="10"
+            attack-delta="2"
+            attack-magic="0"
+            hit="10"
+            evade="5"
+            physical-defence="5"
+            magical-defence="0"
+            mutation="50"
+            />
+    </monster>
+
 </monsters>
diff --git a/skills.xml b/skills.xml
index d8c8e872..7ba1fff9 100644
--- a/skills.xml
+++ b/skills.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skills>
   <skill id="1" name="Basic" fixed="0"/>
+  <skill id="340" name="Magic" fixed="1"/>
+  <skill id="341" name="Life Magic" fixed="1"/>
+  <skill id="342" name="War Magic" fixed="1"/>
+  <skill id="343" name="Transmutation Magic" fixed="1"/>
+  <skill id="344" name="Nature Magic" fixed="1"/>
+  <skill id="345" name="Ether Magic" fixed="1"/>
 </skills>
diff --git a/status-effects.xml b/status-effects.xml
index 5c56b423..59fc781d 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -17,4 +17,16 @@
 		   persistent-particle-effect="true"
 		   start-particle="graphics/particles/sphere-white.particle.xml"
 		 />
+    <status-effect name="hide" id="194"
+                   icon="icon-hidden.xml"
+		 />
+    <status-effect name="flying-backpack" id="196"
+                   icon="icon-feather.xml"
+		 />
+    <status-effect name="barrier" id="197"
+                   icon="icon-green-barrier.xml"
+		 />
+    <status-effect name="phys-shield" id="199"
+                   icon="icon-red-rotating-hex.xml"
+		 />
 </status-effects>