diff --git a/constraints.txt b/constraints.txt index 3e683b8..dd49c60 100644 --- a/constraints.txt +++ b/constraints.txt @@ -335,13 +335,13 @@ ITM & ( } { -"edge": "FOREST_NIGHT_WEST -> FOREST_START", -"prereq": "IMPOSSIBLE", // dummy edge for template constraint +"edge": "FOREST_NIGHT_ATK_UP_ROOM -> FOREST_NIGHT_WEST", +"prereq": "DARKNESS & (CARROT_SHOOTER | (CARROT_BOMB & BACKTRACK_1))", } { -"edge": "FOREST_NIGHT_ATK_UP_ROOM -> FOREST_NIGHT_WEST", -"prereq": "DARKNESS & (CARROT_SHOOTER | (CARROT_BOMB & BACKTRACK_1))", +"edge": "FOREST_NIGHT_WEST -> FOREST_START", +"prereq": "IMPOSSIBLE", // dummy edge for template constraint } diff --git a/src/sig/MultiRando.java b/src/sig/MultiRando.java index b00f163..5157c73 100644 --- a/src/sig/MultiRando.java +++ b/src/sig/MultiRando.java @@ -164,6 +164,50 @@ public class MultiRando { new Long[]{DOWNDRILL_SEMISOLID_CLIP}, NULL ); + SW[0].add(SW[12], + new Long[]{INTERMEDIATE|AIR_JUMP|RABI_SLIPPERS, + INTERMEDIATE|AIR_JUMP|HARD|WALL_JUMP, + INTERMEDIATE|WHIRL_BONK_CANCEL, + INTERMEDIATE|SLIDE_JUMP_BUNSTRIKE_CANCEL|AIR_JUMP, + INTERMEDIATE|SLIDE_JUMP_BUNSTRIKE_CANCEL|WALL_JUMP_LV2|AIR_DASH, + INTERMEDIATE|SLIDE_JUMP_BUNSTRIKE_CANCEL|WALL_JUMP_LV2|ADVANCED_STUPID, + INTERMEDIATE|ADVANCED_HARD|HAMMER_ROLL|AIR_JUMP, + INTERMEDIATE|ADVANCED_HARD|HAMMER_ROLL|WALL_JUMP_LV2, + ADVANCED_STUPID|SLIDING_POWDER|BUNNY_AMULET|WALL_JUMP_LV2, + ADVANCED_STUPID|SLIDE_ZIP|AIR_JUMP, + ADVANCED_STUPID|SLIDE_ZIP|BUNNY_AMULET|WALL_JUMP_LV2, + ADVANCED_STUPID|WHIRL_BONK|AIR_JUMP}, + NULL + ); + SW[0].add(SW[9],NULL); + SW[11].add(SW[12], + new Long[]{EXPLOSIVES_ENEMY}, + new Long[]{DARKNESS|CARROT_SHOOTER, + DARKNESS|CARROT_BOMB|BACKTRACK_1}); + SW[11].add(SW[0],IMPOSSIBLE); + SW[8].add(SW[10], + new Long[]{DARKNESS|PROLOGUE_TRIGGER|SLIDING_POWDER}, + new Long[]{PROLOGUE_TRIGGER|SLIDING_POWDER, + PROLOGUE_TRIGGER|HAMMER_ROLL_ZIP}); + SW[9].add(SW[10], + new Long[]{INTERMEDIATE|DARKNESS|AIR_JUMP, + INTERMEDIATE|DARKNESS|WALL_JUMP_LV2|RABI_SLIPPERS, + INTERMEDIATE|DARKNESS|WALL_JUMP_LV2|INTERMEDIATE_HARD|SLIDING_POWDER, + INTERMEDIATE|DARKNESS|WALL_JUMP_LV2|ADVANCED_HARD|SPEED1, + INTERMEDIATE|DARKNESS|WALL_JUMP_LV2|AIR_DASH, + INTERMEDIATE|DARKNESS|WALL_JUMP_LV2|ADVANCED_VERYHARD, + INTERMEDIATE|DARKNESS|WHIRL_BONK_CANCEL, + INTERMEDIATE|DARKNESS|SLIDE_JUMP_BUNSTRIKE_CANCEL, + INTERMEDIATE|DARKNESS|ADVANCED_VERYHARD|SLIDING_POWDER, + INTERMEDIATE|DARKNESS|ADVANCED_VERYHARD|WHIRL_BONK, + INTERMEDIATE|DARKNESS|ADVANCED_STUPID|SPEED5}, + NULL); + SW[9].add(SW[11], + new Long[]{DARKNESS|PROLOGUE_TRIGGER}, + PROLOGUE_TRIGGER); + SW[10].add(SW[11], + new Long[]{DARKNESS|DOWNDRILL_SEMISOLID_CLIP}, + NULL); } private static void InitializeNodes(Node[]...sF) { for (int i=0;i