summaryrefslogtreecommitdiff
path: root/npc/other
AgeCommit message (Collapse)AuthorFilesLines
2014-10-24Renamed ismounting, setmounting, @mount2Haru2-2/+2
To avoid ambiguity: - The script command ismounting is now hascashmount - The script command setmounting is now setcashmount - The at-command @mount2 is now @cashmount Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed trailing whitespace (scripts)Haru11-50/+48
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>
2014-05-13Fixed several files with a missing EOL at EOFHaru2-2/+2
- All text files should end with an EOL. Period. - See http://robots.thoughtbot.com/no-newline-at-end-of-file for info on how to configure the most common text editors to do it automatically for you. Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke13-25/+25
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-28Corrected operator precedence table.Haru1-1/+1
- [ This commit is part of a larger script engine related update ] - Operator precedence rules now closely follow those of languages such as C and derivates/related (C++, Java, PHP, etc.) - Please note that if you had custom scripts with non parenthesized expressions containing bitwise |, &, ^ operators, they may behave incorrectly now (or perhaps they were already behaving incorrectly, since the previous behavior was undocumented). - Added an up to date operator precedence/associativity table in the script documentation. - Added an operator/keyword self-test script in the npc/custom folder, in case if may be of some use for future regression-testing.
2013-11-28Revert "Cleaned up Zeny manipulation in scripts."Haru13-25/+25
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 Locke13-25/+25
2013-11-11Follow-up to 0b7b3796ec987cbb1c263722b841cfa5795aa6d3Haru2-18/+18
- Replaced some leftover numeric IDs Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-11/+11
- Consolidated case in remaining variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru7-19/+19
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-09Consolidated commands called in scripts to their lowercase versionHaru1-1/+1
- 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-11-08Added support for monster spritename constantsHaru3-36/+36
- 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-11-04Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40Haru2-2/+2
- Changed a few leftover NPC IDs to constants - Note: we're still missing support for mob sprite constants, so the NPCs using mob sprites are still not converted. Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka29-1328/+1328
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru34-5203/+4650
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-10-19Instance Dungeons Updateshennetsind1-0/+150
As requested by the community in http://hercules.ws/board/topic/1702-implement-rathena-npc/ we're merging in the latest of rAthena's dungeons, this includes the rewriting of all instance dungeons and the addition of 4 dungeons that were not present previously (BakonawaLake, BangungotHospital, BuwayaCave and OldGlastHeim). Update also includes the ability for instances to reset (or be destroyed if instance files were disabled/removed) upon @reloadscript, instance scripts are able to control to what stage the instances are to be reset via the instance_set_respawn (reload spawn) script command, OnInstanceInit labels are now triggered when the instance starts via instance_init (and upon reload), they may be used alongside instance variables (which are persistent to @reloadscript) to save players' progress. - NPC Changelog: -- npc/instances/EndlessTower.txt --- 2.2 Instance system rewrite. [Euphy] --- 2.3 Added some missing announcements. [Euphy] --- 2.4 Added GM management function. [Euphy] -- npc/instances/NydhoggsNest.txt --- 1.5 Instance system rewrite. [Euphy] --- 1.6 Added GM management NPCs. [Euphy] -- npc/instances/OrcsMemory.txt --- 1.7 Instance system rewrite. [Euphy] -- npc/instances/SealedShrine.txt --- 2.3 Instance system rewrite. [Euphy] -- npc/other/gm_npcs.txt --- 1.0 First version. [Euphy] -- npc/re/instances/BakonawaLake.txt --- 1.0 First version. [Euphy] --- 1.1 Added GM management NPC. [Euphy] -- npc/re/instances/BangungotHospital.txt --- 1.0 First version. [Euphy] --- 1.1 Added GM management function. [Euphy] -- npc/re/instances/BuwayaCave.txt --- 1.0 First version. [Euphy] -- npc/re/instances/HazyForest.txt --- 1.1 Instance system rewrite. [Euphy] -- npc/re/instances/MalangdoCulvert.txt --- 1.0b Fixed incorrect use of 'close'. [Joseph] --- 1.1 Instance system rewrite. [Euphy] -- npc/re/instances/OctopusCave.txt --- 1.1 Instance system rewrite. [Euphy] -- npc/re/instances/OldGlastHeim.txt --- 1.0 First version. [Euphy] Special Thanks to Haru, Uziel for their contributions to this update, and ossi0110 for helping us debug it. Signed-off-by: shennetsind <ind@henn.et>
2013-09-16Corrected line endings and BOM issues with several filesHaru5-5/+5
- 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-05-26Header scripts adapted to HerculesSirius1-4/+2
2013-05-26* Poring War: Added missing barrier resets [Euphy's rAthena fix based on my ↵Sirius1-13/+16
report] * Added support for Baby Novices in the Novice's Quest Skills * Hotfix for the Blacksmith Rank bugreport: http://hercules.ws/board/tracker/issue-7288-max-refine-blacksmith-rank/ * Added duplicates from pre-re Mage Quest required in Sage Quest Skill.
2013-04-17Fixed Bug #6466shennetsind1-453/+453
All credits to Ai4rei! Thank you! http://hercules.ws/board/tracker/issue-6466-fortune/ Signed-off-by: shennetsind <ind@henn.et>
2013-04-15Fixed Bug #7154shennetsind1-2/+2
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-02-19-Moved Arena to main folder so it can be used by pre-re and reStreusel8-0/+8951
Signed-off-by: Streusel
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries24-63/+24
2013-01-29Updated placeholders.Mysteries5-15/+5
2013-01-13* Updated WOE Controller script to v1.5, which overhauls the rewards system ↵euphyy1-9/+12
(with many new features). * Fixed another Renewal Izlude coordinate (bugreport:7169). * Fixed a mail bug, since r16574. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-11- Fixed bugreport:6993, invalid item id in mercenary script. ↵j-tkay1-707/+212
(other/mercenary_rent.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17016 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10* Added a missing shop item, bugreport:6878 (re\merchants\shops.txt)euphyy1-4/+5
* Fixed a few incorrect labels in Poring War script, bugreport:6794 (other\poring_war.txt) * Follow-up r16900, added svn:eol-style=native property. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-08* Updated Renewal 'Mjolnir' item (bugreport:6646)euphyy2-4/+5
* Updated slots on RWC 2008 Dragon Helms (bugreport:6645) * Other minor changes... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16765 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-07- Fixed bugreport:6588, grammatical errors here and there. (other/pvp.txt & ↵j-tkay1-66/+60
cities/morocc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16756 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-05* Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and ↵euphyy1-3/+0
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-09-01* Follow-up r16726, more standardization on docs.euphyy3-41/+38
* 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-27* Optimized "3rd Item Seller" script (re\merchants\3rd_trader.txt)euphyy2-2/+2
* Optimized Eden Quest lv. 71-85 (re\quests\eden\) * Deleted a duplicate NPC, bugreport:6564 (re\quests\quests_dicastes.txt) * Other small fixes git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16715 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-20* Fixed a typo in guild scripts, bugreport:6517 (guild\gefg_cas02.txt)euphyy1-21/+17
* Misc. standardization... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16672 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-13* Fixed cutin errors in Fortune script, bugreport:6466 (other\fortune.txt)euphyy1-454/+453
* Fixed item #5503, bugreport:6440 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16630 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-12- Optimized and fixed Medal Distributor (Dual Race) disappears accordingly. ↵j-tkay1-6850/+1098
(other/monster_race.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16626 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10* Optimized Eden Quest lv. 11-25 (re\quests\eden\)euphyy1-0/+0
* 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-09- Added svn:eol-style=native property on some recently added text files.brianluau1-4723/+4723
- Renamed upgrade_svn16517.sql to the correct SVN revision it was added in (r16518). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16614 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07- Merged other/turbotrack into one template. (other/Turbo_Track.txt)j-tkay9-11006/+4723
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16597 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07* Moved RE coordinates of Bullet/Magazine Dealers in Izlude, bugreport:6410euphyy1-2/+2
* 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-04Fixed and cleaned Izlude Arena and some other scripts.daegaladh3-29/+15
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16574 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh31-0/+36119
-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 ↵shennetsind39-49421/+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-05* Massive cleaning of "The Sign Quest" script, ~90kb reduction ↵euphyy1-43/+44
(quests\The_Sign_Quest.txt) * Removed OnInit label of "Card Trader" NPC, since it most likely won't be used (other\card_trader.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16377 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-02* Neuralizer is no longer consumed upon failure (bugreport:6040)euphyy1-9/+6
* Some cleaning of the Sorcerer job change quest (jobs\3-2\sorcerer.txt) * Cleaning of "Bunny Band Quest" script (quests\bunnyband.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16367 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-20* Optimized "Guild Battle NPC" (other\guildpvp.txt)euphyy4-422/+138
* 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-10* Massive compression of "Card Trader" script, from 123kb to 7kb! ↵euphyy1-4141/+144
(other\card_trader.txt) * Some optimization of Ash-Vacuum quests (quests\quests_13_1.txt) * "Sphinx Mask Quest" script optimized (custom\quests\sphinx_mask.txt) * Moved "Caral" NPC from non-existent moc_fild04 to cmd_fild08, as per bugreport:5959 (custom\quests\thq\THQS_Quests.txt) * Fixed Job_Archbishop/Job_Archbishop_T typos in job change script, but other issues in bugreport:5938 not addressed (jobs\3-1\archbishop.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16254 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01- Replaced more -> rAthena (follow up to r15251).brianluau1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31- Added new towns to the custom warper. bugreport:5878masao871-1/+1
- Fixed a bug in the monster_race.txt where you would get stuck in the dialog window. bugreport:5861 - Fixed a bug in 71-88 eden group mission npc's where you would get stuck in the dialog window. bugreport:5875 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16180 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26- Fixed wrong areawarp coordinations in all arena rooms. bugreport:3494masao876-11/+17
- Added check if the player invoking one of the Izlude Arena NPC's in sec_pri02 is actually a GM. bugreport:3494 - Some other random stuff in arena files. bugreport:3494 - Follow up r15278 , all EF_WIND effects should now work properly. bugreport:5369 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16152 54d463be-8e91-2dee-dedb-b68131a5f0ec