More Skull Woods fixes

- Found more mistakes in Skull Woods logic and corrected them before 1.0.2 release.
trippsc2 · May 10, 2020 · 86898a3 · 86898a3
1 parent 1d63747
commit 86898a3
Showing 1 changed file with 16 additions and 21 deletions.
diff --git a/OpenTracker.Models/ItemSection.cs b/OpenTracker.Models/ItemSection.cs
@@ -3818,45 +3818,40 @@ public ItemSection(Game game, Location location, int index = 0)
                                 }
                                 else
                                 {
-                                    inaccessible = 0;
+                                    inaccessible = 1;
 
                                     if ((_game.Items.Has(ItemType.FireRod) || _game.Mode.EntranceShuffle.Value) &&
                                         _game.Items.CanRemoveCurtains() && _game.Items.Has(ItemType.SWBigKey))
+                                    {
+                                        inaccessible = 0;
                                         sequenceBreak = false;
+                                    }
                                 }
                             }
                             else
                             {
                                 if (_game.Mode.SmallKeyShuffle)
                                 {
-                                    inaccessible = 2;
+                                    inaccessible = 1;
 
-                                    if (_game.Items.Has(ItemType.FireRod) || _game.Mode.EntranceShuffle.Value)
+                                    if ((_game.Items.Has(ItemType.FireRod) || _game.Mode.EntranceShuffle.Value) &&
+                                        _game.Items.CanRemoveCurtains())
                                     {
-                                        inaccessible = 1;
-
-                                        if (_game.Items.CanRemoveCurtains())
-                                        {
-                                            inaccessible = 0;
-
-                                            if (_game.Items.Has(ItemType.SWSmallKey))
-                                                sequenceBreak = false;
-                                        }
+                                        inaccessible = 0;
+                                        
+                                        if (_game.Items.Has(ItemType.SWSmallKey))
+                                            sequenceBreak = false;
                                     }
                                 }
                                 else
                                 {
-                                    inaccessible = 2;
+                                    inaccessible = 1;
 
-                                    if (_game.Items.Has(ItemType.FireRod) || _game.Mode.EntranceShuffle.Value)
+                                    if ((_game.Items.Has(ItemType.FireRod) || _game.Mode.EntranceShuffle.Value) &&
+                                        _game.Items.CanRemoveCurtains())
                                     {
-                                        inaccessible = 1;
-
-                                        if (_game.Items.CanRemoveCurtains())
-                                        {
-                                            inaccessible = 0;
-                                            sequenceBreak = false;
-                                        }
+                                        inaccessible = 0;
+                                        sequenceBreak = false;
                                     }
                                 }
                             }