Skip to content

Fix b86d930: incorrect sprite ID limit, and reuse old IDs when limit is reached #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glx22 merged 1 commit into from
May 29, 2026
Merged

Fix b86d930: incorrect sprite ID limit, and reuse old IDs when limit is reached #431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions nml/actions/action1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
with NML; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."""

from nml.actions import base_action, real_sprite, action2
from nml.actions import base_action, real_sprite

"""
Maximum number of sprites IDs.
"""
total_action1_ids = 0x4000


class Action1(base_action.BaseAction):
Expand Down Expand Up @@ -88,7 +93,6 @@ def __init__(self, feature, first_set, num_sprites_per_spriteset):
self.first_set = first_set
self.num_sprites_per_spriteset = num_sprites_per_spriteset
self.spritesets = {}
self.max_id = 0x3FFF if feature in action2.features_sprite_layout else 0xFFFF

def skip_action7(self):
return False
Expand All @@ -109,10 +113,12 @@ def can_add(self, spriteset):
@return: True iff the given spriteset can be added to this collection.
@rtype: C{bool}
"""
assert self.first_set + 1 <= self.max_id
assert self.first_set + len(self.spritesets) <= total_action1_ids
if len(real_sprite.parse_sprite_data(spriteset)) != self.num_sprites_per_spriteset:
return False
return self.first_set + len(self.spritesets) + (1 if spriteset not in self.spritesets else 0) <= self.max_id
return (
self.first_set + len(self.spritesets) + (1 if spriteset not in self.spritesets else 0) <= total_action1_ids
)

def add(self, spriteset):
"""
Expand Down Expand Up @@ -196,14 +202,13 @@ def add_to_action1(spritesets, feature, pos):

current_collection = spriteset_collections[feature][-1]
for spriteset in spritesets:
for spriteset_collection in spriteset_collections[feature]:
if spriteset in spriteset_collection.spritesets:
continue
if any(spriteset in spriteset_collection.spritesets for spriteset_collection in spriteset_collections[feature]):
continue
if not current_collection.can_add(spriteset):
spriteset_collections[feature].append(
SpritesetCollection(
feature,
current_collection.first_set + len(current_collection.spritesets),
(current_collection.first_set + len(current_collection.spritesets)) % total_action1_ids,
len(real_sprite.parse_sprite_data(spriteset)),
)
)
Expand Down
Loading