summaryrefslogtreecommitdiff
path: root/npc/merchants
AgeCommit message (Collapse)AuthorFilesLines
2016-01-03Update morroc trader npc's to match kRO's morroc trader npc's.Jedzkie1-60/+1
Update some coordinates of the npc's in morroc. Added Marrol Battle Recruiter and Mr. Smile npc in morroc town.
2016-01-03Update Prontera trader npc's to match kRO's trader npc's.Jedzkie1-62/+1
2015-12-31Replace -1,{ with FAKE_NPC,{AnnieRuru5-7/+7
replace using Notepad++
2015-12-22NPC Update:Jedzkie2-24/+30
- Add RENEWAL Checks for Material Seller. - in Renewal the selling prize of Medicine Bowl of Guild Dealer is 250z. Closes #982 as merged Signed-off-by: Haru <haru@dotalux.com>
2015-12-18ItemID to Constant: kafras/merchants FolderDastgir18-139/+139
2015-12-15Standardized header in scripts (part 6)Haru30-797/+1187
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Merchants scripts folders Signed-off-by: Haru <haru@dotalux.com>
2015-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru2-2/+2
Signed-off-by: Haru <haru@dotalux.com>
2015-06-25Updated Buying Shops scriptDastgir1-1/+11
Signed-off-by: Haru <haru@dotalux.com>
2015-05-08Replaced checkre() calls with constantsHaru2-4/+3
Signed-off-by: Haru <haru@dotalux.com>
2015-03-03Updated socket_enchant2.txt to contain ninja itemDastgir1-1/+2
2015-03-03Updated ninja shopDastgir1-0/+8
2015-01-11Added check for Renewal items in Shop, Fixed #8484Dastgir1-2/+4
2014-12-30Merge pull request #325 from happyme9/mastermalufett1-0/+2
Added 'Explosive_Kunai' and 'Makibishi' to 'Boonji' NPC
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru20-259/+259
Signed-off-by: Haru <haru@dotalux.com>
2014-10-31Follow-up to c6f102e (fixed a typo)Haru1-1/+1
Special thanks to kyeme Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkriding and setriding commandsHaru1-6/+6
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-24Renamed ismounting, setmounting, @mount2Haru1-4/+2
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-08-21Added Kagerou ToolsHappy1-0/+2
Added Explosive_Kunai and Makibishi to Boonji NPC
2014-05-13Removed trailing whitespace (scripts)Haru9-21/+21
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed several files with a missing EOL at EOFHaru3-3/+3
- 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-12-24Christmas Patch - 2013-12-23 Supportshennetsind1-182/+2058
Info: http://hercules.ws/board/topic/3614-christmas-patch-gifto/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke19-57/+57
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."Haru19-57/+57
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 Locke19-57/+57
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-2/+2
- Consolidated case in remaining variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru5-19/+19
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka30-294/+294
npcs to use this.
2013-10-24Follow up 418dd821c91ae19723a7b7b531e64b9c4565d555shennetsind1-1/+1
Minor Hercules divergence. Thanks to Haruna, Michieru. Signed-off-by: shennetsind <ind@henn.et>
2013-10-24Update to last rAthena npc.Michieru29-677/+559
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-10-11Moscovia Quest Update / Catalog Magician Moveshennetsind1-99/+5
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 filesHaru7-8/+8
- 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-tkay2-21/+6
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-05-28Woohooo! Some more cleaning up!Mysteries1-2/+2
- Follow up to 80510a0 { Corrected name placeholders } - Vas cleanup on name placeholders - Small change in /doc/permissions.txt
2013-05-28Follow up from my last commit.Masao1-176/+283
- Updated the custom HD Refiner with it's original file. Credits and a big thanks to Euphy. - Restored official authorship of Malaya Port Warps and fixed an minor issue. - Forgot to add an check in episode 13.1 quest. - Removed an not yet ready instance for Malaya Port from the scripts.conf file. Again an big thanks to Euphy for pointing out those issues. Signed-off-by: Masao <masao@gmx.ch>
2013-05-27- Added custom HD Refiner NPC Dwarf Mighty Hammer. (Disabled by default.)Masao1-0/+211
* This NPC uses the cash shop HD ores to upgrade your weapon or gear up to +10 when your current gear or weapon is already +7 without breaking it but downgrading it. - Moved Malaya Port NPC's to re folder and updated the Malaya Port warps. - Fixed Bug where players weren't able to finish the Guardian of Yggdrasil Quest and didn't get their reward. - Fixed that players weren't able to start the "Ring of the wise king" and "Finding a Fairy" quest using the Cat Hand Agent warper inside Eden Group Headquarters. Signed-off-by: Masao <masao@gmx.ch>
2013-04-15Fixed Bug #7154shennetsind1-1/+1
http://hercules.ws/board/tracker/issue-7154-equipment-based-skills-skill-891-for-example-persisting-through-resetsremoving-gears/ Merge of 3a9bacc515674885f079391899b22a5ccd8c2e31 Special Thanks to akinari1087 http://hercules.ws/board/topic/410-skill-script-command-updatefix/ Signed-off-by: shennetsind <ind@henn.et>
2013-04-11* Initial implementation of Archangel Wing Enchants script.euphyy1-0/+2
* 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-02-25* Part one of fixing bugreport:6527. This does not yet change functionality.euphyy6-9/+26
-- 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/+2
-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-03Follow up to 2f02be9Mysteries1-1/+1
Spacing issue
2013-02-03Merged rAthena r17103Mysteries1-87/+119
Added and updated many Renewal item scripts (incl. bugreport:7162, bugreport:7147). Some formatting changes in Clothes Dyer script (incl. bugreport:7204).
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries28-78/+34
2013-01-29Updated placeholders.Mysteries7-21/+7
2012-12-27> Follow-up r17048:euphyy1-3/+3
- Renamed 'useskilltopc' to 'npcskill'; - Removed cast time from NPC objects, code by mkbu95 (suspected official behavior); - Documented 'npcskill'; - Replaced all instances in scripts. * Fixed max level bypass, code by malufett (bugreport:5800). * Updated Malangdo spawns to official. * Some standardization of npc/quests/first_class/. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17049 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-24> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:euphyy2-615/+27
* 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-11-25* Added the "Catalog Magician" NPC to merchants/buying_shops.txt, thanks to ↵euphyy1-91/+178
Muad_Dib! * Changed all commands in atcommands.txt to their defined names, not aliases, and added two more common aliases. * Documented 'makerune' in script_commands.txt. * Documented '@accinfo' in atcommands.txt. * Follow-up r16965, database update for rune crafting formula. * Updated Magic Mushroom DB according to 3CeAM revision 703. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16966 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-10* Added Kagerou/Oboro support to Ninja Quests and Kunai Merchant (credits to ↵euphyy1-2/+3
insarius) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16816 54d463be-8e91-2dee-dedb-b68131a5f0ec
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-09-10* Optimized Splendide coin merchant and merged it to a template with Manuk's ↵euphyy4-186/+88
(merchants\coin_exchange.txt) * Fixed and enabled a Manuk NPC (cities\manuk.txt) * Other small changes and fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16773 54d463be-8e91-2dee-dedb-b68131a5f0ec