Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/Fix develop branch deadbot call #66

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi

if [ "$DECOMPILE" = true ]; then
cd src
python3 deadbot.py --decompile=true --deadbot=false
python3 deadbot.py --decompile
cd ..
fi

Expand All @@ -23,7 +23,7 @@ fi

if [ "$BOT_PUSH" = true ]; then
cd src
python3 deadbot.py # uses BOT_PUSH env var
python3 deadbot.py --bot_push # uses BOT_PUSH env var
cd ..
fi

Expand Down
4 changes: 2 additions & 2 deletions src/deadbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ def main():
1,
]

if args.decompile or os.getenv('DECOMPILE', False) in true_args:
if args.decompile or (os.getenv('DECOMPILE', False) in true_args):
print('Decompiling source files...')
decompile.decompile(args.dl_path, args.workdir, args.output, args.decompiler_cmd)
else:
print('! Skipping Decompiler !')

if args.bot_push or os.getenv('BOT_PUSH', False) in true_args:
if args.bot_push or (os.getenv('BOT_PUSH', False) in true_args):
print('Running DeadBot...')
bot = DeadBot()
bot.push_lane()
Expand Down
7 changes: 4 additions & 3 deletions src/parser/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,11 @@ def _merge_localizations(self, language, group, data):
# duplicate key error. This is a temporary measure to keep patch updates going
elif group != 'heroes':
current_value = self.localizations[language][key]
raise Exception(
f'Key {key} with value {value} already exists in {language} localization '
+ f'data with value {current_value}.'
print(
f'Warning: In {language} localization under key `{key}`, '
+ f'value `{current_value}` was replaced with `{value}`.'
)
self.localizations[language][key] = value

def run(self):
print('Parsing...')
Expand Down