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

v0.4.0: fixed some bugs and adjusted lucky enchant

Browse Source
This commit is contained in:
Evan Debenham 2016-06-07 16:48:15 -04:00 committed by Evan Debenham
parent 5a30d89647
commit f20130de0f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,7 +895,7 @@ public class Hero extends Char {
public int attackProc( Char enemy, int damage ) { public int attackProc( Char enemy, int damage ) {
KindOfWeapon wep = rangedWeapon != null ? rangedWeapon : belongings.weapon; KindOfWeapon wep = rangedWeapon != null ? rangedWeapon : belongings.weapon;
if (wep != null) wep.proc( this, enemy, damage ); if (wep != null) damage = wep.proc( this, enemy, damage );
switch (subClass) { switch (subClass) {
case SNIPER: case SNIPER:

3
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java
View File

@ -123,8 +123,7 @@ public class Statue extends Mob {
@Override @Override
public int attackProc( Char enemy, int damage ) { public int attackProc( Char enemy, int damage ) {
weapon.proc( this, enemy, damage ); return weapon.proc( this, enemy, damage );
return damage;
} }
@Override @Override

9
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Lucky.java
View File

@ -20,6 +20,7 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
@ -35,10 +36,14 @@ public class Lucky extends Weapon.Enchantment {
int level = Math.max( 0, weapon.level() ); int level = Math.max( 0, weapon.level() );
if (Random.Int(100) < (50 + level)){ if (Random.Int(100) < (50 + level)){
return weapon.max() - defender.dr()/2; int exStr = 0;
if (attacker == Dungeon.hero) exStr = Math.max(0, Dungeon.hero.STR() - weapon.STRReq());
damage = weapon.max() + exStr - Random.IntRange(0, defender.dr());
} else { } else {
return weapon.min() - defender.dr()/2; damage = weapon.min() - Random.IntRange(0, defender.dr());
} }
return Math.max(0, damage);
} }
@Override @Override