summaryrefslogtreecommitdiff
path: root/npc/custom
AgeCommit message (Collapse)AuthorFilesLines
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>
2013-08-28Update warper.txtWolf1-2/+2
Bug Fix - http://hercules.ws/board/tracker/issue-7671-warper-npc-bug-for-pre-re/?gopid=20248#entry20248 * For a end, the script will terminate, but returns nothing, because there's nothing else to be returned, as with a close, the script closes and ends the above function.
2013-07-31Fixed Bug #7486j-tkay1-8/+20
- Fixed 'close' issues that causes players to stuck. Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-29BG Queue Fixesshennetsind1-3/+2
Cleared 3 out of 5, #69 Support for the cancel button, for pre-game position to return afterwards and fix to the queue position problem after first game. Signed-off-by: shennetsind <ind@henn.et>
2013-07-05DB Queue Debug Updateshennetsind1-34/+24
Some documentation update on battlegrounds.conf Fixed Hercules Queue Option constants, they're 1-2-3 not 0-1-2. Some Bugfixes to the test script, special thanks to ossi0110 http://hercules.ws/board/topic/1302-bg-queue-debug Signed-off-by: shennetsind <ind@henn.et>
2013-07-05Follow up 28a9fec0916db3d92629ae6e6cd62b5777b09e73j-tkay2-2/+2
- Fixed Bug #7469 - Fixed Bug #7468 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-04Merge branch 'master' of https://github.com/HerculesWS/Herculesj-tkay1-0/+723
2013-07-04Merged/Updated/Added scripts from rAthena.j-tkay4-239/+387
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-06-30Follow up 918b1123963ac2f91a4d074b092ceef1db71b4e8shennetsind1-4/+1
Just dropping a couple debug messages that shouldn't have gone live into the test script Signed-off-by: shennetsind <ind@henn.et>
2013-06-28BG Queue Testingshennetsind1-0/+726
http://hercules.ws/board/topic/1302-bg-queue-debug/ Signed-off-by: shennetsind <ind@henn.et>
2013-06-13Hercules Renewal Phase : Renewalmalufett1-1/+1
Rename SC names to eagis standard. Implement SC Configuration.(see db/sc_config.txt) Skill updates and fixes. Some code optimization. Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2013-05-28Woohooo! Some more cleaning up!Mysteries47-121/+119
- Follow up to 80510a0 { Corrected name placeholders } - Vas cleanup on name placeholders - Small change in /doc/permissions.txt
2013-05-19Update breeder.txtStreusel1-4/+5
Fixed Bug #7271. http://hercules.ws/board/tracker/issue-7271-any-work-in-progress-npc-dialog-manufactoring-quit-and-try-again/ Thanks to bgamez23 for bringing it up.
2013-05-02Fixed bug report #7183Kenpachi1-2/+3
You now wont get stuck when using MVP-Protector NPC (npc/custom/etc/mvp_arena.txt), but there still seems to be a bug with select command when no message is shown by the NPC. http://hercules.ws/board/index.php?app=tracker&showissue=7183
2013-04-15Fixed Bug #7116shennetsind2-2/+2
http://hercules.ws/board/tracker/issue-7116-close-close2-script-commands/ Signed-off-by: shennetsind <ind@henn.et>
2013-03-14-Updated DB, Credits to Euphy & LemongrassStreusel1-2/+8
-Added coin_exchange.txt Credits to EUphy & Lemongrass
2013-03-05-Reverted a disable_items; Credits to EuphyStreusel1-2/+1
-Sorted quest_db.txt by id
2013-02-25* Part one of fixing bugreport:6527. This does not yet change functionality.euphyy3-4/+13
-- Added 'disable_items' to all applicable scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-10Merged rAthena ChangesMysteries1-4/+3
- Added checkidle() command that was present in rAthena since r17126 - Documented checkidle() function - More clearly defined variables in eA Job System documentation - Added missing 'stopnpctimer' in custom Cluckers script
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries9-11/+9
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-19 11:35:55 +0000