From 93812bb62906b31aafe3414c082e5bcadf0067a8 Mon Sep 17 00:00:00 2001 From: spinerak Date: Mon, 10 Jun 2024 18:55:12 +0200 Subject: [PATCH] faster collection of categories --- worlds/yachtdice/Rules.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/worlds/yachtdice/Rules.py b/worlds/yachtdice/Rules.py index 3fd63b2547..fecd2c04e3 100644 --- a/worlds/yachtdice/Rules.py +++ b/worlds/yachtdice/Rules.py @@ -99,10 +99,13 @@ def extract_progression(state, player, options): ) number_of_fixed_mults = state.count("Fixed Score Multiplier", player) number_of_step_mults = state.count("Step Score Multiplier", player) - categories = [] - for category_name, category_value in category_mappings.items(): - if state.count(category_name, player) >= 1: - categories += [Category(category_value, state.count(category_name, player))] + + categories = [ + Category(category_value, state.count(category_name, player)) + for category_name, category_value in category_mappings.items() + if state.count(category_name, player) # want all categories that have count >= 1 + ] + extra_points_in_logic = state.count("1 Point", player) extra_points_in_logic += state.count("10 Points", player) * 10 extra_points_in_logic += state.count("100 Points", player) * 100