summaryrefslogtreecommitdiff
path: root/npc
AgeCommit message (Collapse)AuthorFilesLines
2014-05-13Fixed several files with a missing EOL at EOFHaru28-28/+28
- 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-13Wolfchev's Laboratory Instance Release.Taylor Locke3-595/+3460
2014-05-11Merge branch 'master' of http://github.com/HerculesWS/Herculespanikon1-1/+1
2014-05-11Fixed typo in thqs_ttshoppanikon1-1/+1
2014-05-10Travis improvementsHaru1-1/+1
- Parallelized pre-re and re tests - Added mapserver and script engine tests: this means that travis will detect parse errors in scripts as well as the source now) Signed-off-by: Haru <haru@dotalux.com>
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-05-09Improved the self-test scriptHaru1-69/+82
- Moved tests into a function, so that they can be easily called by external scripts. Ensured that the tests are only executed once. Signed-off-by: Haru <haru@dotalux.com>
2014-04-25Update official Spawn monster - Malaya and Biolab Dungeon 4Michieru3-24/+24
Update many items scripts to official
2014-04-10Fixed issue: 8140panikon1-1/+7
http://hercules.ws/board/tracker/issue-8140-toucan-npc-error-message/ That error usually happens when the player clicked on a NPC that has the view id of a mob, to activate this kind of npc it's needed to be in a 2,2 range from it. If the OnTouch area of a npc, coincides with the 2,2 range of another it's expected that the OnTouch event be put first in stack, because unit_walktoxy_timer is executed before any other function in this case. So it's best practice to put an 'end;' before OnTouch events in npcs that have view ids of mobs to avoid this kind of error. Also updated script_commands.txt to add this recomendation.
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.Haru5-4/+14
- 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-17Fix WoE:SE guild flag doesn't change emblemAnnieRuru1-1/+1
Fix bug 8077 http://hercules.ws/board/tracker/issue-8077-woese-flag-emblems-gives-warning/
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-24Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind3-25/+55
2013-12-24Christmas Patch - 2013-12-23 Supportshennetsind1-182/+2058
Info: http://hercules.ws/board/topic/3614-christmas-patch-gifto/ Signed-off-by: shennetsind <ind@henn.et>
2013-12-21HPM Hooks UpdateHercules.ws2-23179/+23179
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-20Update to aegis info the number of mob that spawn in 13.1 quest to get the ↵Michieru2-23149/+23179
Some_Of_Report item. Update malaya quest, added item Lost_Belongings to Tiyanak mob & fix wrong item id and change headers to Masao original.
2013-12-18Merge pull request #234 from mhalicot/mastershennetsind1-2/+2
Fixed error when unbinding items, removed /* */
2013-12-14Corrected a minor error (wrong constant name) in the bard quest.Haru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2013-12-07Fixed several incorrect script labels and eventsHaru13-19/+19
Signed-off-by: Haru <haru@dotalux.com>
2013-12-04- Fix part 2 of issue 7841Patskie1-5/+5
- http://hercules.ws/board/tracker/issue-7841-endless-tower-part-2/ - Thanks to Haru for the getarg suggestion Signed-off-by: Patskie <escalona3413@gmail.com>
2013-12-03Fixed error when unbinding items, removed /* */Mhalicot1-2/+2
2013-12-01Corrected some accidentally renamed NPCsHaru3-3/+3
- 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 Locke192-558/+558
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-29Fixed a missing/incorrect check in the Moscovia Whale questHaru1-6/+6
- Most of the checks for the GUSLI accessory were completely ineffective, and could be bypassed by wearing any accessory. - Replaced numeric item ID with the item DB constant. Signed-off-by: Haru <haru@dotalux.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.Haru4-4/+424
- [ 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."Haru193-572/+572
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-25Fixed Bug 7841.Taylor Locke1-1/+1
2013-11-25Cleaned up Zeny manipulation in scripts.Taylor Locke193-572/+572
2013-11-11Follow-up to 0b7b3796ec987cbb1c263722b841cfa5795aa6d3Haru6-58/+58
- Replaced some leftover numeric IDs Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru30-213/+213
- Consolidated case in remaining variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru79-448/+448
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-09Consolidated commands called in scripts to their lowercase versionHaru62-403/+403
- 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 mercenary/homunculus constants from AegisHaru1-1/+1
- Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced last leftover numeric sprite ID with the appropriate constant - Special thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
2013-11-08Added support for monster spritename constantsHaru27-211/+213
- 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'shennetsind6-18/+18
2013-11-07Extended script constants to support NPC sprite IDsHaru6-18/+18
- 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'shennetsind2-0/+134
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>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-25 23:50:53 +0000