diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configconverter.pl | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/mobskilldbconverter.py | 0 | ||||
| -rw-r--r-- | tools/utils/libconf.py | 11 |
3 files changed, 9 insertions, 3 deletions
diff --git a/tools/configconverter.pl b/tools/configconverter.pl index dc511aaef..20f5f4cfb 100755 --- a/tools/configconverter.pl +++ b/tools/configconverter.pl @@ -554,7 +554,6 @@ my @defaults = ( guild_exp_limit => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 50}, guild_max_castles => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 0}, guild_skill_relog_delay => {parse => \&parsecfg_bool, print => \&printcfg_bool, path => "guild:", default => "false"}, - castle_defense_rate => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 100}, gvg_flee_penalty => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 20}, require_glory_guild => {parse => \&parsecfg_bool, print => \&printcfg_bool, path => "guild:", default => "false"}, max_guild_alliance => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 3}, diff --git a/tools/mobskilldbconverter.py b/tools/mobskilldbconverter.py index 4ba042062..4ba042062 100644..100755 --- a/tools/mobskilldbconverter.py +++ b/tools/mobskilldbconverter.py diff --git a/tools/utils/libconf.py b/tools/utils/libconf.py index 635efd07d..7f9d6de90 100644 --- a/tools/utils/libconf.py +++ b/tools/utils/libconf.py @@ -226,8 +226,15 @@ class Tokenizer: for cls, type, regex in self.token_map: m = regex.match(string, pos=pos) if m: - yield cls(type, m.group(0), - self.filename, self.row, self.column) + try: + yield cls(type, m.group(0), + self.filename, self.row, self.column) + except ValueError as e: + print("Error parsing file " + "{0}, in line:\n{1}\n{2}".format(self.filename, + m.group(0), + self.row)) + raise self.column += len(m.group(0)) pos = m.end() break |