summaryrefslogtreecommitdiff
path: root/conf/map/battle.conf
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-14 18:49:13 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-14 18:49:13 -0300
commitcaa876d59502c2020e7685adba470a3fae8786bb (patch)
treef3119b50fc1ea6f5369d60e7b1c03ba8bffdf98d /conf/map/battle.conf
parente356ef5e200896fbf74803618c5add7dca8b18ce (diff)
downloadserverdata-caa876d59502c2020e7685adba470a3fae8786bb.tar.gz
serverdata-caa876d59502c2020e7685adba470a3fae8786bb.tar.bz2
serverdata-caa876d59502c2020e7685adba470a3fae8786bb.tar.xz
serverdata-caa876d59502c2020e7685adba470a3fae8786bb.zip
Hercules updates (authored by 4144)
Diffstat (limited to 'conf/map/battle.conf')
-rw-r--r--conf/map/battle.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/map/battle.conf b/conf/map/battle.conf
index cc9687233..f8c6b9a14 100644
--- a/conf/map/battle.conf
+++ b/conf/map/battle.conf
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2014-2018 Hercules Dev Team
+//= Copyright (C) 2014-2019 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
@@ -76,6 +76,9 @@ battle_configuration: {
// Feature control (on/off) settings
@include "conf/map/battle/feature.conf"
+ // Different calculation limits
+ @include "conf/map/battle/limits.conf"
+
// Anything else that didn't fit anywhere else.
// Includes duel, day/night, mute/manner, log settings.
@include "conf/map/battle/misc.conf"