Commit magic patch and bilevel cave tileset

13 files changed, 431 insertions, 3 deletions

diff --git a/effects.xml b/effects.xml
index 9a92337e..c2d2c6b0 100644
--- a/effects.xml
+++ b/effects.xml
@@ -7,12 +7,18 @@
   <effect id="5" particle="graphics/particles/magic.black.xml"/>
   <effect id="11" particle="graphics/particles/magic.shield.xml"/>
 <!--  <effect id="12" particle="graphics/particles/magic.haste.xml"/>-->
-  <effect id="14" particle="graphics/particles/magic.hit.xml"/>
-  <effect id="15" particle="graphics/particles/magic.hit.evil.xml"/>
-  <effect id="19" particle="graphics/particles/magic.teleport.xml"/>
+  <effect id="13" particle="graphics/particles/magic.hit.xml"/>
+  <effect id="14" particle="graphics/particles/magic.hit.evil.xml"/>
+  <effect id="15" particle="graphics/particles/fire-burst.xml"/>
+  <effect id="16" particle="graphics/particles/fire-explosion.xml"/>
+  <effect id="17" particle="graphics/particles/lightning1.xml"/>
+  <effect id="18" particle="graphics/particles/lightning2.xml"/>
+  <effect id="19" particle="graphics/particles/lightning3.xml"/>
+  <effect id="20" particle="graphics/particles/magic.teleport.xml"/>
   <effect id="21" particle="graphics/particles/pentagram-buildup-short.xml"/>
   <effect id="22" particle="graphics/particles/pentagram-burst.xml"/>
   <effect id="24" particle="graphics/particles/magic.teleport.xml"/>
+  <effect id="25" particle="graphics/particles/rain.xml"/>
 <!--  <effect id="20" particle="graphics/particles/magic.barrier.xml"/> -->
   <default particle="graphics/particles/magic.default.xml" />
   <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/>
diff --git a/graphics/particles/fire-burst.xml b/graphics/particles/fire-burst.xml
new file mode 100644
index 00000000..c5e64228
--- /dev/null
+++ b/graphics/particles/fire-burst.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "20"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="35" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="2"/>

+			<property name="gravity" value="0.1"/>

+			<animation imageset="graphics/particles/aniblaze.png" width="8" height="8">

+				<sequence start="0" end="14" delay="20" />

+				<frame index="14" delay="1000" />

+			</animation>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="35" max="50"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="0.1"/>

+			<property name="image" value="graphics/particles/orb-medium.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="6" max="12"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="65" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="-0.1"/>

+			<property name="image" value="graphics/particles/smoke-large-grey.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="1" max="2"/>

+			<property name="fade-out" value="80"/>

+		</emitter>

+	</particle>

+</effect>

+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "20"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="35" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="2"/>

+			<property name="gravity" value="0.1"/>

+			<animation imageset="graphics/particles/aniblaze.png" width="8" height="8">

+				<sequence start="0" end="14" delay="20" />

+				<frame index="14" delay="1000" />

+			</animation>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="35" max="50"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="0.1"/>

+			<property name="image" value="graphics/particles/orb-medium.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="6" max="12"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="65" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="-0.1"/>

+			<property name="image" value="graphics/particles/smoke-large-grey.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="1" max="2"/>

+			<property name="fade-out" value="80"/>

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/fire-explosion.xml b/graphics/particles/fire-explosion.xml
new file mode 100644
index 00000000..7fbd8768
--- /dev/null
+++ b/graphics/particles/fire-explosion.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "20"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="-10" max="10"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="5"/>

+			<property name="gravity" value="0.1"/>

+			<animation imageset="graphics/particles/aniblaze.png" width="8" height="8">

+				<sequence start="0" end="14" delay="20" />

+				<frame index="14" delay="1000" />

+			</animation>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="300" max="330"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="8"/>

+			<property name="gravity" value="0.1"/>

+			<property name="image" value="graphics/particles/orb-medium.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="6" max="12"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-10" max="10"/>

