summaryrefslogtreecommitdiff
path: root/npc/jobs/2-1
AgeCommit message (Collapse)AuthorFilesLines
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru6-334/+334
Signed-off-by: Haru <haru@dotalux.com>
2014-10-28Removed use of 'checkquest' from scripts (common folder)Haru6-29/+31
Signed-off-by: Haru <haru@dotalux.com>
2014-08-23change rand(1) to rand(2)TungSinpei2-2/+2
2014-05-13Removed trailing whitespace (scripts)Haru4-6/+6
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed some charset issuesHaru1-0/+2
- Fixed files with mixed character set or invalid CP949 characters. - Uncommented '#music' script in the_sign_quest.txt (now the soundeffect filename should be fixed). - Added a note to the header of CP949 files not to read or save them as UTF8, since it'd break their encoding. It should be safe enough to read them as EUC-KR if your text editor doesn't offer CP949 as an option. - Added FIXME notes about untranslated strings in assassin_skills.txt and WolfchevLaboratory.txt. Signed-off-by: Haru <haru@dotalux.com>
2013-12-07Fixed several incorrect script labels and eventsHaru2-4/+4
Signed-off-by: Haru <haru@dotalux.com>
2013-12-01Corrected some accidentally renamed NPCsHaru1-1/+1
- Fixes bugreport:7860, thanks to SSky http://hercules.ws/board/tracker/issue-7860-eden-mission-board-npc-name/ - Follow-up to 6309eba Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke2-2/+2
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."Haru2-2/+2
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 Locke2-2/+2
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-16/+16
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-08Added support for monster spritename constantsHaru1-3/+3
- Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced numeric IDs in NPC definitions and setnpcdisplay calls with the appropriate constants - Made possible thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka6-70/+70
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru6-168/+119
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-02-04Merged some commits from rAthena.Matheus Macabu1-0/+1
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries2-4/+2
2013-01-29Updated placeholders.Mysteries2-6/+2
2013-01-16* Documented @set command from r16123.euphyy1-12/+10
* Fixed a waitingroom bug in Wizard job quest (bugreport:7189). * Fixed getequipname() returning -1 instead of an empty string (bugreport:7186). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17100 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-08* Updated Geneticist, Warlock, and Sura job quests to their latest versions.euphyy5-9/+9
* 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-11-22- Fixed missing 'close' in priest.txt (bugreport:6921)brianluau1-31/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16943 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-15- Fixed bugreport:6785, missing changequest in Knight Job Quest. ↵j-tkay1-2/+5
(npc/jobs/2-1/knight.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-18* Fixed a misplaced quest log entry in Priest job quest, bugreport:6702 ↵euphyy1-3/+3
(jobs\2-1\priest.txt) * Fixed an incorrect check in Taekwon job quest, bugreport:6711 (jobs\1-1e\taekwon.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16786 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10* Raw revert of all job files back to r16578, prior to the rewrite in ↵euphyy6-7775/+4009
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- This should fix all job quests which didn't work after the update.masao875-2326/+1789
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16584 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-05- Some little adjustments to the job change quests, also reverted some ↵masao876-6/+0
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- Follow up r16579 .masao872-2/+2
* Added some missing Baby checks... This Update really started great didn't it ;) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-04- Here comes the big Job folder Update.masao876-4715/+9024
* 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-02Fixed some bugs on jobs and merchants scripts.daegaladh1-0/+2
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:)daegaladh6-0/+12101
-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 ↵shennetsind6-12047/+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* Optimization of Knight job change quest, and fixed bugreport:6163 ↵euphyy1-272/+72
(jobs\2-1\knight.txt) * Follow-up r16373: added another missing entry (bugreport:6162) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-01- Fixed a bug in Eden Group Quests where a variable was set which was ↵masao872-5/+5
supposed to be converted and give the player certain gears. bugreport:6143 - Fixed an Priest Quest cutin which would result in getting an missing file error of the MvP Mistress Card illustration. bugreport:6144 - Fixed EXP Values in Eden Group Quest Boards 86 - 90 and 91 - 99. Source: http://irowiki.org/wiki/Eden_Group_Leveling_Quests * 3 Hours cooldown isn't added yet since some testing is needed. bugreport:6110 - Some minor paranthesis fix in Knight Jobchange Quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16362 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17- Updated Monster spawns in Job change Quests to renewal. bugreport:5574masao873-40/+28
- Some minor changes to the Arch Bishop Job change Quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16124 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26Fixed the (bugreport:4096) where player can enter the Test Area without ↵mandark0221-1/+9
passing the written exam. Now player will not be warp inside the Test Area when did not passed the written exam instead the player will be warp back to the written exam entrance. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15795 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30- Removed more trailing tabs.brianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-28Fixed issue in niflheim quest where the script set a variable not related to ↵jmanfffreak1-2/+6
the quest at all (bugreport:4104). Added check in Knight job change test to prevent repeating the quest (bugreport:4099). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15292 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1236-18/+18
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-07Fixed priest job change NPC. bugreport:4862jmanfffreak1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15021 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-19- Fixed some script typos (bugreport:4861, bugreport:5028).brianluau1-1/+1
- Fixed a typo in Blacksmith Quest (fixes issue 5012). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14936 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-21* Removed usage of the 'goto' command from job quests.L0ne_W0lf6-1129/+1180
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14351 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-29- Fixed typo in WoE:SE Castle announcements (bugreport:3714).Kisuka1-0/+1
- Fixed typo of a check in god_weapon_creation.txt (bugreport:3613). - Fixed missing changequest in Knight Job Quest (bugreport:3757). - Fixed placement of Control Device01#aru04 (bugreport:3716). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14178 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-13- Fixed typo on item 6079 (bugreport:3581).Kisuka1-9/+3
- Fixed issue with Knight Quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14058 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-11- Added quest log commands to all job quests.Kisuka6-18/+186
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14054 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-19- Fixed a Assassin Quest question having all correct answers. (bugreport:3260)brianluau1-6/+5
- Fixed lots of random typos, thanks to BloodWist for pointing them out. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13898 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-29Updated ASSIN_Q2 variable range check from < 1 to < 3 to defend against the ↵Paradox924X1-1/+1
variable being stuck at an incorrect value of 1 or 2, caused by logging out or pressing cancel on choices list at an inappropriate time thus rendering the player unable to complete the Assassin Quest. Thanks to Chibi for Report. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13707 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-28* Removed unnecessary text and fixed a goto in the Hunter Jobquest ↵Playtester1-8/+1
(bugreport:3014) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13705 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-28Fixed location error in Blacksmith quest. NPC said Alberta, NPC location in ↵jmanfffreak1-1/+1
Einbech (bugreport:2401) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13335 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-12Reverted donpcevent change to wizard quest. Moved a percentheal, which ↵L0ne_W0lf1-13/+14
should fix bugreport:2311. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13289 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-12* Changed An nonexistent variable in Refine NPC. (bugreport:2340)samuray221-11/+13
* Fixed a Exploit in Thief Quest Skill. (bugreport:2332) * Fixed donpcevent to doevent. (bugreport:2311) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13288 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-21* Deleted Unnecesary Next; in Hunter Job Quest. (bugreports:1665,2239,2179)samuray221-10/+12
* Fixed a bug with the Bio Lab Quest when you relog. (bugreport:1798) * Corrected some Issues with the Waiting Room in Hunter Job Quest. (bugreport:1890) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13227 54d463be-8e91-2dee-dedb-b68131a5f0ec