Skip to content

cb logic fix and slight improvement #3366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrSnap23 wants to merge 2 commits into
base: dev
Choose a base branch
from
+19 −18
Open

cb logic fix and slight improvement #3366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fda445a
cb logic fix and slight improvement
DrSnap23 Aug 9, 2026
86cdeff
lint
DrSnap23 Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions randomizer/Lists/CBLocations/DKIslesCBLocations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,20 @@
[5, 1.0, 2358, 807, 1747],
],
),
ColoredBananaGroup(
group=46,
map_id=Maps.Isles,
name="Tree below caves",
konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
region=Regions.IslesMain,
locations=[
[1, 1.0, 2381, 600, 1808],
[1, 1.0, 2367, 600, 1764],
[1, 1.0, 2319, 600, 1764],
[1, 1.0, 2305, 600, 1808],
[1, 1.0, 2343, 600, 1836],
],
), # Linked for logic
ColoredBananaGroup(
group=47,
map_id=Maps.Isles,
Expand Down Expand Up @@ -970,17 +984,18 @@
ColoredBananaGroup(
group=70,
map_id=Maps.Isles,
name="On the fairy tree",
name="Up and around the fairy tree",
konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
region=Regions.OuterIsles,
logic=lambda l: (l.climbing) or (Events.AirSpaceEntered in l.Events and l.isdiddy),
locations=[
[5, 1.0, 1067, 733, 1413],
],
),
ColoredBananaGroup(
group=71,
group=70,
map_id=Maps.Isles,
name="Around the fairy tree",
name="Up and around the fairy tree",
konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
region=Regions.OuterIsles,
locations=[
Expand All @@ -990,7 +1005,7 @@
[1, 1.0, 1029, 500, 1425],
[1, 1.0, 1067, 500, 1453],
],
),
), # Grouped together to make cb trees consistent
ColoredBananaGroup(
group=72,
map_id=Maps.Isles,
Expand Down Expand Up @@ -2840,20 +2855,6 @@
],
),
# Wave 2 by Snap
ColoredBananaGroup(
group=219,
map_id=Maps.Isles,
name="Around the tree below caves",
konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
region=Regions.IslesMain,
locations=[
[1, 1.0, 2381, 600, 1808],
[1, 1.0, 2367, 600, 1764],
[1, 1.0, 2319, 600, 1764],
[1, 1.0, 2305, 600, 1808],
[1, 1.0, 2343, 600, 1836],
],
),
ColoredBananaGroup(
group=220,
map_id=Maps.Isles,
Expand Down
Loading