+			<property name="position-y" min="-10" max="10"/>

+			<property name="vertical-angle" min="65" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="-0.1"/>

+			<property name="image" value="graphics/particles/smoke-large-grey.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="10" max="15"/>

+			<property name="fade-out" value="80"/>

+		</emitter>

+	</particle>

+</effect>

+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "20"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="-10" max="10"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="5"/>

+			<property name="gravity" value="0.1"/>

+			<animation imageset="graphics/particles/aniblaze.png" width="8" height="8">

+				<sequence start="0" end="14" delay="20" />

+				<frame index="14" delay="1000" />

+			</animation>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="300" max="330"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-8" max="8"/>

+			<property name="position-y" min="-8" max="8"/>

+			<property name="vertical-angle" min="45" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="8"/>

+			<property name="gravity" value="0.1"/>

+			<property name="image" value="graphics/particles/orb-medium.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="6" max="12"/>

+			<property name="fade-out" value="10"/>

+		</emitter>

+		<emitter>

+			<property name="position-x" min="-10" max="10"/>

+			<property name="position-y" min="-10" max="10"/>

+			<property name="vertical-angle" min="65" max="90"/>

+			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="power" min="0" max="6"/>

+			<property name="gravity" value="-0.1"/>

+			<property name="image" value="graphics/particles/smoke-large-grey.png"/>

+			<property name="lifetime" min="0" max="80"/>

+			<property name="output" min="10" max="15"/>

+			<property name="fade-out" value="80"/>

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/lightning1-240.png b/graphics/particles/lightning1-240.png
new file mode 100644
index 00000000..65064104
--- /dev/null
+++ b/graphics/particles/lightning1-240.png
diff --git a/graphics/particles/lightning1.xml b/graphics/particles/lightning1.xml
new file mode 100644
index 00000000..df489cb5
--- /dev/null
+++ b/graphics/particles/lightning1.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "120"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="power" min="0" max="0"/>

+			<property name="gravity" value="0"/>

+                        <property name="image" value="graphics/particles/lightning1-240.png"/>

+			<property name="lifetime" min="5" max="10"/>

+			<property name="output" value="1"/>

+			<property name="fade-out" value="8"/>

+		</emitter>

+	</particle>

+</effect>

+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "120"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="power" min="0" max="0"/>

+			<property name="gravity" value="0"/>

+                        <property name="image" value="graphics/particles/lightning1-240.png"/>

+			<property name="lifetime" min="5" max="10"/>

+			<property name="output" value="1"/>

+			<property name="fade-out" value="8"/>

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/lightning2-263.png b/graphics/particles/lightning2-263.png
new file mode 100644
index 00000000..6f084ef5
--- /dev/null
+++ b/graphics/particles/lightning2-263.png
diff --git a/graphics/particles/lightning2.xml b/graphics/particles/lightning2.xml
new file mode 100644
index 00000000..484d9649
--- /dev/null
+++ b/graphics/particles/lightning2.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "131"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="power" min="0" max="0"/>

+			<property name="gravity" value="0"/>

+                        <property name="image" value="graphics/particles/lightning2-263.png"/>

+			<property name="lifetime" min="5" max="10"/>

+			<property name="output" value="1"/>

+			<property name="fade-out" value="8"/>

+		</emitter>

+	</particle>

+</effect>

+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "131"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="power" min="0" max="0"/>

+			<property name="gravity" value="0"/>

+                        <property name="image" value="graphics/particles/lightning2-263.png"/>

+			<property name="lifetime" min="5" max="10"/>

+			<property name="output" value="1"/>

+			<property name="fade-out" value="8"/>

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/lightning3-275.png b/graphics/particles/lightning3-275.png
new file mode 100644
index 00000000..ac1e1cb6
--- /dev/null
+++ b/graphics/particles/lightning3-275.png
diff --git a/graphics/particles/lightning3.xml b/graphics/particles/lightning3.xml
new file mode 100644
index 00000000..ce477d2b
--- /dev/null
+++ b/graphics/particles/lightning3.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "137"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="power" min="0" max="0"/>

