diff --git a/bemani/backend/popn/common.py b/bemani/backend/popn/common.py index 01cf149..81d8355 100644 --- a/bemani/backend/popn/common.py +++ b/bemani/backend/popn/common.py @@ -971,12 +971,12 @@ class PopnMusicModernBase(PopnMusicBase, ABC): game_config = self.get_game_config() if game_config.get_bool('force_unlock_songs'): - songs = self.data.local.music.get_all_songs(self.game, self.version) + songs = {song.id for song in self.data.local.music.get_all_songs(self.game, self.version)} for song in songs: item = Node.void('item') root.add_child(item) item.add_child(Node.u8('type', 0)) - item.add_child(Node.u16('id', song.id)) + item.add_child(Node.u16('id', song)) item.add_child(Node.u16('param', 15)) item.add_child(Node.bool('is_new', False)) item.add_child(Node.u64('get_time', 0)) diff --git a/bemani/backend/popn/eclale.py b/bemani/backend/popn/eclale.py index 0253dff..f20772e 100644 --- a/bemani/backend/popn/eclale.py +++ b/bemani/backend/popn/eclale.py @@ -704,12 +704,12 @@ class PopnMusicEclale(PopnMusicBase): game_config = self.get_game_config() if game_config.get_bool('force_unlock_songs'): - songs = self.data.local.music.get_all_songs(self.game, self.version) + songs = {song.id for song in self.data.local.music.get_all_songs(self.game, self.version)} for song in songs: item = Node.void('item') root.add_child(item) item.add_child(Node.u8('type', 0)) - item.add_child(Node.u16('id', song.id)) + item.add_child(Node.u16('id', song)) item.add_child(Node.u16('param', 15)) item.add_child(Node.bool('is_new', False)) diff --git a/bemani/backend/popn/lapistoria.py b/bemani/backend/popn/lapistoria.py index c6c80b6..c3c6c30 100644 --- a/bemani/backend/popn/lapistoria.py +++ b/bemani/backend/popn/lapistoria.py @@ -741,12 +741,12 @@ class PopnMusicLapistoria(PopnMusicBase): game_config = self.get_game_config() if game_config.get_bool('force_unlock_songs'): - songs = self.data.local.music.get_all_songs(self.game, self.version) + songs = {song.id for song in self.data.local.music.get_all_songs(self.game, self.version)} for song in songs: item = Node.void('item') root.add_child(item) item.add_child(Node.u8('type', 0)) - item.add_child(Node.u16('id', song.id)) + item.add_child(Node.u16('id', song)) item.add_child(Node.u16('param', 15)) item.add_child(Node.bool('is_new', False))