summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
AgeCommit message (Collapse)AuthorFilesLines
2017-05-10Remove conf dir.Andrei Karas7-13544/+0
2017-04-23Merge pull request #1548 from AtlantisRO/goto_removalRidley1-32/+30
Removed the usage of deprecated command goto from npc scripts (except custom folder)
2017-03-16Fix wrong order of dialogue at Crusader Jobchange Quest. (#1637)skyleo1-14/+22
Fix wrong order of dialogue at Crusader Jobchange Quest.
2017-03-08Removed the usage of deprecated command goto from npc scripts (except custom ↵AtlantisRO1-32/+30
folder). Signed-off-by: Ragno <ragno@atlantis-ro.net>
2016-11-20Replaced some unsupported symbols in AegisNames (step 2)Haru4-15/+15
This removes the remaining unsupported symbols (despite they being official names) in AegisNames: The apostrophe (`'`) sign is suppressed. The full replacement rules (cumulative with the step 1 commit) are thus: - Any apostrophe is suppressed. - Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`). - If the replaced symbol is at a word boundary (beginning or end of the string, or next to another underscore), it is suppressed instead. - If the replacement causes an AegisName conflict, underscores are appended appropriately. Signed-off-by: Haru <haru@dotalux.com>
2016-09-02change *strcharinfo to use constantsAsheraf6-92/+92
2016-07-10Fixed a typo in the alchemist.txt scriptHaru1-3/+3
Signed-off-by: Haru <haru@dotalux.com>
2016-06-26Fixed a typo in the last edit of alchemist.txt (missing comma)Haru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2016-06-25Replaced _() with _$() in scripts, where appropriateHaru1-8/+8
Signed-off-by: Haru <haru@dotalux.com>
2016-06-25Proof-of-concept best scripting practices for HULD (draft)Haru1-102/+159
- Replaced hardcoded item names with getitemname() Only the npc/jobs/2-2/alchemist.txt script was modified, as a proof of concept. Signed-off-by: Haru <haru@dotalux.com>
2016-06-25Proof-of-concept best scripting practices for HULDHaru1-676/+776
- `mes` strings are split by sentences: each string contains one and only one sentence. Line-break hints are specified with \r (and for readability the string is split in multiple lines with parse-time concatenation, without using the '+' operator) - When sentences need concatenation (variable names or values), sprintf is used, so that the generated translatable string is still one and only one. The `_()` macro is used inside sprintf, to mark the string as translatable. - `select()` / `prompt()` entries are in separate entries, separated by commas, where possible (it makes their translation easier) - This makes it easier to translate NPCs to languages with different sentence ordering (and with longer or shorter sentences). In the generated .pot, sentecnes will no longer span across several strings. Only the npc/jobs/2-2/alchemist.txt script was modified, as a proof of concept. Signed-off-by: Haru <haru@dotalux.com>
2016-02-29Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where appropriateEmistry6-20/+27
2016-01-16Script Standardization: changed select format in jobs folderDastgir7-299/+299
2015-12-31Replaced leftover -1 view IDs with FAKE_NPCHaru4-74/+74
Signed-off-by: Haru <haru@dotalux.com>
2015-12-31Replace -1,{ with FAKE_NPC,{AnnieRuru5-16/+16
replace using Notepad++
2015-12-18ItemID to Constant: instances/jobs FolderDastgir7-166/+166
2015-12-15Standardized header in scripts (part 5)Haru7-321/+290
- Now including GPL-compliant license/copyright info - Restored some missing copyrights - Jobs scripts folders Signed-off-by: Haru <haru@dotalux.com>
2015-09-25More aggressive whitespace cleanup. Follow up to 51329e6Haru1-3/+0
Signed-off-by: Haru <haru@dotalux.com>
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru7-504/+504
Signed-off-by: Haru <haru@dotalux.com>
2014-10-28Removed use of 'checkquest' from scripts (common folder)Haru6-33/+33
Signed-off-by: Haru <haru@dotalux.com>
2014-05-17Added missing changequest commands on Alchemist Job Change Quest.Taylor Locke1-2/+7
2014-05-13Removed trailing whitespace (scripts)Haru7-30/+30
Signed-off-by: Haru <haru@dotalux.com>
2013-12-07Fixed several incorrect script labels and eventsHaru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke4-7/+7
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."Haru4-7/+7
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 Locke4-7/+7
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-1/+1
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-09Consolidated commands called in scripts to their lowercase versionHaru1-2/+2
- Added a note about variables and command scripts case sensitivity. Even though the engine still accepts variable, function and command names in a case insensitive way, it is discouraged to rely on such behavior. Please update your custom scripts as soon as possible. Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka7-67/+67
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru7-146/+154
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries3-5/+3
2013-01-29Updated placeholders.Mysteries2-6/+2
2012-12-08* Updated Geneticist, Warlock, and Sura job quests to their latest versions.euphyy7-8/+8
* 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-09-05* Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and ↵euphyy5-39/+24
whisper system documentation (doc\whisper_sys.txt) * Follow-up r16745, fixed a few typos in atcommand documentation (doc\atcommands.txt) * Minor cleaning - spacing, tabulation, comments, dividers git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16746 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10* Raw revert of all job files back to r16578, prior to the rewrite in ↵euphyy7-8314/+4459
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-10* Optimized Eden Quest lv. 11-25 (re\quests\eden\)euphyy1-1/+1
* Fixed bugreport:6427 with new Alchemist quest (jobs\2-2\alchemist.txt) * Other misc changes/fixes... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16615 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-05- This should fix all job quests which didn't work after the update.masao876-77/+147
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 ↵masao877-17/+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 .masao874-5/+5
* 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.masao877-4497/+8299
* 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.daegaladh2-0/+4
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:)daegaladh7-0/+13412
-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 ↵shennetsind7-13412/+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
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial1237-15/+15
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12- Fixed a divide-by-zero error in airships.txt (bugreport:651)brianluau1-10/+10
- Fixed a typo in Crusader jobchange quiz. (bugreport:443) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-09-20- Updated strnpcinfo documentation, following r14929.brianluau1-1/+2
- Fixed some script typos. (bugreport:5047, bugreport:5049, bugreport:5056) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14960 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-14* Quest log kill count now updated properly. (Added from topic 253813)L0ne_W0lf4-24/+0
* More battleground editing, and some bug fixes. - * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING * - Rewrote the Badge Exchange NPC in bg_common.txt, is official now. - Other changes to the bg_common folder, including disabled GM NPC. - Completely rewrote Flavius for the most part, from ground up. - Moved old Flavius battlegrounds to /custom/battleground folder. - Restored original bg_common, and KVM to /custom/battleground - Fixed wall bugs in Tierra Gorge, and added an oninit to the timers. - Other minor tweaks to both Tierra Gorge and KVM scripts. - Fixed the pseudo-cooldown on KVM not working properly, I hope. - Added global time2str function which will be used later in Endless tower. * Applied Epoque's mapflag clean up, which removes flags from scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-21* Removed usage of the 'goto' command from job quests.L0ne_W0lf5-384/+268
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14351 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-22Removed unnecessary event call on a missing event. (bugreport:4140)Paradox924X1-1/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14268 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-30- Fixed a copy-paste 'nowarpto' mapflag. (bugreport:3688)brianluau1-0/+1
- Updated documentation for 'rentitem'. (follow up to r14082) - Fixed a variable name in Valentines 2009 quest. (bugreport:3644) - Added a missing 'input' in Alchemist Job quest. (bugreport:3695) - Fixed a typo in Cooking Quest. (bugreport:3691) - Fixed some typos in Veins Quest. (bugreport:3588) and (bugreport:3692) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14111 54d463be-8e91-2dee-dedb-b68131a5f0ec