Skip to content

Some bugfixes #3176

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

Merged
GreenestBeen merged 7 commits into from
Apr 8, 2026
Merged

Some bugfixes #3176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7d61fe
Random settings fixes
GreenestBeen Apr 2, 2026
ffe9311
And some logic fixes for good measure
GreenestBeen Apr 2, 2026
4b6e1a3
ap ver bump
GreenestBeen Apr 2, 2026
adecec2
Get the raw weight files too
GreenestBeen Apr 2, 2026
25232da
lint
GreenestBeen Apr 2, 2026
3ade972
parenthesis
GreenestBeen Apr 2, 2026
49b6b88
guaranteed starting moves
GreenestBeen Apr 2, 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
2 changes: 1 addition & 1 deletion archipelago.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"minimum_ap_version": "0.6.5",
"world_version": "1.5.1",
"world_version": "1.5.2",
"authors": ["2dos", "AlmostSeagull", "Ballaam", "Green Bean", "Killklli", "Lrauq", "PoryGone", "Umed"],
"version": 7,
"compatible_version": 7,
Expand Down
2 changes: 1 addition & 1 deletion randomizer/LogicFiles/CrystalCaves.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
),

Regions.FrozenCastle: Region("Frozen Castle", HintRegion.MainCaves, Levels.CrystalCaves, False, None, [
LocationLogic(Locations.CavesLankyCastle, lambda l: l.Slam and (l.islanky or (l.settings.free_trade_items and (not l.isdonkey or l.superSlam)))),
LocationLogic(Locations.CavesLankyCastle, lambda l: l.Slam and (l.islanky or (l.settings.free_trade_items and ((l.isdiddy or l.islanky or l.istiny or l.ischunky) or l.superSlam)))),
LocationLogic(Locations.KremKap_CavesNPC_IceTomato, lambda l: l.camera),
], [], [
TransitionFront(Regions.CrystalCavesMain, lambda _: True, Transitions.CavesCastleToMain),
Expand Down
2 changes: 1 addition & 1 deletion randomizer/LogicFiles/FungiForest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
]),

