diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/027-2/gy_inn_shops.txt | |
parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/027-2/gy_inn_shops.txt')
-rw-r--r-- | world/map/npc/027-2/gy_inn_shops.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt index 4298106f..15ec2292 100644 --- a/world/map/npc/027-2/gy_inn_shops.txt +++ b/world/map/npc/027-2/gy_inn_shops.txt @@ -12,7 +12,8 @@ 027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows :-1,ShockSweet :-1 027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink :-1,CactusPotion :-1,BugLeg :-1,SmallMushroom :-1,IronPotion :-1,ConcentrationPotion :-1,HardSpike :-1,DarkCrystal :-1,Root :-1,WispPowder :-1,SpectrePowder :-1,PoltergeistPowder :-1 -027-2.gat,106,22,0|script|Edwin|309,{ +027-2.gat,106,22,0|script|Edwin|309, +{ set @npcname$, "Edwin"; mes "[" + @npcname$ + "]"; @@ -23,7 +24,8 @@ } // Inn -027-2.gat,107,39,0|script|Barbara Grey|320,{ +027-2.gat,107,39,0|script|Barbara Grey|320, +{ set @npcname$, "Barbara Grey"; set @cost, 1000; @@ -35,7 +37,8 @@ } // Bank and Storage -027-2.gat,88,22,0|script|J.P. Morbid|321,{ +027-2.gat,88,22,0|script|J.P. Morbid|321, +{ callfunc "ClearVariables"; set @npcname$, "J.P. Morbid"; callfunc "Banker"; |