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

V0.2.0c : Fixed Ring of Might behaviour

Browse Source
This commit is contained in:
Evan Debenham 2014-09-21 16:35:01 -04:00
parent 20686b5ba0
commit 8aa2b5c8a2
2 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,10 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Drowsy;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CapeOfThorns; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CapeOfThorns;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TalismanOfForesight; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TalismanOfForesight;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfForce; import com.shatteredpixel.shatteredpixeldungeon.items.rings.*;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfFuror;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfSharpshooting;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfTenacity;
import com.watabou.noosa.Camera; import com.watabou.noosa.Camera;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
@ -75,10 +72,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.Key;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEvasion;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaste;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
@ -175,6 +168,12 @@ public class Hero extends Char {
} }
public int STR() { public int STR() {
int STR = this.STR;
for (Buff buff : buffs(RingOfMight.Might.class)) {
STR += ((RingOfMight.Might)buff).level;
}
return weakened ? STR - 2 : STR; return weakened ? STR - 2 : STR;
} }
@ -186,6 +185,7 @@ public class Hero extends Char {
@Override @Override
public void storeInBundle( Bundle bundle ) { public void storeInBundle( Bundle bundle ) {
super.storeInBundle( bundle ); super.storeInBundle( bundle );
heroClass.storeInBundle( bundle ); heroClass.storeInBundle( bundle );
@ -1079,6 +1079,10 @@ public class Hero extends Char {
GLog.w( "You are crippled!" ); GLog.w( "You are crippled!" );
} else if (buff instanceof Bleeding) { } else if (buff instanceof Bleeding) {
GLog.w( "You are bleeding!" ); GLog.w( "You are bleeding!" );
} else if (buff instanceof RingOfMight.Might){
if (((RingOfMight.Might)buff).level > 0) {
HT += ((RingOfMight.Might) buff).level * 5;
}
} }
else if (buff instanceof Light) { else if (buff instanceof Light) {
@ -1095,6 +1099,10 @@ public class Hero extends Char {
if (buff instanceof Light) { if (buff instanceof Light) {
sprite.remove( CharSprite.State.ILLUMINATED ); sprite.remove( CharSprite.State.ILLUMINATED );
} else if (buff instanceof RingOfMight.Might){
if (((RingOfMight.Might)buff).level > 0){
HT -= ((RingOfMight.Might) buff).level * 5;
}
} }
BuffIndicator.refreshHero(); BuffIndicator.refreshHero();
@ -1188,7 +1196,7 @@ public class Hero extends Char {
} else { } else {
Sample.INSTANCE.play( Assets.SND_STEP ); Sample.INSTANCE.play( Assets.SND_STEP );
} }
Dungeon.level.press( step, this ); Dungeon.level.press(step, this);
} }
} }
@ -1204,7 +1212,7 @@ public class Hero extends Char {
@Override @Override
public void onAttackComplete() { public void onAttackComplete() {
AttackIndicator.target( enemy ); AttackIndicator.target(enemy);
attack( enemy ); attack( enemy );
curAction = null; curAction = null;

25
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMight.java
View File

@ -1,7 +1,5 @@
package com.shatteredpixel.shatteredpixeldungeon.items.rings; package com.shatteredpixel.shatteredpixeldungeon.items.rings;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
/** /**
* Created by debenhame on 10/09/2014. * Created by debenhame on 10/09/2014.
@ -27,29 +25,6 @@ public class RingOfMight extends Ring {
} }
public class Might extends RingBuff { public class Might extends RingBuff {
@Override
public boolean attachTo( Char target ) {
if (target instanceof Hero){
((Hero) target).STR += level;
}
if (level > 0){
target.HT += level*5;
}
return super.attachTo(target);
}
@Override
public void detach(){
if (target instanceof Hero){
((Hero) target).STR -= level;
}
if (level > 0){
target.HT -= level*5;
}
super.detach();
}
} }
} }