diff --git a/constraints.txt b/constraints.txt index dd49c60..3602ba9 100644 --- a/constraints.txt +++ b/constraints.txt @@ -468,18 +468,19 @@ ITM & DARKNESS & ( " } + { -"edge": "SPECTRAL_CICINI_LEDGE -> SPECTRAL_CICINI_ROOM", -"prereq": "PROLOGUE_TRIGGER" +"edge": "SPECTRAL_CICINI_LEDGE -> SPECTRAL_WARP", +"prereq": "NONE", } { -"edge": "SPECTRAL_CICINI_ROOM -> SPECTRAL_CICINI_LEDGE", -"prereq": "NONE", +"edge": "SPECTRAL_CICINI_LEDGE -> SPECTRAL_CICINI_ROOM", +"prereq": "PROLOGUE_TRIGGER" } { -"edge": "SPECTRAL_CICINI_LEDGE -> SPECTRAL_WARP", +"edge": "SPECTRAL_CICINI_ROOM -> SPECTRAL_CICINI_LEDGE", "prereq": "NONE", } diff --git a/src/sig/MultiRando.java b/src/sig/MultiRando.java index 5157c73..cb44652 100644 --- a/src/sig/MultiRando.java +++ b/src/sig/MultiRando.java @@ -208,6 +208,43 @@ public class MultiRando { SW[10].add(SW[11], new Long[]{DARKNESS|DOWNDRILL_SEMISOLID_CLIP}, NULL); + SW[0].add(SW[13],NULL); + SW[13].add(SW[14], + new Long[]{KOTRI_1|COCOA_1|CHAPTER_1}, + NULL); + SW[13].add(SW[15], + new Long[]{NULL}, + new Long[]{SLIDING_POWDER, + HAMMER_ROLL_ZIP, + WHIRL_BONK_CANCEL, + RABI_SLIPPERS|WALL_JUMP_LV2, + RABI_SLIPPERS|AIR_JUMP, + AIR_JUMP,WALL_JUMP + }); + SW[15].add(SW[19], + new Long[]{NULL}, + new Long[]{AIR_JUMP|RABI_SLIPPERS, + AIR_JUMP|AIR_DASH, + AIR_JUMP|INTERMEDIATE_HARD, + BUNNY_STRIKE|INTERMEDIATE_HARD, + AIR_DASH_LV3, + WHIRL_BONK + }); + SW[19].add(SW[20], + new Long[]{ + PROLOGUE_TRIGGER|RABI_SLIPPERS, + PROLOGUE_TRIGGER|AIR_JUMP, + PROLOGUE_TRIGGER|AIR_DASH, + PROLOGUE_TRIGGER|SLIDE_JUMP_BUNSTRIKE, + PROLOGUE_TRIGGER|COCOA_1|KOTRI_1|CHAPTER_1, + PROLOGUE_TRIGGER|ADVANCED_VERYHARD, + ADVANCED_HARD|RABI_SLIPPERS, + ADVANCED_HARD|AIR_JUMP, + ADVANCED_HARD|AIR_DASH, + ADVANCED_HARD|SLIDE_JUMP_BUNSTRIKE, + ADVANCED_HARD|COCOA_1|KOTRI_1|CHAPTER_1, + ADVANCED_HARD|ADVANCED_VERYHARD,}, + NULL); } private static void InitializeNodes(Node[]...sF) { for (int i=0;i