Hercules Hell: The Great Merge

After nearly a year of no merges of Hercules, the server software we use to run RebirthRO, this month that was the main focus. With me leaving for vacation tomorrow (Monday), we were really down to the wire. I wanted the merge done and live before I left. After only 2 days of testing here we are. Only some minor bugs were found, and that's honestly surprising after all that went into getting this merged. Nearly 3 weeks were spent on this, and the reality is most people won't even appreciate the changes that were made because most of them you don't see right in front of you...

This merge brought a lot of reorganization as well as optimization and better client support. I don't think the server will be any faster to you guys, but testing on Zeus looks promising. At the very least, map server starts slightly faster. The databases are in an easier to read format, which makes them easier to merge and less error-prone, and we also got some code optimizations and clean up.

Cleaning up code and optimizing things have been the primary goal of Hercules. While that's resulted in a slightly outdated server in terms of NPC's, quests, etc, it has resulted in a much faster, more stable, and easier to read code base. Since RebirthRO focuses quite heavily on the custom aspect, that's more important to us than a few official quests people might do once or twice. That's another reason I felt this merge was important.

Comments

For the technically inclined, here's a list of what files changed:

Changes to be committed:
    modified:   .gitignore
    deleted:    3rdparty/msinttypes/include/stdint.h
    modified:   CONTRIBUTING.md
    modified:   README.md
    modified:   conf/atcommand.conf
    deleted:    conf/battle/battleground.conf
    deleted:    conf/battle/feature.conf
    deleted:    conf/battle/homunc.conf
    deleted:    conf/battle/pet.conf
    deleted:    conf/battle/player.conf
    deleted:    conf/battle/skill.conf
    deleted:    conf/battle/status.conf
    modified:   conf/channels.conf
    new file:   conf/char/char-server.conf
    new file:   conf/common/inter-server.conf
    new file:   conf/common/socket.conf
    new file:   conf/global/console.conf
    new file:   conf/global/sql_connection.conf
    new file:   conf/import-tmpl/battle.conf
    deleted:    conf/import-tmpl/battle_conf.txt
    new file:   conf/import-tmpl/char-server.conf
    deleted:    conf/import-tmpl/char_conf.txt
    new file:   conf/import-tmpl/inter-server.conf
    deleted:    conf/import-tmpl/inter_conf.txt
    deleted:    conf/import-tmpl/log_conf.txt
    new file:   conf/import-tmpl/login-server.conf
    deleted:    conf/import-tmpl/login_conf.txt
    new file:   conf/import-tmpl/logs.conf
    new file:   conf/import-tmpl/map-server.conf
    deleted:    conf/import-tmpl/map_conf.txt
    deleted:    conf/import-tmpl/packet_conf.txt
    new file:   conf/import-tmpl/script.conf
    deleted:    conf/import-tmpl/script_conf.txt
    new file:   conf/import-tmpl/socket.conf
    deleted:    conf/inter-server.conf
    new file:   conf/login/login-server.conf
    new file:   conf/map/battle.conf
    renamed:    conf/battle/battle.conf -> conf/map/battle/battle.conf
    new file:   conf/map/battle/battleground.conf
    renamed:    conf/battle/client.conf -> conf/map/battle/client.conf
    renamed:    conf/battle/drops.conf -> conf/map/battle/drops.conf
    renamed:    conf/battle/exp.conf -> conf/map/battle/exp.conf
    new file:   conf/map/battle/feature.conf
    new file:   conf/map/battle/gm.conf
    new file:   conf/map/battle/guild.conf
    new file:   conf/map/battle/homunc.conf
    renamed:    conf/battle/items.conf -> conf/map/battle/items.conf
    renamed:    conf/battle/misc.conf -> conf/map/battle/misc.conf
    renamed:    conf/battle/monster.conf -> conf/map/battle/monster.conf
    renamed:    conf/battle/party.conf -> conf/map/battle/party.conf
    new file:   conf/map/battle/status.conf
    renamed:    conf/charhelp.txt -> conf/map/charhelp.txt
    renamed:    conf/help.txt -> conf/map/help.txt
    new file:   conf/map/logs.conf
    new file:   conf/map/map-server.conf
    new file:   conf/map/maps.conf
    new file:   conf/map/script.conf
    modified:   conf/messages.conf
    modified:   conf/readme.txt
    deleted:    conf/script.conf
    modified:   configure
    renamed:    configure.in -> configure.ac
    modified:   db/constants.conf
    deleted:    db/pre-re/skill_castnodex_db.txt
    new file:   db/pre-re/skill_db.conf
    modified:   db/re/item_combo_db.txt
    deleted:    db/re/skill_castnodex_db.txt
    new file:   db/re/skill_db.conf
    modified:   doc/atcommands.txt
    modified:   doc/constants.md
    new file:   doc/global_configuration.txt
    modified:   doc/map_cache.txt
    modified:   doc/md5_hashcheck.txt
    modified:   doc/permissions.txt
    modified:   doc/sample/npc_test_duplicate.txt
    modified:   doc/script_commands.txt
    modified:   npc/airports/airships.txt
    modified:   npc/airports/einbroch.txt
    modified:   npc/airports/hugel.txt
    modified:   npc/airports/izlude.txt
    modified:   npc/airports/lighthalzen.txt
    modified:   npc/airports/rachel.txt
    modified:   npc/airports/yuno.txt
    modified:   npc/battleground/bg_common.txt
    modified:   npc/battleground/flavius/flavius_enter.txt
    modified:   npc/battleground/kvm/kvm_enter.txt
    modified:   npc/battleground/kvm/kvm_item_pay.txt
    modified:   npc/battleground/tierra/tierra_enter.txt
    modified:   npc/cities/aldebaran.txt
    modified:   npc/cities/ayothaya.txt
    modified:   npc/cities/comodo.txt
    modified:   npc/cities/einbech.txt
    modified:   npc/cities/einbroch.txt
    modified:   npc/cities/geffen.txt
    modified:   npc/cities/jawaii.txt
    modified:   npc/cities/lighthalzen.txt
    modified:   npc/cities/louyang.txt
    modified:   npc/cities/niflheim.txt
    modified:   npc/cities/prontera.txt
    modified:   npc/cities/rachel.txt
    modified:   npc/cities/splendide.txt
    modified:   npc/cities/umbala.txt
    modified:   npc/custom/battleground/bg_common.txt
    modified:   npc/custom/battleground/bg_flavius_01.txt
    modified:   npc/custom/battleground/bg_flavius_02.txt
    modified:   npc/custom/battleground/bg_kvm01.txt
    modified:   npc/custom/battleground/bg_kvm02.txt
    modified:   npc/custom/battleground/bg_kvm03.txt
    modified:   npc/custom/battleground/bg_tierra_01.txt
    modified:   npc/custom/battleground/bg_tierra_02.txt
    modified:   npc/custom/bgqueue/flavius.txt
    modified:   npc/custom/breeder.txt
    modified:   npc/custom/etc/airplane.txt
    modified:   npc/custom/etc/bank_kafra.txt
    modified:   npc/custom/etc/lottery.txt
    modified:   npc/custom/etc/marriage.txt
    modified:   npc/custom/etc/monster_arena.txt
    modified:   npc/custom/etc/morroc_raceway.txt
    modified:   npc/custom/etc/mvp_arena.txt
    modified:   npc/custom/etc/quest_warper.txt
    modified:   npc/custom/etc/shifty_assassin.txt
    modified:   npc/custom/etc/stock_market.txt
    modified:   npc/custom/events/cluckers.txt
    modified:   npc/custom/events/disguise.txt
    modified:   npc/custom/events/hallow06.txt
    modified:   npc/custom/events/mushroom_event.txt
    modified:   npc/custom/events/uneasy_cemetery.txt
    modified:   npc/custom/events/valentinesdayexp.txt
    modified:   npc/custom/events/xmas_rings_event.txt
    modified:   npc/custom/healer.txt
    modified:   npc/custom/itembind.txt
    modified:   npc/custom/quests/bandit_beard.txt
    modified:   npc/custom/quests/berzebub.txt
    modified:   npc/custom/quests/dead_branch.txt
    modified:   npc/custom/quests/elvenear.txt
    modified:   npc/custom/quests/event_6_new_hats.txt
    modified:   npc/custom/quests/hunting_missions.txt
    modified:   npc/custom/quests/may_hats.txt
    modified:   npc/custom/quests/quest_shop.txt
    modified:   npc/custom/quests/thq/THQS_ChatingNPC.txt
    modified:   npc/custom/quests/thq/THQS_GuildNPC.txt
    modified:   npc/custom/quests/thq/THQS_QuestNPC.txt
    modified:   npc/custom/quests/thq/THQS_Quests.txt
    modified:   npc/custom/quests/thq/THQS_TTShop.txt
    modified:   npc/custom/quests/umbalian_language.txt
    modified:   npc/custom/stylist.txt
    modified:   npc/custom/warper.txt
    modified:   npc/custom/woe_controller.txt
    modified:   npc/dev/test.txt
    modified:   npc/events/MemorialDay_2008.txt
    modified:   npc/events/christmas_2005.txt
    modified:   npc/events/christmas_2008.txt
    modified:   npc/events/easter_2008.txt
    modified:   npc/events/event_skill_reset.txt
    modified:   npc/events/gdevent_aru.txt
    modified:   npc/events/gdevent_sch.txt
    modified:   npc/events/god_se_festival.txt
    modified:   npc/events/halloween_2006.txt
    modified:   npc/events/halloween_2009.txt
    modified:   npc/events/idul_fitri.txt
    modified:   npc/events/lunar_2008.txt
    modified:   npc/events/nguild/nguild_managers.txt
    modified:   npc/events/nguild/nguild_warper.txt
    modified:   npc/events/valentinesday_2009.txt
    modified:   npc/events/valentinesday_2012.txt
    modified:   npc/instances/EndlessTower.txt
    modified:   npc/instances/NydhoggsNest.txt
    modified:   npc/instances/OrcsMemory.txt
    modified:   npc/instances/SealedShrine.txt
    modified:   npc/jobs/1-1e/gunslinger.txt
    modified:   npc/jobs/1-1e/ninja.txt
    modified:   npc/jobs/1-1e/taekwon.txt
    modified:   npc/jobs/2-1/assassin.txt
    modified:   npc/jobs/2-1/blacksmith.txt
    modified:   npc/jobs/2-1/hunter.txt
    modified:   npc/jobs/2-1/knight.txt
    modified:   npc/jobs/2-1/priest.txt
    modified:   npc/jobs/2-1/wizard.txt
    modified:   npc/jobs/2-1e/StarGladiator.txt
    modified:   npc/jobs/2-2/alchemist.txt
    modified:   npc/jobs/2-2/crusader.txt
    modified:   npc/jobs/2-2/dancer.txt
    modified:   npc/jobs/2-2/monk.txt
    modified:   npc/jobs/2-2/rogue.txt
    modified:   npc/jobs/2-2/sage.txt
    modified:   npc/jobs/2-2e/SoulLinker.txt
    modified:   npc/jobs/valkyrie.txt
    modified:   npc/kafras/functions_kafras.txt
    modified:   npc/kafras/kafras.txt
    modified:   npc/mapflag/nobranch.txt
    modified:   npc/mapflag/noicewall.txt
    modified:   npc/mapflag/nomemo.txt
    modified:   npc/mapflag/nopvp.txt
    modified:   npc/mapflag/nosave.txt
    modified:   npc/mapflag/noteleport.txt
    modified:   npc/mapflag/nowarpto.txt
    modified:   npc/mapflag/partylock.txt
    modified:   npc/mapflag/zone.txt
    modified:   npc/merchants/buying_shops.txt
    modified:   npc/merchants/cashheadgear_dye.txt
    modified:   npc/merchants/coin_exchange.txt
    modified:   npc/other/Global_Functions.txt
    modified:   npc/other/arena/arena_aco.txt
    modified:   npc/other/arena/arena_lvl50.txt
    modified:   npc/other/arena/arena_lvl60.txt
    modified:   npc/other/arena/arena_lvl70.txt
    modified:   npc/other/arena/arena_lvl80.txt
    modified:   npc/other/arena/arena_party.txt
    modified:   npc/other/arena/arena_point.txt
    modified:   npc/other/arena/arena_room.txt
    modified:   npc/other/fortune.txt
    modified:   npc/other/gm_npcs.txt
    modified:   npc/other/hugel_bingo.txt
    modified:   npc/other/marriage.txt
    modified:   npc/other/mercenary_rent.txt
    modified:   npc/other/poring_war.txt
    modified:   npc/other/pvp.txt
    modified:   npc/other/turbo_track.txt
    modified:   npc/pre-re/jobs/1-1/acolyte.txt
    modified:   npc/pre-re/jobs/1-1/archer.txt
    modified:   npc/pre-re/jobs/1-1/merchant.txt
    modified:   npc/pre-re/jobs/1-1/swordman.txt
    modified:   npc/pre-re/jobs/1-1/thief.txt
    modified:   npc/pre-re/jobs/novice/novice.txt
    modified:   npc/pre-re/scripts_jobs.conf
    modified:   npc/pre-re/scripts_main.conf
    modified:   npc/quests/bard_quest.txt
    modified:   npc/quests/cooking_quest.txt
    modified:   npc/quests/dandelion_request.txt
    modified:   npc/quests/doomed_swords_quest.txt
    modified:   npc/quests/eye_of_hellion.txt
    modified:   npc/quests/first_class/tu_acolyte.txt
    modified:   npc/quests/first_class/tu_archer.txt
    modified:   npc/quests/first_class/tu_ma_th01.txt
    modified:   npc/quests/first_class/tu_magician01.txt
    modified:   npc/quests/first_class/tu_sword.txt
    modified:   npc/quests/guildrelay.txt
    modified:   npc/quests/gunslinger_quests.txt
    modified:   npc/quests/kiel_hyre_quest.txt
    modified:   npc/quests/newgears/2004_headgears.txt
    modified:   npc/quests/newgears/2005_headgears.txt
    modified:   npc/quests/newgears/2008_headgears.txt
    modified:   npc/quests/newgears/2010_headgears.txt
    modified:   npc/quests/obb_quest.txt
    modified:   npc/quests/partyrelay.txt
    modified:   npc/quests/quests_13_1.txt
    modified:   npc/quests/quests_13_2.txt
    modified:   npc/quests/quests_airship.txt
    modified:   npc/quests/quests_alberta.txt
    modified:   npc/quests/quests_ayothaya.txt
    modified:   npc/quests/quests_comodo.txt
    modified:   npc/quests/quests_ein.txt
    modified:   npc/quests/quests_geffen.txt
    modified:   npc/quests/quests_gonryun.txt
    modified:   npc/quests/quests_hugel.txt
    modified:   npc/quests/quests_juperos.txt
    modified:   npc/quests/quests_lighthalzen.txt
    modified:   npc/quests/quests_louyang.txt
    modified:   npc/quests/quests_morocc.txt
    modified:   npc/quests/quests_moscovia.txt
    modified:   npc/quests/quests_nameless.txt
    modified:   npc/quests/quests_niflheim.txt
    modified:   npc/quests/quests_prontera.txt
    modified:   npc/quests/quests_rachel.txt
    modified:   npc/quests/quests_umbala.txt
    modified:   npc/quests/quests_veins.txt
    modified:   npc/quests/seals/brisingamen_seal.txt
    modified:   npc/quests/seals/god_weapon_creation.txt
    modified:   npc/quests/seals/megingard_seal.txt
    modified:   npc/quests/seals/mjolnir_seal.txt
    modified:   npc/quests/skills/alchemist_skills.txt
    modified:   npc/quests/skills/assassin_skills.txt
    modified:   npc/quests/skills/bard_skills.txt
    modified:   npc/quests/skills/blacksmith_skills.txt
    modified:   npc/quests/skills/crusader_skills.txt
    modified:   npc/quests/skills/dancer_skills.txt
    modified:   npc/quests/skills/knight_skills.txt
    modified:   npc/quests/skills/merchant_skills.txt
    modified:   npc/quests/skills/priest_skills.txt
    modified:   npc/quests/skills/rogue_skills.txt
    modified:   npc/quests/skills/sage_skills.txt
    modified:   npc/quests/thana_quest.txt
    modified:   npc/quests/the_sign_quest.txt
    modified:   npc/re/cities/dewata.txt
    modified:   npc/re/cities/dicastes.txt
    modified:   npc/re/cities/malangdo.txt
    modified:   npc/re/cities/malaya.txt
    modified:   npc/re/cities/mora.txt
    modified:   npc/re/events/halloween_2013.txt
    modified:   npc/re/events/halloween_2014.txt
    modified:   npc/re/guides/guides_ayothaya.txt
    modified:   npc/re/guides/guides_izlude.txt
    modified:   npc/re/instances/BakonawaLake.txt
    modified:   npc/re/instances/BangungotHospital.txt
    modified:   npc/re/instances/BuwayaCave.txt
    modified:   npc/re/instances/EclageInterior.txt
    modified:   npc/re/instances/HazyForest.txt
    modified:   npc/re/instances/MalangdoCulvert.txt
    modified:   npc/re/instances/OctopusCave.txt
    modified:   npc/re/instances/WolfchevLaboratory.txt
    new file:   npc/re/instances/ghost_palace.txt
    new file:   npc/re/instances/saras_memory.txt
    modified:   npc/re/jobs/1-1/acolyte.txt
    modified:   npc/re/jobs/1-1/archer.txt
    modified:   npc/re/jobs/1-1/mage.txt
    modified:   npc/re/jobs/1-1/thief.txt
    modified:   npc/re/jobs/2e/kagerou_oboro.txt
    modified:   npc/re/jobs/3-1/archbishop.txt
    modified:   npc/re/jobs/3-1/guillotine_cross.txt
    modified:   npc/re/jobs/3-1/ranger.txt
    modified:   npc/re/jobs/3-1/rune_knight.txt
    modified:   npc/re/jobs/3-1/warlock.txt
    modified:   npc/re/jobs/3-2/genetic.txt
    modified:   npc/re/jobs/3-2/minstrel.txt
    modified:   npc/re/jobs/3-2/royal_guard.txt
    modified:   npc/re/jobs/3-2/shadow_chaser.txt
    modified:   npc/re/jobs/3-2/sorcerer.txt
    modified:   npc/re/jobs/3-2/sura.txt
    modified:   npc/re/jobs/3-2/wanderer.txt
    modified:   npc/re/jobs/novice/academy.txt
    modified:   npc/re/jobs/novice/novice.txt
    modified:   npc/re/jobs/novice/supernovice_ex.txt
    modified:   npc/re/kafras/kafras.txt
    modified:   npc/re/merchants/card_separation.txt
    modified:   npc/re/merchants/diamond.txt
    modified:   npc/re/merchants/ninja_craftsman.txt
    modified:   npc/re/merchants/ticket_refiner.txt
    modified:   npc/re/mobs/dungeons/c_tower.txt
    modified:   npc/re/mobs/dungeons/glastheim.txt
    modified:   npc/re/mobs/dungeons/lhz_dun.txt
    modified:   npc/re/mobs/fields/niflheim.txt
    modified:   npc/re/quests/eden/100-110.txt
    modified:   npc/re/quests/eden/111-120.txt
    modified:   npc/re/quests/eden/121-130.txt
    modified:   npc/re/quests/eden/eden_common.txt
    modified:   npc/re/quests/eden/eden_iro.txt
    modified:   npc/re/quests/eden/eden_quests.txt
    modified:   npc/re/quests/homun_s.txt
    new file:   npc/re/quests/quests_aldebaran.txt
    modified:   npc/re/quests/quests_brasilis.txt
    modified:   npc/re/quests/quests_dewata.txt
    modified:   npc/re/quests/quests_dicastes.txt
    modified:   npc/re/quests/quests_malangdo.txt
    modified:   npc/re/quests/quests_mora.txt
    modified:   npc/re/scripts_jobs.conf
    modified:   npc/re/scripts_main.conf
    modified:   npc/re/scripts_mapflags.conf
    modified:   npc/re/scripts_monsters.conf
    modified:   npc/re/scripts_warps.conf
    modified:   npc/re/scripts_woe.conf
    modified:   npc/re/warps/cities/dicastes.txt
    modified:   npc/re/warps/cities/izlude.txt
    modified:   npc/re/warps/fields/bif_fild.txt
    modified:   npc/re/woe-fe/invest_main.txt
    modified:   npc/scripts_jobs.conf
    modified:   npc/scripts_mapflags.conf
    modified:   npc/scripts_monsters.conf
    new file:   npc/scripts_removed.conf
    modified:   npc/scripts_warps.conf
    modified:   npc/warps/dungeons/mosk_dun.txt
    modified:   npc/woe-fe/trs_rp.txt
    modified:   script-checker.bat
    modified:   sql-files/item_db2.sql
    modified:   sql-files/logs.sql
    modified:   sql-files/main.sql
    modified:   sql-files/mob_db.sql
    modified:   sql-files/mob_db2.sql
    modified:   sql-files/mob_db_re.sql
    new file:   sql-files/upgrades/2016-07-08--02-42.sql
    new file:   sql-files/upgrades/2016-07-08--02-51.sql
    modified:   sql-files/upgrades/eAthena-logs-upgrade.sql
    modified:   sql-files/upgrades/eAthena-main-upgrade.sql
    modified:   sql-files/upgrades/index.txt
    modified:   sql-files/upgrades/rAthena-logs-upgrade.sql
    modified:   sql-files/upgrades/rAthena-main-upgrade.sql
    modified:   src/char/HPMchar.c
    modified:   src/char/Makefile.in
    modified:   src/char/geoip.c
    modified:   src/char/int_elemental.c
    modified:   src/char/int_guild.c
    modified:   src/char/int_homun.c
    modified:   src/char/int_mercenary.c
    modified:   src/char/int_party.c
    modified:   src/char/int_pet.c
    modified:   src/char/inter.h
    modified:   src/char/pincode.c
    modified:   src/char/pincode.h
    modified:   src/common/HPM.c
    modified:   src/common/HPM.h
    modified:   src/common/HPMDataCheck.h
    modified:   src/common/HPMSymbols.inc.h
    modified:   src/common/HPMi.h
    modified:   src/common/Makefile.in
    modified:   src/common/cbasetypes.h
    modified:   src/common/conf.c
    modified:   src/common/console.c
    modified:   src/common/console.h
    modified:   src/common/core.c
    modified:   src/common/db.h
    modified:   src/common/des.c
    modified:   src/common/des.h
    modified:   src/common/grfio.c
    modified:   src/common/grfio.h
    modified:   src/common/md5calc.c
    modified:   src/common/md5calc.h
    modified:   src/common/memmgr.c
    modified:   src/common/mutex.c
    modified:   src/common/mutex.h
    modified:   src/common/random.c
    modified:   src/common/random.h
    modified:   src/common/showmsg.c
    modified:   src/common/showmsg.h
    modified:   src/common/socket.c
    modified:   src/common/spinlock.h
    modified:   src/common/sql.c
    modified:   src/common/sql.h
    modified:   src/common/strlib.c
    modified:   src/common/strlib.h
    modified:   src/common/sysinfo.c
    modified:   src/common/thread.c
    modified:   src/common/thread.h
    modified:   src/common/timer.c
    modified:   src/config/core.h
    modified:   src/login/HPMlogin.c
    modified:   src/login/Makefile.in
    modified:   src/login/account.h
    modified:   src/login/account_sql.c
    modified:   src/login/ipban.h
    modified:   src/login/ipban_sql.c
    modified:   src/login/lclif.c
    modified:   src/login/login.h
    modified:   src/login/loginlog.h
    modified:   src/login/loginlog_sql.c
    modified:   src/map/HPMmap.c
    modified:   src/map/Makefile.in
    modified:   src/map/atcommand.h
    modified:   src/map/battleground.c
    modified:   src/map/battleground.h
    modified:   src/map/buyingstore.c
    modified:   src/map/channel.c
    modified:   src/map/chat.c
    modified:   src/map/chat.h
    modified:   src/map/chrif.c
    modified:   src/map/clif.h
    modified:   src/map/duel.c
    modified:   src/map/guild.c
    modified:   src/map/guild.h
    modified:   src/map/homunculus.c
    modified:   src/map/instance.c
    modified:   src/map/intif.c
    modified:   src/map/intif.h
    modified:   src/map/irc-bot.c
    modified:   src/map/irc-bot.h
    modified:   src/map/itemdb.c
    modified:   src/map/log.c
    modified:   src/map/log.h
    modified:   src/map/map.h
    modified:   src/map/mapreg.h
    modified:   src/map/mapreg_sql.c
    modified:   src/map/mob.c
    modified:   src/map/npc.c
    modified:   src/map/npc_chat.c
    modified:   src/map/party.h
    modified:   src/map/path.c
    modified:   src/map/script.h
    modified:   src/map/unit.h
    modified:   src/plugins/HPMHooking.c
    new file:   src/plugins/HPMHooking.h
    new file:   src/plugins/HPMHooking/HPMHooking.Defs.inc
    modified:   src/plugins/HPMHooking/HPMHooking_char.sources.inc
    modified:   src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
    modified:   src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
    modified:   src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
    modified:   src/plugins/HPMHooking/HPMHooking_login.sources.inc
    modified:   src/plugins/HPMHooking/HPMHooking_map.sources.inc
    modified:   src/plugins/Makefile.in
    modified:   src/plugins/constdb2doc.c
    modified:   src/plugins/dbghelpplug.c
    new file:   src/plugins/generate-translations.c
    modified:   src/plugins/sample.c
    modified:   src/test/test_libconfig.c
    modified:   src/test/test_spinlock.c
    modified:   src/tool/mapcache.c
    modified:   tools/HPMHookGen/HPMDataCheckGen.pl
    modified:   tools/HPMHookGen/HPMHookGen.pl
    new file:   tools/configconverter.pl
    modified:   tools/item_merge.lua
    new file:   tools/skilldbconverter.php
    modified:   travis.sh
    deleted:    vcproj-10/login-server.vcxproj.filters
    deleted:    vcproj-10/mapcache.vcxproj
    deleted:    vcproj-10/mapcache.vcxproj.filters
    deleted:    vcproj-10/plugin-HPMHooking_char.vcxproj
    deleted:    vcproj-10/plugin-HPMHooking_login.vcxproj
    deleted:    vcproj-10/plugin-HPMHooking_map.vcxproj
    deleted:    vcproj-10/plugin-sample.vcxproj
    modified:   vcproj-11/char-server.vcxproj
    modified:   vcproj-11/char-server.vcxproj.filters
    modified:   vcproj-11/login-server.vcxproj
    modified:   vcproj-11/login-server.vcxproj.filters
    modified:   vcproj-11/map-server.vcxproj
    modified:   vcproj-12/char-server.vcxproj.filters
    modified:   vcproj-12/login-server.vcxproj
    modified:   vcproj-12/login-server.vcxproj.filters
    modified:   vcproj-12/map-server.vcxproj
    modified:   vcproj-14/char-server.vcxproj
    modified:   vcproj-14/char-server.vcxproj.filters
    modified:   vcproj-14/login-server.vcxproj
    modified:   vcproj-14/login-server.vcxproj.filters
    modified:   vcproj-14/map-server.vcxproj

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

    both modified:   .travis.yml
    deleted by them: Hercules-10.sln
    deleted by them: conf/battle.conf
    deleted by them: conf/battle/gm.conf
    deleted by them: conf/battle/guild.conf
    deleted by them: conf/char-server.conf
    deleted by them: conf/login-server.conf
    deleted by them: conf/logs.conf
    deleted by them: conf/map-server.conf
    both modified:   conf/map/battle/pet.conf
    both modified:   conf/map/battle/player.conf
    both modified:   conf/map/battle/skill.conf
    deleted by them: conf/maps.conf
    deleted by them: conf/packet.conf
    both modified:   db/pre-re/item_db.conf
    deleted by them: db/pre-re/skill_cast_db.txt
    deleted by them: db/pre-re/skill_db.txt
    deleted by them: db/pre-re/skill_require_db.txt
    deleted by them: db/pre-re/skill_unit_db.txt
    both modified:   db/quest_db.conf
    both modified:   db/re/item_db.conf
    both modified:   db/re/mob_db.conf
    both modified:   db/re/mob_skill_db.txt
    deleted by them: db/re/skill_cast_db.txt
    deleted by them: db/re/skill_db.txt
    deleted by them: db/re/skill_require_db.txt
    deleted by them: db/re/skill_unit_db.txt
    both modified:   db/sc_config.txt
    both modified:   npc/MOTD.txt
    both modified:   npc/battleground/flavius/flavius01.txt
    both modified:   npc/battleground/flavius/flavius02.txt
    both modified:   npc/battleground/kvm/kvm01.txt
    both modified:   npc/battleground/kvm/kvm02.txt
    both modified:   npc/battleground/kvm/kvm03.txt
    both modified:   npc/battleground/tierra/tierra01.txt
    both modified:   npc/battleground/tierra/tierra02.txt
    both modified:   npc/other/monster_race.txt
    both modified:   npc/pre-re/jobs/1-1/mage.txt
    both modified:   npc/pre-re/scripts.conf
    both modified:   npc/pre-re/scripts_monsters.conf
    both modified:   npc/pre-re/scripts_warps.conf
    both modified:   npc/quests/okolnir.txt
    both modified:   npc/re/instances/OldGlastHeim.txt
    both modified:   npc/re/quests/quests_eclage.txt
    both added:      npc/re/quests/quests_lighthalzen.txt
    both modified:   npc/re/quests/quests_malaya.txt
    both modified:   npc/re/scripts.conf
    both modified:   npc/scripts.conf
    both modified:   npc/scripts_custom.conf
    both modified:   npc/scripts_dev.conf
    both modified:   npc/scripts_woe.conf
    both modified:   npc/woe-fe/agit_main.txt
    both modified:   npc/woe-se/agit_main_se.txt
    both modified:   sql-files/item_db.sql
    both modified:   sql-files/item_db_re.sql
    both modified:   src/char/char.c
    both modified:   src/char/char.h
    both modified:   src/char/inter.c
    both modified:   src/common/mmo.h
    both modified:   src/login/login.c
    both modified:   src/map/atcommand.c
    both modified:   src/map/battle.c
    both modified:   src/map/battle.h
    both modified:   src/map/clif.c
    both modified:   src/map/map.c
    both modified:   src/map/npc.h
    both modified:   src/map/packets_struct.h
    both modified:   src/map/party.c
    both modified:   src/map/pc.c
    both modified:   src/map/pc.h
    both modified:   src/map/script.c
    both modified:   src/map/skill.c
    both modified:   src/map/skill.h
    both modified:   src/map/status.c
    both modified:   src/map/status.h
    both modified:   src/map/storage.c
    both modified:   src/map/trade.c
    both modified:   src/map/unit.c
    both modified:   src/map/vending.c
    both modified:   src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
    both modified:   src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
    both modified:   src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
    both modified:   src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
    both modified:   src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
    both modified:   src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
    both modified:   src/plugins/db2sql.c
    deleted by them: vcproj-10/char-server.vcxproj
    deleted by them: vcproj-10/char-server.vcxproj.filters
    deleted by them: vcproj-10/login-server.vcxproj
    deleted by them: vcproj-10/map-server.vcxproj
    deleted by them: vcproj-10/map-server.vcxproj.filters
    both modified:   vcproj-12/char-server.vcxproj

Comments