diff --git a/src/sig/modules/TouhouMotherModule.java b/src/sig/modules/TouhouMotherModule.java index 2690517..33fc435 100644 --- a/src/sig/modules/TouhouMotherModule.java +++ b/src/sig/modules/TouhouMotherModule.java @@ -264,7 +264,8 @@ public class TouhouMotherModule extends Module implements ActionListener{ return TouhouPlayerCharacter.MIMA.getID(); } else if (data.contains("Nitori") || data.contains("Sanae") || - data.contains("Patchouli") || data.contains("Iku")) { + data.contains("Patchouli") || data.contains("Iku") + || data.contains("Alice")) { return -1; } return lastCharacterAttacked; @@ -291,8 +292,13 @@ public class TouhouMotherModule extends Module implements ActionListener{ characterDatabase[lastCharacterAttacked].addTotalDamage(diff); characterDatabase[lastCharacterAttacked].addDamageTurns(1); characterDatabase[lastCharacterAttacked].setLargestHit(diff); + lastCharacterAttacked=-1; } lastBossHP=real_bossHP; + } else { + if (real_bossHP>lastBossHP) { //This boss healed somehow. + lastBossHP = real_bossHP; + } } } lastCharacterAttacked = GetLastAttacker(real_gameData); @@ -355,7 +361,7 @@ public class TouhouMotherModule extends Module implements ActionListener{ characterDatabase[TouhouPlayerCharacter.REIMU.getID()] = new TouhouMotherCharacterData("Reimu",new Color(255,70,70)); characterDatabase[TouhouPlayerCharacter.MARISA.getID()] = new TouhouMotherCharacterData("Marisa",new Color(255,200,70)); characterDatabase[TouhouPlayerCharacter.YUUKA.getID()] = new TouhouMotherCharacterData("Yuuka",new Color(35,140,35)); - characterDatabase[TouhouPlayerCharacter.MIMA.getID()] = new TouhouMotherCharacterData("Mima",new Color(55,100,200)); + characterDatabase[TouhouPlayerCharacter.MIMA.getID()] = new TouhouMotherCharacterData("Mima",new Color(110,60,250)); } private void DefineMonsterDatabase() { diff --git a/src/sig/modules/utils/SemiValidInteger.java b/src/sig/modules/utils/SemiValidInteger.java index 4507d40..77bdb0f 100644 --- a/src/sig/modules/utils/SemiValidInteger.java +++ b/src/sig/modules/utils/SemiValidInteger.java @@ -56,7 +56,7 @@ public class SemiValidInteger { } public boolean passesTestConditions(int testnumb) { - return testnumb!=0 && testnumb<1000000 && (((!initialized && testnumb==bossHP) || (initialized && testnumb<=bossHP)) || bossHP==Integer.MAX_VALUE); + return testnumb!=0 && testnumb<1000000 && (((!initialized && testnumb==bossHP) || (initialized && testnumb<=bossHP+7000)) || bossHP==Integer.MAX_VALUE); } public String toString() {