From 41883e44e7b2141e38e8bbcfb280adb0dd06836c Mon Sep 17 00:00:00 2001
From: PoryGone <98504756+PoryGone@users.noreply.github.com>
Date: Mon, 25 Jul 2022 15:34:31 -0400
Subject: [PATCH] DKC3 - Logic Softlock Fix (#817)

* Add two locations to Trade Sequence List

* Remove trace sequence locations from ROM data dict
---
 worlds/dkc3/Regions.py  | 16 ++++++++++------
 worlds/dkc3/Rom.py      |  4 ++--
 worlds/dkc3/__init__.py |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/worlds/dkc3/Regions.py b/worlds/dkc3/Regions.py
index 6cb01e4f1823..501f1a0ea4fb 100644
--- a/worlds/dkc3/Regions.py
+++ b/worlds/dkc3/Regions.py
@@ -501,9 +501,11 @@ def create_regions(world, player: int, active_locations):
     bounty_bay_region = create_region(world, player, active_locations, LocationName.bounty_bay_region,
                                       bounty_bay_region_locations, None)
 
-    sky_high_secret_region_locations = {
-        LocationName.sky_high_secret: [0x64B, 1],
-    }
+    sky_high_secret_region_locations = {}
+    if False:#world.include_trade_sequence[player]:
+        sky_high_secret_region_locations.update({
+            LocationName.sky_high_secret: [0x64B, 1],
+        })
     sky_high_secret_region = create_region(world, player, active_locations, LocationName.sky_high_secret_region,
                                            sky_high_secret_region_locations, None)
 
@@ -513,9 +515,11 @@ def create_regions(world, player: int, active_locations):
     glacial_grotto_region = create_region(world, player, active_locations, LocationName.glacial_grotto_region,
                                           glacial_grotto_region_locations, None)
 
-    cifftop_cache_region_locations = {
-        LocationName.cifftop_cache: [0x64D, 1],
-    }
+    cifftop_cache_region_locations = {}
+    if False:#world.include_trade_sequence[player]:
+        cifftop_cache_region_locations.update({
+            LocationName.cifftop_cache: [0x64D, 1],
+        })
     cifftop_cache_region = create_region(world, player, active_locations, LocationName.cifftop_cache_region,
                                          cifftop_cache_region_locations, None)
 
diff --git a/worlds/dkc3/Rom.py b/worlds/dkc3/Rom.py
index 761161ee834e..821143090b04 100644
--- a/worlds/dkc3/Rom.py
+++ b/worlds/dkc3/Rom.py
@@ -238,9 +238,9 @@
     0xDC30AF: [0x648, 1],
     0xDC30B0: [0x649, 1],
     0xDC30B1: [0x64A, 1],
-    0xDC30B2: [0x64B, 1],
+    #0xDC30B2: [0x64B, 1], # Disabled until Trade Sequence
     0xDC30B3: [0x64C, 1],
-    0xDC30B4: [0x64D, 1],
+    #0xDC30B4: [0x64D, 1], # Disabled until Trade Sequence
     0xDC30B5: [0x64E, 1],
 
     0xDC30B6: [0x5FD, 4], # Banana Bird Mother
diff --git a/worlds/dkc3/__init__.py b/worlds/dkc3/__init__.py
index 54087db9aa0e..d9e73a7ec307 100644
--- a/worlds/dkc3/__init__.py
+++ b/worlds/dkc3/__init__.py
@@ -82,7 +82,7 @@ def generate_basic(self):
         itempool: typing.List[DKC3Item] = []
 
         # Levels
-        total_required_locations = 161
+        total_required_locations = 159
 
         number_of_banana_birds = 0
         # Rocket Rush Cog
@@ -105,7 +105,7 @@ def generate_basic(self):
 
         ## Brothers Bear
         if False:#self.world.include_trade_sequence[self.player]:
-            total_required_locations += 8
+            total_required_locations += 10
 
         number_of_bonus_coins = (self.world.krematoa_bonus_coin_cost[self.player] * 5)
         number_of_bonus_coins += math.ceil((85 - number_of_bonus_coins) * self.world.percentage_of_extra_bonus_coins[self.player] / 100)