summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-18Merge pull request #837 from AnnieRuru/request_5Haruna5-1/+11
Add new config to allow player vend/chat room nearby hidden npc (#834)
2015-11-18Merge pull request #817 from HerculesWS/atcommand_msgHaruna1-2/+2
Fix Crash when message is not defined
2015-11-18ItemDB SQL SyncHercules.ws2-6/+6
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-18Merge pull request #878 from Jedzkie/request_01Dastgir7-15/+30
ItemDB Update:
2015-11-18ItemDB Update:Jedzkie7-15/+30
- Fixes Issue #688. - Update the item 'Acaraje' to its official effect. (Ref: http://herc.ws/board/tracker/issue-7773-acaraje-12375/) - Fix 'Vitata500' not giving additional % in sp. (Thanks to Haru) (Ref: http://www.divine-pride.net/database/item/12436) - Fix Ljosalfar and Mermaid Bubbles disappear its effect when died / dispell and etc.
2015-11-18Fixed a crash in some skills' multi-hit codeHaru1-4/+4
- The crash could happen when Land Protector is cast as result of a Fire Wall hit. - Fixes #698 (fix based on ultramage's suggestion) - The fix was also applied to the Taekwon Master's Warmth skills that, while not affected by Land Protector, use a very similar multi-hit loop. Signed-off-by: Haru <haru@dotalux.com>
2015-11-18Merge pull request #874 from Jedzkie/Script_ItemID_ConstantsFrost3-58/+626
Converted some dealers to new trader format.
2015-11-18Another follow up.Jedzkie1-17/+17
2015-11-18Follow up.Jedzkie1-0/+2
2015-11-18Converted some dealers to new trader format.Jedzkie3-58/+624
2015-11-18Revert "Update map_cache.dat.".Jedzkie4-122/+0
2015-11-17Revert "Item DB Updates:"Haru7-875/+795
This reverts commit 912578159c8ccca9545e3c7dce9f7ce2b92bee2e. This will be re-committed in a more atomic form.
2015-11-17Revert "ItemDB SQL Sync"Haru2-23/+23
This reverts commit 53dbbb3ff6cf8bf7a46a711057d02f27f0ed1229.
2015-11-17ItemDB SQL SyncHercules.ws2-23/+23
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-17Item DB Updates:Jedzkie7-795/+875
- Update Geffen Scrolls to its official behavior and effect. - Added Official item effect of Mental Potion. - Fixed Chinese Pestel item effect. - Fixed Vitata500 not giving 5% sp. - Added 'Costume: Time Accessory'.
2015-11-17Update map_cache.dat.Jedzkie4-4/+125
Signed-off-by: Jedzkie <jedzkie13@rocketmail.com>
2015-11-17Merge pull request #870 from Jedzkie/ItemDB_UpdatesFrost1-1/+1
Follow up.
2015-11-17Add some FAQ documentation that some script command can return valueAnnieRuru2-4/+7
- getitemname can return "null" - getmapusers can return -1 and fix the bad ... misleading global function example
2015-11-16Follow up ↵Jedzkie1-1/+1
https://github.com/HerculesWS/Hercules/commit/44a79fd2d56ca8c9ec0a13eb3ce206d940e0d4ae Signed-off-by: Jedzkie <jedzkie13@rocketmail.com>
2015-11-16Merge pull request #869 from Jedzkie/ItemDB_UpdatesDastgir2-1/+62
Update new NPC ID's.
2015-11-16Update new NPC ID's.Jedzkie2-1/+62
Signed-off-by: Jedzkie <jedzkie13@rocketmail.com>
2015-11-15ItemDB SQL SyncHercules.ws2-4/+4
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-15Fixed too-generic constant names of gettime() typesHaru33-259/+240
- Follow-up to 3bd77ffc0daca508352834add828766490075aee - The names were too generic (not namespaced), and were easily clashing with custom (and potential future official) constants or variables. - Constants are now prefixed with a 'GETTIME_' namespace: - GETTIME_SECOND - GETTIME_MINUTE - GETTIME_HOUR - GETTIME_WEEKDAY - GETTIME_DAYOFMONTH - GETTIME_MONTH - GETTIME_YEAR - GETTIME_DAYOFYEAR - Fixed some excessive (and some times incorrect) parentheses in various scripts using gettime(). - Updated documentation. Signed-off-by: Haru <haru@dotalux.com>
2015-11-15Merge pull request #857 from HerculesWS/scriptqueueAndrei Karas14-414/+557
Scriptqueue
2015-11-14Fix npc initialisation in first map (m == 0).Andrei Karas1-1/+1
2015-11-14Changed struct map_session_data::queues into a VECTOR and renamed to ↵Haru5-29/+20
::script_queues Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Changed struct script_queue_iterator::item into a VECTOR and Renamed to ↵Haru2-19/+23
::entries Signed-off-by: Haru <haru@dotalux.com>
2015-11-14HPM Hooks UpdateHaru1-8/+9
2015-11-14Changed struct script_queue::item into a VECTOR and Renamed to ::entriesHaru4-157/+127
Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Standardized script-queue related commandsHaru5-44/+53
- The commands queueadd, queueremove, queueopt, queuedel and qiclear now all return true (success) or false (failure). - Taken/extended from AnnieRuru's PR #847. - The constants HQO_OnDeath, HQO_OnLogOut, HQO_OnMapChange were renamed to QUEUEOPT_DEATH, QUEUEOPT_LOGOUT, QUEUEOPT_MAPCHANGE respectively. - The name of the variable @QMapChangeTo$ used during the QUEUEOPT_MAPCHANGE event has been renamed to @Queue_Destination_Map$. Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Fix @QMapChangeTo$ not usable when HQO_OnMapChange triggeredAnnieRuru2-1/+4
- also add documentation for it
2015-11-14Refactored the script queue systemHaru1-185/+333
- Corrected return value in bool functions (true always means success, false means failure, some were inverted). The script command return values are left unchanged for backwards compatibility. - Added some missing script_pushint to commands that are expected to return a value (on failure). - Cleaned up and optimized various functions. Signed-off-by: Haru <haru@dotalux.com>
2015-11-14HPM Hooks UpdateHaru2-6/+6
2015-11-14Renamed hQueue/hQueueIterator/hQueueOpt to latest standardsHaru6-59/+66
Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Changed script->hq and script->hqi into VECTOR typeHaru2-94/+87
Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Fixed some direct accesses to script->hq[] from other modules.Haru2-14/+16
- script->hq[] should only be accessed through the provided interface, script->queue(). Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Fixed include path in the doxygen configurationHaru1-1/+2
Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Corrected an issue causing queue iterators not to return their last valueHaru2-11/+25
- Follow-up to 918b1123963ac2f91a4d074b092ceef1db71b4e8, a9042bf0bee2d2453058b22973bea8f335c5a201 - Thanks to Dastgir Signed-off-by: Haru <haru@dotalux.com>
2015-11-14Merge pull request #856 from 4144/fixhitHaruna3-4/+13
fix hit after warp.
2015-11-14Add option for fix hit after warp.Andrei Karas3-4/+13
Introduced new configuration option: fix_warp_hit_delay_abuse. Official way is to set this option to false.
2015-11-14HPM Hooks UpdateHercules.ws3-6/+228
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-14Merge pull request #820 from HerculesWS/instancewarningAndrei Karas3-264/+314
Fix a warning when loading instance duplicates (#812)
2015-11-12Split npc_duplicate_sub into separate functions based on subtypesHaru2-48/+85
- For plugin overriding purposes. Thanks to Andrei Karas for the idea. Signed-off-by: Haru <haru@dotalux.com>
2015-11-12Split frequently repeated code to add/register new NPCs to its own functionHaru2-58/+35
Signed-off-by: Haru <haru@dotalux.com>
2015-11-12Added subtype initializer to npc_create_npcHaru3-19/+20
Signed-off-by: Haru <haru@dotalux.com>
2015-11-12Moved class and dir initializers to npc_create_npcHaru3-57/+39
Signed-off-by: Haru <haru@dotalux.com>
2015-11-12Split the duplication logic away from the parsing logic in NPC duplicatesHaru2-136/+155
- Fixes #812 (warning message while creating instances) Signed-off-by: Haru <haru@dotalux.com>
2015-11-11Split the source path reference retain mechanism out of npc_parsename.Haru2-38/+72
Signed-off-by: Haru <haru@dotalux.com>
2015-11-11Fixed Issue #860Emistry1-1/+1
Fixed invalid zeny deduction.
2015-11-08Fixes missing new RC_ constants in some bonuses. Fixes #815Dastgir1-25/+102