From e9992c6c5fe44dd440a0bbe2d86a1f2909338efe Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Tue, 15 Feb 2011 23:53:07 +0100
Subject: Added a merchant and a blacksmith on the template map.

They're both using a fully working merchant lua function.

Resolves: Mana-mantis #295.
---
 example/clientdata/items.xml | 19 +++++++++++++------
 example/clientdata/npcs.xml  |  4 ++++
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'example/clientdata')

diff --git a/example/clientdata/items.xml b/example/clientdata/items.xml
index 504ced4..8ab3fd1 100644
--- a/example/clientdata/items.xml
+++ b/example/clientdata/items.xml
@@ -67,10 +67,12 @@
         script="candy.lua"
         weight="1"
         max-per-slot="30"
+        value="15"
         />
     <item id="2" max-per-slot="1" name="Regenerative trinket"
         description="A trinket with refreshing powers."
-        image="usable/usable-regenerative-trinket.png">
+        image="usable/usable-regenerative-trinket.png"
+        value="25">
         <effect trigger="existence">
             <modifier attribute="hpr2" value="1.05" />
             <modifier attribute="cap1" value="-50" />
@@ -78,7 +80,8 @@
     </item>
     <item id="3" max-per-slot="99" name="Minor health potion"
         description="A small bottle containing a lightly tinted red fluid. A faint sparkle can be seen occasionally, and the very smell of the contents make you feel more alive, vibrant, and healthy."
-        image="usable/usable-minor-health-potion.png">
+        image="usable/usable-minor-health-potion.png"
+        value="40">
         <effect trigger="activation">
             <modifier attribute="hpr3" value="2.5" duration="30" />
             <modifier attribute="hpr4" value="2.0" duration="30" />
@@ -90,7 +93,8 @@
     </item>
     <item id="4" max-per-slot="1" name="Token of speed"
         description="An old, cracked, rectangular slab. It has a faint blue glow, and a strangle symbol set into one of the sides. A circular pattern in the centre is just big enough for someone to put their hand on."
-        image="usable/usable-token-of-speed.png">
+        image="usable/usable-token-of-speed.png"
+        value="50">
         <effect trigger="activation">
             <modifier attribute="mspd" value="1.3" duration="50" />
             <cooldown value="150" />
@@ -103,7 +107,8 @@
     <!-- Example of weapons -->
     <item id="5" max-per-slot="1" name="Sword" attack-action="attack_stab"
         description="A simple sword."
-        image="equipment/weapons/weapon-sword-sword.png">
+        image="equipment/weapons/weapon-sword-sword.png"
+        value="70">
         <equip>
             <slot type="hand" required="2" />
         </equip>
@@ -119,7 +124,8 @@
     </item>
     <item id="6" max-per-slot="1" name="Bow" attack-action="attack_bow"
         description="A simple bow made of fine oak wood."
-        image="equipment/weapons/weapon-bow-bow.png">
+        image="equipment/weapons/weapon-bow-bow.png"
+        value="80">
         <equip>
             <slot type="hand" required="2" />
         </equip>
@@ -137,7 +143,8 @@
     <!-- Example of equippable items -->
     <item id="7" max-per-slot="1" name="Leather shirt"
         description="A simple shirt made of leather."
-        image="equipment/chest/chest-leathershirt.png">
+        image="equipment/chest/chest-leathershirt.png"
+        value="80">
         <equip>
             <slot type="torso" required="1" />
         </equip>
diff --git a/example/clientdata/npcs.xml b/example/clientdata/npcs.xml
index 0af855f..f94ce49 100644
--- a/example/clientdata/npcs.xml
+++ b/example/clientdata/npcs.xml
@@ -9,6 +9,10 @@
 <npcs>
     <npc id="1"><sprite variant="0">npcs/static-npcs.xml</sprite></npc><!-- Barber 1&2 -->
     <!-- ... -->
+    <npc id="3"><sprite variant="2">npcs/static-npcs.xml</sprite></npc><!-- Merchant -->
+    <!-- ... -->
+    <npc id="5"><sprite variant="4">npcs/static-npcs.xml</sprite></npc><!-- Smith -->
+    <!-- ... -->
     <npc id="8"><sprite variant="7">npcs/static-npcs.xml</sprite></npc><!-- Banker -->
     <!-- ... -->
     <npc id="11"><sprite variant="10">npcs/static-npcs.xml</sprite></npc><!-- Welcoming girl -->
-- 
cgit