konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed duelist abilities benefitting from time freeze

Browse Source
This commit is contained in:
Evan Debenham
2023-02-03 14:08:34 -05:00
parent f11535f507
commit 7fcce5a14e
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java
View File

@@ -215,8 +215,8 @@ public class Pickaxe extends MeleeWeapon {
}
Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG);
}
hero.spendAndNext(hero.attackDelay());
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java
View File

@@ -95,8 +95,8 @@ public class Greataxe extends MeleeWeapon {
onAbilityKill(hero);
}
}
hero.spendAndNext(hero.attackDelay());
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java
View File

@@ -94,8 +94,8 @@ public class Mace extends MeleeWeapon {
wep.onAbilityKill(hero);
}
}
hero.spendAndNext(hero.attackDelay());
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
wep.afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java
View File

@@ -126,8 +126,8 @@ public class Rapier extends MeleeWeapon {
onAbilityKill(hero);
}
}
hero.spendAndNext(hero.attackDelay());
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RunicBlade.java
View File

@@ -94,8 +94,8 @@ public class RunicBlade extends MeleeWeapon {
}
}
tracker.detach();
hero.spendAndNext(hero.attackDelay());
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java
View File

@@ -101,6 +101,7 @@ public class Sai extends MeleeWeapon {
}
}
Invisibility.dispel();
if (recentHits >= 2 && hit){
for (Buff b : buffs){
b.detach();
@@ -110,7 +111,6 @@ public class Sai extends MeleeWeapon {
} else {
hero.spendAndNext(hero.attackDelay());
}
Invisibility.dispel();
wep.afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java
View File

@@ -101,8 +101,8 @@ public class Spear extends MeleeWeapon {
}
Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG);
}
hero.spendAndNext(hero.attackDelay());
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
wep.afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java
View File

@@ -93,6 +93,7 @@ public class Sword extends MeleeWeapon {
Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG);
}
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
if (!enemy.isAlive()){
wep.onAbilityKill(hero);
@@ -102,7 +103,6 @@ public class Sword extends MeleeWeapon {
hero.buff(CleaveTracker.class).detach();
}
}
Invisibility.dispel();
wep.afterAbilityUsed(hero);
}
});

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Whip.java
View File

@@ -84,8 +84,8 @@ public class Whip extends MeleeWeapon {
onAbilityKill(hero);
}
}
hero.spendAndNext(hero.attackDelay());
Invisibility.dispel();
hero.spendAndNext(hero.attackDelay());
afterAbilityUsed(hero);
}
});