summaryrefslogtreecommitdiff
path: root/npc/merchants
AgeCommit message (Collapse)AuthorFilesLines
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
2012-09-01* Follow-up r16726, more standardization on docs.euphyy1-31/+12
* Replaced and added dividers in many script files with one standard divider. * Other misc. cleaning... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-24* Added warg rider check to custom breeder (custom\breeder.txt)euphyy1-2/+2
* Follow-up r16656, documented the new commands git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16698 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-24* Added warg checks to Falcon Renter, bugreport:6546 (merchants\renters.txt)euphyy1-1/+15
* Follow-up r16695, finished documentating. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16696 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07* Moved RE coordinates of Bullet/Magazine Dealers in Izlude, bugreport:6410euphyy2-18/+17
* Added "favorite" column to main.sql file, bugreport:6425 (sql-files\main.sql) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16595 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-02Fixed some bugs on jobs and merchants scripts.daegaladh3-36/+55
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh30-0/+8574
-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-08Okie ladies and gentleman if this commit breaks anything it's jman's and ↵shennetsind34-9716/+0
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
2012-07-04* Corrected and optimized 12 guide NPCs (/guides/)euphyy2-29/+4
* Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt) * Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt) * Removed non-RE changelogs from RE scripts git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20* Optimized "Elemental Stone Trader" (merchants\elemental_trader.txt)euphyy3-575/+147
* Optimized "Armor Enchanter" (merchants\enchan_arm.txt) * Optimized "Manuk Merchant" (merchants\manuk.txt) * Fixed an incorrect variable in "Thanatos Tower" script, as per bugreport:6073 (quests\thana_quest.txt) * Reverted quests_morocc edit, encoding error? - bugreport:6067 (quests\quests_morocc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16325 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20* Optimized "Guild Battle NPC" (other\guildpvp.txt)euphyy1-20/+2
* Cleanup of "Gonryun Power Arena" script (other\powernpc.txt) * Condensed "Seal Status" script a little bit (other\sealstatus.txt) * Other general cleaning... :3 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16323 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-19* Fixed problems with third classes/new mounts in official "Renters" script, ↵euphyy1-8/+38
as per bugreport:6046 and bugreport:5924 (merchants\renters.txt) * Small bug in El Dicastes quests fixed (quests\quests_dicastes.txt) * Fixed two warps in the custom warper (custom\warper.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16319 54d463be-8e91-2dee-dedb-b68131a5f0ec
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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 17:02:36 +0000