--- deliantra/Deliantra/res/types.xml	2009/01/08 03:05:17	1.45
+++ deliantra/Deliantra/res/types.xml	2009/10/11 17:00:44	1.50
@@ -351,6 +351,12 @@
       </section>
    ">
 
+  <!ENTITY match_compat "
+    If the string starts with 'match ', then it is interpreted
+    as a match expression (e.g. 'match type=POTION', or 'match type=SPELL
+    in applied type=CONTAINER in inv in originator'). For details, see
+    http://pod.tst.eu/http://cvs.schmorp.de/deliantra/server/lib/cf/match.pm
+  ">
 ]>
 
 <types>
@@ -676,7 +682,7 @@
   <attribute arch="glow_radius" editor="glow radius" type="int">
     If &lt;glow radius&gt; is set to a value greater zero, the object
     appears lit up on dark maps. &lt;glow radius&gt; can be a value
-    between 0 and 4, the higher, the more light does the object emit.
+    between 0 and 9, the higher, the more light does the object emit.
   </attribute>
   <attribute arch="material" editor="material" type="bitmask_material">
     This bitmask-value informs the player of which material(s) the
@@ -694,7 +700,7 @@
   </attribute>
   <attribute arch="blocksview" editor="block view" type="bool">
     If an item is set to block view, players (and monsters) cannot
-    see byond it unless they cross it or manage to stand ontop.
+    see beyond it unless they cross it or manage to stand ontop.
   </attribute>
   <attribute arch="identified" editor="identified" type="bool">
     If an item is identified, the player has full knowledge about it.
@@ -845,6 +851,59 @@
 </type>
 
 <!--####################################################################-->
+
+<type number="81" name="Torch">
+  <description><![CDATA[
+    Torches are a special kind of Lamp, they are worn out by repeatedly
+    lightening them up (when the is_lightable flag is set) and otherwise
+    they can only be used once.]]>
+  </description>
+  <attribute arch="food" editor="burning duration" type="int">
+     This field specifies the burning duration of the torch.
+  </attribute>
+  <attribute arch="range" editor="enabled glow radius" type="int">
+     This field sets the glow radius of the torch if it is enabled.
+     If you want to make a torch that is already burning set the 
+     "glow radius" field.
+  </attribute>
+  <attribute arch="level" editor="level" type="int">
+    If this field specyfies the cursed effect's level. If it is
+    0 no cursed effect will be generate. See also the "cursed" flag.
+  </attribute>
+  <attribute arch="cursed" editor="cursed" type="bool">
+    Cursed torches, which have a level above 0, explode if the
+    player applies them.
+  </attribute>
+</type>
+
+<type number="82" name="Lamp">
+  <description><![CDATA[
+    Lamps are carryable light sources for players with a fuel tank.]]>
+  </description>
+  <attribute arch="speed" editor="burn speed" type="float">
+     This field is the speed of the lamp. (If the value 0.00208 is given
+     here the fuel field will specify the burning duration in minutes.)
+  </attribute>
+  <attribute arch="food" editor="fuel" type="int">
+     This field sets the burning duration of the lamp, which depends on the speed
+     field of this object.
+  </attribute>
+  <attribute arch="range" editor="enabled glow radius" type="int">
+     This field sets the glow radius of the lamp if it is enabled.
+     If you want to make a lamp that is already burning set the 
+     "glow radius" field.
+  </attribute>
+  <attribute arch="level" editor="level" type="int">
+    If this field specyfies the cursed effect's level. If it is
+    0 no cursed effect will be generate. See also the "cursed" flag.
+  </attribute>
+  <attribute arch="cursed" editor="cursed" type="bool">
+    Cursed lamps, which have a level above 0, explode if the
+    player applies them.
+  </attribute>
+</type>
+
+<!--####################################################################-->
 <type number="18" name="Altar">
   <ignore>
     <ignore_list name="non_pickable" />
@@ -863,6 +922,7 @@
     the name of an object. Yet, titles are not recognized by altars.
     If you want the player to have to drop a specific amount of money use "money".
     See also the "drop amount" attribute.
+    &match_compat;
   </attribute>
   <attribute arch="food" editor="drop amount" type="int">
     The drop amount specifies the amount of items (specified
@@ -918,6 +978,7 @@
     the name of an object. Yet, titles are not recognized by altars.
     If you want the player to have to drop a specific amount of money use "money".
     See also the "drop amount" attribute.
+    &match_compat;
   </attribute>
   <attribute arch="food" editor="drop amount" type="int">
     The drop amount specifies the amount of items (specified
@@ -1227,6 +1288,25 @@
 </type>
 
 <!--####################################################################-->
+<type number="110" name="Inscribable">
+  <description><![CDATA[
+    Inscribable Item - when inscribed, it becomes another object.]]>
+  </description>
+  <attribute arch="startequip" editor="godgiven item" type="bool">
+    A godgiven item vanishes as soon as the player
+    drops it to the ground.
+  </attribute>
+  <attribute arch="unique" editor="unique item" type="bool">
+    Unique items exist only one time on a server. If the item
+    is taken, lost or destroyed - it's gone for good.
+  </attribute>
+  <attribute arch="other_arch" editor="book/scroll arch" type="string">
+     This is the item created after being inscribed - scrolls are treated
+     like spell scrolls, all else will have it's message replaced.
+  </attribute>
+</type>
+
+<!--####################################################################-->
 <type number="99" name="Boots">
   <import_type name="Amulet" />
   <description><![CDATA[
@@ -2076,7 +2156,7 @@
   </attribute>
   <attribute arch="unique" editor="unique map" type="bool">
     Unique floor means that any items dropped on that spot
-    will be saved byond map reset. For permanent apartments,
+    will be saved beyond map reset. For permanent apartments,
     all floor tiles must be set &lt;unique map&gt;.
   </attribute>
   <attribute arch_begin="msg" arch_end="endmsg" editor="description" type="text">
@@ -2120,7 +2200,7 @@
   </attribute>
   <attribute arch="unique" editor="unique map" type="bool">
     Unique floor means that any items dropped on that spot
-    will be saved byond map reset. For permanent apartments,
+    will be saved beyond map reset. For permanent apartments,
     all floor tiles must be set &lt;unique map&gt;.
   </attribute>
   <attribute arch_begin="msg" arch_end="endmsg" editor="description" type="text">
@@ -2339,7 +2419,7 @@
   </attribute>
   <attribute arch="unique" editor="unique map" type="bool">
     Unique floor means that any items dropped on that spot
-    will be saved byond map reset. For permanent apartments,
+    will be saved beyond map reset. For permanent apartments,
     all floor tiles must be set &lt;unique map&gt;.
   </attribute>
 </type>
@@ -2374,7 +2454,7 @@
     <ignore_list name="non_pickable" />
   </ignore>
   <description><![CDATA[
-    Holy_altars are altars for the various religions. Praying
+    Holy Altars are altars for the various religions. Praying
     at a Holy_altar will make you a follower of that god, and
     if you already follow that god, you may get some extra bonus.]]>
   </description>