From b9728d5a6610b86f5f6976756b69c843589075f5 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 16 Feb 2025 13:23:19 -0500 Subject: [PATCH] v3.0.0: enabled power of many even out of debug, updated cleric TODOs --- core/src/main/assets/messages/actors/actors.properties | 2 +- .../com/shatteredpixel/shatteredpixeldungeon/Badges.java | 2 +- .../shatteredpixeldungeon/journal/Bestiary.java | 3 ++- .../shatteredpixeldungeon/sprites/ItemSpriteSheet.java | 4 ++-- .../shatteredpixeldungeon/windows/WndChooseAbility.java | 7 ------- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 00c3e3775..952c48e84 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -583,7 +583,7 @@ actors.hero.abilities.cleric.powerofmany.prompt_ally=Direct your light ally actors.hero.abilities.cleric.powerofmany.ally_exists=You already have an empowered ally. actors.hero.abilities.cleric.powerofmany.no_vision=You can't target a location you can't see. actors.hero.abilities.cleric.powerofmany.only_allies=You can only empower allies. -actors.hero.abilities.cleric.powerofmany.short_desc=_(UNFINISHED)_ The Cleric channels the _Power of Many_, empowering an existing ally or creating a new one. +actors.hero.abilities.cleric.powerofmany.short_desc=The Cleric channels the _Power of Many_, empowering an existing ally or creating a new one. actors.hero.abilities.cleric.powerofmany.desc=The Cleric channels the _Power of Many_, which either empowers an existing ally or creates a new empowered one for 100 turns. Targeting an empty space creates a new ally.\n\nWhile empowered by Power of Many, any ally deals +25% damage, takes -25% damage, and shares their vision with the Cleric. They also gain 25 shielding when the ability is used.\n\nThe Cleric also gains three new spells that can only be cast with an empowered ally. Power of Many won't end while one of these spells is active. actors.hero.abilities.cleric.powerofmany$powerbuff.name=power of many actors.hero.abilities.cleric.powerofmany$powerbuff.desc=This ally has been empowered by Power of Many, granting them +25%% damage dealt and -25%% damage taken. They will also share their vision range with the Cleric, and can benefit from power of many spells.\n\nPower of Many will persist when allies such as prismatic images hide away, but its duration will still count down.\n\nTurns Remaining: %s. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java index 200551fa9..214cc6437 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java @@ -75,7 +75,7 @@ public class Badges { UNLOCK_ROGUE ( 2 ), UNLOCK_HUNTRESS ( 3 ), UNLOCK_DUELIST ( 4 ), - UNLOCK_CLERIC ( 5 ), //TODO CLERIC icon for this badge + UNLOCK_CLERIC ( 5 ), //TODO CLERIC finish icon for this badge MONSTERS_SLAIN_1 ( 6 ), MONSTERS_SLAIN_2 ( 7 ), GOLD_COLLECTED_1 ( 8 ), diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Bestiary.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Bestiary.java index 68b77d89f..19661f05f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Bestiary.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Bestiary.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.journal; import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.PowerOfMany; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.huntress.SpiritHawk; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.rogue.ShadowClone; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.rogue.SmokeBomb; @@ -235,7 +236,7 @@ public enum Bestiary { ALLY.addEntities(MirrorImage.class, PrismaticImage.class, DriedRose.GhostHero.class, WandOfWarding.Ward.class, WandOfWarding.Ward.WardSentry.class, WandOfLivingEarth.EarthGuardian.class, - ShadowClone.ShadowAlly.class, SmokeBomb.NinjaLog.class, SpiritHawk.HawkAlly.class/*, PowerOfMany.LightAlly.class*/); + ShadowClone.ShadowAlly.class, SmokeBomb.NinjaLog.class, SpiritHawk.HawkAlly.class, PowerOfMany.LightAlly.class); TRAP.addEntities(WornDartTrap.class, PoisonDartTrap.class, DisintegrationTrap.class, GatewayTrap.class, ChillingTrap.class, BurningTrap.class, ShockingTrap.class, AlarmTrap.class, GrippingTrap.class, TeleportationTrap.class, OozeTrap.class, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index baca901c6..c20fa6e8e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -215,7 +215,7 @@ public class ItemSpriteSheet { private static final int WEP_TIER1 = xy(1, 7); //8 slots public static final int WORN_SHORTSWORD = WEP_TIER1+0; - public static final int CUDGEL = WEP_TIER1+1; //TODO CLERIC better sprite + public static final int CUDGEL = WEP_TIER1+1; public static final int GLOVES = WEP_TIER1+2; public static final int RAPIER = WEP_TIER1+3; public static final int DAGGER = WEP_TIER1+4; @@ -454,7 +454,7 @@ public class ItemSpriteSheet { public static final int ARTIFACT_ROSE1 = ARTIFACTS+20; public static final int ARTIFACT_ROSE2 = ARTIFACTS+21; public static final int ARTIFACT_ROSE3 = ARTIFACTS+22; - public static final int ARTIFACT_TOME = ARTIFACTS+23; //TODO CLERIC finalize sprite + public static final int ARTIFACT_TOME = ARTIFACTS+23; static{ assignItemRect(ARTIFACT_CLOAK, 9, 15); assignItemRect(ARTIFACT_ARMBAND, 16, 13); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseAbility.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseAbility.java index a95094941..a7b96b2db 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseAbility.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseAbility.java @@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.windows; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.PowerOfMany; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.Trinity; import com.shatteredpixel.shatteredpixeldungeon.items.KingsCrown; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; @@ -38,7 +37,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.Window; -import com.watabou.utils.DeviceCompat; public class WndChooseAbility extends Window { @@ -104,11 +102,6 @@ public class WndChooseAbility extends Window { abilityButton.setRect(0, pos, WIDTH-20, abilityButton.reqHeight()+2); add(abilityButton); - //TODO CLERIC power of many isn't playable atm - if (!DeviceCompat.isDebug() && ability instanceof PowerOfMany){ - abilityButton.enable(false); - } - IconButton abilityInfo = new IconButton(Icons.get(Icons.INFO)){ @Override protected void onClick() {