Index: Pets/Aquatic.cs
===================================================================
--- Pets/Aquatic.cs (revision 46)
+++ Pets/Aquatic.cs (working copy)
@@ -184,7 +184,7 @@
{
new AandC("Renewing Mists", () => ! buff("Renewing Mists")),
new AandC("Healing Wave", () => hp < 0.7),
- new AandC("Shell Shield", () => speed <= speedEnemy && buffLeft("Shell Shield") < 2),
+ new AandC("Shell Shield", () => speed <= speedEnemy && buffLeft("Shell Shield") <= 1),
new AandC("Shell Shield", () => ! buff("Shell Shield")),
new AandC("Whirlpool", () => ! debuff("Whirlpool") && hpEnemy > 0.5),
new AandC("Snap"),
@@ -533,10 +533,10 @@
*/
aquatic_abilities = new List<AandC>()
{
- new AandC("Spiked Skin", () => ! shouldIHide && speed >= speedEnemy),
+ new AandC("Spiked Skin", () => ! shouldIHide && speed >= speedEnemy && ! buff("Spiked Skin")),
new AandC("Healing Wave", () => hp < 0.7 ),
new AandC("Spiked Skin", () => ! buff("Spiked Skin")),
- new AandC("Spiked Skin", () => buffLeft("Spiked Skin") == 1 && speed <= speedEnemy),
+ new AandC("Spiked Skin", () => buffLeft("Spiked Skin") <= 1 && speed <= speedEnemy),
new AandC("Pump", () => ! buff("Pumped Up")),
new AandC("Whirlpool", () => ! debuff("Whirlpool") && hpEnemy > 0.5),
new AandC("Water Jet"),
Index: Pets/Flying.cs
===================================================================
--- Pets/Flying.cs (revision 46)
+++ Pets/Flying.cs (working copy)
@@ -41,10 +41,10 @@
* Slot 3: Puncture Wound | Ravage
*/
flying_abilities = new List<AandC>() {
- new AandC("Ravage", () => hpEnemy < 0.25 || (famEnemy(PF.Critter) && hpEnemy > 0.4)),
+ new AandC("Focus", () => ! buff("Focused") && hp > 0.5),
+ new AandC("Ravage", () => hpEnemy < 0.25 || (famEnemy(PF.Critter) && hpEnemy > 0.4)),
new AandC("Barbed Stinger", () => ! debuff("Poisoned")),
new AandC("Puncture Wound", () => enemyIsPoisoned),
- new AandC("Focus", () => ! buff("Focused")),
new AandC("Predatory Strike", () => hpEnemy < 0.25),
new AandC("Puncture Wound"),
new AandC("Barbed Stinger"),
@@ -78,7 +78,7 @@
*/
flying_abilities = new List<AandC>()
{
- new AandC("Cocoon Strike", () => shouldIHide && speed >= speedEnemy),
+ new AandC("Cocoon Strike", () => shouldIHide || speed >= speedEnemy),
new AandC("Adrenaline Rush", () => ! buff("Adrenaline")),
new AandC("Moth Balls", () => myPetIsLucky),
new AandC("Moth Dust"),
@@ -968,8 +968,8 @@
flying_abilities = new List<AandC>()
{
new AandC("Lift-Off", () => shouldIHide && speed >= speedEnemy),
+ new AandC("Hawk Eye", () => ! buff("Hawk Eye")),
new AandC("Cyclone", () => ! debuff("Cyclone")),
- new AandC("Hawk Eye", () => ! buff("Hawk Eye")),
new AandC("Adrenaline Rush", () => ! buff("Adrenaline")),
new AandC("Slicing Wind"),
new AandC("Thrash"),
@@ -1201,7 +1201,7 @@
{
new AandC("Cyclone", () => ! debuff("Cyclone")),
new AandC("Wild Winds", () => ! debuff("Wild Winds")),
- new AandC("Flyby", () => ! debuff("Attack Reduction")),
+ new AandC("Flyby", () => ! debuff("Weakened Defenses")),
new AandC("Reckless Strike", () => hp > hpEnemy),
new AandC("Slicing Wind"),
new AandC("Frost Shock"),
Index: Pets/Magic.cs
===================================================================
--- Pets/Magic.cs (revision 46)
+++ Pets/Magic.cs (working copy)
@@ -684,9 +684,9 @@
magic_abilities = new List<AandC>()
{
new AandC("Soul Ward", () => shouldIHide && speed >= speedEnemy),
- new AandC("Light", () => enemyIsBlinded),
+ new AandC("Arcane Blast", () => hp >= 0.9 && hpEnemy >= 0.7),
+ new AandC("Light", () => enemyIsBlinded),
new AandC("Flash", () => ! enemyIsBlinded),
- new AandC("Arcane Blast"),
new AandC("Beam"),
new AandC("Light"),
};
@@ -885,7 +885,7 @@
magic_abilities = new List<AandC>()
{
new AandC("Interrupting Gaze", () => speed > speedEnemy),
- new AandC("Eye Blast", () => ! debuff("Speed Reduction") && speed <= speedEnemy),
+ new AandC("Eye Blast", () => ! debuff("Speed Reduction") && speed >= speedEnemy),
new AandC("Agony", () => ! debuff("Agony")),
new AandC("Dark Simulacrum"),
new AandC("Tongue Lash"),