Skip to content
Merged
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
25 changes: 20 additions & 5 deletions umalauncher/helper_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,19 @@ def __init__(self, partner_id, starting_bond, chara_info):

if partner_id < 100:
support_id = chara_info['support_card_array'][partner_id - 1]['support_card_id']
support_data = mdb.get_support_card_dict()[support_id]
support_card_dict = mdb.get_support_card_dict()
if support_id not in support_card_dict:
logger.warning(f"Could not find support_id {support_id}, attempting to force an update")
support_card_dict = mdb.get_support_card_dict(force=True)
if support_id not in support_card_dict:
logger.error(f"Could not find support_id {support_id} after forced update")
# TODO: handle this better
util.show_error_box("Error", f"Could not find a support card with id {support_id} in game database ({mdb.get_db_path()}). Try restarting the game and Uma Launcher, and make sure the game is up to date. If that doesn't work, try downloading all game data from the options menu.")
raise Exception(f"Could not find support_id {support_id} after forced update")
else:
logger.info(f"Successfully found support_id {support_id}")

support_data = support_card_dict[support_id]
chara_id = support_data[3]
self.chara_id = chara_id
self.img = f"https://gametora.com/images/umamusume/characters/icons/chr_icon_{chara_id}.png"
Expand Down Expand Up @@ -243,10 +255,13 @@ def create_helper_elements(self, data, last_data) -> str:


# Support Dict
eval_dict = {
eval_data['training_partner_id']: TrainingPartner(eval_data['training_partner_id'], eval_data['evaluation'], data['chara_info'])
for eval_data in data['chara_info']['evaluation_info_array']
}
eval_dict = {}
for eval_data in data['chara_info']['evaluation_info_array']:
try:
eval_dict[eval_data['training_partner_id']] = TrainingPartner(eval_data['training_partner_id'], eval_data['evaluation'],data['chara_info'])
except Exception as e:
logger.error(f"Error while creating TrainingPartner: {e}")
continue

onsen_points_gain = {}
# Onsen
Expand Down
5 changes: 4 additions & 1 deletion umalauncher/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,10 @@ def download_file(url, path):
shutil.move(tmp_path, path)

def open_folder(path):
os.startfile(path)
try:
os.startfile(path)
except:
logger.error(f"Failed to open training logs folder: {path}")



Expand Down
2 changes: 1 addition & 1 deletion umalauncher/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import gui
import glob

VERSION = "1.17.15"
VERSION = "1.17.16"

def parse_version(version_string: str):
"""Convert version string to tuple."""
Expand Down