sigonasr2/sigIRCv2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Touhou Mother Module engine fixes.

Browse Source
This commit is contained in:
sigonasr2 2017-03-26 19:59:49 -05:00
parent aaa19e9cc9
commit 5573ca9945
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sig/modules/TouhouMotherModule.java
View File

@ -264,7 +264,8 @@ public class TouhouMotherModule extends Module implements ActionListener{
return TouhouPlayerCharacter.MIMA.getID(); return TouhouPlayerCharacter.MIMA.getID();
} else } else
if (data.contains("Nitori") || data.contains("Sanae") || 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 -1;
} }
return lastCharacterAttacked; return lastCharacterAttacked;
@ -291,8 +292,13 @@ public class TouhouMotherModule extends Module implements ActionListener{
characterDatabase[lastCharacterAttacked].addTotalDamage(diff); characterDatabase[lastCharacterAttacked].addTotalDamage(diff);
characterDatabase[lastCharacterAttacked].addDamageTurns(1); characterDatabase[lastCharacterAttacked].addDamageTurns(1);
characterDatabase[lastCharacterAttacked].setLargestHit(diff); characterDatabase[lastCharacterAttacked].setLargestHit(diff);
lastCharacterAttacked=-1;
} }
lastBossHP=real_bossHP; lastBossHP=real_bossHP;
} else {
if (real_bossHP>lastBossHP) { //This boss healed somehow.
lastBossHP = real_bossHP;
}
} }
} }
lastCharacterAttacked = GetLastAttacker(real_gameData); 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.REIMU.getID()] = new TouhouMotherCharacterData("Reimu",new Color(255,70,70));
characterDatabase[TouhouPlayerCharacter.MARISA.getID()] = new TouhouMotherCharacterData("Marisa",new Color(255,200,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.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() { private void DefineMonsterDatabase() {

2
src/sig/modules/utils/SemiValidInteger.java
View File

@ -56,7 +56,7 @@ public class SemiValidInteger {
} }
public boolean passesTestConditions(int testnumb) { 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() { public String toString() {