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

v0.2.4: made potions susceptible to cold, refactored a bit of buff logic.

Browse Source
This commit is contained in:
Evan Debenham
2015-02-10 02:09:57 -05:00
parent ae2ba8be0e
commit 72975a49cc
9 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
+6 -4
View File
@@ -218,10 +218,12 @@ public class Potion extends Item {
shatter( hero.pos );
}
protected void shatter( int cell ) {
GLog.i( "The flask shatters and " + color() + " liquid splashes harmlessly" );
Sample.INSTANCE.play( Assets.SND_SHATTER );
splash( cell );
public void shatter( int cell ) {
if (Dungeon.visible[cell]) {
GLog.i( "The flask shatters and " + color() + " liquid splashes harmlessly" );
Sample.INSTANCE.play( Assets.SND_SHATTER );
splash( cell );
}
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java
+11 -8
View File
@@ -35,22 +35,25 @@ public class PotionOfFrost extends Potion {
}
@Override
protected void shatter( int cell ) {
public void shatter( int cell ) {
PathFinder.buildDistanceMap( cell, BArray.not( Level.losBlocking, null ), DISTANCE );
Fire fire = (Fire)Dungeon.level.blobs.get( Fire.class );
boolean visible = false;
for (int i=0; i < Level.LENGTH; i++) {
if (PathFinder.distance[i] < Integer.MAX_VALUE) {
Freezing.affect( i, fire );
visible = Freezing.affect( i, fire ) || visible;
}
}
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
setKnown();
if (visible) {
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
setKnown();
}
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java
+8 -5
View File
@@ -18,6 +18,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.potions;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ConfusionGas;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
@@ -34,14 +35,16 @@ public class PotionOfLevitation extends Potion {
}
@Override
protected void shatter( int cell ) {
public void shatter( int cell ) {
setKnown();
if (Dungeon.visible[cell]) {
setKnown();
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
}
GameScene.add( Blob.seed( cell, 1000, ConfusionGas.class ) );
GameScene.add( Blob.seed( cell, 1000, ConfusionGas.class ) );
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java
+11 -9
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.potions;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
@@ -30,15 +31,16 @@ public class PotionOfLiquidFlame extends Potion {
}
@Override
protected void shatter( int cell ) {
setKnown();
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
Fire fire = Blob.seed( cell, 2, Fire.class );
GameScene.add( fire );
public void shatter( int cell ) {
if (Dungeon.visible[cell]) {
setKnown();
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
}
GameScene.add( Blob.seed( cell, 2, Fire.class ) );
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java
+10 -7
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.potions;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
@@ -30,13 +31,15 @@ public class PotionOfParalyticGas extends Potion {
}
@Override
protected void shatter( int cell ) {
setKnown();
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
public void shatter( int cell ) {
if (Dungeon.visible[cell]) {
setKnown();
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
}
GameScene.add( Blob.seed( cell, 1000, ParalyticGas.class ) );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java
+12 -8
View File
@@ -47,7 +47,7 @@ public class PotionOfPurity extends Potion {
}
@Override
protected void shatter( int cell ) {
public void shatter( int cell ) {
PathFinder.buildDistanceMap( cell, BArray.not( Level.losBlocking, null ), DISTANCE );
@@ -76,8 +76,10 @@ public class PotionOfPurity extends Potion {
blob.cur[i] = 0;
blob.volume -= value;
procd = true;
CellEmitter.get( i ).burst( Speck.factory( Speck.DISCOVER ), 1 );
if (Dungeon.visible[i]) {
CellEmitter.get( i ).burst( Speck.factory( Speck.DISCOVER ), 1 );
}
}
}
@@ -87,12 +89,14 @@ public class PotionOfPurity extends Potion {
boolean heroAffected = PathFinder.distance[Dungeon.hero.pos] < Integer.MAX_VALUE;
if (procd) {
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
if (Dungeon.visible[cell]) {
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
}
setKnown();
if (heroAffected) {
GLog.p( TXT_FRESHNESS );
}
src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java
+11 -10
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.potions;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -31,16 +32,16 @@ public class PotionOfToxicGas extends Potion {
}
@Override
protected void shatter( int cell ) {
setKnown();
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
ToxicGas gas = Blob.seed( cell, 1000, ToxicGas.class );
Actor.add( gas );
GameScene.add( gas );
public void shatter( int cell ) {
if (Dungeon.visible[cell]) {
setKnown();
splash( cell );
Sample.INSTANCE.play( Assets.SND_SHATTER );
}
GameScene.add( Blob.seed( cell, 1000, ToxicGas.class ) );
}
@Override