From ebe261f533e8a614793d0e92097d990be32b8e7a Mon Sep 17 00:00:00 2001
From: ryo_saeba <ryo_saeba@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 19 Jun 2010 10:04:59 +0000
Subject: [PATCH] Remove some NPCs without dialog from tavern, move some around
 to not have multiple conversations. Have the barman give wine when asked.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13407 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 darcap/darcap/cameron.msg | 35 +++++++++++++++
 darcap/darcap/tavern      | 93 ++++++++++++++-------------------------
 2 files changed, 68 insertions(+), 60 deletions(-)
 create mode 100644 darcap/darcap/cameron.msg

diff --git a/darcap/darcap/cameron.msg b/darcap/darcap/cameron.msg
new file mode 100644
index 000000000..b2475f29d
--- /dev/null
+++ b/darcap/darcap/cameron.msg
@@ -0,0 +1,35 @@
+{
+  "location" : "darcap/cameron",
+  "rules": [
+  {
+  "match" : ["wine"],
+  "pre" : [["item", "money", "18"], ["npctoken", "step", "drink"]],
+  "post" : [["takeitem", "money", "18"], ["giveitem", "bottle of wine"], ["setnpctoken", "step", "0"]],
+  "msg" : ["Here you go."],
+  "replies" : []
+  },{
+  "match" : ["wine"],
+  "pre" : [["npctoken", "step", "drink"]],
+  "post" : [["setnpctoken", "step", "0"]],
+  "msg" : ["Sorry, friend, but you definitely need to pay for the wine."],
+  "replies" : []
+  },{
+  "match" : ["drink"],
+  "pre" : [],
+  "post" : [["setnpctoken", "step", "drink"]],
+  "msg" : ["I have some fine wine, for 18 silver coins."],
+  "replies" : [["wine", "I'll have some wine, please.", "0"], ["food", "And what about food?", "2"]]
+  },{
+  "match" : ["food"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["Sorry, no. But you can try Bob's Fish & Chips, south of Darcap."],
+  "replies" : [["drink", "Ok, what about drinks, then?", "2"]]
+  },{
+  "match" : ["*"],
+  "pre" : [],
+  "post" : [],
+  "msg" : ["What can I get you?"],
+  "replies" : [["drinks", "What drinks do you have?", "2"], ["food", "Do you have anything to eat?", "2"]]
+  }
+]}
diff --git a/darcap/darcap/tavern b/darcap/darcap/tavern
index 4117f379d..efe475460 100644
--- a/darcap/darcap/tavern
+++ b/darcap/darcap/tavern
@@ -8,7 +8,7 @@ enter_x 19
 enter_y 13
 msg
 Created:  1999-01-15 Cater/Wade (john_cater@yahoo.com)
-Modified: 2009-12-28 Nicolas Weeger
+Modified: 2010-06-19 Nicolas Weeger
 endmsg
 end
 arch cobblestones2
@@ -512,8 +512,16 @@ face man.131
 x 5
 y 10
 pick_up 0
-move_type walk boat
 random_movement 1
+arch event_say
+name /darcap/darcap/cameron.msg
+title Python
+slaying /python/dialog/npc_dialog.py
+end
+arch NPCGift
+arch wine
+end
+end
 end
 arch magic_banned
 x 5
@@ -637,7 +645,7 @@ end
 arch table_4
 x 6
 y 7
-move_block all -boat
+move_block all
 no_pick 1
 end
 arch magic_banned
@@ -651,7 +659,7 @@ end
 arch table_4
 x 6
 y 8
-move_block all -boat
+move_block all
 no_pick 1
 end
 arch magic_banned
@@ -665,7 +673,7 @@ end
 arch table_4
 x 6
 y 9
-move_block all -boat
+move_block all
 no_pick 1
 end
 arch magic_banned
@@ -679,7 +687,7 @@ end
 arch table_4
 x 6
 y 10
-move_block all -boat
+move_block all
 no_pick 1
 end
 arch magic_banned
@@ -693,7 +701,7 @@ end
 arch table_4
 x 6
 y 11
-move_block all -boat
+move_block all
 no_pick 1
 end
 arch magic_banned
@@ -820,17 +828,6 @@ arch woodfloor
 x 7
 y 9
 end
-arch man
-msg
-@match *
-Buy me a drink
-endmsg
-face man.171
-x 7
-y 9
-friendly 1
-unaggressive 0
-end
 arch magic_banned
 x 7
 y 10
@@ -949,10 +946,6 @@ arch woodfloor
 x 8
 y 7
 end
-arch chair_1.4
-x 8
-y 7
-end
 arch magic_banned
 x 8
 y 8
@@ -1064,11 +1057,26 @@ arch woodfloor
 x 9
 y 6
 end
-arch woman
+arch chair_1.1
 x 9
 y 6
-friendly 1
-unaggressive 0
+end
+arch elf_man
+name Frightened Elf Man
+msg
+@match nightmares
+Yes, I keep having a nightmare where the Pygmys slaughter me and then eat me..like what I saw them doing to their prisoners when I stumbled upon that forest...
+
+@match pygmy|forest
+The Pygmys are these evil little creatures that live in a forest on an island north and slightly east of this town...I had to use dimension door to get there...they are really dangerous and I'm sure they are guarding something in that forest...
+
+@match *
+I still have nightmares about my visit to the Pygmy Forest.
+endmsg
+x 9
+y 6
+move_type 0
+no_damage 1
 end
 arch magic_banned
 x 9
@@ -1098,27 +1106,6 @@ arch woodfloor
 x 9
 y 9
 end
-arch chair_1.1
-x 9
-y 9
-end
-arch elf_man
-name Frightened Elf Man
-msg
-@match nightmares
-Yes, I keep having a nightmare where the Pygmys slaughter me and then eat me..like what I saw them doing to their prisoners when I stumbled upon that forest...
-
-@match pygmy|forest
-The Pygmys are these evil little creatures that live in a forest on an island north and slightly east of this town...I had to use dimension door to get there...they are really dangerous and I'm sure they are guarding something in that forest...
-
-@match *
-I still have nightmares about my visit to the Pygmy Forest.
-endmsg
-x 9
-y 9
-move_type 0
-no_damage 1
-end
 arch magic_banned
 x 9
 y 10
@@ -1234,14 +1221,6 @@ arch woodfloor
 x 10
 y 7
 end
-arch guildmaster
-name Old Man
-x 10
-y 7
-monster 0
-friendly 1
-unaggressive 0
-end
 arch magic_banned
 x 10
 y 8
@@ -1537,12 +1516,6 @@ arch woodfloor
 x 12
 y 7
 end
-arch woman
-x 12
-y 7
-friendly 1
-unaggressive 0
-end
 arch magic_banned
 x 12
 y 8