diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
| commit | 2a73e3544d6ac4d4f000c621753d70e8695e203c (patch) | |
| tree | b3784983e268ecf01a506229255116ac64fb0f57 /npc/020-2_Nivalis | |
| parent | 7464175373616085130e0d2e3b9ddc8e0322f291 (diff) | |
| parent | 3226368a1cd36e4d6e47302493fe5e0e91dddef3 (diff) | |
| download | serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.gz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.bz2 serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.xz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.zip | |
Merge commit 'mainline/master'
Conflicts:
conf/magic.conf
Diffstat (limited to 'npc/020-2_Nivalis')
| -rw-r--r-- | npc/020-2_Nivalis/shops.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2_Nivalis/shops.txt index fa7d8fe6..f1b452b5 100644 --- a/npc/020-2_Nivalis/shops.txt +++ b/npc/020-2_Nivalis/shops.txt @@ -1,7 +1,7 @@ // Snow town shops // Clothes shop -020-2.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000 +020-2.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,741:-1 // Weapons shop 020-2.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5 // Potions shop |