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/010-2/dimonds.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/010-2/dimonds.txt')
-rw-r--r-- | world/map/npc/010-2/dimonds.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt index 8fe8cbc5..300891c3 100644 --- a/world/map/npc/010-2/dimonds.txt +++ b/world/map/npc/010-2/dimonds.txt @@ -216,7 +216,7 @@ getinventorylist; if (@inventorylist_count == 100) goto L_Full_Inv; - getitem "bowlerhat", 1; + getitem "BowlerHat", 1; set FLAGS, FLAGS | FLAG_HAS_BOWLER_BURNSDAY; close; @@ -501,14 +501,14 @@ leave: close; } -010-2.gat,71,38,0|script|Store Policy|400, +010-2.gat,71,38,0|script|Store Policy#1|400, { mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; close; } -010-2.gat,77,38,0|script|Store Policy|400, +010-2.gat,77,38,0|script|Store Policy#2|400, { mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; @@ -565,7 +565,7 @@ leave: 010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow :-1,IronArrow :-1,LeatherShield :-1 -010-2.gat,65,41,0|shop|General Store|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1 +010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1 010-2.gat,75,68,0|script|Basil|107, { |