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

v3.1.0: Gladiator combo now preserves seal shielding

Browse Source
This commit is contained in:
Evan Debenham
2025-05-30 11:30:39 -04:00
parent aa96b4ec8a
commit 94ed2188d2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/assets/messages/actors/actors.properties
View File

@@ -168,7 +168,7 @@ actors.buffs.combo.action_name=combo attack
actors.buffs.combo.combo=%d hit combo! actors.buffs.combo.combo=%d hit combo!
actors.buffs.combo.bad_target=You must target an enemy in attack range. actors.buffs.combo.bad_target=You must target an enemy in attack range.
actors.buffs.combo.prompt=Select a target to attack. actors.buffs.combo.prompt=Select a target to attack.
actors.buffs.combo.desc=The gladiator builds momentum as they land successful blows. Each attack increases the combo counter by one, but taking too long between hits will reset the combo counter to 0.\n\nBuilding combo unlocks special combo attacks that cannot miss! A different attack is unlocked at 2, 4, 6, 8, and 10 combo count. Some moves reset combo and some do not, but each move can only be used once per combo session.\n\nCurrent combo: %1$d.\n\nTurns until Combo is lost: %2$s. actors.buffs.combo.desc=The gladiator builds momentum as he lands successful blows. Each attack increases the combo counter by one, but taking too long between hits will reset the combo counter to 0. While the gladiator has combo any shielding he has from his broken seal will not start to fade.\n\nBuilding combo unlocks special combo attacks that cannot miss! A different attack is unlocked at 2, 4, 6, 8, and 10 combo count. Some moves reset combo and some do not, but each move can only be used once per combo session.\n\nCurrent combo: %1$d.\n\nTurns until Combo is lost: %2$s.
actors.buffs.combo$combomove.clobber.name=clobber actors.buffs.combo$combomove.clobber.name=clobber
actors.buffs.combo$combomove.clobber.desc=Knocks an enemy back 2 tiles, but deals no damage and cannot knock into pits. Increments combo by 1. actors.buffs.combo$combomove.clobber.desc=Knocks an enemy back 2 tiles, but deals no damage and cannot knock into pits. Increments combo by 1.
actors.buffs.combo$combomove.clobber.empower_desc=Knocks an enemy back _3 tiles, inflicts vertigo, and can knock into pits,_ but deals no damage. Increments combo by 1. actors.buffs.combo$combomove.clobber.empower_desc=Knocks an enemy back _3 tiles, inflicts vertigo, and can knock into pits,_ but deals no damage. Increments combo by 1.

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java
View File

@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Combo;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Regeneration; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Regeneration;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ShieldBuff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ShieldBuff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings;
@@ -313,7 +314,7 @@ public class BrokenSeal extends Item {
} }
if (shielding() > 0){ if (shielding() > 0){
if (Dungeon.hero.visibleEnemies() == 0){ if (Dungeon.hero.visibleEnemies() == 0 && Dungeon.hero.buff(Combo.class) == null){
turnsSinceEnemies++; turnsSinceEnemies++;
if (turnsSinceEnemies >= 5){ if (turnsSinceEnemies >= 5){
if (cooldown > 0) { if (cooldown > 0) {