summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-06Update Fixshennetsind4-2/+18
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'shennetsind29-128/+919
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-06Updated to latest Herculesshennetsind1-13/+40
Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Merge remote-tracking branch 'upstream/master'shennetsind100-1243/+2600
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/pc.c
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-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/Herculesshennetsind59-251/+623
2013-11-06Merge pull request #217 from HerculesWS/script-checkershennetsind58-197/+569
Introducing the Hercules Standalone Script Syntax Checker
2013-11-06BG Queue Updateshennetsind5-26/+120
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 7799shennetsind5-34/+25
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-06Fixed Bug 7801shennetsind1-1/+1
Fixed idletime_criteria description, the demonstration of how the default value is aggregated had the wrong value. http://hercules.ws/board/tracker/issue-7801-description-of-idletime-criteria/ (Thanks to jaBote!) 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-05Follow-up to 97001710c06ed7053d18c8baaac602eb563b64b3Mumbles1-0/+29
- Added script-checker.bat launcher for Windows.
2013-11-05Follow-up to 97001710c06ed7053d18c8baaac602eb563b64b3Haru2-0/+158
- Added missing license note and error message to the script-checker bash script - Added Script-Checker.applescript. Open in Applescript Editor and save as .app bundle in order to use it. It's not pretty, but it works. Signed-off-by: Haru <haru@dotalux.com>
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 CheckerHaru56-197/+382
- 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/Herculesshennetsind32-274/+645
2013-11-04pc_groups interfacedshennetsind7-129/+215
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-05Fixed grammarsevenzz232-5/+7
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-04Follow-up to 3b0cd11f980a48b903262c857fde1cd9c784c2e0Haru2-80/+79
- Changed <? ?> to <" "> after some further brainstorming. Special thanks to Yommy. Signed-off-by: Haru <haru@dotalux.com>
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-04Implemented correct refine success rates above +10Haru2-13/+12
- 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-03Modified travis to not compile pluginsshennetsind1-2/+2
Thanks to Haruna. Signed-off-by: shennetsind <ind@henn.et>
2013-11-03Added some packetver-related flags to the UNIX build scriptHaru4-13/+211
- 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-03Added support for <? ?> blocks (parsed as multiline strings) in libconfigHaru3-176/+215
- If this doesn't make any sense right now, fear not. It'll make sense in an upcoming update. - Special thanks to Yommy, Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-11-03Allow warp duplicates without a 'facing' valueHaru2-4/+6
- 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)Haru8-12/+146
- 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 #7786shennetsind5-23/+29
@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 Bonusesshennetsind6-4/+17
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 Herculesshennetsind3-0/+8
Signed-off-by: shennetsind <ind@henn.et>
2013-11-02Merge remote-tracking branch 'upstream/master'shennetsind596-9976/+10093
Signed-off-by: shennetsind <ind@henn.et> Conflicts: sql-files/main.sql sql-files/upgrades/index.txt src/common/mmo.h
2013-11-02Fixed const values for the new mod paramsshennetsind1-3/+3
Thanks to ossi0110 for pointing it out. Signed-off-by: shennetsind <ind@henn.et>
2013-11-01Removed type_id and some unused variables from @autoloottypeDastgir Pojee3-35/+22
2013-11-01Deleted extra messages lines.sevenzz231-21/+5
Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-11-01Item Binding System Final.sevenzz235-2/+137
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.sevenzz2330-137/+825
Im pretty sure its on the clif.c Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-10-30Merge pull request #210 from kisuka/npc-constantsshennetsind583-9928/+9982
NPC Constants
2013-10-30Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind2-5/+5
2013-10-30Official Font Supportshennetsind13-41/+112
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 Modifiersshennetsind11-144/+216
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>