summaryrefslogtreecommitdiff
path: root/world/map/npc
AgeCommit message (Collapse)AuthorFilesLines
2013-09-30Fixing the destination of the npc warp from 002-4 to 002-5.tux9th1-1/+1
Update submodule pointer.
2013-09-28fixed 013-1 flowerpentagram.txtwushin1-1/+2
{ should be on the line after NPC line
2013-09-28Fixed 017-4 Gaurdian Spirit OnTouchwushin1-1/+2
2013-09-26Fix bug that made require_stat script always failv2013.09.27Ben Longbons1-0/+1
2013-09-25Valia typo fix, spotted by Itchy Demon:tux9th1-1/+1
http://forums.themanaworld.org/viewtopic.php?p=137922#p137922
2013-09-18Illia: give Boss Points to each player.Vincent Petithory2-4/+10
* It previously gave boss points only to the player giving the death blow.
2013-09-16Orum fix:tux9th1-2/+2
* no longer banishes people with OrumQuest > 32; Reported by Fortunato. * fix off by 1 error at first minigame.
2013-09-16Make RequireStat script less sillyBen Longbons1-21/+8
2013-09-16Refactor all broken returns into goto L_ReturnBen Longbons13-26/+69
2013-09-14Pauline NPC - 021-1:tux9th3-11/+300
* Creating a new NPC script. * Removing Pauline from 021-1/npcs.txt. * Reset temporary NPC var in 021-1/npcs.txt. * Proofread by Melkior. Pauline now is part of the QUEST_MAGIC2 variable using Nibble4 only. She teaches two new Astral Magic spells.
2013-09-14Astral Magic:tux9th1-0/+4
* Adding summon mouboo spell. * Adding summon pinkie spell. * Fluffies are from now on also slaves and attack. * Adding Pinkie to shear-drop list. * Killing Pinkies will now make Sagatha unhappy, shearing them will make her happy.
2013-09-11Adding missing "[" in gossip.txt, reported by cody.tux9th1-1/+1
2013-09-11Add missing close to DirynStefan Dombrowski1-1/+3
2013-09-08Fix Waric: replace root with dark crystal.tux9th1-4/+4
2013-09-07Addition to Orum's dialog: make easy minigame more clearJessica Tölke1-1/+6
2013-09-06Waric: fix explanation of spelltux9th1-1/+1
2013-09-05Waric: fix freeze issue at Quest State 18tux9th1-1/+1
http://forums.themanaworld.org/viewtopic.php?p=137508#p137508
2013-09-03Dark Magic - Quests:tux9th3-11/+308
* Adjusting Debug-NPC. * added Quests for 3 Spells, QuestStates are documented in the NPC script. * proofread by melkior.
2013-08-29I changed the miners.txt file to make a daily for level 40.cinderweb1-1/+28
2013-08-29Small indentation fix on NPC JackDino Paskvan1-1/+1
2013-08-26Illia: adjust the alloted times after completing each stepVincent Petithory8-10/+10
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