summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2013-11-07Merge remote-tracking branch 'upstream/master'shennetsind5-38/+113
2013-11-07Further item bind adjustmentsshennetsind10-17/+21
Thanks to Haruna! Signed-off-by: shennetsind <ind@henn.et>
2013-11-07Extended script constants to support NPC sprite IDsHaru1-35/+76
- 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-07Item Bound Fixes/Adjustments/Improvementsshennetsind24-384/+275
Special Thanks to Haruna Signed-off-by: shennetsind <ind@henn.et>
2013-11-07Corrected a const pointer being incorrectly initializedHaru1-2/+1
- Fixes bugreport:7804, thanks to kyeme http://hercules.ws/board/tracker/issue-7804-warning-c4090-function Signed-off-by: Haru <haru@dotalux.com>
2013-11-07Fixed equip command failing when another item of the same kind is equippedHaru1-1/+1
- The command now correctly skips the already equipped items, rather than trying to equip them again (and fail during the process). - Special thanks to Poison. Signed-off-by: Haru <haru@dotalux.com>
2013-11-06Update Fixshennetsind3-1/+3
Re-added the changes that were gone in the update conflict. Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Merge remote-tracking branch 'origin/master'shennetsind21-127/+712
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-07Added _MSC_VER check.Shido1-0/+5
* This will check if C/C++ Compiler Version since VER 18.00 already defined Interlocked/Interlocked64. Signed-off-by: Shido <the.keikun@gmail.com>
2013-11-07HPM Hooks UpdateHercules.ws3-0/+30
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-06Updated to latest Herculesshennetsind1-13/+40
Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Merge remote-tracking branch 'upstream/master'shennetsind66-1002/+1804
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/pc.c
2013-11-06Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind1-179/+180
2013-11-07HPM Hooks UpdateHercules.ws1-179/+180
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-06Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind56-251/+418
2013-11-06Merge pull request #217 from HerculesWS/script-checkershennetsind55-197/+364
Introducing the Hercules Standalone Script Syntax Checker
2013-11-06BG Queue Updateshennetsind4-15/+41
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-06Fixed Bug 7799shennetsind3-27/+12
SC_MOONSTAR, SC_SUPER_STAR are no longer removeable by sc_end all, and sc clear. Modified sc_config.txt, added a new flag (0x80/128) for such cases. http://hercules.ws/board/tracker/issue-7799-sc-moonstar/ Special Thanks to kyeme. Signed-off-by: shennetsind <ind@henn.et>
2013-11-06HPM Hooks UpdateHercules.ws1-54/+54
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-06Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind5-3/+377
2013-11-06Modified status_calc_shennetsind14-122/+132
Replaces the previous 'first' flag with a multi-option flag capable of selectively determining calls where the recalculation must not be hold by delayed damage, and therefore must take place immediately. This fixes issues caused by actions that require immediate recalculation e.g. on-level-up max_hp update, also modified @baselevel where status_calc was being called after the heal and not before, causing it not to be fully healed. Special Thanks to Haruna! <3 Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Modified @command loadingshennetsind3-14/+12
So that HPM plugins are able to override default commands, thanks to Akkarin for bringing it up. Signed-off-by: shennetsind <ind@henn.et>
2013-11-05cbasetypes.h updateshennetsind1-6/+6
partial usage of ea:15242 (ai4rei) -- will revisit the remaining. Signed-off-by: shennetsind <ind@henn.et>
2013-11-05Introducing the Hercules Standalone Script Syntax CheckerHaru55-197/+364
- Added a command line argument '--script-check' to check a script's syntax without running the server (and without requiring a SQL connection). Usage: ./map-server --script-check /path/to/the/script.txt - For convenience, a script-checker bash script is provided, to set the path correctly when called from a different directory. Usage: /path/to/Hercules/script-checker /path/to/the/script/to/check.txt - While the script checker will supposedly work under windows as well, no convenience scripts are currently provided for platforms other than UNIX (feel free to open a pull request with a .bat launcher or whatever you like) - Integration with IDEs or text editors is possible. In fact, I already have a fully functional plugin for vim (through vim-syntastic), and if there's enough interest, I'll publish it. - screenshot: http://d.pr/i/NOBD - If you want an online checker, http://haru.ws/scriptchecker/ is running this code, without modifications and will be kept up to date (without any warranty though.) - Special thanks to Ind, Yommy, Streusel, who helped making this possible, in a way or another.
2013-11-05HPM Hooks UpdateHercules.ws5-3/+377
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-04Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind7-60/+171
2013-11-04pc_groups interfacedshennetsind6-129/+212
The last file without a interface is now no more (date.h doesn't count :P). Modified the way permissions are stored in order to enable plugins to be able to create permissions ( pcg->add_permission("name") [returns permission key] ). Special Thanks to Haruna! Closes #121 Signed-off-by: shennetsind <ind@henn.et>
2013-11-04Standardized the format of some NPC parse error messagesHaru2-39/+39
- For better machine-parsing of such messages (i.e. in IDEs) Signed-off-by: Haru <haru@dotalux.com>
2013-11-03Added some packetver-related flags to the UNIX build scriptHaru2-7/+11
- The --disable-packetver-re (or --enable-packetver-re=no) flag prevents the definition of PACKETVER_RE (without editing mmo.h) - The --with-key1=, --with-key2=, --with-key3= flags override the encryption key defined by the current packetver. All three flags are required if at least one is used, or they'll be ignored. - These options are mostly useful for buildbots, developers who often use git bisect, or users who want to minimize their diffs and still want to override those settings. - (unrelated minor tweak) Silenced an unnecessarily verbose STDERR message caused by the $CC shipped with clang-5 during the MinGW check.
2013-11-03Allow warp duplicates without a 'facing' valueHaru1-2/+4
- Warps don't require a facing, so their duplicates shouldn't either. - Credits to jaBote. Signed-off-by: Haru <haru@dotalux.com>
2013-11-03Merged Pull Request #195 (@autoloottype)Haru3-12/+117
- Small tweaks to the command, fixed merge conflicts Signed-off-by: Haru <haru@dotalux.com>
2013-11-02Fixed Bug #7621shennetsind2-11/+11
Magicmushroom poison now properly cancels skills being cast upon activating one of its own, also modified unit_skillcastcancel's error message upon timer deletion failure so that it becomes easier to debug in the future. http://hercules.ws/board/tracker/issue-7621-erro-map-server-waraitake/ Thanks to Beret Signed-off-by: shennetsind <ind@henn.et>
2013-11-02Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind3-0/+62
2013-11-02Fixed Bug #7786shennetsind4-22/+28
@speed no longer screws up on map change, modified @speed feedback so its clear whether the permanent speed flag is gone, enhanced @speed by making it capable of bypassing battle_config.max_walk_speed, made status_calc_speed rely on MIN_WALK_SPEED instead of the hardcoded 0, modified MIN_WALK_SPEED from 0 to 20 (it 1) wasnt being respected and 2) less than 20 clips). @speed is now capable of moving the character faster, prior to this commit @speed 0 was equivalent to @speed 50 of this new version, @speed 20 for example is now the new maximum (and moves much faster). http://hercules.ws/board/tracker/issue-7786-speed-bug-when-changing-maps/ Thanks to Mumbles for all the info Signed-off-by: shennetsind <ind@henn.et>
2013-11-02Fixed Bug #7793shennetsind1-2/+5
package parser will now throw an error when using a invalid random: field, also fixed another error message (was missing a double %) http://hercules.ws/board/tracker/issue-7793-item-packages-crash/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-02HPM Hooks UpdateHercules.ws3-0/+62
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-02Fixed Shadow System Bonusesshennetsind4-4/+4
Item in shadow slots are now able to give bonuses properly, thanks to rosfus for pointing it out! Also added the missing constants for script handling. Signed-off-by: shennetsind <ind@henn.et>
2013-11-02Updated to latest Herculesshennetsind1-0/+3
Signed-off-by: shennetsind <ind@henn.et>
2013-11-02Merge remote-tracking branch 'upstream/master'shennetsind10-38/+149
Signed-off-by: shennetsind <ind@henn.et> Conflicts: sql-files/main.sql sql-files/upgrades/index.txt src/common/mmo.h
2013-11-01Removed type_id and some unused variables from @autoloottypeDastgir Pojee2-29/+17
2013-11-01Item Binding System Final.sevenzz231-0/+1
Fixed, some issue thanks to Master Ind ;) Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-10-31No error after compilation, but when logging in at map server it will crash.sevenzz2324-131/+717
Im pretty sure its on the clif.c Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-10-30Merge pull request #210 from kisuka/npc-constantsshennetsind2-13/+62
NPC Constants
2013-10-30Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind2-5/+5
2013-10-30Official Font Supportshennetsind8-22/+87
Fonts are now relog-persistent. Font items are now toggle-on/off, they no longer go away on use, they go away when their rental duration is over (and the font effect goes back to original). Special Thanks to Yommy for all the data! Signed-off-by: shennetsind <ind@henn.et>
2013-10-30Account-wide Exp/Drop/Death Modifiersshennetsind7-143/+202
Attempting to mimic the official as suggested in http://hercules.ws/board/topic/250-official-vip-system/ The variables can be read and modified thru scripting as well as sql, the patch introduces 3 new pc-arams 'ModExp','ModDrop' and 'ModDeath' for that purpose. The OnLogin modifier display is not the real deal though -- wasn't able to get it to output properly (though that might have been my client files failt) Up for review. Signed-off-by: shennetsind <ind@henn.et>
2013-10-30Follow-up to 44c33fda3614d588e6bf6cee1cf884e98f1531f0Haru1-4/+4
Corrected some leftover 32bit typecasts. Special thanks to Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-10-31Several Changes to autoloottype command.Dastgir Pojee3-53/+43
2013-10-30Follow-up to baef78f7954fa4e6fa2449f2c7de92a901c7f5f3Haru1-1/+1
- Corrected an issue with ammunitions not being detected correctly, making all ammo-dependent skills fail. - Credits to Ind, special thanks to Yommy Signed-off-by: Haru <haru@dotalux.com>
2013-10-30Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind1-7/+7