Skip to content

Commit 64ab4cc

Browse files
committed
Keep Earliest Seed in build.py
add checks to build.py to only keep earliest seed found in sheet, as opposed to overwriting when a later duplicate is found
1 parent 268cd84 commit 64ab4cc

File tree

1 file changed

+28
-5
lines changed

1 file changed

+28
-5
lines changed

build.py

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,16 @@ def add_seed(col, sound, l, button):
186186
if seed < 0x10000:
187187
eng_fr = frlg_seeds["fr"][sound][l][button]
188188
for held in eng_fr.keys():
189-
eng_fr[held][(seed + ENG_OFFSETS[l][held]) & 0xFFFF] = frame
189+
offset_seed = (seed + ENG_OFFSETS[l][held]) & 0xFFFF
190+
if offset_seed not in eng_fr[held]:
191+
eng_fr[held][offset_seed] = frame
190192
eu_fr = frlg_seeds["fr_eu"][sound][l][button]
191193
for held in eu_fr.keys():
192-
eu_fr[held][(seed + EU_OFFSETS[l][held]) & 0xFFFF] = frame
194+
offset_seed = (seed + EU_OFFSETS[l][held]) & 0xFFFF
195+
if offset_seed not in eu_fr[held]:
196+
eu_fr[held][offset_seed] = frame
193197

198+
194199
add_seed(3, "stereo", "la", "a")
195200
add_seed(7, "stereo", "help", "a")
196201
add_seed(11, "stereo", "lr", "a")
@@ -221,10 +226,14 @@ def add_seed(col, sound, l, button):
221226
seed = int(row[col], 16)
222227
eng_lg = frlg_seeds["lg"][sound][l][button]
223228
for held in eng_lg.keys():
224-
eng_lg[held][(seed + ENG_OFFSETS[l][held]) & 0xFFFF] = frame
229+
offset_seed = (seed + ENG_OFFSETS[l][held]) & 0xFFFF
230+
if offset_seed not in eng_lg[held]:
231+
eng_lg[held][offset_seed] = frame
225232
eu_lg = frlg_seeds["lg_eu"][sound][l][button]
226233
for held in eu_lg.keys():
227-
eu_lg[held][(seed + EU_OFFSETS[l][held]) & 0xFFFF] = frame
234+
offset_seed = (seed + EU_OFFSETS[l][held]) & 0xFFFF
235+
if offset_seed not in eu_lg[held]:
236+
eu_lg[held][offset_seed] = frame
228237

229238
add_seed(3, "mono", "lr", "a")
230239
add_seed(4, "mono", "la", "a")
@@ -249,9 +258,15 @@ def add_seed(col, sound, l, button):
249258
seed = int(row[col], 16)
250259
jpn_fr_1_0 = frlg_seeds["fr_jpn_1_0"][sound][l][button]
251260
for held in jpn_fr_1_0.keys():
261+
<<<<<<< HEAD
262+
offset_seed = (seed + FR_JPN_1_0_OFFSETS[l][held]) & 0xFFFF
263+
if offset_seed not in jpn_fr_1_0[held]:
264+
jpn_fr_1_0[held][offset_seed] = frame
265+
=======
252266
jpn_fr_1_0[held][
253267
(seed + FR_JPN_1_0_OFFSETS[l][held]) & 0xFFFF
254268
] = frame
269+
>>>>>>> 980be2f6b61ff52f572c5b675fdde9d06d13ef13
255270

256271
add_seed(1, "mono", "lr", "a")
257272
add_seed(2, "mono", "la", "a")
@@ -276,9 +291,15 @@ def add_seed(col, sound, l, button):
276291
seed = int(row[col], 16)
277292
jpn_fr_1_1 = frlg_seeds["fr_jpn_1_1"][sound][l][button]
278293
for held in jpn_fr_1_1.keys():
294+
<<<<<<< HEAD
295+
offset_seed = (seed + FR_JPN_1_1_OFFSETS[l][held]) & 0xFFFF
296+
if offset_seed not in jpn_fr_1_1[held]:
297+
jpn_fr_1_1[held][offset_seed] = frame
298+
=======
279299
jpn_fr_1_1[held][
280300
(seed + FR_JPN_1_1_OFFSETS[l][held]) & 0xFFFF
281301
] = frame
302+
>>>>>>> 980be2f6b61ff52f572c5b675fdde9d06d13ef13
282303

283304
add_seed(1, "mono", "lr", "a")
284305
add_seed(2, "mono", "la", "a")
@@ -303,7 +324,9 @@ def add_seed(col, sound, l, button):
303324
seed = int(row[col], 16)
304325
jpn_lg = frlg_seeds["lg_jpn"][sound][l][button]
305326
for held in jpn_lg.keys():
306-
jpn_lg[held][(seed + LG_JPN_OFFSETS[l][held]) & 0xFFFF] = frame
327+
offset_seed = (seed + LG_JPN_OFFSETS[l][held]) & 0xFFFF
328+
if offset_seed not in jpn_lg[held]:
329+
jpn_lg[held][offset_seed] = frame
307330

308331
add_seed(1, "mono", "lr", "a")
309332
add_seed(2, "mono", "la", "a")

0 commit comments

Comments
 (0)