konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging 1.7.5 Source: items/weapon changes

Browse Source
This commit is contained in:
Evan Debenham
2015-02-04 01:19:05 -05:00
parent fbd2fb907e
commit 37e1c8b8ff
8 changed files with 135 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java
+1 -12
View File
@@ -16,13 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Piercing;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Swing;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite;
@@ -69,15 +67,6 @@ public class Boomerang extends MissileWeapon {
MAX -= 2;
return super.degrade();
}
@Override
public Weapon enchant( Enchantment ench ) {
while (ench instanceof Piercing || ench instanceof Swing) {
ench = Enchantment.random();
}
return super.enchant( ench );
}
@Override
public void proc( Char attacker, Char defender, int damage ) {