summaryrefslogtreecommitdiff
path: root/npc/pre-re/jobs/1-1/merchant.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-01-17Script Standardization: changed select format in pre-re folderDastgir1-12/+12
2015-12-18ItemID to Constant: pre-re FolderDastgir1-69/+69
2015-12-15Standardized header in scripts (part 5)Haru1-28/+37
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Jobs scripts folders Signed-off-by: Haru <haru@dotalux.com>
2014-11-02Replaced 'set' with direct assignment where applicable (pre-re folder)Haru1-32/+32
Signed-off-by: Haru <haru@dotalux.com>
2014-10-28Removed use of 'checkquest' from scripts (pre-re folder)Haru1-3/+3
Signed-off-by: Haru <haru@dotalux.com>
2014-08-23change rand(1) to rand(2)TungSinpei1-1/+1
2014-05-13Removed trailing whitespace (scripts)Haru1-2/+2
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke1-5/+5
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."Haru1-5/+5
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 Locke1-5/+5
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka1-6/+6
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru1-14/+12
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2012-12-08* Updated Geneticist, Warlock, and Sura job quests to their latest versions.euphyy1-5/+5
* Added a clearer example for party_even_share_bonus (tid:58005). * Standardized job headers. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17010 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10* Raw revert of all job files back to r16578, prior to the rewrite in ↵euphyy1-129/+1087
r16579. The updates will be re-applied after more testing is done. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16621 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-05- Some little adjustments to the job change quests, also reverted some ↵masao871-3/+3
variables to the old job change files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16582 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-04- Here comes the big Job folder Update.masao871-1087/+129
* Updated all 1-1, 2-1, 2-2 and the expanded files to the latest available official files and also added support for baby job change. * There might be some optimizations still needed at some places and there maybe occur some errors as well or the job change isn't fully working anymore since I didn't test all the jobs through the end (Me = Lazy), if so then please fill out a bug report in our bug tracker: http://rathena.org/board/tracker/project-4-scripts/ * Ninja, Gunslinger and the other files will follow within the next days. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16579 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh1-57/+1104
-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- Reverted all changes done to the job change quest files.masao871-130/+41
* Decided it'd be better to commit it all together when updating, fixing and optimization is done all at once. Sorry guys and girls for the trouble! Big shame on me :-/ :( git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16533 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-28- Follow up r16521masao871-5/+5
* Forgot to apply some changes from my Test folder to the rAthena folder. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16522 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-28Part 1 - 3 of the big job folder Update:masao871-41/+130
- Updated all 1-1 and 2-1 job change files to latest available official file. * 2-2 and advanced / reborn and the other job change scripts will follow with Part 2. * NPC optimizations will follow in Part 3. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16521 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08Okie ladies and gentleman if this commit breaks anything it's jman's and ↵shennetsind1-0/+125
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-11-06 06:43:41 +0000