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/009-2_Hurnscald | |
| 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/009-2_Hurnscald')
| -rw-r--r-- | npc/009-2_Hurnscald/selim.txt | 7 | ||||
| -rw-r--r-- | npc/009-2_Hurnscald/shops.txt | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2_Hurnscald/selim.txt index 14eac5b9..bfd8bc46 100644 --- a/npc/009-2_Hurnscald/selim.txt +++ b/npc/009-2_Hurnscald/selim.txt @@ -29,6 +29,7 @@ L_clothes_choice: "Cotton headband", L_headband, "Desert hat", L_desert_hat, "Cotton boots", L_cottonboots, + "Cotton gloves", L_cottongloves, "I'm fine for now, thanks.", -; close; @@ -100,6 +101,12 @@ L_cottonboots: set @name$, "cotton boots"; goto L_picked_item; +L_cottongloves: + set @del, 741; + set @new, 2160; + set @name$, "cotton gloves"; + goto L_picked_item; + L_picked_item: if (countitem(@del) == 0) goto L_havenone; L_colour: diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt index f943ac8f..f357074c 100644 --- a/npc/009-2_Hurnscald/shops.txt +++ b/npc/009-2_Hurnscald/shops.txt @@ -31,4 +31,4 @@ // General Store // Sells various things, many not sold elsewhere -009-2.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000 +009-2.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000,741:-1 |