diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/021-1/gate_guards.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/021-1/gate_guards.txt')
| -rw-r--r-- | world/map/npc/021-1/gate_guards.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt index 52fa5a4b..2cb97658 100644 --- a/world/map/npc/021-1/gate_guards.txt +++ b/world/map/npc/021-1/gate_guards.txt @@ -1,14 +1,14 @@ // Various guards at gates // Guards by the gates to the port -021-1.gat,70,23,0|script|Guard|104, +021-1.gat,70,23,0|script|Guard#port1|104, { mes "[Guard]"; mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\""; close; } -021-1.gat,110,23,0|script|Guard|104, +021-1.gat,110,23,0|script|Guard#port2|104, { mes "[Guard]"; mes "\"I'm not quite sure why I'm here, since that bridge is out.\""; @@ -16,7 +16,7 @@ } // Guard near the magic school -021-1.gat,46,65,0|script|Guard|104, +021-1.gat,46,65,0|script|Guard#school|104, { mes "[Guard]"; mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\""; @@ -24,20 +24,20 @@ } // Guards by the gates to East Tulimshar -021-1.gat,146,23,0|script|Guard|104, +021-1.gat,146,23,0|script|Guard#east1|104, { mes "[Guard]"; mes "\"I make sure less desirables don't enter the Noble District.\""; close; } -021-1.gat,156,42,0|script|Guard|104, +021-1.gat,156,42,0|script|Guard#east2|104, { mes "[Guard]"; mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\""; close; } -021-1.gat,156,95,0|script|Guard|104, +021-1.gat,156,95,0|script|Guard#east3|104, { mes "[Guard]"; mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\""; @@ -45,7 +45,7 @@ } // Near the bazaar, outside the government building -021-1.gat,55,136,0|script|Guard|123, +021-1.gat,55,136,0|script|Guard#govt_out|123, { mes "[Guard]"; mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\""; |