diff --git a/sigIRCv2.jar b/sigIRCv2.jar index b3dd337..09c1f81 100644 Binary files a/sigIRCv2.jar and b/sigIRCv2.jar differ diff --git a/src/sig/modules/RabiRace/MemoryData.java b/src/sig/modules/RabiRace/MemoryData.java index e4dd227..839ac08 100644 --- a/src/sig/modules/RabiRace/MemoryData.java +++ b/src/sig/modules/RabiRace/MemoryData.java @@ -44,8 +44,9 @@ public enum MemoryData { SUPER_CARROT(MemoryOffset.SUPER_CARROT,"Super Carrot","super_carrot.png",true), /*DLC_ITEM1(MemoryOffset.DLC_ITEM1,"","",true), DLC_ITEM2(MemoryOffset.DLC_ITEM2,"","",true), - DLC_ITEM3(MemoryOffset.DLC_ITEM3,"","",true), DLC_ITEM4(MemoryOffset.DLC_ITEM4,"","",true),*/ + BUNNY_CLOVER(MemoryOffset.BUNNY_CLOVER,"Bunny Clover","bunny_clover.png",true), + FAIRYS_FLUTE(MemoryOffset.FAIRYS_FLUTE,"Fairy's Flute","fairy_s_flute.png",true), BADGE_HEALTH_PLUS(MemoryOffset.BADGE_HEALTH_PLUS,"Health Plus","health_plus.png",false), BADGE_HEALTH_SURGE(MemoryOffset.BADGE_HEALTH_SURGE,"Health Surge","health_surge.png",false), BADGE_MANA_PLUS(MemoryOffset.BADGE_MANA_PLUS,"Mana Plus","mana_plus.png",false), @@ -83,17 +84,19 @@ public enum MemoryData { public MemoryOffset mem; public String name; public String img_path; - public Image img; public boolean key_item; //Set to true if it's a key item. False if it's a badge. MemoryData(MemoryOffset mem, String name, String icon_name, boolean isKeyItem) { this.mem = mem; this.name = name; - this.img = RabiRaceModule.image_map.get(icon_name); this.img_path = icon_name; this.key_item = isKeyItem; } + public Image getImage() { + return RabiRaceModule.image_map.get(img_path); + } + public String getDisplayName() { return (key_item)?name:name+" Badge"; } diff --git a/src/sig/modules/RabiRace/Profile.java b/src/sig/modules/RabiRace/Profile.java index 388db56..a38f5dd 100644 --- a/src/sig/modules/RabiRace/Profile.java +++ b/src/sig/modules/RabiRace/Profile.java @@ -40,7 +40,7 @@ public class Profile { badges.put(md.name, md); //System.out.println("Obtained "+md.getDisplayName()); } else { - key_items.remove(md.name); + badges.remove(md.name); } } } diff --git a/src/sig/modules/RabiRaceModule.java b/src/sig/modules/RabiRaceModule.java index d0e147b..e058016 100644 --- a/src/sig/modules/RabiRaceModule.java +++ b/src/sig/modules/RabiRaceModule.java @@ -72,6 +72,11 @@ public class RabiRaceModule extends Module{ new FileManager("sigIRC/rabi-ribi/items/"+data.img_path).verifyAndFetchFileFromServer(); } new FileManager("sigIRC/rabi-ribi/items/easter_egg.png").verifyAndFetchFileFromServer(); + new FileManager("sigIRC/rabi-ribi/items/health_up.png").verifyAndFetchFileFromServer(); + new FileManager("sigIRC/rabi-ribi/items/mana_up.png").verifyAndFetchFileFromServer(); + new FileManager("sigIRC/rabi-ribi/items/regen_up.png").verifyAndFetchFileFromServer(); + new FileManager("sigIRC/rabi-ribi/items/pack_up.png").verifyAndFetchFileFromServer(); + new FileManager("sigIRC/rabi-ribi/items/attack_up.png").verifyAndFetchFileFromServer(); String[] images = dir.list(); List filtered_images = new ArrayList(); @@ -84,6 +89,7 @@ public class RabiRaceModule extends Module{ images = filtered_images.toArray(new String[filtered_images.size()]); for (String image : images) { try { + //System.out.println("Loaded "+image); image_map.put(image, ImageIO.read(new File(ITEMS_DIRECTORY+image))); } catch (IOException e) { e.printStackTrace(); @@ -260,7 +266,7 @@ public class RabiRaceModule extends Module{ if (!foundRabiRibi) { DrawUtils.drawTextFont(g, sigIRC.panel.userFont, position.getX(), position.getY()+26, Color.BLACK, "Rabi-Ribi not found! Please start it."); } else { - DrawUtils.drawTextFont(g, sigIRC.panel.userFont, position.getX(), position.getY()+26, Color.BLACK, "Values: "+readIntFromMemory(MemoryOffset.DLC_ITEM1)+","+readIntFromMemory(MemoryOffset.DLC_ITEM2)+","+readIntFromMemory(MemoryOffset.DLC_ITEM3)+","+readIntFromMemory(MemoryOffset.DLC_ITEM4)); + //DrawUtils.drawTextFont(g, sigIRC.panel.userFont, position.getX(), position.getY()+26, Color.BLACK, "Values: "+readIntFromMemory(MemoryOffset.DLC_ITEM1)+","+readIntFromMemory(MemoryOffset.DLC_ITEM2)+","+readIntFromMemory(MemoryOffset.DLC_ITEM3)+","+readIntFromMemory(MemoryOffset.DLC_ITEM4)); final int border=20; final int width=(int)(position.getWidth()-border*2); final int spacing=width/5; @@ -275,24 +281,49 @@ public class RabiRaceModule extends Module{ try { for (String key : myProfile.key_items.keySet()) { MemoryData data = myProfile.key_items.get(key); - - if (size*icon_size