summaryrefslogtreecommitdiff
path: root/npc/re/merchants
AgeCommit message (Collapse)AuthorFilesLines
2013-10-24Update to last rAthena npc.Michieru21-381/+1141
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-10-11Moscovia Quest Update / Catalog Magician Moveshennetsind1-0/+108
Partial Merge of 198dc48 / 48d36c2 Changelog: - npc/merchants/buying_shops.txt -- 1.1a Moved Catalog Magician to Renewal path. [Euphy] - npc/quests/quests_moscovia.txt -- 2.0b Bug fixes. [Lemongrass] -- 2.1 Fixed incorrect use of 'close'. [Joseph] -- 2.2 Updated RE/Pre-RE EXP. [Euphy] - npc/re/merchants/catalog.txt -- 1.1 Updated dialogue. [Euphy] Closes #149 Signed-off-by: shennetsind <ind@henn.et>
2013-09-16Corrected line endings and BOM issues with several filesHaru2-2/+2
- Ensured final end-of-line character in every file. - Corrected cases of mixed line endings (mostly CR and CRLF within the same file.) - Removed extra BOM from some scripts, since it causes a parsing error. Signed-off-by: Haru <haru@dotalux.com>
2013-07-04Merged/Updated/Added scripts from rAthena.j-tkay6-858/+1308
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-06-01Implemented Mora Enchants.Euphy1-0/+2356
2013-05-30Mora / NPC Updatesshennetsind1-0/+121
* Implemented all Mora quests (excluding instance-related quests and Mora Enchants). * Updated Mora town NPCs, Quiver Maker, and guides. * Updated Bifrost spawns and warps. All Credits to Euphy for sending those to us, Thank you~! Signed-off-by: shennetsind <ind@henn.et>
2013-05-28Woohooo! Some more cleaning up!Mysteries9-27/+27
- Follow up to 80510a0 { Corrected name placeholders } - Vas cleanup on name placeholders - Small change in /doc/permissions.txt
2013-05-18Update renters.txtStreusel1-2/+2
Fixed Bug #7260 http://hercules.ws/board/tracker/issue-7260-minor-bug-for-magic-gear/ Thanks to bgamez23!
2013-04-11* Initial implementation of Malangdo Card Separation script.euphyy2-18/+290
* Added and documented 'delequip' command, used in new official scripts. * Fixed issue in Guillotine Cross job quest where mobs did not properly reset (bugreport:7323). * Minor cleaning of script_commands.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17168 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-11* Initial implementation of Archangel Wing Enchants script.euphyy1-1/+1
* Added some Malangdo coin exchange NPCs, more will come later. * Updated Malangdo warp portals. * Fixed item ID 12220 and clarified documentation of 'getiteminfo' types 11 and 14 (bugreport:7256). * Minor Renewal item database update. * Applied changes from r17171 to SQL databases. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-20-Updated shops.txt & quests_moscovia.txt, credits to EuphyStreusel1-0/+15
2013-03-14-Updated DB, Credits to Euphy & LemongrassStreusel1-0/+827
-Added coin_exchange.txt Credits to EUphy & Lemongrass
2013-03-06Updated dewata to match the official scripts.lemongrass31101-2/+13
This commit includes a optional SQL upgrade file, that will reset all the dewata quests and the related variables, that your users have done. Thanks to Euphy for helping me and additionally thanks to Flaid for taking his time to test our conversion. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17178 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-05-Added Malangdo Enchantments, credits to EuphyStreusel1-0/+648
-Fixed Guillotine Cross job change, credits to Euphy -Updated message display of Malangdo NPC's, credits to Euphy -Updated item_db_re.sql
2013-02-25* Part one of fixing bugreport:6527. This does not yet change functionality.euphyy1-1/+5
-- Added 'disable_items' to all applicable scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-18-Updated map_cache.datStreusel1-3/+6
-Updated Izlude -Added Fly Wing to Lunatic & Poring -Added new Quests (Thanks Flaid) --Expanded MAX_QUEST_DB for the newly added quests Signed-off-by: Streusel
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries4-10/+4
2013-01-29Updated placeholders.Mysteries1-3/+1
2012-12-28* Added a point to 'npcskill' documentation.euphyy1-1/+7
* Added Malangdo Tool Dealer. * Fixed quest log sample, which never worked to begin with -- thanks clydelion! * Fixed potential error with clones in custom Hunting Missions script (bugreport:7055). * Follow-up r16990, forgot to commit the EXP fix. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17055 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-24> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:euphyy2-7/+527
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041). * Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042). * Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-17* Updated Rune Knight and Ranger job quests to their latest versions. This ↵euphyy2-123/+141
completes the recent third job updates (r17024, r17010, r16991, r16990). * Fixed quest_db name typos (bugreport:7011). * Added Wolf Flute Trader script to re\merchants\falcon_flute.txt, and renamed to re\merchants\flute.txt. * Optimized Falcon Flute Trader script. * Added constants in El Dicastes quests. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17028 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-08- Updated and adapted El Dicastes NPC from official script. Credits to Muad_Dib!j-tkay1-1/+8
- Standardized header. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17009 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10* Added a missing shop item, bugreport:6878 (re\merchants\shops.txt)euphyy1-5/+5
* Fixed a few incorrect labels in Poring War script, bugreport:6794 (other\poring_war.txt) * Follow-up r16900, added svn:eol-style=native property. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-05* Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and ↵euphyy2-2/+6
whisper system documentation (doc\whisper_sys.txt) * Follow-up r16745, fixed a few typos in atcommand documentation (doc\atcommands.txt) * Minor cleaning - spacing, tabulation, comments, dividers git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16746 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-27* Optimized "3rd Item Seller" script (re\merchants\3rd_trader.txt)euphyy1-427/+133
* Optimized Eden Quest lv. 71-85 (re\quests\eden\) * Deleted a duplicate NPC, bugreport:6564 (re\quests\quests_dicastes.txt) * Other small fixes git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh32-8699/+141
-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-30- Added svn:eol-style=native property on some recently added text files.brianluau1-180/+180
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16534 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-30* Fixed checks in "Gemstone Trader" script, and cleaned a little, ↵euphyy1-23/+22
bugreport:6370 (merchants\gemstone.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16532 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-19* Condensed the documentation on the "Import" folder, it should be more ↵euphyy2-6/+6
reader-friendly now (conf\readme.txt) * Deleted doc\pccommand_list.txt, it's outdated and its contents are already (better) explained in doc\script_commands.txt * Other misc cleaning... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16453 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-16Forgot to remove the scripts in last commit, sorry.daegaladh1-0/+180
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16431 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-16Disabled and removed all renewal-only scripts from pre-re folder. You still ↵daegaladh1-168/+2
can enable them in pre-renewal scripts conf files, but scripts are read from the re folder. Follow up r16387. Splitted some renewal-only NPCs from renters.txt into another file. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16430 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-11- Added some missing Eden Group Teleport Officers. bugreport:6160masao871-2/+5
- Some Kafra location and dialog updates. bugreport:6160 - Added missing Sorcerer Point Shop NPC's. bugreport:6160 - Fixed Bulletin Board Locations in Payon Archer Village. bugreport:6160 * Special thanks to Baneado who provided the locations. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08- First try to commit something into this whole new Mess Ind created ^^masao871-5/+6
* Added the Izlude Town Map Update some of you may already know from me from the download section. Moving all NPC's and Warps around to match the new Izlude Town Map. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16384 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08Okie ladies and gentleman if this commit breaks anything it's jman's and ↵shennetsind34-0/+9716
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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-29 09:31:08 +0000