summaryrefslogtreecommitdiff
path: root/npc/merchants/shops.txt
AgeCommit message (Collapse)AuthorFilesLines
2012-09-26Updated Items, Uncommented the Traditional Cookie as it works fine and is ↵spre1231-2/+2
needed for a pet. Also updated The Groomers That sell it. Bugreport:6734 [Spre] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16798 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-24Updated Pet Groomer Shops.txt with the new Items they were ↵spre1231-3/+4
missing.(Prontera, Payon, and Yuno) Bugreport:6680 [Spre] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16795 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-0/+376
-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders. -NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences. -For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates. -All pre-renewal files has been reverted back to their pre-renewal behavior. TODO: -Correct pre-re quest rewards. -Check for pre-re/re differences in mapflags. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08Okie ladies and gentleman if this commit breaks anything it's jman's and ↵shennetsind1-380/+0
maki's fault, yes, blame them. Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-04* Corrected and optimized 12 guide NPCs (/guides/)euphyy1-2/+2
* Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt) * Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt) * Removed non-RE changelogs from RE scripts git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09Moved a few merchants and mob spawns to separate files to prevent error ↵kenpachi2k111-13/+1
message when running server in pre-RE mode and with TXT databases. (bugreport:5846) Fixed Tao Gunka Cards (#4302) renewal effect. (bugreport:5866) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16247 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21- Added probably all 3rd Class related Shops. bugreport:5781 bugreport:5782 ↵masao871-1/+21
bugreport:5783 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12- Added 2 new Shops to Comodo. bugreport:5732masao871-0/+2
- Added check for Baby Warlock to Magic Book Quest. bugreport:5527 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16104 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26Added missing Cooking Items for Material Seller. (bugreport:5334)tr0n931-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15794 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1231-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-09* Implemented remaining Brasilis NPCs.L0ne_W0lf1-5/+5
* Added remaining database modifications for Brasilis. - Added the skills for the Brasilis monsters. - Added remaining entries for Bathroom Ghost quest. - Added stats for the Suspicious Hydra monsters. - Corrected the capture rate for Suspicious Hydra. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14928 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-05* Corrected Brasilis Fruit Merchant. (bugreport:4278)L0ne_W0lf1-2/+3
* Implemented some new items, most 13.2 equipment. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14331 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-02* Actually applied the right update to the comodo weapon shop.L0ne_W0lf1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14330 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-30* Shop update, and added Wanderer pet food maker NPC.L0ne_W0lf1-38/+44
- Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. - Made Brasilis shop names unique, and uncommented. - Changed the whip sold in comodo weapon shop. (1956 ->1960) - Added Fire and Silver arrow to Einbroch tool dealer. - Re-added Bill of Birds to Morroc Item Collectors. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14315 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21Added some Brasilis basic NPCs.L0ne_W0lf1-8/+20
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-16- Fixed a small typo in a shop name. (bugreport:4235)brianluau1-1/+1
- Removed a duplicate 'next' in Kiel Hyre Quest. (bugreport:4222) - Fixed pc_checkitem() running before sending the client the inventory list, resulting in "Unknown Item is taken off" messages. (topic:245385) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14295 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21- Moscovia NPCs. (All the generic, kafra, and guide NPCs.)Kisuka1-2/+2
(Moscovia quest npcs still have horrible english, so that's why they aren't being committed yet.) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-26Happy boxing day, eAthena! Here have a massive update.L0ne_W0lf1-18/+19
* Implemented the first round of episode 12.1 change which include: - Many Morroc NPCs have been moved to Morroc Ruins. - The addition of new of NPCs to the ruins of Morroc. - Several warp points leading around Morroc altered. - The implementation of the continental Guard Quest. - The removal of the 'Dandelion's Request" quest. - This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps. * Commented out maps no longer accessable with 12.1 in maps_athena.conf * Updated mob_skill_db episode 12.1 skills to official. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13415 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13* Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jALupus1-0/+9
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12823 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-26Some random cleaningultramage1-4/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12141 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-24Corrected the Jawaii Ice Cream salesman. bugreport:285L0ne_W0lf1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11566 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up ↵L0ne_W0lf1-161/+162
the warnings it produced. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 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-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-01updated file versionsLupus1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10941 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-06-25* Rather large Kafra update. (May need further testing)L0ne_W0lf1-1/+3
- 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_W0lf1-217/+187
- 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-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-05updated some headers in 3 merchants scriptsLupus1-2/+3
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-05-05Updated Food Seller to officialPlaytester1-17/+18
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29More eof eols (followup to r10401); skipping /npc/custom and /npc/samplesultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10402 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-22Fixed up some shopsPlaytester1-5/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10312 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-04Added Gunslinger quest for slotted ButcherPlaytester1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10159 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-02Officialized Kunai/Shuriken tradersPlaytester1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10123 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15removed all .GAT from all the scripts and testedLupus1-190/+190
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05- Massive EOL normalization & 'svn:eol-style native' flag setting for all ↵FlavioJS1-350/+350
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-09fixed Lighthalzen, Swaltzwalt Quest Part 1, added Hugel-Bingo warps, added ↵Lupus1-1/+3
Airship mobs, fixed Hunte job quest typos, added pet shop into Light git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9182 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-08Fixed Einbroch Headgear shopPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8677 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-19enabled homunculus shopevera1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8358 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-12* Added Violin[3] to the Comodo Weapon sellerPlaytester1-1/+1
* Optimized a warp near Gunslinger weapon shop * Extended the Garrison quest to slot the Garrison git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8247 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-27Fixed the Morroc ingredient seller to not appearPlaytester1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7911 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-27* Added Rachel NPCs:eaac1-1/+11
~ Added Official warps of Rachel. About 50% of them. Will get the rest soon. [erKURITA] ~ Added the Tool/Armor/Weapon dealer, aswell as a Vegetable Gardener. [erKURITA] ~ Added the guards + guide locations. Also added the Zondaman location. [erKURITA] ~ Added Rachel Inn npc. [erKURITA] \- Special thanks to RockmanEXE for all the info above. * eAAC update to the vending machine, disguiser and quest warper. [erKURITA] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7349 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-25A shop in Prontera... Blah blah, too lazy to write more about it.MasterOfMuppets1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7330 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-12- Started the Juno Update process. 5% complete. [Musashiden]musashiden1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7112 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-10-Added some missing iRO - Lighthalzen Shops [Musashiden]musashiden1-4/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7087 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30Implemented the Lighthalzen guides, added some missing warps and a tool dealer.MasterOfMuppets1-1/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6846 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-24Removed Blue Potions from Yuno ShopsPlaytester1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6740 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-13Fixed the new shopsPlaytester1-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6579 54d463be-8e91-2dee-dedb-b68131a5f0ec