diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 2fe9f212f..029b02346 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -109,6 +109,9 @@ items.armor.classarmor.transfer_prompt=Select an Armor items.armor.classarmor.transfer_cancel=Cancel items.armor.classarmor.transfer_complete=Your heroic armor's properties have been transferred! +items.armor.clericarmor.name=hero's vestments +items.armor.clericarmor.desc=While wearing this mixture of cloth and plate, the Cleric and perform a special ability. + items.armor.clotharmor.name=cloth armor items.armor.clotharmor.desc=This lightweight armor offers basic protection. diff --git a/core/src/main/assets/sprites/items.png b/core/src/main/assets/sprites/items.png index 30271658d..289b2a52f 100644 Binary files a/core/src/main/assets/sprites/items.png and b/core/src/main/assets/sprites/items.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java index 949329a2c..05503a03a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClericArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.DuelistArmor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.HuntressArmor; @@ -480,9 +481,10 @@ public class Generator { MageArmor.class, RogueArmor.class, HuntressArmor.class, - DuelistArmor.class + DuelistArmor.class, + ClericArmor.class }; - ARMOR.probs = new float[]{ 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; + ARMOR.probs = new float[]{ 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 }; //see Generator.randomMissile MISSILE.classes = new Class[]{}; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java index ae94393fe..f15adcbff 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java @@ -114,8 +114,8 @@ abstract public class ClassArmor extends Armor { case DUELIST: classArmor = new DuelistArmor(); break; - case CLERIC: //TODO CLERIC class armor - classArmor = new WarriorArmor(); + case CLERIC: + classArmor = new ClericArmor(); break; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClericArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClericArmor.java new file mode 100644 index 000000000..4b8ed5901 --- /dev/null +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClericArmor.java @@ -0,0 +1,32 @@ +/* + * 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.items.armor; + +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; + +public class ClericArmor extends ClassArmor { + + { + image = ItemSpriteSheet.ARMOR_CLERIC; + } + +} 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 2d6ecaac3..ddf48825b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -376,6 +376,7 @@ public class ItemSpriteSheet { public static final int ARMOR_ROGUE = ARMOR+7; public static final int ARMOR_HUNTRESS = ARMOR+8; public static final int ARMOR_DUELIST = ARMOR+9; + public static final int ARMOR_CLERIC = ARMOR+10; //TODO CLERIC sprite for this static{ assignItemRect(ARMOR_CLOTH, 15, 12); assignItemRect(ARMOR_LEATHER, 14, 13); @@ -387,6 +388,7 @@ public class ItemSpriteSheet { assignItemRect(ARMOR_ROGUE, 14, 12); assignItemRect(ARMOR_HUNTRESS, 13, 15); assignItemRect(ARMOR_DUELIST, 12, 13); + assignItemRect(ARMOR_CLERIC, 12, 12); } //16 free slots