diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 939e7e574..294455efd 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -937,7 +937,7 @@ actors.hero.talent.enraged_catalyst.desc=_+1:_ Enchantments and curses on the Be actors.hero.talent.cleave.title=cleave actors.hero.talent.cleave.desc=_+1:_ The extra time the Gladiator gets on a kill is increased to _30 turns_, from 15.\n\n_+2:_ The extra time the Gladiator gets on a kill is increased to _45 turns_, from 15.\n\n_+3:_ The extra time the Gladiator gets on a kill is increased to _60 turns_, from 15. actors.hero.talent.lethal_defense.title=lethal defense -actors.hero.talent.lethal_defense.desc=_+1:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 33%_.\n\n_+2:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 67%_.\n\n_+3:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 100%_.\n\nThe shield cooldown can be reduced to as low as -100% by this talent, which means it will immediately be available again once it is activated. +actors.hero.talent.lethal_defense.desc=_+1:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 50 turns_.\n\n_+2:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 100 turns_.\n\n_+3:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 150 turns_.\n\nThe shield cooldown can be reduced to as low as -150 turns by this talent, which means it will immediately be available again once it is activated. actors.hero.talent.enhanced_combo.title=enhanced combo actors.hero.talent.enhanced_combo.desc=_+1:_ When the Gladiator's combo is 7 or higher, Clobber's knockback range increases to 3, it inflicts vertigo, and it can knock enemies into pits.\n\n_+2:_ In addition to the benefits of +1, when the Gladiator's combo is 9 or higher Parry works on multiple attacks.\n\n_+3:_ In addition to the benefits of +1 and +2, the Gladiator can leap up to combo/3 tiles when using Slam, Crush, or Fury. diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 53b299748..6fb92a8cc 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -2301,6 +2301,7 @@ items.brokenseal.discover_hint=One of the heroes starts with this item. items.brokenseal$warriorshield.name=Warrior Shield items.brokenseal$warriorshield.desc_active=The Warrior's broken seal is currently helping him persevere, granting him shielding on top of his health. There is a cooldown after the shielding initially triggers before it can be used again.\n\nThis shield does not decay over time, but will end if no enemies are nearby for a few turns. When it ends, any unused shielding will reduce the cooldown, up to a max of 50%%.\n\nShield remaining: %1$d.\n\nCurrent Cooldown: %2$d. items.brokenseal$warriorshield.desc_cooldown=The Warrior has recently gained shielding from his broken seal, and must wait until he can benefit from its shielding effect again.\n\nTurns Remaining: %d. +items.brokenseal$warriorshield.desc_negative_cooldown=The Warrior's shield cooldown is currently negative, meaning that when his shield activates the cooldown will be lower than the usual 150 turns. The shield cooldown can be reduced to as low as -150 turns, which means it will immediately be available again once it is activated.\n\nCurrent cooldown: %d. items.dewdrop.name=dewdrop items.dewdrop.already_full=You already have full health. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java index b7513dc14..52c62dddf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java @@ -261,7 +261,7 @@ public class BrokenSeal extends Item { @Override public int icon() { - if (coolingDown() || shielding() > 0){ + if (coolingDown() || shielding() > 0 || cooldown < 0){ return BuffIndicator.SEAL_SHIELD; } else { return BuffIndicator.NONE; @@ -270,10 +270,11 @@ public class BrokenSeal extends Item { @Override public void tintIcon(Image icon) { + icon.resetColor(); if (coolingDown() && shielding() == 0){ icon.brightness(0.3f); - } else { - icon.resetColor(); + } else if (cooldown < 0) { + icon.invert(); } } @@ -283,6 +284,8 @@ public class BrokenSeal extends Item { return GameMath.gate(0, 1f - shielding()/(float)maxShield(), 1); } else if (coolingDown()){ return GameMath.gate(0, cooldown / (float)COOLDOWN_START, 1); + } else if (cooldown < 0) { + return GameMath.gate(0, (COOLDOWN_START+cooldown) / (float)COOLDOWN_START, 1); } else { return 0; } @@ -292,7 +295,7 @@ public class BrokenSeal extends Item { public String iconTextDisplay() { if (shielding() > 0){ return Integer.toString(shielding()); - } else if (coolingDown()){ + } else if (coolingDown() || cooldown < 0){ return Integer.toString(cooldown); } else { return ""; @@ -301,8 +304,10 @@ public class BrokenSeal extends Item { @Override public String desc() { - if (shielding() > 0){ + if (shielding() > 0) { return Messages.get(this, "desc_active", shielding(), cooldown); + } else if (cooldown < 0) { + return Messages.get(this, "desc_negative_cooldown", cooldown); } else { return Messages.get(this, "desc_cooldown", cooldown); }