summaryrefslogtreecommitdiff
path: root/npc/merchants
AgeCommit message (Collapse)AuthorFilesLines
2012-01-11- Set svn:eol-style=native property for recently added text files.brianluau1-261/+262
- Removed trailing spaces/tabs. - Changed duplicate() to use a floating source npc. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15430 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11Added Version Historyscript-z3r01-6/+11
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15429 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11removed a double space: emotion e_loud to emotion e_loudscript-z3r01-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15428 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11Changed emotion # - const.txt definition | I swear to god I hate you allscript-z3r01-8/+8
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15427 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11Removed Comments due to Hatersscript-z3r01-306/+187
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15426 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11Fixed Missing ; Line 272script-z3r01-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15425 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11Added Rare Diamond Merchant, converted from AEGIS scriptscript-z3r01-0/+375
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15422 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-09- Added svn:eol-style=native property to some recently added text files.brianluau1-520/+520
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15413 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02- Updated const.txt. bugreport:5177masao871-3/+3
- Fixed Rental NPC. bugreport:5178 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15351 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01- Bunch of Typo fixes from my previous Commits.masao872-7/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15348 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01- Added Genetic Book Seller to Alchemist Shop.masao873-6/+123
- Updated Gunslinger Ammo & Boxes Sales NPC positions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-26` Updated Refiners and Repairersxantara1-23/+55
- Updated several NPC names and locations. - Added WoE map Refiners. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15282 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial12329-75/+75
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-23- Rebranded NPC Informationmercurial1231-212/+99
- Optimized Poison Herb Salesman since an optimized version already exist. (Tested and Approved) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15221 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-23- Added first Version of Mechanic Job change Quest and 3rd_trader which ↵masao871-0/+634
sells 3rd Job related Items. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15220 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-26* Added Rune Knight job quest, and mount rental NPC.L0neW0lf.eAthena1-0/+126
* Added Rune Knight skill updates, and supporting information for r14983. * Updated Emperium to be plant-mode. * Updated item database with RE stats. * Added new constants to const.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14984 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-10* Raised MAX_MERCENARY_CLASS to 44 for new mercenaries.L0ne_W0lf2-31/+27
* Raised max_lv to allow values up to 150 in battle.conf. * Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees. * Upped max_lv and max_aura to 150, and max_aspd to 193. * Added Brasilis database updates from trunk r14928. * Added scripts and NPC Brasilis updates from trunk r14928. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14931 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-09* Merged changes from trunk [14742:14782/trunk].ai4rei2-5/+873
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-09* Fixed some missing/wrong bits in merge from trunk (follow up to r14740).ai4rei1-247/+247
- Fixed added files not being svn-copied (thus lacking svn history). - Applied missing property changes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14741 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-09* Merged changes from trunk [14688:14739/trunk].Kisuka3-18/+27
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-21- Added Buying Shop NPCsKisuka1-0/+248
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14722 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26* Merged changes from trunk [14496:14630/trunk].ai4rei1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14632 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-03Fixed KvM announcements showing during WoE:SE (bugreport:4335).Gepard2-6/+6
Added missing Lighthalzen NPC (bugreport:4319). Fixed checkweights in Manuk & Splendide shops. Fixed some condition checks in Moscovia quests. Fixed some typos in Sealed Shrine and Manuk quests dialogues. Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14360 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-06-02* Corrected warnings (and errors on some compilers) from r14327.L0ne_W0lf2-0/+234
* Actually added Manul/Splendide shop files from r14327. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14329 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-02- Fixed item script of Chicken_Hat (5431). (bugreport:4174)brianluau1-124/+124
- Fixed a typo in script_commands.txt (bugreport:4270) - Fixed some links in the README html files. - Fixed the range of 'max_guild_alliance' in battle.c (0 to 3). - Set svn:eol-style=native for some recently added text files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14328 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-30* Shop update, and added Wanderer pet food maker NPC.L0ne_W0lf2-38/+119
- 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_W0lf2-9/+67
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
2010-04-17- Fixed some typos in quest_db.txt (bugreport:4186)brianluau1-1/+1
- Fixed a typo in socket_enchant.txt (bugreport:4188) - Added missing `quest` table to the convert_engine sql files. (r12559,r13960,r13963) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14284 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-08Implemented official armor enchanting NPC.L0ne_W0lf1-0/+275
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14192 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-28Updated Socket Enchant: all items moved to proper NPCs, added slotted Hat of ↵Gepard2-240/+633
Sun God. (bugreport:2871) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14107 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-09- Fixed some 'getarg' that were switched in Magazine Dealer Kenny.brianluau1-5/+5
- Fixed a situation in Rogue Agent where NPC window doesn't close. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14051 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-05- Added some missing quests to quest_db.Kisuka1-3/+4
- Fixed an issue on some 1-1 job quest log commands. - Fixed some issues with hair_style. (bugreport:3558) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14041 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-05- Updates to several npc files to match AEGIS standards.Kisuka8-766/+1117
- Added Cash Hair Stylist (disabled by default). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14040 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-17- Fixed a bug/typo in Valorous Assassin's Damascus's bonus.Kisuka1-8/+11
- Added missing Gae Bolg & Dragon Slayer to socket enchanter. (bugreport:3386) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13951 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-21- Added moscovia quest 'Koshei the Immortal'.Kisuka1-31/+2
- Added 2009rwc maps & mosk_que to map indexing/conf. - Removed duplicate Moscovia Inn NPC (bugreport:3188). - Removed pointless specialeffects from speed items (bugreport:3208). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-03- Fixed a variable in refine.txt not being used. (bugreport:2882)brianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13723 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-03- Switched the slot enchanter's checks so they come AFTER the final 'next' ↵brianluau1-5/+5
pause. (bugreport:2664) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13721 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-01* Optimized the renters.txt thanks to various peoplePlaytester1-35/+44
* Fixed an Aldebaran castle flag thanks to BrianL git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13650 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21- Moscovia NPCs. (All the generic, kafra, and guide NPCs.)Kisuka2-29/+25
(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
2009-01-20* Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]L0ne_W0lf1-12/+13
- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363) - Fixed some requirements for the socket NPC. (famiong) (Bugreport:2572) - Fixed a global variable-collision in Z-Gang quest. (Bugreport:2616) - Fixed issue with Zhed saying things he shouldn't (Bugreport:2627) - Fixed OnMyMobDwead in Nameless quest issue. (Bugreport:2628) - Fixed Kyle Hyre script halting on delitem. (Bugreport:2633) - Added missing part of Peace for Arunafelts (Gepard) (Bugreport:2639) - Added missing Kafra npc to Comodo. (Daegaladh) (Bugreport:2662) - Fixed a minor error in Einbroch Tower NPC. (magegahell) (Bugreport:2669) - Fixed exp reward in Peace for Arunafeltz. (Gepard) (Bugreport:2676) - Fixed exp reward in Meg. God Seal quest. (Daegaladh) (Bugreport:2677) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13458 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-26Happy boxing day, eAthena! Here have a massive update.L0ne_W0lf3-22/+26
* 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-11-04Small update to fix merchant Paul Spanner from giving item 612 instead of ↵Paradox924X1-1/+2
.@item. (bugreport:2418) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13351 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-28* More boredom and bugfixing to various scripts. :DL0ne_W0lf2-5/+243
- Updated an outdated comment in refine.txt. (bugreport:2370) - Fixed two bad event calls in arug_cas04/05. (bugreport:2386) - Fixed wrong check in haire dresser script. (bugreport:2392) - Fixed infinite loop in archer quest scropt. (bugreport:2393) - Bonus: Updated the blacksmith supply dealer in Einbroch git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13330 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-12* Changed An nonexistent variable in Refine NPC. (bugreport:2340)samuray221-3/+4
* Fixed a Exploit in Thief Quest Skill. (bugreport:2332) * Fixed donpcevent to doevent. (bugreport:2311) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13288 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-27* Continues replacing of specialeffect/2 numerics with constants.samuray221-4/+5
* Corrected an If to continue the President's Quest. (bugreport:2276) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13241 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-20* Fixed DZeroX's fix! (Missing ;'s)L0ne_W0lf1-3/+3
* Added Guild PVP NPC, and seal progress NPC. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13222 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-20- Fixed zeny exploit on the refiner (bugreport:2248)DZeroX1-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13221 54d463be-8e91-2dee-dedb-b68131a5f0ec
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 12:44:54 +0000