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

v0.2.2b: fixed interaction between challenges and bones

Browse Source
This commit is contained in:
Evan Debenham 2014-11-15 18:45:21 -05:00
parent 1703c7108d
commit 9943f5da90
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/shatteredpixel/shatteredpixeldungeon/Bones.java
View File

@ -47,8 +47,10 @@ public class Bones {
depth = Dungeon.depth; depth = Dungeon.depth;
//heroes which have won the game, who die far above their farthest depth, or who are challenged drop no bones. //heroes which have won the game, who die far above their farthest depth, or who are challenged drop no bones.
if (Statistics.amuletObtained || (Statistics.deepestFloor - 5) >= depth || Dungeon.challenges > 0) if (Statistics.amuletObtained || (Statistics.deepestFloor - 5) >= depth || Dungeon.challenges > 0) {
depth = -1;
return; return;
}
item = pickItem(Dungeon.hero); item = pickItem(Dungeon.hero);
@ -122,10 +124,6 @@ public class Bones {
public static Item get() { public static Item get() {
if (depth == -1) { if (depth == -1) {
//challenged heroes cannot find bones.
if (Dungeon.challenges > 0)
return null;
try { try {
InputStream input = Game.instance.openFileInput( BONES_FILE ) ; InputStream input = Game.instance.openFileInput( BONES_FILE ) ;
Bundle bundle = Bundle.read( input ); Bundle bundle = Bundle.read( input );
@ -141,7 +139,8 @@ public class Bones {
} }
} else { } else {
if (depth == Dungeon.depth) { //heroes who are challenged cannot find bones
if (depth == Dungeon.depth && Dungeon.challenges == 0) {
Game.instance.deleteFile( BONES_FILE ); Game.instance.deleteFile( BONES_FILE );
depth = 0; depth = 0;