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

v0.7.2: rebalanced damage scaling for fire and toxic gas

Browse Source 
Also removed many boss resistances to these effects, as their damage is now more reasonable
This commit is contained in:
Evan Debenham 2019-02-28 15:52:57 -05:00
parent 75f20247c2
commit 374a80ebec
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
View File

@ -606,7 +606,7 @@ public abstract class Char extends Actor {
new HashSet<Class>( Arrays.asList(Blob.class) )), new HashSet<Class>( Arrays.asList(Blob.class) )),
FIERY ( new HashSet<Class>( Arrays.asList(WandOfFireblast.class)), FIERY ( new HashSet<Class>( Arrays.asList(WandOfFireblast.class)),
new HashSet<Class>( Arrays.asList(Burning.class, Blazing.class))), new HashSet<Class>( Arrays.asList(Burning.class, Blazing.class))),
ACIDIC ( new HashSet<Class>( Arrays.asList(ToxicGas.class, Corrosion.class)), ACIDIC ( new HashSet<Class>( Arrays.asList(Corrosion.class)),
new HashSet<Class>( Arrays.asList(Ooze.class))), new HashSet<Class>( Arrays.asList(Ooze.class))),
ELECTRIC ( new HashSet<Class>( Arrays.asList(WandOfLightning.class, Shocking.class, Potential.class, Electricity.class, ShockingDart.class)), ELECTRIC ( new HashSet<Class>( Arrays.asList(WandOfLightning.class, Shocking.class, Potential.class, Electricity.class, ShockingDart.class)),
new HashSet<Class>()), new HashSet<Class>()),

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java
View File

@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.utils.Random;
public class ToxicGas extends Blob implements Hero.Doom { public class ToxicGas extends Blob implements Hero.Doom {
@ -38,7 +37,7 @@ public class ToxicGas extends Blob implements Hero.Doom {
protected void evolve() { protected void evolve() {
super.evolve(); super.evolve();
int levelDamage = 5 + Dungeon.depth * 5; int damage = 1 + Dungeon.depth/5;
Char ch; Char ch;
int cell; int cell;
@ -49,11 +48,6 @@ public class ToxicGas extends Blob implements Hero.Doom {
if (cur[cell] > 0 && (ch = Actor.findChar( cell )) != null) { if (cur[cell] > 0 && (ch = Actor.findChar( cell )) != null) {
if (!ch.isImmune(this.getClass())) { if (!ch.isImmune(this.getClass())) {
int damage = (ch.HT + levelDamage) / 40;
if (Random.Int( 40 ) < (ch.HT + levelDamage) % 40) {
damage++;
}
ch.damage(damage, this); ch.damage(damage, this);
} }
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java
View File

@ -82,7 +82,7 @@ public class Burning extends Buff implements Hero.Doom {
if (target.isAlive()) { if (target.isAlive()) {
int damage = Random.NormalIntRange( 1, 3 + target.HT/40 ); int damage = Random.NormalIntRange( 1, 3 + Dungeon.depth/4 );
Buff.detach( target, Chill.class); Buff.detach( target, Chill.class);
//FIXME doesn't work with the sad ghost //FIXME doesn't work with the sad ghost

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java
View File

@ -26,9 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
@ -241,11 +239,6 @@ public class Tengu extends Mob {
} }
} }
{
resistances.add( ToxicGas.class );
resistances.add( Poison.class );
}
@Override @Override
public void restoreFromBundle(Bundle bundle) { public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java
View File

@ -357,10 +357,6 @@ public class Yog extends Mob {
if (lock != null) lock.addTime(dmg*0.5f); if (lock != null) lock.addTime(dmg*0.5f);
} }
{
resistances.add( ToxicGas.class );
}
{ {
immunities.add( Amok.class ); immunities.add( Amok.class );
immunities.add( Sleep.class ); immunities.add( Sleep.class );