summaryrefslogtreecommitdiff
path: root/world/map/npc
AgeCommit message (Collapse)AuthorFilesLines
2013-08-25Merge remote-tracking branch 'origin/master' into waricJessica Tölke76-197/+207
Conflicts: world/map/db/item_db.txt
2013-08-20Put Cindy messages in an array and use announcement formattingBen Longbons1-42/+22
2013-08-19Give every NPC a unique nameBen Longbons37-82/+83
2013-08-19Move storage option to top of bankerBen Longbons1-1/+1
As suggested by Dyna.
2013-08-19Trivial removal of some trailing whitespace that snuck inBen Longbons3-11/+11
2013-08-14Merge pull request #21 from DinoPaskvan/masterJared Adams1-3/+29
Added the daily quest for NPC Jack Approved by wombatism.
2013-08-14Miriam Heavy metal items additions:tux9th1-1/+4
Adding Warlord Boots, Light Platemail and Candle Helmet to the Heavy armor list.
2013-08-13Added the daily quest for NPC Jack, written by skragarDino Paskvan1-3/+29
Fixes for NPC Jack As suggested by o11c. Fixed indentation
2013-07-24Remove a couple of spaces and fix one case error in shopsBen Longbons1-2/+2
When I rewrote the code for the shop parser, it was much simpler to change these two NPCs than try to preserve the exact parsing behavior. The item case error, on the other hand, was just plain wrong.
2013-07-23Fix some casing and spacing issuesBen Longbons3-8/+8
2013-07-23Use canonical separator for mapflagsBen Longbons24-33/+33
2013-07-15Returned the mistakenly removed newline at the end of waric.txtDino Paskvan1-1/+1
2013-07-15Orum and Waric quest proofreading and editingDino Paskvan10-202/+202
All the NPCs involved in the quest have been edited, with help from Dyna.
2013-07-07Canonicalize case of items, which will soon be strictBen Longbons7-19/+19
2013-07-07Move starting brace of npc scripts to new line.Jessica Tölke9-18/+20
2013-07-07Merge remote-tracking branch 'origin/master' into waricJessica Tölke450-1210/+2361
Conflicts: world/map/db/mob_db.txt
2013-07-07Waric's dialog without spell teaching logic.Jessica Tölke1-2/+89
2013-07-05Canonicalize event label capitalizationBen Longbons21-145/+145
2013-07-05Make fourth word of functions non-empty, to appease the current serverBen Longbons41-70/+70
2013-07-05Move starting brace to new lineBen Longbons421-846/+1425
2013-07-04server side changes to the snow docks addition and related fixesWombat4-24/+10
2013-06-29Fix unintended fallthrough in annualeaster script.v2013.06.29.1Jessica Tölke1-0/+1
2013-06-28Merge pull request #20 from o11c/masterjtoelke10-98/+113
Refactor callfunc and callsub out of if statements
2013-06-28Refactor all calls within an if, which is illegalBen Longbons10-98/+113
2013-06-28Warp Towels: block them from working in Candor or the Yeti battle cave.Jessica Tölke1-0/+130
2013-06-27Typo fixPlaque_fcc1-1/+1
Signed-off-by: Plaque_fcc <Plaque_fcc@github>
2013-06-26Typo fix, reported by Yummiebh281-1/+1
2013-06-26Add an option to disable global timers for debuggingBen Longbons7-0/+7
2013-06-25Run 'make maps' for map changes and update submodule pointer.Jessica Tölke3-6/+6
2013-06-25Small formatting, naming and position fixups on the sewer warp scripts.Jessica Tölke3-25/+22
- The Eastern entrance wasn't directly on the entrance tile - Indentation was too much for some lines - The Labels in all three scripts were named L_SewerNorth, renaming to L_Sewer - Put the Label L_Close directly in the menu instead of below
2013-06-25Modified NPCs scripts for sewer entrances. Fixed sewer_westwushin3-12/+9
2013-06-25Tulimshar Sewer Warp fixwushin3-0/+54
2013-06-21Run 'make maps' for map changes and additions in and around Tulimshar.Jessica Tölke27-82/+278
Updated submodule pointer.
2013-06-21Change id used by the supply chest npc, based on the merge in client-data.Jessica Tölke1-1/+1
2013-06-21New server content to support new caveswushin12-20/+20
Added mobs:Angry Fire Goblin, Angry Sea Slime, Angry Green Slime. Moved NPCs in sandstorm around. Malvox got a house and lives in it now on 002-2 The mines go a layer deeper so the merchant was moved into the camp along with nathan. Naem and Sema moved down with respective maps. Sandstorm_mine_barrier is not mining_camp_barrier
2013-06-20Reenable the MoneyChanger in the casino to sell Casino Coins.Jessica Tölke1-7/+1
Adjust the buy-price of casino coins in item_db to be the same as the sell-price.
2013-06-17run 'make maps' for client data changes.tux9th3-7/+7
update submodule pointer for client data.
2013-06-16Edit Dyrin: Player has to close the NPC dialogue before getting warped. tux9th1-1/+7
2013-06-14Replace Purple Tulip with Pink Tulip.Jessica Tölke1-4/+4
The purple one isn't sold at Blossom and therefore not obtainable.
2013-06-13Flowerpentagram balancing:Jessica Tölke2-2/+1
Increase treshold of monsters that are allowed to be still alive when trying to trigger a new summoning.
2013-06-13Fixing some spelling errors reported by Cassy.Jessica Tölke3-13/+13
2013-06-13Nivalis Transportation Modifications.Jessica Tölke3-7/+21
Frozenbeard is now DOCK_nivalis Diryn teleports player to blue sages. All ferrys now travel to and from each other.
2013-06-12Blossom: Set local variables to 0 before closing.Jessica Tölke1-0/+2
2013-06-11Remove some slipped debug lines in Blossom and flowerpentagram5.Jessica Tölke2-3/+1
2013-06-11GM Broadcasts NPC: record and display additional info...Vincent Petithory1-2/+5
Record the name of the GM/Admin who scheduled the broadcast and display it where relevant.
2013-06-10Fix wrong quest values in flowerpentagram4, reported by Cassy.Jessica Tölke1-3/+3
2013-06-10Expand debug function of Orum and Waric quest to tell current quest state.Jessica Tölke2-1/+5
Remove debug message in FlowerPentagramCount function.
2013-06-09Remove requirement for GM cap from announcer scriptJared Adams1-3/+3
Also fix some grammar.
2013-06-10GM broadcasts NPC: add an optional max times to broadcast a messageVincent Petithory1-6/+21
2013-06-10Add a NPC to botcheck area to create scheduled broadcastsVincent Petithory2-0/+157