Smz3 early sword fix (#939)

This commit is contained in:
lordlou 2022-08-19 09:02:39 -04:00 committed by GitHub
parent 0d61192c67
commit 0ac67bfe76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -590,8 +590,6 @@ class SMZ3World(World):
# /* Check Swords option and place as needed */
if self.smz3World.Config.SwordLocation == SwordLocation.Uncle:
self.FillItemAtLocation(self.progression, TotalSMZ3Item.ItemType.ProgressiveSword, self.smz3World.GetLocation("Link's Uncle"))
elif self.smz3World.Config.SwordLocation == SwordLocation.Early:
self.FrontFillItemInOwnWorld(self.progression, TotalSMZ3Item.ItemType.ProgressiveSword)
# /* Check Morph option and place as needed */
if self.smz3World.Config.MorphLocation == MorphLocation.Original:
@ -599,6 +597,10 @@ class SMZ3World(World):
elif self.smz3World.Config.MorphLocation == MorphLocation.Early:
self.FrontFillItemInOwnWorld(self.progression, TotalSMZ3Item.ItemType.Morph)
# We do early Sword placement after Morph in case its Original location
if self.smz3World.Config.SwordLocation == SwordLocation.Early:
self.FrontFillItemInOwnWorld(self.progression, TotalSMZ3Item.ItemType.ProgressiveSword)
# /* We place a PB and Super in Sphere 1 to make sure the filler
# * doesn't start locking items behind this when there are a
# * high chance of the trash fill actually making them available */