summaryrefslogtreecommitdiff
path: root/npc/quests/skills/merchant_skills.txt
AgeCommit message (Collapse)AuthorFilesLines
2015-08-11Remove conf dir.Andrei Karas1-734/+0
2014-11-02Replaced 'set' with direct assignment where applicable (quests subfolders)Haru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka1-2/+2
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-9/+7
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2012-12-24> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:euphyy1-4/+4
* 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-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-0/+736
-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 ↵shennetsind1-735/+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-05-29- Added BaseClass explanation to script_commands.txt .masao871-4/+4
- Some updates to the custom folder / the old eAAC Scripts which are now in there. - Fixed custom/warper.txt prontera location to not collide with Ash Vacuum warper. bugreport:5857 - Fixed Platinum Skill Quests properly checking for BaseClass now. bugreport:5853 - Fixed some typos in Ranger Job change Quest & Eden Paradise. bugreport:5858 - Fixed a typo in scripts_athena.conf . bugreport:5852 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17- Updated some Alberta NPC Locations to match with the new Map. Also updated ↵masao871-1/+1
the coordinates in the Alberta Guide NPC. bugreport:5273 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24- Some more 1st Class Platinum Skill NPC optimizations.masao871-5/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-23- Follow up r15949 .masao871-8/+3
* Removed some unneeded perm. char. variables. * And i meant [bugreport:5607] got fixed NOT [bugreport:5606] since Brian already fixed that Bugreport. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-23- Updated 1st class platinum skill NPC's.masao871-221/+354
- Fixed [bugreport:5606] . git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15949 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1231-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13Converted skill commands integers to strings. Follow up on r12814shadow1-6/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-15Updated Merchant quest skill NPCs.L0ne_W0lf1-283/+580
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11472 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29More eof eols (followup to r10401); skipping /npc/custom and /npc/samplesultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10402 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15removed all .GAT from all the scripts and testedLupus1-5/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-28Fixes to Merchant and Blacksmith skill quests (ran into them by playing on ↵DracoRPG1-2/+5
an eA server and using RI's wiki) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9930 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05- Massive EOL normalization & 'svn:eol-style native' flag setting for all ↵FlavioJS1-307/+307
txt/conf/h/c files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-28Reverted fix in Merchant Skills QuestsKarLaeda1-5/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9338 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-27Fixed exploit in Merchant Skills QuestsKarLaeda1-1/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9333 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-212 typos fixedLupus1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8834 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-201s job skill quests optimization. now using @temp varsLupus1-20/+21
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8820 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-19name typo GershaunLupus1-9/+9
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8804 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-14fixed some typos, optimized, added missing NEXT;Lupus1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8739 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16* Commited Silent's Fix to the duplicate NPCsPlaytester1-2/+2
- needs testing - can't be fully fixed because of length limitation of names git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-12Some typo fixes by IVBela.MasterOfMuppets1-19/+20
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6015 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-27constant-fied!Vicious1-13/+13
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5763 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES ↵Valaris1-0/+304
GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5094 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29Clearing trunk.Valaris1-304/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-22git-svn-id: ↵ajarn1-8/+4
https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-14Fixed some file typesamber1-308/+308
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-04git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@2 ↵(no author)1-0/+308
54d463be-8e91-2dee-dedb-b68131a5f0ec
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 00:15:11 +0000