From 3b05a1994aa71dcee983c075d84f89d33494b0f4 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 25 Oct 2024 16:00:40 +0100 Subject: [PATCH] - Tiny bit more work to flesh it out --- DBEditor/DBEditor.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/DBEditor/DBEditor.py b/DBEditor/DBEditor.py index 34365e2..bf0ec90 100644 --- a/DBEditor/DBEditor.py +++ b/DBEditor/DBEditor.py @@ -453,14 +453,21 @@ class DBEditor(QMainWindow): find_me = lambda x: x[0] == pfic target_index = next((i for i, item in enumerate(chain) if find_me(item)), -1) base_form_in_generation = None - for i in range(target_index, -1, -1): - chain_pfic, chain_name, chain_form_name, method = chain[i] - chain_pokemon_data = event_system.call_sync('get_pokemon_data', chain_pfic) + current_pfic = pfic + while True: + current_pfic = event_system.call_sync('get_evolution_parent', current_pfic) + if current_pfic == None: + base_form_in_generation = current_pfic + break + chain_pokemon_data = event_system.call_sync('get_pokemon_data', current_pfic) if chain_pokemon_data[3] == pokemon_data[3]: - base_form_in_generation = chain_pfic - else: + base_form_in_generation = current_pfic break + if base_form_in_generation: + self.logger.info(f"Base form in generation for {name} {form_name if form_name else ''} is {base_form_in_generation}") + +