summaryrefslogtreecommitdiff
path: root/npc/custom
AgeCommit message (Collapse)AuthorFilesLines
2014-10-30Deprecated checkriding and setriding commandsHaru3-20/+21
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkdragon and setdragon commandsHaru1-1/+2
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-30Deprecated checkmadogear and setmadogear commandsHaru1-7/+12
Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru <haru@dotalux.com>
2014-10-28Removed use of 'checkquest' from scripts (common folder)Haru2-44/+44
Signed-off-by: Haru <haru@dotalux.com>
2014-10-24Renamed ismounting, setmounting, @mount2Haru2-3/+3
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-10-06Fix Bug 8133dastgir1-1/+4
* Disguise Event was having Renewal and Pre-Renewal Monster Constant in an array without any checks
2014-09-23Fix blackjack script by logging out to prevent zeny deletionAnnieRuru1-6/+15
there is a well known bug of this script (I've known this since eathena actually) when you are certainly going to lose the bet, log out immediately while the card are still dealt and you don't get zeny deletion thx to Holiness to bring this up again
2014-09-02Update hunting_missions.txt to follow author's method on fixing character ↵AnnieRuru1-2/+16
deletion bug https://github.com/rathena/rathena/commit/3c24f45
2014-08-02Fixed Bug #8248Mumbles1-0/+4
http://hercules.ws/board/tracker/issue-8248-job-master-bug/ - Job Master now properly resets Novice Basic Skill upon job change into Baby Novice. - Sparkles and thanks to @Ridley8819 for pointing out the issue.
2014-05-20Fixed an exploit in the custom jobmaster NPCHaru1-95/+165
- Improved legibility (renamed variables, replaced numbers with constants. - Changed syntax to match Hercules standards. - Fixed status point exploit upon Baby Novice job change. - Special thanks to bgamez23. Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed trailing whitespace (scripts)Haru30-162/+134
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed several files with a missing EOL at EOFHaru1-1/+1
- 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>
2014-05-11Fixed typo in thqs_ttshoppanikon1-1/+1
2014-05-10Changed set_reg behavior on pc_setparam failure, now it won't simply END the ↵panikon1-10/+20
script, if a dialog window is open it'll also CLOSE it. Corrected Zeny formula in THQS
2014-05-10Optimized THQS_TTShop.txt and corrected a minor mistakepanikon1-478/+158
Added npc_market_data_db to inter-server.conf Added shop message to messages.conf Fixed small typo in clif_GM_kickack
2014-03-21Fix hunting mission and clarify weight's unitAnnieRuru1-3/+6
Fix hunting mission not able to take mission after a character has deleted http://hercules.ws/board/tracker/issue-8104-hunting-missiontxt-delete-character/ Clarify Weight and MaxWeight unit as in 0.1 http://hercules.ws/board/tracker/issue-7836-weight-and-maxweight/
2014-03-18Created npc/dev/ folder for scripts with development or testing purposes.Haru1-726/+0
- Moved npc/custom/test.txt to npc/dev/test.txt - Special thanks to AnnieRuru for the idea. Signed-off-by: Haru <haru@dotalux.com>
2014-03-17Added regular expression matching script commands and operatorsHaru1-1/+16
- The script command pcre_match and the operator ~= will return the number of regular expression matches in a given string (roughly equivalent to the php function preg_match or the perl operator =~) - The operator ~! is the opposite of ~= (roughly equivalent to the perl operator !~) - See script_commands and npc/custom/test.txt for more information. Signed-off-by: Haru <haru@dotalux.com>
2014-03-10Fixed a crash caused by NPC variable references in callfuncHaru1-32/+152
- Fixes bugreport:8074, thanks to ahmadshidqi http://hercules.ws/board/tracker/issue-8074-help-crash/ - Also fixed some DBMap allocation mistakes introduced in 4f3156b. - Added testcases to the self-test script. - Made possible thanks to Ind. Signed-off-by: Haru <haru@dotalux.com>
2014-03-05Added some callsub tests to the script testsuiteHaru1-2/+63
- Also includes testcases for the recent ref fixes/changes. Signed-off-by: Haru <haru@dotalux.com>
2014-01-14Update Hunting Mission ossi01101-3/+3
Update Hunting_Mission.txt to the new SQL dbs
2014-01-13Improved overwriting priority of variables/constants/parametersHaru1-0/+26
- Fixes issue 7968, thanks to Moguri http://hercules.ws/board/tracker/issue-7968-trader-npc-not-working/ - Corrected sprite name for KO_KAGE to match latest kRO info (previouly KO_ZANZOU, conflicting with a Kagerou/Oboro skill identifier) - Updated self-test script to include checks for constants and for setd and getd. - Made possible thanks to Ind. Signed-off-by: Haru <haru@dotalux.com>
2014-01-12Updated script engine self-test npc with array testsHaru1-7/+111
Signed-off-by: Haru <haru@dotalux.com>
2013-12-18Merge pull request #234 from mhalicot/mastershennetsind1-2/+2
Fixed error when unbinding items, removed /* */
2013-12-07Fixed several incorrect script labels and eventsHaru1-2/+2
Signed-off-by: Haru <haru@dotalux.com>
2013-12-03Fixed error when unbinding items, removed /* */Mhalicot1-2/+2
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke24-73/+73
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-30Fixed an issue with assignment operators and expressionsHaru1-55/+25
- Assignment operators would not work correctly, or at all, when followed by an expression (as opposed as a value). - Fixes bugreport:7864, thanks to Lelouch, Ind. - Added associativity tests for those operators to the self-test script. - Added total error count to the self-test script (thanks to Lighta.) Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Fixed some case mismatches in the Flavius bgqueue test scriptHaru1-3/+3
Signed-off-by: Haru <haru@dotalux.com>
2013-11-30- Fix Bug 7850Patskie1-8/+9
- Replace incorrect end commands with close - Update variable syntax Signed-off-by: Patskie <escalona3413@gmail.com> Fix variables and character stuck at healing Signed-off-by: Patskie <escalona3413@gmail.com>
2013-11-28Added support for automatic concatenation of adjacent string literalsHaru1-0/+14
- [ This commit is part of a larger script engine related update ] - Adjacent string literals are now automatically concatenated into one string upon parsing. - Adjacent string literals are string literals (i.e. "such as this", with only whitespace (including line breaks and/or comments) between them. For example, the lines: mes "this will be concatenated " /* skipping this comment */ " into one string"; // at parse time will produce an output of "this will be concatenated into one string". - The feature brings parity with other languages (i.e. C), and makes it easier to split long strings in multiple lines, without having to resort to a, slower, run-time string concatenation operator ('+') - Special thanks to Trojal for the idea. Signed-off-by: Haru <haru@dotalux.com>
2013-11-28Corrected operator precedence table.Haru2-3/+419
- [ 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."Haru25-74/+74
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 Locke25-74/+74
2013-11-11Follow-up to 0b7b3796ec987cbb1c263722b841cfa5795aa6d3Haru1-1/+1
- Replaced some leftover numeric IDs Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru24-180/+180
- Consolidated case in remaining variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru20-151/+151
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-09Consolidated commands called in scripts to their lowercase versionHaru7-32/+32
- 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 constantsHaru2-14/+16
- 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-07Merge remote-tracking branch 'upstream/master'shennetsind1-4/+4
2013-11-07Extended script constants to support NPC sprite IDsHaru1-4/+4
- Added support for constants whose name begins with a number. - Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40. - Replaced calls to setnpcdisplay with hardcoded numeric IDs to constants. - Thanks to Yommy. Signed-off-by: Haru <haru@dotalux.com>
2013-11-06Merge remote-tracking branch 'origin/master'shennetsind1-0/+133
Signed-off-by: shennetsind <ind@henn.et> Conflicts: conf/messages.conf src/common/mmo.h src/map/pc_groups.c src/map/pc_groups.h
2013-11-06Follow up eaf04b9a2f0b399027df251c5d19d58d74e24e6ashennetsind1-19/+19
Adjustments to the team-splitting algorithm Thanks to Haruna! Signed-off-by: shennetsind <ind@henn.et>
2013-11-06BG Queue Updateshennetsind1-11/+79
Enabled Party/Guild joining methods, Implements first attempt at the splitting algorithm (Thanks to jaBote!) Checks item 1 on issue #69 Help us test! -- http://hercules.ws/board/topic/1302-bg-queue-debug/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-05Fixed grammarsevenzz231-4/+5
Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-11-01Item Binding System Final.sevenzz231-0/+132
Fixed, some issue thanks to Master Ind ;) Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka63-690/+690
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru52-134/+40
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-09-16Corrected line endings and BOM issues with several filesHaru11-11/+11
- 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-08-29Corrected an integer overflow in npc/custom/etc/marriage.txtHaru1-1/+1
Thanks to Euphy for bringing this to my attention. Signed-off-by: Haru <haru@dotalux.com>