summaryrefslogtreecommitdiff
path: root/npc
AgeCommit message (Collapse)AuthorFilesLines
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>
2013-11-05Fixed grammarsevenzz231-4/+5
Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-11-04Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40Haru12-17/+17
- 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-11-04Implemented correct refine success rates above +10Haru1-7/+7
- Refine rates above +10 are updated with the official values obtained from Aegis. Note: There are no safe refines above +10 anymore. - Corrected the above +10 refine NPC to decrease the refine level by 3 in case of failure, according to what observed in Aegis. - Special thanks to malufett, Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-11-01Item Binding System Final.sevenzz232-0/+133
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 ↵Kisuka580-9915/+9915
npcs to use this.
2013-10-24Follow up 418dd821c91ae19723a7b7b531e64b9c4565d555shennetsind1-1/+1
Minor Hercules divergence. Thanks to Haruna, Michieru. Signed-off-by: shennetsind <ind@henn.et>
2013-10-24Update to last rAthena npc.Michieru784-30991/+42442
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-10-19Instance Dungeons Updateshennetsind14-6840/+7280
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-10-11Moscovia Quest Update / Catalog Magician Moveshennetsind4-410/+450
Partial Merge of 198dc48 / 48d36c2 Changelog: - npc/merchants/buying_shops.txt -- 1.1a Moved Catalog Magician to Renewal path. [Euphy] - npc/quests/quests_moscovia.txt -- 2.0b Bug fixes. [Lemongrass] -- 2.1 Fixed incorrect use of 'close'. [Joseph] -- 2.2 Updated RE/Pre-RE EXP. [Euphy] - npc/re/merchants/catalog.txt -- 1.1 Updated dialogue. [Euphy] Closes #149 Signed-off-by: shennetsind <ind@henn.et>
2013-10-11Minor Veins NPC Updateshennetsind3-1/+12
Partial Merge of eeafb5393f09b4fbea6d6f6df20f50fdbb6db432 - Moved "Wincing Old Man" (from quests_veins) to pre-re/re coordinates. [Euphy] Closes #145 Signed-off-by: shennetsind <ind@henn.et>
2013-10-10Homun-S Quest Updatedshennetsind3-145/+1363
Partial Merge of 0b68607 Quest Changelog: - 1.2 Replaced with official script. [Euphy] Closes #177 Closes #178 Signed-off-by: shennetsind <ind@henn.et>
2013-10-10Updated Spawns for iz_dun05, dic_dun, dewata and dew_dunshennetsind4-39/+43
Changelog: - dew_dun.txt -- 1.1 Updated spawn delays. [Euphy] - dic_dun.txt -- 1.2 Updated Nightmare spawns and names. [Euphy] - iz_dun.txt -- 1.4 Official F6 spawns [Euphy] - dewata.txt -- 1.1 Updated spawn delays. [Euphy] Closes #170 Signed-off-by: shennetsind <ind@henn.et>
2013-10-07RE El Dicastes Quest Updateshennetsind1-147/+178
Changelog: 2.1 Added reset option to "Kareka". [Euphy] 2.2 Added Izlude duplicates. [Euphy] 2.3 Added GM management NPCs. [Euphy] Closes #146 Signed-off-by: shennetsind <ind@henn.et>
2013-10-07Updated tu_acolyte.txtshennetsind1-57/+110
File Changelog: 1.7 Fixed exp, texts, and requirements in pre-renewal [Daegaladh] 1.8 Updated to match the official script. [Euphy] 1.9 Added GM management function. [Euphy] Closes #176 Signed-off-by: shennetsind <ind@henn.et>
2013-10-07Fixed pre-re NPC Errorshennetsind1-42/+0
Mage solution npcs were present twice, in npc/quests and in /npc/pre-re/jobs/1-1/mage I've removed the mage ones are there is no difference between the re and non-re one, warning is gone. Signed-off-by: shennetsind <ind@henn.et>
2013-09-16Corrected line endings and BOM issues with several filesHaru112-113/+113
- 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-29Quest's added.Wolf2-0/+44
http://hercules.ws/board/tracker/issue-7214-moroccpayon-solution-npcs-missing/?gopid=20262#entry20262
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-08-26Added an integer overflow check on literal values in the script parserHaru3-14/+14
- When attempting to use a value greater than INT_MAX or smaller than INT_MIN (about +/- 2 billions), an error message will be shown and script execution will be aborted. - Corrected some scripts that were attempting to use such values. - Fixed some possible issues when using literal negative values in scripts. Thanks to Ind for his help on this issue (figuring it out and fixing it) Signed-off-by: Haru <haru@dotalux.com>
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-28Fixed bug #7510j-tkay1-2/+2
- Enabled Dewata warps. http://hercules.ws/board/tracker/issue-7510-dewata-legend-quest-incomplete/ Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-07-11Some fixes regarding Sentences, and AlignmentMysteries1-0/+17
Also, Fixed Bug#7504 - http://hercules.ws/board/tracker/issue-7504-missing-monsters/?gopid=1929 1#entry19291 ~Merged from rAthena
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-04Follow up 28a9fec0916db3d92629ae6e6cd62b5777b09e73j-tkay1-1/+1
- Corrected the file path for ticket_refiner.txt. 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-tkay43-1806/+9713
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 07:14:12 +0000