From a791207aaa7f41284d22a21fcf0b079cec1cc413 Mon Sep 17 00:00:00 2001 From: Afaelin Date: Tue, 19 Apr 2022 23:57:36 +0200 Subject: [PATCH 1/2] Add: Information about unavailable level 60 Metamons. --- metamon_play.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/metamon_play.py b/metamon_play.py index 3e114b4..4f395e8 100644 --- a/metamon_play.py +++ b/metamon_play.py @@ -237,10 +237,15 @@ def battle(self, w_name=None): print(f"Monsters total: {len(wallet_monsters)}") available_monsters = [ - monster for monster in wallet_monsters if monster.get("tear") > 0 + monster for monster in wallet_monsters if monster.get("tear") > 0 and monster.get("level") < 60 + ] + level60_monsters = [ + monster for monster in wallet_monsters if monster.get("level") >= 60 ] stats_l = [] print(f"Available Monsters : {len(available_monsters)}") + print(f"Level 60 Monsters : {len(level60_monsters)}") + for monster in available_monsters: monster_id = monster.get("id") tear = monster.get("tear") From 663959429ba8a3b0c88b91eb8c0573a6d461377c Mon Sep 17 00:00:00 2001 From: Afaelin Date: Thu, 28 Apr 2022 13:15:50 +0200 Subject: [PATCH 2/2] Fix: lvl60 can now play, do not take care of level but the bool "allowReset". --- metamon_play.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metamon_play.py b/metamon_play.py index 4f395e8..dd099cd 100644 --- a/metamon_play.py +++ b/metamon_play.py @@ -237,7 +237,7 @@ def battle(self, w_name=None): print(f"Monsters total: {len(wallet_monsters)}") available_monsters = [ - monster for monster in wallet_monsters if monster.get("tear") > 0 and monster.get("level") < 60 + monster for monster in wallet_monsters if (monster.get("level") < 60 or monster.get("allowReset") == True) and monster.get("tear") > 0 ] level60_monsters = [ monster for monster in wallet_monsters if monster.get("level") >= 60 @@ -251,9 +251,9 @@ def battle(self, w_name=None): tear = monster.get("tear") level = monster.get("level") exp = monster.get("exp") - if int(level) >= 60 or int(exp) >= 600: + if int(exp) >= 600 or (int(level) >= 60 and int(exp) >= 395): print(f"Monster {monster_id} cannot fight due to " - f"max lvl and/or exp overflow. Skipping...") + f"exp overflow. Skipping...") continue battlers = self.list_battlers(monster_id) battler = picker_battler(battlers)