diff --git a/sigIRCv2.jar b/sigIRCv2.jar index 224dba8..c2d93d2 100644 Binary files a/sigIRCv2.jar and b/sigIRCv2.jar differ diff --git a/src/sig/modules/RabiRace/Profile.java b/src/sig/modules/RabiRace/Profile.java index 6869e84..c68424e 100644 --- a/src/sig/modules/RabiRace/Profile.java +++ b/src/sig/modules/RabiRace/Profile.java @@ -324,14 +324,16 @@ public class Profile { RabiRaceModule.syncEvents=true; RabiRaceModule.darknessHasReachedzero=false; }*/ + + RabiRaceModule.syncEvents = InBossBattleSong(); - if (parent.readIntFromMemory(MemoryOffset.DARKNESS)>0 && RabiRaceModule.darknessHasReachedzero) { + /*if (parent.readIntFromMemory(MemoryOffset.DARKNESS)>0 && RabiRaceModule.darknessHasReachedzero) { RabiRaceModule.syncEvents=!RabiRaceModule.syncEvents; RabiRaceModule.darknessHasReachedzero=false; } if (parent.readIntFromMemory(MemoryOffset.DARKNESS)==0) { RabiRaceModule.darknessHasReachedzero=true; - } + }*/ for (int i=0;i newmapdata = new HashMap(); public static ScheduledExecutorService scheduler,scheduler2; public static boolean syncEvents = true; - public static boolean darknessHasReachedzero = true; //darkness needs to go down to 0, then go back up. + //public static boolean darknessHasReachedzero = true; //darkness needs to go down to 0, then go back up. public static boolean hasDied = false; + public static String lastEventString = ""; int frames=0; public static final int[] RESTRICTED_EVENTS = new int[] {256,257,260,262,264,265,266,267,268,269,271,272,278,279,284,289,290,295,296,307,315,316,322,323,324,331,333,344,345,371,377,379,385,386,387,399,412,427,428,451,452,464,465,484,516,517,518,519}; + public static final int[] BOSSSONGS = new int[] {8,27,33,34,36,37,38,39,42,43,44,47,48,51,52,54,56,59,60,61,63,64}; public SessionListData session_listing = new SessionListData(); @@ -609,16 +611,14 @@ public class RabiRaceModule extends Module{ if (mySession!=null && mySession.isCoop()) { - if (mySession!=null && mySession.isCoop()) { - if (OnTitleScreen()) { - if (waitframes--<=0) { - mapdata.clear(); - newmapdata.clear(); - lastreadmapdata=0; - } - } else { - waitframes = WAITFRAMEMAX; + if (OnTitleScreen()) { + if (waitframes--<=0) { + mapdata.clear(); + newmapdata.clear(); + lastreadmapdata=0; } + } else { + waitframes = WAITFRAMEMAX; } if (newmapdata.size()>0 && readIntFromMemory(MemoryOffset.PAUSED)>0) { diff --git a/src/sig/modules/RabiRibi/MemoryOffset.java b/src/sig/modules/RabiRibi/MemoryOffset.java index 609ac97..0949d38 100644 --- a/src/sig/modules/RabiRibi/MemoryOffset.java +++ b/src/sig/modules/RabiRibi/MemoryOffset.java @@ -163,6 +163,7 @@ public enum MemoryOffset { MESSAGE_TEXTREF(0x16EA4B0,0,0,0,0,0), //This should be 27 as this allows for MESSAGE_TEXT to be our "custom message" handler. MAP_AREA_COLOR(0x84C888,0,0,0,0,0), //See https://github.com/wcko87/rabiribi-map-editing/blob/master/docs/room_colors.md for colors. + //Also changes based on music BOSS_FIGHT(0x16E7D9C,0,0,0,0,0), //Should be 1 when in a boss fight. AUTOSAVE(0xD34A70,0,0,0,0,0), //1 if autosaving is occurring.