summaryrefslogtreecommitdiff
path: root/npc/merchants
AgeCommit message (Collapse)AuthorFilesLines
2012-06-10- Added svn:eol-style=native property on some recently added text files.brianluau1-67/+67
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09Moved a few merchants and mob spawns to separate files to prevent error ↵kenpachi2k112-13/+68
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-06-03* Platinum Skills NPC now works for all Upper types (bugreport:5903) ↵euphyy1-366/+122
(custom\platinum_skills.txt) * Revamped the official clothes dyer (merchants\clothes_dyer.txt) * Optimized custom Berzebub Card quest (custom\quests\berzebub.txt) * Warper bug on ma_fild02 fixed (bugreport:5908) (custom\warper.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16216 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01- Replaced more -> rAthena (follow up to r15251).brianluau3-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01- Follow up to r16164 and r16193: used SVN Copy/Move so SVN History is ↵brianluau1-123/+123
preserved. - Added svn:eol-style=native property for some recently added text files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16194 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-27- Added an security check for each player which is entering an instance to ↵masao871-1/+3
make sure that the cool down time can't be bypassed which would lead to abuses of the according instance dungeons. bugreport:5768 - Some minor additions to the Magic Gear renter NPC. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16158 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-27- Fixed typo in the new refining NPC Bestry. bugreport:5836masao872-16/+37
- Enabled Gryphon renter NPC and added Magic Gear Master NPC (Mado Gear renter). bugreport:5754 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16156 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26- Some minor improvements in the instance Scripts.masao871-1/+1
- Some minor improvements in the Eden Group NPC's. - Fixed typo in Wanderer Pet Food NPC. bugreport:5823 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16151 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-17- Added +11 and above refiner NPC.masao872-34/+607
- Added NPC to refine Oridecons / Eluniums to Cardium / Bradium. - Added downrefitem script command and updated script_commands.txt with it. - Updated refine_db.txt with probably custom values for +11 to +20 values. Source : http://ratemyserver.net/index.php?page=misc_table_refine - Some little script improvements to Suhnbi. (Enriched Elunium / Oridecon Upgrader.) * Further improvements for the refinement system and refinement NPC's will come within the next few days. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16126 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-05-12- Updated town.txt to allow Mailbox access in all the newer cities. ↵masao871-1/+2
bugreport:4457 - Removed easter.txt event and the corresponding mobs in mob_db2.txt and mob_db2.sql since they collide with Satan Morroc minions Mob ID's. bugreport:1240 - Updated Magical Amplify Power cast time to only be affected by item bonuses. bugreport:2777 - Added missing Economy check in agit_main and some missing close; also fixed bugreport:5030 - Added Credits for Ziu in Falcon Flute NPC. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-11- Added Baby Hunter and Baby Ranger check. bugreport:5728masao871-8/+23
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-10- Added Falcon Flute Trader NPC.masao871-0/+107
- Added Falcon Flute to db/pre-re/item_db.txt, db/re/item_db.txt and item_db.sql. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16095 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
2012-03-07- Fixed a little leftover in socket_enchant2.txt .masao871-1/+1
- Added warp to iz_dun05 bugreport:5395 . - Fixed a little typo in clif.c . - Moved "int clif_status_load_single" from clif.c to clif.h . git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15665 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30- Removed more trailing tabs.brianluau5-6/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30- Removed trailing tabs, and fixed some spacing.brianluau3-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-24- Fixed some typos in Socket Enchant NPC. (bugreport:5263)brianluau1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15517 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-18` Added (Cash) Headgear Dyer (cashheadgear_dye.txt)xantara1-0/+119
-- Aegis Conversion git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15493 54d463be-8e91-2dee-dedb-b68131a5f0ec
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