summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-08-26Implementation of Ghost palace instance based on iROAsheraf15-14/+1531
* Added ghost palace instance script * Add needed monster, item and quest database entries * Added mapflags for instance map (1@spa)
2016-08-25Merge pull request #1408 from 4144/vendingHaru1-1/+1
Swap calls to send info about solt item to seller and actual item del…
2016-08-25Swap calls to send info about solt item to seller and actual item deletion ↵Andrei Karas1-1/+1
from cart.
2016-08-22HPM Hooks UpdateHercules.ws4-0/+34
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-22Corrected an issue that prevented the map server's database port from being ↵Haru1-1/+1
changed Signed-off-by: Haru <haru@dotalux.com>
2016-08-22Corrected an issue that caused the setting inter_configuration/log/log_inter ↵Haru3-3/+35
to be ignored Signed-off-by: Haru <haru@dotalux.com>
2016-08-22Corrected an issue that caused the setting ↵Haru1-1/+6
char_configuration/permission/display_new to be ignored Fixes #1407 Signed-off-by: Haru <haru@dotalux.com>
2016-08-22Temporary quick-fix for a warning in the linux buildsHaru1-1/+1
- libconfig uses 'long long' for its 64 bit lookup/set/get functions, rather than a well-defined size integer (such as int64_t). GCC doesn't like the use of an int64_t* where a long long* is required, especially on linux x86_64, where int64_t is typedeffed as long int - In future, the function signature will be changed, so we can use int64 normally. Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Updated Visual Studio projects with the conf/import file name changesHaru3-24/+24
Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Corrected some issues reported by coverityHaru1-4/+7
- Incorrect sizeof expression in char_config_set_ip() - Invalid comparison (when MAX_ZENY == MAX_INT) in char_config_read_player_new() Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Syntax clean up in the script documentationHaru1-1652/+1680
- Changed all function calls to encourage parenthesized calls - Replaced numbers with constants where appropriate - Removed some incorrect remarks Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Removed some of the leftover calls to menu() in custom scriptsHaru16-2074/+2047
Signed-off-by: Haru <haru@dotalux.com>
2016-08-20Re-added HPM support for configuration settingsHaru8-11/+73
Plugin settings should be relative to the the libconfig file root. For example, a configuration setting of type HPCT_CHAR will be relative to the root of conf/char/char-server.conf. In order to add a configuration entry inside the char_configuration block, the full configuration path (slash-delimited) should be passed to addCharConf(), as in the following example: `addCharConf("char_configuration/my_setting", my_parser_function);` Signed-off-by: Haru <haru@dotalux.com>
2016-08-20Added a better error message when a libconfig file is not foundHaru1-0/+5
Previously, it'd say "[Error] (null):0 - file I/O error" Signed-off-by: Haru <haru@dotalux.com>
2016-08-20Merge pull request #1399 from HerculesWS/settings_libconfigAndrei Karas140-5396/+9547
Ported the configuration to libconfig format
2016-08-20Updated references to the old config in the documentationHaru6-48/+50
Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Added option to make plugin-defined battle config entries optionalHaru4-12/+15
When a setting optional, no warning is issued on the console when said setting is not found in the config Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru4-18/+52
Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Ported battle.conf to libconfigHaru36-594/+1538
Ported to modern Hercules and cleaned up from Panikon's commits: 44fea0b3cdba6901599265220228ba4359b1f96d, 9cba05bc0811e638bbaaa6cff887d0b2c9872560 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Ported socket.conf (was packet.conf) to libconfigHaru10-148/+354
Ported to modern Hercules and cleaned up from Panikon's commits: b10f2a88073882bea812c6278fdec7848102ab87, bc5007299a92898ea4630f2a977d9a1b42b6c145 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Changed access_allow and access_deny to VECTORsHaru1-24/+29
Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Removed unnecessary typedefs in socket.cHaru1-13/+13
Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru2-9/+9
2016-08-19Ported script.conf to libconfigHaru9-77/+160
Ported to modern Hercules and cleaned up from Panikon's commits: a0e4da63ef3afcd896603398e2468876681ac54a, b5f487c2676833492a6d4044b5d1f1bb1e552b04 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru2-9/+9
2016-08-19Ported logs.conf to libconfigHaru9-235/+468
Ported to modern Hercules and cleaned up from Panikon's commits: 2a7c931b9b4e0f9c6e7766cb25701514230ec7e3, f5b1ee3df777ba7e69f1f99abaf0d00b987fc0e3, 6d1f8f50b0e7349bdab2c53bb172d0b036e47c04 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru4-21/+22
2016-08-19Ported npc config to libconfigHaru23-1016/+1106
Ported to modern Hercules and cleaned up from Panikon's commits: ca009582cb22340951aa3e86c044ec1dca05df36, 6d6adf9bab2ba6f4274395018b8def566b880197 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Updated Travis script to work with the new configuration filesHaru1-27/+41
Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru4-39/+5
2016-08-19Improved map list loadingHaru2-64/+46
There's no need to parse the map list twice anymore Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru2-18/+18
2016-08-19Ported map-server.conf to libconfigHaru14-1471/+1776
Ported to modern Hercules and cleaned up from Panikon's commits: ee48838b12d15902fc14738cfa46d58b39080d11, 55498ebb7ac5d28444d0b01506c88ef6874f6055, 6d1f8f50b0e7349bdab2c53bb172d0b036e47c04, 25dde7e46524ace330b83cb4bf0255cc4d796792 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru2-9/+9
2016-08-19Ported login-server.conf to libconfigHaru17-683/+1142
Ported to modern Hercules and cleaned up from Panikon's commits: ceb8a486ac47c2ed9aae4baa1ec39a11f31e9368, c1049123a4ea6ae6f0992ffe766db8aed7435ab5, 6feb097046355610d2288670a569ccc175358580, 9f6e27a96d655f2b4555310786d9d10898754404, 21fa5d24255ba026f96b1dbedf74ac5ef831d3ae, e22a56ad4def8ca22e94d44377a5364b9db1a425, f753a754923140bfec02057c16e6e8429b863d0e, 25dde7e46524ace330b83cb4bf0255cc4d796792 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru7-61/+266
2016-08-19Ported inter-server.conf to libconfigHaru18-376/+738
Ported to modern Hercules and cleaned up from Panikon's commits: 40f9ec33868e2240cab013308897898ed252b3e0, a9d646da19e25ab6fcf44dbd1ae7d90c30f6686c, 1aa8581a0aecbfd53e877686c399ffb731dcd75e, 72c645b015ae6130ca7d4309d0fb1413340e7f23, f8c906a0496b9acdae1d8244b1544fa03592061e, 51d88a58983c9552dfd1a0f059e5a031742aed61, 443684b3c77f4c32fe7877a7f8d62debf73b1e93, cf93eafef1f322cd1583226272b7d4008f562da4 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru4-42/+416
2016-08-19Ported char-server.conf to libconfigHaru13-427/+1309
Fixed issue: 8115, now start items can be equipped as well Ported to modern Hercules and cleaned up from Panikon's commits: c6482e9870645ffe59a6a059b819574d4ac79fd9, 832fb27d4f767e4bc8b68c432d0da00b7cb7a4f9, f81b579899e3a15bd472ca8c6a6e0116c43bec92, e23723725499b617def03d05661eca637edaeabd, 0b783a83d82e588efd760f7f4baec0c8074a6fd1, 1b7de91308a57ea07b158ed95a2515a3c8cc36bd, 677d3430cbda0962b320a60cf499e9dadf637d00 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Renamed some char and inter server variablesHaru10-74/+75
- `int save_log` -> `bool chr->show_save_log` - `bool char_new` -> `bool enable_char_creation` - `int log_char` -> `bool chr->enable_logs` - `int log_inter` -> `bool inter->enable_logs` - `int chr->new_display` -> `int16 chr->new_display` - `int char_aegis_delete` -> `bool char_aegis_delete` Split and improved from Panikon's commit 832fb27d4f767e4bc8b68c432d0da00b7cb7a4f9 Signed-off-by: Haru <haru@dotalux.com>
2016-08-17Constants Documentation SyncHercules.ws1-0/+8
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-17MobDB SQL SyncHercules.ws1-0/+8
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-17ItemDB SQL SyncHercules.ws1-2/+2
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-17Nightmare Clock Tower DungeonRidley88197-78/+662
- added mobs and (updated) skills - added quests_aldebaran.txt - iro dialogues - all items are already in available in item_db.conf - maps are already available in mapcache, index and .conf - Updated item effect for Pocket_Watch_ and Pocket_Watch__, and their combo with Memorize_Book and Pocket_Watch__ Closes #1389 as merged Signed-off-by: Haru <haru@dotalux.com>
2016-08-16Merge pull request #1401 from Emistry/clif_showscriptAndrei Karas1-1/+1
Corrected the showscript packet
2016-08-16Corrected the showscript packetEmistry Haoyan1-1/+1
The showscript packet was being sent to all players logged in which can be network intensive. Thanks to @Tokeiburu & aleos89! Based on https://github.com/rathena/rathena/commit/47a69c082a9520f14b19ebfd335c4956d0c5a13b
2016-08-16Merge pull request #1400 from 4144/sqlfixHaru2-3/+6
Add missing sql escapes in char server
2016-08-16Add missing quote chars in char.cAndrei Karas1-1/+1
2016-08-16Add missing escaping for saved player strings into db.Andrei Karas1-2/+5
2016-08-14Merge pull request #1396 from Emistry/on_pc_eventHaru4-0/+17
Enable @b/joblvl trigger OnPCLvUpEvent