diff --git a/core/src/main/assets/interfaces/hero_icons.png b/core/src/main/assets/interfaces/hero_icons.png
index 55012ebb2..c68ed7aac 100644
Binary files a/core/src/main/assets/interfaces/hero_icons.png and b/core/src/main/assets/interfaces/hero_icons.png differ
diff --git a/core/src/main/assets/interfaces/talent_icons.png b/core/src/main/assets/interfaces/talent_icons.png
index 359dc8a25..fa9bb1153 100644
Binary files a/core/src/main/assets/interfaces/talent_icons.png and b/core/src/main/assets/interfaces/talent_icons.png differ
diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties
index 2b7add079..51f2bcc90 100644
--- a/core/src/main/assets/messages/actors/actors.properties
+++ b/core/src/main/assets/messages/actors/actors.properties
@@ -523,6 +523,17 @@ actors.hero.abilities.duelist.feint.bad_location=You can't move to that location
actors.hero.abilities.duelist.feint.short_desc=The Duelist _Feints_, faking an attack while dashing to an adjacent tile. Enemies will attack her afterimage, leaving them open to a counterattack.
actors.hero.abilities.duelist.feint.desc=The Duelist fakes an attack while dashing to an adjacent tile, leaving behind a momentary afterimage of herself. Enemies that were attacking the Duelist will attack her afterimage instead.\n\nEnemies that attack the afterimage become confused, which cancels their next action and leaves them open to a surprise attack.
+actors.hero.abilities.cleric.cleric1.name=Unknown
+actors.hero.abilities.cleric.cleric1.short_desc=This armor ability hasn't been implemented yet.
+actors.hero.abilities.cleric.cleric1.desc=This armor ability hasn't been implemented yet. It is not currently selectable.
+actors.hero.abilities.cleric.cleric2.name=Unknown
+actors.hero.abilities.cleric.cleric2.short_desc=This armor ability hasn't been implemented yet.
+actors.hero.abilities.cleric.cleric2.desc=This armor ability hasn't been implemented yet. It is not currently selectable.
+actors.hero.abilities.cleric.cleric3.name=Unknown
+actors.hero.abilities.cleric.cleric3.short_desc=This armor ability hasn't been implemented yet.
+actors.hero.abilities.cleric.cleric3.desc=This armor ability hasn't been implemented yet. It is not currently selectable.
+
+
actors.hero.abilities.ratmogrify.name=ratmogrify
actors.hero.abilities.ratmogrify.cant_transform=You can't ratmogrify that!
actors.hero.abilities.ratmogrify.too_strong=That enemy is too strong to ratmogrify!
@@ -670,10 +681,10 @@ actors.hero.herosubclass.monk_short_desc=The _Monk_ builds energy while fighting
actors.hero.herosubclass.monk_desc=The Monk is a master of physical technique. As she defeats enemies, she gains energy which can be used on a variety of defensive and utility-focused abilities. This energy does not fade over time, but has a cap based on the Monk's level.\n\n1 Energy: quickly strike with fists\n2 Energy: focus to dodge next attack\n3 Energy: instantly dash nearby\n4 Energy: kick an enemy away\n5 Energy: meditate to clear statuses and restore wand & artifact charge
actors.hero.herosubclass.priest=priest
actors.hero.herosubclass.priest_short_desc=The _Priest_ gains new long-range spells and an empowered version of guiding light.
-actors.hero.herosubclass.priest_desc=The Priest gains a variety of new and upgraded spells that emphasize ranged combat and synergy with magical items.\n\nThe Priest can cast _Guiding Light_ for free once every 100 turns, and can trigger the illumination debuff with wands or artifacts for bonus damage.\n\nThey also gain the _Radiance_ spell, which dispels darkness and illuminates and momentarily stuns all visible enemies at the cost of 2 charges.
+actors.hero.herosubclass.priest_desc=_The Priest has not been implemented yet, and so is currently unselectable_\n\nThe Priest gains a variety of new and upgraded spells that emphasize ranged combat and synergy with magical items.\n\nThe Priest can cast _Guiding Light_ for free once every 100 turns, and can trigger the illumination debuff with wands or artifacts for bonus damage.\n\nThey also gain the _Radiance_ spell, which dispels darkness and illuminates and momentarily stuns all visible enemies at the cost of 2 charges.
actors.hero.herosubclass.paladin=paladin
actors.hero.herosubclass.paladin_short_desc=The _Paladin_ gains new short-range spells and empowered versions of holy weapon and ward.
-actors.hero.herosubclass.paladin_desc=The Paladin gains a variety of new and upgraded spells that emphasize melee combat and synergy with weapons and armor.\n\nThe Paladin's _Holy Weapon_ and _Holy Ward_ spells grant larger bonuses, and no longer override existing enchantments and glyphs.\n\nThey also gain the _Smite_ spell, which lets them perform a guaranteed melee hit with bonus damage and enchantment power.
+actors.hero.herosubclass.paladin_desc=_The Paladin has not been implemented yet, and so is currently unselectable_\n\nThe Paladin gains a variety of new and upgraded spells that emphasize melee combat and synergy with weapons and armor.\n\nThe Paladin's _Holy Weapon_ and _Holy Ward_ spells grant larger bonuses, and no longer override existing enchantments and glyphs.\n\nThey also gain the _Smite_ spell, which lets them perform a guaranteed melee hit with bonus damage and enchantment power.
##talents
actors.hero.talent$provokedangertracker.name=provoked anger
@@ -1042,27 +1053,48 @@ actors.hero.talent.sunray.title=Sunray
actors.hero.talent.sunray.desc=_+1:_ The Cleric can cast _Sunray,_ A spell that deals _2-8 damage_ and blinds the target for _4 turns,_ at the cost of 1 charge.\n\n_+2:_ The Cleric can cast _Sunray,_ A spell that deals _3-12 damage_ and blinds the target for _6 turns,_ at the cost of 1 charge.\n\nSunray can only blind each target once, but if the target is already blinded by Sunray then it paralyses instead. Sunray always deals maximum damage to demonic and undead foes.
actors.hero.talent.divine_sense.title=Divine Sense
actors.hero.talent.divine_sense.desc=_+1:_ The Cleric can cast _Divine Sense,_ a spell that grants them _8 tiles_ of Mind Vision for 50 turns, at the cost of 2 charges.\n\n_+2:_ The Cleric can cast _Divine Sense,_ a spell that grants them _12 tiles_ of Mind Vision for 50 turns, at the cost of 2 charges.
-actors.hero.talent.clerict2e.title=TODO
-actors.hero.talent.clerict2e.desc=TODO
+actors.hero.talent.clerict2e.title=Unknown
+actors.hero.talent.clerict2e.desc=This talent hasn't been implemented yet, it currently does nothing.
-actors.hero.talent.clerict3a.title=TODO
-actors.hero.talent.clerict3a.desc=TODO
-actors.hero.talent.clerict3b.title=TODO
-actors.hero.talent.clerict3b.desc=TODO
+actors.hero.talent.clerict3a.title=Unknown
+actors.hero.talent.clerict3a.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.clerict3b.title=Unknown
+actors.hero.talent.clerict3b.desc=This talent hasn't been implemented yet, it currently does nothing.
-actors.hero.talent.priestt3a.title=TODO
-actors.hero.talent.priestt3a.desc=TODO
-actors.hero.talent.priestt3b.title=TODO
-actors.hero.talent.priestt3b.desc=TODO
-actors.hero.talent.priestt3c.title=TODO
-actors.hero.talent.priestt3c.desc=TODO
+actors.hero.talent.priestt3a.title=Unknown
+actors.hero.talent.priestt3a.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.priestt3b.title=Unknown
+actors.hero.talent.priestt3b.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.priestt3c.title=Unknown
+actors.hero.talent.priestt3c.desc=This talent hasn't been implemented yet, it currently does nothing.
-actors.hero.talent.paladint3a.title=TODO
-actors.hero.talent.paladint3a.desc=TODO
-actors.hero.talent.paladint3b.title=TODO
-actors.hero.talent.paladint3b.desc=TODO
-actors.hero.talent.paladint3c.title=TODO
-actors.hero.talent.paladint3c.desc=TODO
+actors.hero.talent.paladint3a.title=Unknown
+actors.hero.talent.paladint3a.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.paladint3b.title=Unknown
+actors.hero.talent.paladint3b.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.paladint3c.title=Unknown
+actors.hero.talent.paladint3c.desc=This talent hasn't been implemented yet, it currently does nothing.
+
+actors.hero.talent.cleric_a1_1.title=Unknown
+actors.hero.talent.cleric_a1_1.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.cleric_a1_2.title=Unknown
+actors.hero.talent.cleric_a1_2.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.cleric_a1_3.title=Unknown
+actors.hero.talent.cleric_a1_3.desc=This talent hasn't been implemented yet, it currently does nothing.
+
+actors.hero.talent.cleric_a2_1.title=Unknown
+actors.hero.talent.cleric_a2_1.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.cleric_a2_2.title=Unknown
+actors.hero.talent.cleric_a2_2.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.cleric_a2_3.title=Unknown
+actors.hero.talent.cleric_a2_3.desc=This talent hasn't been implemented yet, it currently does nothing.
+
+actors.hero.talent.cleric_a3_1.title=Unknown
+actors.hero.talent.cleric_a3_1.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.cleric_a3_2.title=Unknown
+actors.hero.talent.cleric_a3_2.desc=This talent hasn't been implemented yet, it currently does nothing.
+actors.hero.talent.cleric_a3_3.title=Unknown
+actors.hero.talent.cleric_a3_3.desc=This talent hasn't been implemented yet, it currently does nothing.
#universal
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
index ba74f8328..9d313829a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
@@ -28,6 +28,9 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.Cleric1;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.Cleric2;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.Cleric3;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.duelist.Challenge;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.duelist.ElementalStrike;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.duelist.Feint;
@@ -284,8 +287,8 @@ public enum HeroClass {
return new ArmorAbility[]{new SpectralBlades(), new NaturesPower(), new SpiritHawk()};
case DUELIST:
return new ArmorAbility[]{new Challenge(), new ElementalStrike(), new Feint()};
- case CLERIC: //TODO CLERIC armor abilities
- return new ArmorAbility[]{new HeroicLeap(), new Shockwave(), new Endure()};
+ case CLERIC:
+ return new ArmorAbility[]{new Cleric1(), new Cleric2(), new Cleric3()};
}
}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
index 3768297b2..3a9398f24 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
@@ -171,7 +171,7 @@ public enum Talent {
CLOSE_THE_GAP(145, 4), INVIGORATING_VICTORY(146, 4), ELIMINATION_MATCH(147, 4),
//Elemental Strike T4
ELEMENTAL_REACH(148, 4), STRIKING_FORCE(149, 4), DIRECTED_POWER(150, 4),
- //Duelist A3 T4
+ //Feint T4
FEIGNED_RETREAT(151, 4), EXPOSE_WEAKNESS(152, 4), COUNTER_ABILITY(153, 4),
//Cleric T1
@@ -184,6 +184,12 @@ public enum Talent {
PRIESTT3A(171, 3), PRIESTT3B(172, 3), PRIESTT3C(173, 3),
//Paladin T3
PALADINT3A(174, 3), PALADINT3B(175, 3), PALADINT3C(176, 3),
+ //Cleric A1 T4
+ CLERIC_A1_1(177, 4), CLERIC_A1_2(178, 4), CLERIC_A1_3(179, 4),
+ //Cleric A2 T4
+ CLERIC_A2_1(180, 4), CLERIC_A2_2(181, 4), CLERIC_A2_3(182, 4),
+ //Cleric A3 T4
+ CLERIC_A3_1(183, 4), CLERIC_A3_2(184, 4), CLERIC_A3_3(185, 4),
//universal T4
HEROIC_ENERGY(26, 4), //See icon() and title() for special logic for this one
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric1.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric1.java
new file mode 100644
index 000000000..452237d89
--- /dev/null
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric1.java
@@ -0,0 +1,47 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2024 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ */
+
+package com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric;
+
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
+import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
+import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
+
+public class Cleric1 extends ArmorAbility {
+
+ @Override
+ protected void activate(ClassArmor armor, Hero hero, Integer target) {
+
+ }
+
+ @Override
+ public int icon() {
+ return HeroIcon.CLERIC1;
+ }
+
+ @Override
+ public Talent[] talents() {
+ return new Talent[]{Talent.CLERIC_A1_1, Talent.CLERIC_A1_2, Talent.CLERIC_A1_3};
+ }
+
+}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric2.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric2.java
new file mode 100644
index 000000000..e6429c0cd
--- /dev/null
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric2.java
@@ -0,0 +1,47 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2024 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ */
+
+package com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric;
+
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
+import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
+import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
+
+public class Cleric2 extends ArmorAbility {
+
+ @Override
+ protected void activate(ClassArmor armor, Hero hero, Integer target) {
+
+ }
+
+ @Override
+ public int icon() {
+ return HeroIcon.CLERIC2;
+ }
+
+ @Override
+ public Talent[] talents() {
+ return new Talent[]{Talent.CLERIC_A2_1, Talent.CLERIC_A2_2, Talent.CLERIC_A2_3};
+ }
+
+}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric3.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric3.java
new file mode 100644
index 000000000..43069f5b7
--- /dev/null
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Cleric3.java
@@ -0,0 +1,47 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2024 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ */
+
+package com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric;
+
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
+import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
+import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
+
+public class Cleric3 extends ArmorAbility {
+
+ @Override
+ protected void activate(ClassArmor armor, Hero hero, Integer target) {
+
+ }
+
+ @Override
+ public int icon() {
+ return HeroIcon.CLERIC3;
+ }
+
+ @Override
+ public Talent[] talents() {
+ return new Talent[]{Talent.CLERIC_A3_1, Talent.CLERIC_A3_2, Talent.CLERIC_A3_3};
+ }
+
+}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java
index ea2273140..af1d1f900 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java
@@ -91,7 +91,6 @@ public class StoneOfIntuition extends InventoryStone {
private static Class curGuess = null;
- //TODO CLERIC! yikes...
public class WndGuess extends Window {
private static final int WIDTH = 120;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java
index 635260a27..eb1611961 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java
@@ -175,10 +175,6 @@ public class HeroSelectScene extends PixelScene {
add(infoButton);
for (HeroClass cl : HeroClass.values()){
- //TODO CLERIC skip this when not in debug for now
- if (cl == HeroClass.CLERIC && !DeviceCompat.isDebug()){
- continue;
- }
HeroBtn button = new HeroBtn(cl);
add(button);
heroBtns.add(button);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java
index 2e1533d74..53944baf5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java
@@ -67,7 +67,10 @@ public class HeroIcon extends Image {
public static final int CHALLENGE = 28;
public static final int ELEMENTAL_STRIKE= 29;
public static final int FEINT = 30;
- public static final int RATMOGRIFY = 31;
+ public static final int CLERIC1 = 31;
+ public static final int CLERIC2 = 32;
+ public static final int CLERIC3 = 33;
+ public static final int RATMOGRIFY = 34;
//cleric spells
public static final int GUIDING_LIGHT = 40;
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 74602584e..38440fdc6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseAbility.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseAbility.java
@@ -24,6 +24,9 @@ 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.Cleric1;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.Cleric2;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.cleric.Cleric3;
import com.shatteredpixel.shatteredpixeldungeon.items.KingsCrown;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@@ -95,6 +98,11 @@ public class WndChooseAbility extends Window {
abilityButton.setRect(0, pos, WIDTH-20, abilityButton.reqHeight()+2);
add(abilityButton);
+ //TODO CLERIC no abilities are actually playable atm
+ if (ability instanceof Cleric1 || ability instanceof Cleric2 || ability instanceof Cleric3){
+ abilityButton.enable(false);
+ }
+
IconButton abilityInfo = new IconButton(Icons.get(Icons.INFO)){
@Override
protected void onClick() {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseSubclass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseSubclass.java
index e2e1b9209..ae64f9d21 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseSubclass.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseSubclass.java
@@ -84,6 +84,11 @@ public class WndChooseSubclass extends Window {
btnCls.setRect( 0, pos, WIDTH-20, btnCls.reqHeight()+2);
add( btnCls );
+ //TODO CLERIC neither subclass is actually playable atm
+ if (subCls == HeroSubClass.PRIEST || subCls == HeroSubClass.PALADIN){
+ btnCls.enable(false);
+ }
+
IconButton clsInfo = new IconButton(Icons.get(Icons.INFO)){
@Override
protected void onClick() {