+			<property name="gravity" value="0"/>

+                        <property name="image" value="graphics/particles/lightning3-275.png"/>

+			<property name="lifetime" min="5" max="10"/>

+			<property name="output" value="1"/>

+			<property name="fade-out" value="8"/>

+		</emitter>

+	</particle>

+</effect>

+<?xml version="1.0"?>

+

+<!--

+An explosion of white particles.

+-->

+

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "137"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="power" min="0" max="0"/>

+			<property name="gravity" value="0"/>

+                        <property name="image" value="graphics/particles/lightning3-275.png"/>

+			<property name="lifetime" min="5" max="10"/>

+			<property name="output" value="1"/>

+			<property name="fade-out" value="8"/>

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/rain.xml b/graphics/particles/rain.xml
new file mode 100644
index 00000000..f6486848
--- /dev/null
+++ b/graphics/particles/rain.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "20"

+		position-y = "0"

+		position-z = "400"

+		lifetime = "100"

+		>

+                <!-- <property name="follow-parent" value="0"/> -->

+                <emitter><!-- <property name="follow-parent" value="0"/> -->

+		  <property name="lifetime" min="16" max="20"/>

+		  <property name="position-x" min="-30" max="30"/>

+		  <property name="position-y" min="-30" max="30"/>

+                  <property name="vertical-angle" value="260"/>

+                  <property name="power" value="20"/>

+                  <property name="output" min="0" max="1"/>

+                  <property name="gravity" value="0.04"/>

+                  <property name="image" value="graphics/particles/raindrop.png"/>

+                </emitter>

+        </particle>

+</effect>

+<?xml version="1.0"?>

+

+<effect>

+	<particle

+		position-x = "20"

+		position-y = "0"

+		position-z = "400"

+		lifetime = "100"

+		>

+                <!-- <property name="follow-parent" value="0"/> -->

+                <emitter><!-- <property name="follow-parent" value="0"/> -->

+		  <property name="lifetime" min="16" max="20"/>

+		  <property name="position-x" min="-30" max="30"/>

+		  <property name="position-y" min="-30" max="30"/>

+                  <property name="vertical-angle" value="260"/>

+                  <property name="power" value="20"/>

+                  <property name="output" min="0" max="1"/>

+                  <property name="gravity" value="0.04"/>

+                  <property name="image" value="graphics/particles/raindrop.png"/>

+                </emitter>

+        </particle>

+</effect>

diff --git a/graphics/particles/raindrop.png b/graphics/particles/raindrop.png
new file mode 100644
index 00000000..2510ba67
--- /dev/null
+++ b/graphics/particles/raindrop.png
diff --git a/graphics/tiles/cave_bilevel_water.png b/graphics/tiles/cave_bilevel_water.png
new file mode 100644
index 00000000..af5d6d87
--- /dev/null
+++ b/graphics/tiles/cave_bilevel_water.png
diff --git a/items.xml b/items.xml
index a5e8e65c..14e3ec16 100644
--- a/items.xml
+++ b/items.xml
@@ -2390,6 +2390,30 @@
         weight="3"
         max-per-slot="10"/>
 
+    <item id="702"
+        image="armor-ring-wedding.png"
+        name="Wedding Ring"
+        description="Your wedding ring."
+        type="equip-ring"
+        weight="1"
+        max-per-slot="1"/>
+
+    <item id="703"
+          image="generic-powder.png|W:#606030,b0b090,e0e0a0,ffffe0"
+          name="Sulphur"
+          description="A small pile of sulphur."
+          type="generic"
+          weight="2"
+          max-per-slot="10"/>
+
+    <item id="704"
+          image="generic-powder.png|W:#405060"
+          name="Iron Powder"
+          description="A pile of powdered iron."
+          type="generic"
+          weight="5"
+          max-per-slot="10"/>
+
     <!--
                          HERE ARE SOME UNUSED ITEM IDs
            -->