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/020-2 | |
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/020-2')
-rw-r--r-- | world/map/npc/020-2/mapflags.txt | 4 | ||||
-rw-r--r-- | world/map/npc/020-2/shops.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/world/map/npc/020-2/mapflags.txt b/world/map/npc/020-2/mapflags.txt index aaa1b90f..8c185eec 100644 --- a/world/map/npc/020-2/mapflags.txt +++ b/world/map/npc/020-2/mapflags.txt @@ -1,2 +1,2 @@ -020-2.gat mapflag no_player_drops -020-2.gat mapflag town +020-2.gat|mapflag|no_player_drops +020-2.gat|mapflag|town diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt index 80399668..d27e1b0c 100644 --- a/world/map/npc/020-2/shops.txt +++ b/world/map/npc/020-2/shops.txt @@ -14,9 +14,9 @@ close; } // Weapons shop -020-2.gat,25,65,0|shop|Bracco|135,IronArrow :-1, Shortbow :-1, Dagger :-1, LeatherShield :-1 +020-2.gat,25,65,0|shop|Bracco|135,IronArrow :-1,ShortBow :-1,Dagger :-1,LeatherShield :-1 // Potions shop -020-2.gat,75,24,0|shop|Mede|103,CactusDrink :-1, CactusPotion :-1, IronPotion :-1, ConcentrationPotion :-1 +020-2.gat,75,24,0|shop|Mede|103,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1 // INN 020-2.gat,111,23,0|script|Kane|120, |