diff --git a/assets/items.png b/assets/items.png index 5e8fddb8d..e2eb59860 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/HandAxe.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/HandAxe.java new file mode 100644 index 000000000..4f00921a9 --- /dev/null +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/HandAxe.java @@ -0,0 +1,40 @@ +/* + * Pixel Dungeon + * Copyright (C) 2012-2015 Oleg Dolya + * + * Shattered Pixel Dungeon + * Copyright (C) 2014-2016 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.weapon.melee; + +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; + +public class HandAxe extends MeleeWeapon { + + { + image = ItemSpriteSheet.HAND_AXE; + + tier = 2; + ACC = 1.225f; //22.5% boost to accuracy + } + + @Override + public int max(int lvl) { + return 4*(tier+1) + //12 base, down from 15 + lvl*(tier+1); //scaling unchanged + } + +} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index ac6bf03a3..e13d6cb98 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -696,6 +696,10 @@ items.weapon.melee.glaive.desc=A massive polearm consisting of a sword blade on items.weapon.melee.greatsword.name=greatsword items.weapon.melee.greatsword.desc=This towering blade inflicts heavy damage by investing its heft into every swing. +items.weapon.melee.handaxe.name=hand axe +items.weapon.melee.handaxe.stats_desc=This is a rather accurate weapon. +items.weapon.melee.handaxe.desc=TODO + items.weapon.melee.knuckles.name=knuckleduster items.weapon.melee.knuckles.stats_desc=This is a rather fast weapon. items.weapon.melee.knuckles.desc=A piece of iron shaped to fit around the knuckles. @@ -729,7 +733,6 @@ items.weapon.melee.meleeweapon.cursed_worn=Because this weapon is cursed, you ar items.weapon.melee.meleeweapon.cursed=You can feel a malevolent magic lurking within this weapon. items.weapon.melee.newshortsword.name=shortsword -items.weapon.melee.newshortsword.ac_reforge=REFORGE items.weapon.melee.newshortsword.desc=A quite short sword, only a few inches longer than a dagger. items.weapon.melee.quarterstaff.name=quarterstaff @@ -747,7 +750,6 @@ items.weapon.melee.warhammer.stats_desc=This is a rather accurate weapon. items.weapon.melee.warhammer.desc=Few creatures can withstand the crushing blow of this towering mass of lead and steel, but only the strongest of adventurers can use it effectively. items.weapon.melee.wornshortsword.name=worn shortsword -items.weapon.melee.wornshortsword.ac_reforge=REFORGE items.weapon.melee.wornshortsword.desc=A quite short sword, worn down through heavy use. It is both weaker and a bit lighter than a shortsword in better condition. diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index cf10555f9..bc4805329 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -82,7 +82,7 @@ public class ItemSpriteSheet { private static final int WEP_TIER2 = xy(9, 7); //8 slots public static final int SHORTSWORD = WEP_TIER2+0; - public static final int HAND_AXE = WEP_TIER2+0; + public static final int HAND_AXE = WEP_TIER2+1; public static final int SPEAR = WEP_TIER2+2; public static final int QUARTERSTAFF = WEP_TIER2+3;