summaryrefslogtreecommitdiff
path: root/npc/re/merchants
AgeCommit message (Collapse)AuthorFilesLines
2015-12-31Replace -1,{ with FAKE_NPC,{AnnieRuru7-10/+10
replace using Notepad++
2015-12-18ItemID to Constant: re FolderDastgir14-99/+99
2015-12-15Standardized header in scripts (part 6)Haru24-413/+863
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Merchants scripts folders Signed-off-by: Haru <haru@dotalux.com>
2015-11-18Another follow up.Jedzkie1-17/+17
2015-11-18Follow up.Jedzkie1-0/+2
2015-11-18Converted some dealers to new trader format.Jedzkie1-41/+414
2015-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru4-47/+23
Signed-off-by: Haru <haru@dotalux.com>
2015-08-10Minor script cleanup (part 2)Haru1-1/+1
- Replaced leftover sprite IDs with constants - Corrected some NPC facing directions (in modulo 8) - Follow-up to 7b50fce0f62961b0228e6919562efcfe33e7fbca
2015-07-20Follow Up ebde1c70Dastgir1-4/+13
2015-07-13Added Shadow item RefinerDastgir1-0/+146
2015-07-12Implemented Kagerou/Oboro Gear Enchants.Dastgir1-0/+556
Reference: rathena/rathena@9b5798dc395cd77e1ac35228c95603f43aa9e94c Signed-off-by: Haru <haru@dotalux.com>
2015-06-25Fix Izlude In Shops Location and DirectionDastgir1-2/+2
Signed-off-by: Haru <haru@dotalux.com>
2015-06-25Added Ninja ShopDastgir1-0/+21
Signed-off-by: Haru <haru@dotalux.com>
2015-06-25Added duplicates of Riding Creature MasterDastgir1-0/+6
Reference: rathena/rathena@5040b2ac6b61b90346ef698beccdcef26fa1863e Signed-off-by: Haru <haru@dotalux.com>
2015-05-29FollowUp 87beda5Dastgir1-1/+1
2015-05-29Fixes Merchant Naphara Name and a typo in getitemDastgir1-3/+3
2015-04-10Corrected Craftsman Ki Location, Report #8614Dastgir1-1/+1
2015-03-03Added Ninja Weapon and Armor Craftman NPC'sDastgir1-0/+351
2015-01-28Fixes Invalid questprogress condition on Eclage Quests. Fixes Slot Expert ↵Dastgir1-2/+2
rate of success. Bug Report#8511
2015-01-11Follow Up e99cbacdastgirpojee1-2/+2
2015-01-11Added Complete Eclage NPCs,Quests and Instancesdastgirpojee1-253/+296
2014-11-02Replaced 'set' with direct assignment where applicable (re folder)Haru16-891/+899
Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkriding and setriding commandsHaru1-12/+8
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkdragon and setdragon commandsHaru1-6/+6
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkmadogear and setmadogear commandsHaru1-3/+3
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-24Renamed ismounting, setmounting, @mount2Haru1-8/+4
To avoid ambiguity: - The script command ismounting is now hascashmount - The script command setmounting is now setcashmount - The at-command @mount2 is now @cashmount Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed trailing whitespace (scripts)Haru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed several files with a missing EOL at EOFHaru1-1/+1
- All text files should end with an EOL. Period. - See http://robots.thoughtbot.com/no-newline-at-end-of-file for info on how to configure the most common text editors to do it automatically for you. Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke14-24/+24
Cleaned up Zeny manipulation in scripts. - It is now finally safe to re-commit. - Removed some unwanted parts of the original commit, that broke the character set in some scripts. [Haru] - Corrected spacing in some edited lines. [Haru]
2013-11-28Revert "Cleaned up Zeny manipulation in scripts."Haru14-24/+24
Reverted due to a serious regression. I'll commit this again once I fixed the issue in the script engine. Sorry for the inconvenience. This reverts commit 4faa0ec9df7067cee3eb1c1953fccc6c2f842179. Signed-off-by: Haru <haru@dotalux.com>
2013-11-25Cleaned up Zeny manipulation in scripts.Taylor Locke14-24/+24
2013-11-04Implemented correct refine success rates above +10Haru1-7/+7
- Refine rates above +10 are updated with the official values obtained from Aegis. Note: There are no safe refines above +10 anymore. - Corrected the above +10 refine NPC to decrease the refine level by 3 in case of failure, according to what observed in Aegis. - Special thanks to malufett, Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka21-170/+170
npcs to use this.
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