monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issues with customitemarray (#140) 

* Fixed issues with customitemarray

* Fixed Triforce in custom item pool
This commit is contained in:
Louis-David Perron 2020-09-16 18:18:17 -04:00 committed by GitHub
parent f040e96bef
commit c40196e07c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gui.py
View File

@ -557,8 +557,8 @@ def guiMain(args=None):
int(rupee20Var.get()), int(rupee50Var.get()), int(rupee100Var.get()),
int(rupee300Var.get()), int(rupoorVar.get()), int(blueclockVar.get()),
int(greenclockVar.get()), int(redclockVar.get()), int(progbowVar.get()),
int(bomb10Var.get()), int(triforceVar.get()),
int(rupoorcostVar.get()), int(universalkeyVar.get())]
int(bomb10Var.get()), int(universalkeyVar.get()),
int(rupoorcostVar.get()), int(triforceVar.get())]
guiargs.rom = romVar.get()
guiargs.create_diff = patchesVar.get()
guiargs.sprite = sprite

12
ItemPool.py
View File

@ -712,15 +712,16 @@ def make_custom_item_pool(world, player):
placed_items[loc] = item
# Correct for insanely oversized item counts and take initial steps to handle undersized pools.
for x in range(0, 64):
for x in range(0, 67):
if customitemarray[x] > total_items_to_place:
customitemarray[x] = total_items_to_place
if customitemarray[66] > total_items_to_place:
customitemarray[66] = total_items_to_place
if customitemarray[68] > total_items_to_place:
customitemarray[68] = total_items_to_place
# count all items, except rupoor cost
itemtotal = 0
for x in range(0, 64):
for x in range(0, 67):
itemtotal = itemtotal + customitemarray[x]
itemtotal = itemtotal + customitemarray[66]
itemtotal = itemtotal + customitemarray[68]
pool.extend(['Bow'] * customitemarray[0])
@ -784,6 +785,7 @@ def make_custom_item_pool(world, player):
pool.extend(['Red Clock'] * customitemarray[63])
pool.extend(['Progressive Bow'] * customitemarray[64])
pool.extend(['Bombs (10)'] * customitemarray[65])
pool.extend(['Triforce'] * customitemarray[68])
diff = difficulties[difficulty]