From fb57e9fd34937096a72eb84477299d232afacd56 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sat, 16 May 2026 22:18:51 -0500 Subject: [PATCH] Fix some enemy denials being overwritten --- source/rom/DataTables.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/rom/DataTables.py b/source/rom/DataTables.py index 8523cf77..ace6a6ce 100644 --- a/source/rom/DataTables.py +++ b/source/rom/DataTables.py @@ -58,17 +58,17 @@ class DataTables: self.bush_sprite_table = {} # enemizer conditions - self.uw_enemy_denials = {} - self.ow_enemy_denials = {} - self.uw_enemy_drop_denials = {} + self.uw_enemy_denials = defaultdict(set) + self.ow_enemy_denials = defaultdict(set) + self.uw_enemy_drop_denials = defaultdict(set) self.sheet_choices = [] denial_data = load_cached_yaml(['source', 'enemizer', 'enemy_deny.yaml']) for denial in denial_data['UwGeneralDeny']: - self.uw_enemy_denials[denial[0], denial[1]] = {sprite_translation[x] for x in denial[2]} + self.uw_enemy_denials[denial[0], denial[1]] |= {sprite_translation[x] for x in denial[2]} for denial in denial_data['OwGeneralDeny']: - self.ow_enemy_denials[denial[0], denial[1]] = {sprite_translation[x] for x in denial[2]} + self.ow_enemy_denials[denial[0], denial[1]] |= {sprite_translation[x] for x in denial[2]} for denial in denial_data['UwEnemyDrop']: - self.uw_enemy_drop_denials[denial[0], denial[1]] = {sprite_translation[x] for x in denial[2]} + self.uw_enemy_drop_denials[denial[0], denial[1]] |= {sprite_translation[x] for x in denial[2]} weights = load_cached_yaml(['source', 'enemizer', 'enemy_weight.yaml']) self.uw_weights = {sprite_translation[k]: v for k, v in weights['UW'].items()} self.ow_weights = {sprite_translation[k]: v for k, v in weights['OW'].items()}