LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.4.1: rebalanced the flail

Browse Source
This commit is contained in:
Evan Debenham 2016-07-05 19:01:37 -04:00 committed by Evan Debenham
parent 935a4593b8
commit 9518f3dbb5
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -81,6 +81,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMappi
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Flail;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
@ -372,8 +373,16 @@ public class Hero extends Char {
} }
public boolean canSurpriseAttack(){ public boolean canSurpriseAttack(){
return !(belongings.weapon != null && belongings.weapon instanceof Weapon if (belongings.weapon == null || !(belongings.weapon instanceof Weapon))
&& STR() < ((Weapon)belongings.weapon).STRReq()); return true;
if (STR() < ((Weapon)belongings.weapon).STRReq())
return false;
if (belongings.weapon instanceof Flail && rangedWeapon == null)
return false;
return true;
} }
public boolean canAttack(Char enemy){ public boolean canAttack(Char enemy){

1
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Flail.java
View File

@ -29,6 +29,7 @@ public class Flail extends MeleeWeapon {
tier = 4; tier = 4;
DLY = 1.25f; //0.8x speed DLY = 1.25f; //0.8x speed
//also cannot surprise attack, see Hero.canSurpriseAttack
} }
@Override @Override

2
src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -782,7 +782,7 @@ items.weapon.melee.dirk.stats_desc=This weapon is stronger against unaware enemi
items.weapon.melee.dirk.desc=A longer thrusting dagger, gives bit more steel to plunge into foes. items.weapon.melee.dirk.desc=A longer thrusting dagger, gives bit more steel to plunge into foes.
items.weapon.melee.flail.name=flail items.weapon.melee.flail.name=flail
items.weapon.melee.flail.stats_desc=This is a slightly slow weapon.\nThis is a rather inaccurate weapon. items.weapon.melee.flail.stats_desc=This is a slightly slow weapon.\nThis weapon cannot surprise attack.
items.weapon.melee.flail.desc=A spiked ball attached to a handle by a length of chain. Very unwieldy, but devastating if it lands a solid hit. items.weapon.melee.flail.desc=A spiked ball attached to a handle by a length of chain. Very unwieldy, but devastating if it lands a solid hit.
items.weapon.melee.glaive.name=glaive items.weapon.melee.glaive.name=glaive