Regions.ThornvineBarn: Region("Thornvine Barn", HintRegion.Mills, Levels.FungiForest, False, -1, [
LocationLogic(Locations.ForestDonkeyBarn, lambda l: l.CanSlamSwitch(Levels.FungiForest, 1) and l.isdonkey and l.climbing and (l.can_use_vines or l.monkey_maneuvers or l.settings.bonus_barrels == MinigameBarrels.skip), MinigameType.BonusBarrel), # Krusha can make it by jumping onto the beam first.
LocationLogic(Locations.ForestDonkeyBarn, lambda l: l.CanSlamSwitch(Levels.FungiForest, 1) and l.isdonkey and ((l.climbing and (l.can_use_vines or l.monkey_maneuvers)) or l.settings.bonus_barrels == MinigameBarrels.skip), MinigameType.BonusBarrel), # Krusha can make it by jumping onto the beam first.
LocationLogic(Locations.MelonCrate_Location11, lambda _: True),
LocationLogic(Locations.ForestThornBarnEnemy_Enemy, lambda _: True),
LocationLogic(Locations.KremKap_ForestThornBarnEnemy_Enemy, lambda l: l.camera),
Expand Down
15 changes: 9 additions & 6 deletions randomizer/Settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,11 +1098,6 @@ def resolve_settings(self):
self.training_barrels = TrainingBarrels.normal
else:
self.training_barrels = TrainingBarrels.shuffled
# If Climbing is a guaranteed starting move, treat it like the others as well.
if Items.Climbing in guaranteed_starting_moves:
self.climbing_status = ClimbingStatus.normal
else:
self.climbing_status = ClimbingStatus.shuffled
# If you start with two copies of Progressive Instrument Upgrade, you start with 3 melons of health
if guaranteed_starting_moves.count(Items.ProgressiveInstrumentUpgrade) == 2:
self.start_with_3rd_melon = True
Expand Down Expand Up @@ -1674,6 +1669,10 @@ def resolve_settings(self):
selector_types = [sk for sk in [Types.Cranky, Types.Snide, Types.Candy, Types.Funky] if shopkeeper_type_mapping[sk] not in guaranteed_starting_moves]
elif selector_type == Types.TrainingBarrel:
selector_types = [Types.TrainingBarrel, Types.PreGivenMove]
if Items.Climbing in guaranteed_starting_moves:
self.climbing_status = ClimbingStatus.normal
else:
self.climbing_status = ClimbingStatus.shuffled
if self.climbing_status != ClimbingStatus.normal:
selector_types.append(Types.Climbing)
elif selector_type == Types.Medal and IsItemSelected(self.cb_rando_enabled, self.cb_rando_list_selected, Levels.DKIsles):
Expand All @@ -1691,6 +1690,10 @@ def resolve_settings(self):
item_types = []
else:
item_types = [Types.TrainingBarrel, Types.PreGivenMove]
if Items.Climbing in guaranteed_starting_moves:
self.climbing_status = ClimbingStatus.normal
else:
self.climbing_status = ClimbingStatus.shuffled
if self.climbing_status != ClimbingStatus.normal:
item_types.append(Types.Climbing)
elif item_type == Types.Medal and IsItemSelected(self.cb_rando_enabled, self.cb_rando_list_selected, Levels.DKIsles):
Expand Down Expand Up @@ -1728,7 +1731,7 @@ def resolve_settings(self):

# If training moves are not in any shuffled pool, add them to guaranteed_starting_moves
if Types.TrainingBarrel not in self.shuffled_location_types:
training_barrel_items = [Items.Vines, Items.Swim, Items.Oranges, Items.Barrels]
training_barrel_items = [Items.Vines, Items.Swim, Items.Oranges, Items.Barrels, Items.Climbing]
for tb_item in training_barrel_items:
if tb_item not in guaranteed_starting_moves:
guaranteed_starting_moves.append(tb_item)
Expand Down
80 changes: 40 additions & 40 deletions static/presets/weights/weight_files_raw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,46 +1278,46 @@
"min_selected": 3,
"options": {
"easy": {
"JapesBoss": 80,
"AztecBoss": 80,
"FactoryBoss": 80,
"GalleonBoss": 80,
"FungiBoss": 80,
"CavesBoss": 80,
"CastleBoss": 80,
"KroolDonkeyPhase": 80,
"KroolDiddyPhase": 80,
"KroolLankyPhase": 80,
"KroolTinyPhase": 80,
"KroolChunkyPhase": 80
},
"standard": {
"JapesBoss": 80,
"AztecBoss": 80,
"FactoryBoss": 80,
"GalleonBoss": 80,
"FungiBoss": 80,
"CavesBoss": 80,
"CastleBoss": 80,
"KroolDonkeyPhase": 80,
"KroolDiddyPhase": 80,
"KroolLankyPhase": 80,
"KroolTinyPhase": 80,
"KroolChunkyPhase": 80
},
"difficult": {
"JapesBoss": 80,
"AztecBoss": 80,
"FactoryBoss": 80,
"GalleonBoss": 80,
"FungiBoss": 80,
"CavesBoss": 80,
"CastleBoss": 80,
"KroolDonkeyPhase": 80,
"KroolDiddyPhase": 80,
"KroolLankyPhase": 80,
"KroolTinyPhase": 80,
"KroolChunkyPhase": 80
"JapesBoss": 100,
"AztecBoss": 100,
"FactoryBoss": 100,
"GalleonBoss": 100,
"FungiBoss": 100,
"CavesBoss": 100,
"CastleBoss": 100,
"KroolDonkeyPhase": 100,
"KroolDiddyPhase": 100,
"KroolLankyPhase": 100,
"KroolTinyPhase": 100,
"KroolChunkyPhase": 100
},
"standard": {
"JapesBoss": 100,
"AztecBoss": 100,
"FactoryBoss": 100,
"GalleonBoss": 100,
"FungiBoss": 100,
"CavesBoss": 100,
"CastleBoss": 100,
"KroolDonkeyPhase": 100,
"KroolDiddyPhase": 100,
"KroolLankyPhase": 100,
"KroolTinyPhase": 100,
"KroolChunkyPhase": 100
},
"difficult": {
"JapesBoss": 100,
"AztecBoss": 100,
"FactoryBoss": 100,
"GalleonBoss": 100,
"FungiBoss": 100,
"CavesBoss": 100,
"CastleBoss": 100,
"KroolDonkeyPhase": 100,
"KroolDiddyPhase": 100,
"KroolLankyPhase": 100,
"KroolTinyPhase": 100,
"KroolChunkyPhase": 100
}
},
"qol_uses_hard": true
Expand Down
96 changes: 48 additions & 48 deletions static/presets/weights/weights_files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
"bonus_barrel_rando": 0.7,
"boss_location_rando": 0.8,
"bosses_selected": {
"JapesBoss": 0.8,
"AztecBoss": 0.8,
"FactoryBoss": 0.8,
"GalleonBoss": 0.8,
"FungiBoss": 0.8,
"CavesBoss": 0.8,
"CastleBoss": 0.8,
"KroolDonkeyPhase": 0.8,
"KroolDiddyPhase": 0.8,
"KroolLankyPhase": 0.8,
"KroolTinyPhase": 0.8,
"KroolChunkyPhase": 0.8
"JapesBoss": 1,
"AztecBoss": 1,
"FactoryBoss": 1,
"GalleonBoss": 1,
"FungiBoss": 1,
"CavesBoss": 1,
"CastleBoss": 1,
"KroolDonkeyPhase": 1,
"KroolDiddyPhase": 1,
"KroolLankyPhase": 1,
"KroolTinyPhase": 1,
"KroolChunkyPhase": 1
},
"cannons_require_blast": 0,
"cb_rando_enabled": 0.3,
Expand Down Expand Up @@ -468,18 +468,18 @@
"bonus_barrel_rando": 0.7,
"boss_location_rando": 0.8,
"bosses_selected": {
"JapesBoss": 0.8,
"AztecBoss": 0.8,
"FactoryBoss": 0.8,
"GalleonBoss": 0.8,
"FungiBoss": 0.8,
"CavesBoss": 0.8,
"CastleBoss": 0.8,
"KroolDonkeyPhase": 0.8,
"KroolDiddyPhase": 0.8,
"KroolLankyPhase": 0.8,
"KroolTinyPhase": 0.8,
"KroolChunkyPhase": 0.8
"JapesBoss": 1,
"AztecBoss": 1,
"FactoryBoss": 1,
"GalleonBoss": 1,
"FungiBoss": 1,
"CavesBoss": 1,
"CastleBoss": 1,
"KroolDonkeyPhase": 1,
"KroolDiddyPhase": 1,
"KroolLankyPhase": 1,
"KroolTinyPhase": 1,
"KroolChunkyPhase": 1
},
"cannons_require_blast": 0.5,
"cb_rando_enabled": 0.5,
Expand Down Expand Up @@ -933,18 +933,18 @@
"bonus_barrel_rando": 0.7,
"boss_location_rando": 0.8,
"bosses_selected": {
"JapesBoss": 0.8,
"AztecBoss": 0.8,
"FactoryBoss": 0.8,
"GalleonBoss": 0.8,
"FungiBoss": 0.8,
"CavesBoss": 0.8,
"CastleBoss": 0.8,
"KroolDonkeyPhase": 0.8,
"KroolDiddyPhase": 0.8,
"KroolLankyPhase": 0.8,
"KroolTinyPhase": 0.8,
"KroolChunkyPhase": 0.8
"JapesBoss": 1,
"AztecBoss": 1,
"FactoryBoss": 1,
"GalleonBoss": 1,
"FungiBoss": 1,
"CavesBoss": 1,
"CastleBoss": 1,
"KroolDonkeyPhase": 1,
"KroolDiddyPhase": 1,
"KroolLankyPhase": 1,
"KroolTinyPhase": 1,
"KroolChunkyPhase": 1
},
"cannons_require_blast": 1,
"cb_rando_enabled": 0.6,
Expand Down Expand Up @@ -1443,18 +1443,18 @@
"bonus_barrel_rando": 0.7,
"boss_location_rando": 0.8,
"bosses_selected": {
"JapesBoss": 0.8,
"AztecBoss": 0.8,
"FactoryBoss": 0.8,
"GalleonBoss": 0.8,
"FungiBoss": 0.8,
"CavesBoss": 0.8,
"CastleBoss": 0.8,
"KroolDonkeyPhase": 0.8,
"KroolDiddyPhase": 0.8,
"KroolLankyPhase": 0.8,
"KroolTinyPhase": 0.8,
"KroolChunkyPhase": 0.8
"JapesBoss": 1,
"AztecBoss": 1,
"FactoryBoss": 1,
"GalleonBoss": 1,
"FungiBoss": 1,
"CavesBoss": 1,
"CastleBoss": 1,
"KroolDonkeyPhase": 1,
"KroolDiddyPhase": 1,
"KroolLankyPhase": 1,
"KroolTinyPhase": 1,
"KroolChunkyPhase": 1
},
"cannons_require_blast": 1,
"cb_rando_enabled": 0.6,
Expand Down
Loading