summaryrefslogtreecommitdiff
path: root/npc
AgeCommit message (Collapse)AuthorFilesLines
2009-03-08Merge commit 'mainline/master'Jared Adams33-72/+295
Conflicts: data/021-2.wlk data/023-1.wlk
2009-03-07Move bank storage to be account levelJared Adams1-14/+20
2009-03-07Adjust the barrier int he magic schoolJared Adams2-5/+7
THe explaination is now handled better
2009-03-07Adjust Tulimshar's bakery a bitJared Adams2-3/+9
2009-03-07Add some new mapsJared Adams30-55/+263
Includes some indoors for Central Tulimshar, Tulimshar Canyon, and an indoor for Tulimshar Canyon.
2009-03-07Fix a bug in Jack's scriptJared Adams1-1/+2
2009-03-06Merge commit 'mainline/master'Jared Adams10-20/+70
Conflicts: conf/magic.conf
2009-03-01Fix some bugs in the marriage scrciptsJared Adams1-1/+2
2009-03-01Only take GP when divorce was successfulJared Adams1-2/+12
2009-02-28Fix a bug in Jack's scriptJared Adams1-1/+0
2009-02-28Fix relative shop pricesJared Adams1-2/+2
2009-02-25Add dyed gloves and put them on saleScott Ellis4-11/+24
2009-02-24Fix Taro for older clientsJared Adams2-2/+2
2009-02-24Adjust mobs on map 002-3Jared Adams2-3/+30
Also fix the exit warp
2009-02-23Fix close bug in TaroJared Adams2-2/+2
2009-02-20Adjust the Trainer's description of luckJared Adams1-1/+1
Text by MadCamel
2009-02-18Merge commit 'mainline/master'Jared Adams55-104/+169
Conflicts: npc/001-1_Tulimshar/elanore.txt npc/013-3_Cave/barrier.txt npc/015-3/katze.txt
2009-02-18Remove another next;close; and a potential problemJared Adams2-2/+1
2009-02-17Fix position of warp on map 013-3Jared Adams1-1/+1
2009-02-16Spelling and fix of random cut in barber scriptKess Vargavind1-1/+2
I suppose that the 'surprise me' option was mistakingly dropped.
2009-02-16Make sure no script just endsJared Adams49-144/+143
2009-02-15Add the bot check mapJared Adams4-0/+16
2009-02-14Fix spell invocationJared Adams1-1/+1
2009-02-14Merge mainlineJared Adams3-0/+55
2009-02-14Merge commit 'mainline/master'Jared Adams21-26/+228
Conflicts: db/item_db.txt
2009-02-14Add new hair styles and colorJared Adams1-4/+8
2009-02-13Fix a few item name errorsJared Adams1-1/+1
2009-02-11Remove unused lines from main import fileJared Adams1-2/+0
2009-02-11Reenable bank deposits (now that trade is fixed)Jared Adams1-3/+0
2009-02-08Add map 021-1Jared Adams16-16/+213
2009-02-05Fix bug in demon mine bookcaseJared Adams1-1/+1
2009-02-04Fix warp on 013-3Jared Adams1-1/+1
2009-02-03Fix spelling mistake in Sagatha's scriptJared Adams1-1/+1
Found by Octalot
2009-02-03Remove extra characters from bard's nameJared Adams1-1/+1
2009-02-03Add missing ';'Jared Adams1-1/+1
2009-02-02Disable bank deposits for nowJared Adams1-1/+7
2009-02-02Fix typoJared Adams1-1/+1
2009-02-02Merge commit 'mainline/master'Jared Adams2-4/+19
2009-02-02Fix exploit in banker functionJared Adams1-0/+1
2009-01-31Shearing updated, Sagatha hands it out now, and Sagatha also hands out ↵Fate2-13/+41
things slightly more eagerly
2009-01-31Ian now points players to the bard for magicFate1-1/+1
2009-01-31Made levelling up in life magic practical.Fate1-3/+3
2009-01-29Fixed lay-on-hands to require life magic level 2Fate1-1/+1
2009-01-28Update game rulesJared Adams1-4/+18
Bug fix in German by Crush Itallian translation by Shaili
2009-01-26Make Elanore glow with detect-magicJared Adams1-1/+1
2009-01-26Replace references to ether magic with astral magicJared Adams2-6/+6
2009-01-25Fix a bug in Elanore's dialogJared Adams1-2/+0
2009-01-25Fix bugs in the injured mouboo's scriptJared Adams1-22/+20
2009-01-24Move amrak to the woodland and give him new textJared Adams4-18/+11
2009-01-24Merge commit 'mainline/master'Jared Adams4-3/+11