summaryrefslogtreecommitdiff
path: root/npc/merchants
AgeCommit message (Collapse)AuthorFilesLines
2007-10-18Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up ↵L0ne_W0lf6-189/+194
the warnings it produced. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-16* Added a return at the end of several scripts. Should deal with errors ↵L0ne_W0lf7-7/+7
being shown in due to a recent commit by FlavioJS git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11495 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-12Fixed some bugs in the Socket Enchant NPCPlaytester1-6/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11423 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-11* Added secret bonus of slotted Skull RingPlaytester1-2/+2
* Fixed two prices of Socket Enchant NPC git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11413 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-10Fixed some minor typosPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11403 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-10Updated Socket Enchant NPCPlaytester1-9/+41
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11393 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-10Working on updating Socket EnchanterPlaytester1-1/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11392 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-25* Added Veins Cool Event Corp. Rep. and Inn master.L0ne_W0lf1-2/+40
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11303 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-25* Added Veins shops to shops.txt.L0ne_W0lf1-1/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11298 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-22Fixed a weird typo in the dye maker npc (from r11145).ultramage1-3/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11277 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-14Added proper end-of-line encoding properties for some files that were ↵ultramage1-115/+115
neglected... again... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11202 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-08Made the checks in the dye maker npc more dynamic (also fixes missing ↵ultramage1-17/+28
'countitem' bug) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11145 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-08Fixed the dye maker npc (see topic:162818)ultramage1-12/+13
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11144 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-01Fixed certain typos in src/npc/doc filesultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-12* Bug fixes to the updated 2-2 job quests.L0ne_W0lf1-1/+2
- Testing and fixes courtesy of Barron-Monster and Samaury22. * Corrected the second "Line" selling in the Comodo shop to "Whip". git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10985 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-06* Added a null-pointer check to skill_initunit() to prevent a crashultramage1-2/+2
* Added a while() loop to the client packet processor (for performance) * Added support for kRO 2007-05-14aSakexe langtype 0 login packet 0x2b0 * Added Job_Baby_Alchemist define to complement the Job_Alchemist update * Added custom Hollow Poring mob_db2 entry git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10954 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-05* Fixed a wrong item ID in Socket Enchant NPC.SinSloth1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10951 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-01updated file versionsLupus2-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10941 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-31* Fixed north prontera kafra having an empty warp listultramage1-2/+2
* Removed junk ЎA text from the 2004 headgears * Changed deprecated Job_Alchem to Job_Alchemist (see r10904) * Fixed a typo in a geffen city npc (Job_Merhcant) * Fixed a typo in the Jobmaster custom script (Job_Gunsliger) * Fixed one old eAAC Quest Warper bug (warp to nonwalkable coords) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10940 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-27* Changed name from "Pharacon" to "Phracon" in refine.txt.samuray221-3/+5
- Thanks to Barron-Monster. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10920 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-25* Changed name from "Emvertacon" to "Emveretarcon" in refine.txt.samuray221-3/+5
- Thanks to Barron-Monster. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10908 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-14* Fixed missing item from "Fresh Fish" from cooking addition shops.L0ne_W0lf1-3/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10882 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-13* Updated "Name" fields for 11.2 headgears.L0ne_W0lf1-0/+9
* Updated NPCs for Al De Baran - Added Inn NPC for Al De Baran * Fixed problems with Hahoe/Lion/Bride masks quests. * Added Zairik's fix for the wizard quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10879 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-11Fixed a bug in the socket enchanterPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10875 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-06* Updated Juno and Comodo NPCs.L0ne_W0lf1-5/+6
- Updated Monster Museum NPCs as well. - Updated doomed swords quest, moved unrelated NPCs to proper files. - Added the end of the Comodo and Juno doomed swords quests. * Fixed "[Kafra Employee]" being shown twice at one instance. * Fixed the Geffen Inn NPC. * Updated the NPC names for the Geffen Kafra. * Updated the PVP script to official. Includes Event mode. - Added warps for the PVP Cross room. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10858 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-27* Rev 10815 Updated NPC for Payon.L0ne_W0lf3-124/+269
- Added in the comeplete fortune teller. - Rewrote the Arrow quiver and Gemstone trader NPCs. Moved the Gemstone trader intot he '/merchants' folder. - Updated the information for the Payon Inn accordingly. * Removed an NPC from the Lighthalzen quests. Should fix the "NPC not removed." message when reloading scripts. .Removed because I couldn't find this NPC anywhere it he official file. * Fixed a few over-looked names in the Kafra teleport function. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10815 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-26changed all 'dyestuff' -> 'Dyestuffs' which's correctLupus3-13/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10811 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-25* Rather large Kafra update. (May need further testing)L0ne_W0lf3-392/+298
- Updated a good portion of the kafra functions. - Added proper dialog for most functions. - Updated guild Kafras and some o f their locations. * Updated all Guide NPCs. They are now mostly 100% official. - Renamed some of the old files to make them look better, IE: yun to juno. - Added Kunlun and Ayotaya guides. * Added the Einbech tool Dealer since it seemed to had gotten lost when I updated shops. * Updated Dye Maker and Hair Dyer to official. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10810 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14* Updated cities: Morroc, Jawaii, and IzludeL0ne_W0lf3-229/+201
- Moved an NPC out of Prontera because of the Jawaii update. * Updated Wedding script to official. (Moved previous to custom.) - Updated the Divorce NPC to Official as well. * Changed some dialog in the Kafra Functions. * Updated the Message boards to iRO standards. * Added the Mail box NPCs even though the mail system is not implemented. * Near total rewrite of the shops.txt file. Lots of corrections and such. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10766 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14npc header consistency updateultramage2-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10759 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-10* Updated (and added) item_trade entries. (Converted from Aegis.)L0ne_W0lf2-60/+83
* Updated several Prontera NPCs. - Updated Prontera town NPCs, and Prontera Library. - Updated the Prontera Milk Merchant. - Updated the inn dialogs slightly, and corrected information for Prontera. - Added Gaebolg Family Curse quest. - Commented out old Clothes_dyer npc. * Updated Rachel's guide's while loop to be a bit nicer looking. * Added the ability to redeem lottery tickets before max donation is met. * Changed conflicting warps to the "Adoption" room in the church. * Fixed a bug in Kiel Hyre warps and quest. * Updated Dandelion Request quest for Gaebolg compatibility. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10736 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-07* Implemented Official Cooking Quest.L0ne_W0lf1-1/+2
- Optimized Rachel donation quest, and added Rachel Guide. - Fixed the name of one of Rachel's shops. (Tool Dealer -> Fruit Gardener) - Fixed some typos in the Kyle Hyre Quest's additional comments. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-07* Fixed a bug and some typos to Socket Enchant NPC.SinSloth1-7/+14
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10709 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-06More Breeder fixesPlaytester1-9/+9
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10707 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-06updated arena warp, removed scrolls shopLupus2-79/+37
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10703 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-05Fixed Grand Peco breederPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10699 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-05commonized ammo_boxes.txt ammo_dealer.txt kunai_maker.txtLupus3-82/+61
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10696 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-05updated some headers in 3 merchants scriptsLupus3-60/+46
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10693 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-04* Added 11.2 guns to gunslinger shopPlaytester1-1/+1
- updated gun prices - updated sql files git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10682 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-04Some minor fixes...Playtester2-3/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10678 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-04* Reverted Bullet Dealer Tony to StablePlaytester1-51/+65
- current version was bugged and no one fixed it git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10677 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-04small npc header adjustments, eol settingultramage1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10676 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-02* Updated Knight Peco, Crusader Peco, and Falcon breeders to Aegis 10.3 ↵L0ne_W0lf1-147/+158
standards. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10666 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-28Corrected typos/inconsistencies in npc headersultramage5-15/+16
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10638 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-28Readded missing update info in ammo dealer, please don't remove the credits ↵Playtester1-4/+6
if you update a script, just ADD your own. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10636 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-28Fixed NPC name of bullet and magazine dealerPlaytester2-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10635 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-22Tweaked some recent npcs (untested)ultramage3-426/+281
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10608 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-22* Updated Socket Enchant NPC to official.SinSloth1-822/+493
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10604 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-17removed .GAT-s again from recent scriptsLupus2-4/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-17- Fixed several grammar mistakes from the original dialogs.DZeroX1-5/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10550 54d463be-8e91-2dee-dedb-b68131a5f0ec