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

v0.6.2: bugfixes

Browse Source
This commit is contained in:
Evan Debenham 2017-10-01 16:51:44 -04:00
parent ac8a552202
commit 2739595320
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
View File

@ -51,7 +51,7 @@ public class Fire extends Blob {
cell = i + j*Dungeon.level.width(); cell = i + j*Dungeon.level.width();
if (cur[cell] > 0) { if (cur[cell] > 0) {
if (freeze != null && freeze.cur[cell] > 0){ if (freeze != null && freeze.volume > 0 && freeze.cur[cell] > 0){
freeze.clear(cell); freeze.clear(cell);
off[cell] = cur[cell] = 0; off[cell] = cur[cell] = 0;
continue; continue;
@ -69,7 +69,7 @@ public class Fire extends Blob {
} }
} else if (freeze == null || freeze.cur[cell] < 0) { } else if (freeze == null || freeze.volume <= 0 || freeze.cur[cell] < 0) {
if (flamable[cell] if (flamable[cell]
&& (cur[cell-1] > 0 && (cur[cell-1] > 0

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

@ -49,7 +49,7 @@ public class Freezing extends Blob {
cell = i + j*Dungeon.level.width(); cell = i + j*Dungeon.level.width();
if (cur[cell] > 0) { if (cur[cell] > 0) {
if (fire != null && fire.cur[cell] > 0){ if (fire != null && fire.volume > 0 && fire.cur[cell] > 0){
fire.clear(cell); fire.clear(cell);
off[cell] = cur[cell] = 0; off[cell] = cur[cell] = 0;
continue; continue;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java
View File

@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
@ -54,6 +55,7 @@ public class WarpingTrap extends Trap {
ScrollOfTeleportation.teleportHero( (Hero)ch); ScrollOfTeleportation.teleportHero( (Hero)ch);
BArray.setFalse(Dungeon.level.visited); BArray.setFalse(Dungeon.level.visited);
BArray.setFalse(Dungeon.level.mapped); BArray.setFalse(Dungeon.level.mapped);
GameScene.updateFog();
Dungeon.observe(); Dungeon.observe();
} else if (ch != null){ } else if (ch != null){