diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:48:23 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:48:23 +0200 |
| commit | a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c (patch) | |
| tree | 3ec5f5d2452205259789a5106df53c0002a586b8 /example/serverdata | |
| parent | 70f3c0e3d530304b1b1162b1bdc6c1177522b7ff (diff) | |
| parent | 2a581a0f65f4a381a76590be0f8a6e1048347177 (diff) | |
| download | manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.gz manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.bz2 manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.tar.xz manaserv-a4d0b4d6e0360f09b1f01ec59f548cdb297ebd4c.zip | |
Merge git://gitorious.org/~bertram/mana/manaserv-equipment-fix into equipment-fix
Conflicts:
example/serverdata/scripts/maps/desert.lua
Diffstat (limited to 'example/serverdata')
| -rw-r--r-- | example/serverdata/scripts/maps/desert.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/example/serverdata/scripts/maps/desert.lua b/example/serverdata/scripts/maps/desert.lua index 6d88b374..79689216 100644 --- a/example/serverdata/scripts/maps/desert.lua +++ b/example/serverdata/scripts/maps/desert.lua @@ -28,12 +28,12 @@ atinit(function() create_npc("Banker", 8, 35 * TILESIZE + TILESIZE / 2, 24 * TILESIZE + TILESIZE / 2, Banker, nil) -- A simple merchant. - merchant_buy_table = { {"Candy", 10, 20}, {"Regenerative trinket", 10, 30}, {"Minor health potion", 10, 50} } + merchant_buy_table = { {"Candy", 10, 20}, {"Regenerative trinket", 10, 30}, {"Minor health potion", 10, 50}, {11, 10, 60}, {12, 10, 40} } merchant_sell_table = { {"Candy", 10, 19}, {"Sword", 10, 30}, {"Bow", 10, 200}, {"Leather shirt", 10, 300} } create_npc("Merchant", 3, 4 * TILESIZE + TILESIZE / 2, 16 * TILESIZE + TILESIZE / 2, npclib.talk(Merchant, merchant_buy_table, merchant_sell_table), nil) -- Another Merchant, selling some equipment, and buying everything... - smith_buy_table = { {"Sword", 10, 50}, {7, 10, 70} } + smith_buy_table = { {"Sword", 10, 50}, {7, 10, 70}, {10, 10, 20} } create_npc("Smith", 5, 15 * TILESIZE + TILESIZE / 2, 16 * TILESIZE + TILESIZE / 2, npclib.talk(Merchant, smith_buy_table), nil) -- The most simple NPC - Welcoming new ones around. |