From 5885359d5adbb46a777c677082fe980fe1ad5d15 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 13 Oct 2020 19:12:10 -0400 Subject: [PATCH] v0.9.0b: added champ desc to mob desc and tweaked growing champ desc --- core/src/main/assets/messages/actors/actors.properties | 2 +- .../shatteredpixeldungeon/actors/mobs/Mob.java | 10 ++++++++++ .../shatteredpixeldungeon/windows/WndInfoMob.java | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 4fbe5ea2e..f661c8140 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -108,7 +108,7 @@ actors.buffs.championenemy$giant.desc=giant champions take 75% less damage and h actors.buffs.championenemy$blessed.name=blessed champion actors.buffs.championenemy$blessed.desc=Blessed champions have 200% more accuracy and evasion. actors.buffs.championenemy$growing.name=growing champion -actors.buffs.championenemy$growing.desc=Growing champions gain a steadily increasing bonus to accuracy, evasion, melee damage, and a reduction to damage taken.\n\nCurrent Accuracy/Evasion/Damage boost: %1$d%%\nCurrent damage reduction: %2$d%% +actors.buffs.championenemy$growing.desc=Growing champions gain a steadily increasing bonus to accuracy, evasion, melee damage, and a reduction to damage taken.\n\nCurrent acc/eva/dmg boost: %1$d%%\nCurrent damage reduction: %2$d%% actors.buffs.charm.name=Charmed actors.buffs.charm.heromsg=You are charmed! diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index aba5324c5..394b4af70 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -754,6 +754,16 @@ public abstract class Mob extends Char { public String description() { return Messages.get(this, "desc"); } + + public String info(){ + String desc = description(); + + for (Buff b : buffs(ChampionEnemy.class)){ + desc += "\n\n_" + Messages.titleCase(b.toString()) + "_\n" + b.desc(); + } + + return desc; + } public void notice() { sprite.showAlert(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java index 2448320da..cbcf2b750 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java @@ -33,8 +33,8 @@ import com.watabou.noosa.ui.Component; public class WndInfoMob extends WndTitledMessage { public WndInfoMob( Mob mob ) { - - super( new MobTitle( mob ), mob.description() ); + + super( new MobTitle( mob ), mob.info() ); }