v0.7.3: more bug fixes:
- fixed force cubes now correctly handling hero death - fixed being able to stack many windows in the changes scene
This commit is contained in:
parent
9e78b85a55
commit
cd282c9148
|
@ -240,6 +240,10 @@ public abstract class Char extends Actor {
|
|||
|
||||
if (!enemy.isAlive() && visibleFight) {
|
||||
if (enemy == Dungeon.hero) {
|
||||
|
||||
if (this == Dungeon.hero) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Dungeon.fail( getClass() );
|
||||
GLog.n( Messages.capitalize(Messages.get(Char.class, "kill", name)) );
|
||||
|
|
|
@ -26,7 +26,9 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
|
||||
import com.watabou.noosa.audio.Sample;
|
||||
import com.watabou.utils.PathFinder;
|
||||
|
||||
|
@ -57,6 +59,10 @@ public class ForceCube extends MissileWeapon {
|
|||
|
||||
for (Char target : targets){
|
||||
curUser.shoot(target, this);
|
||||
if (target == Dungeon.hero && !target.isAlive()){
|
||||
Dungeon.fail(getClass());
|
||||
GLog.n(Messages.get(this, "ondeath"));
|
||||
}
|
||||
}
|
||||
|
||||
rangedHit( null, cell );
|
||||
|
|
|
@ -2460,12 +2460,14 @@ public class ChangesScene extends PixelScene {
|
|||
public ChangesWindow( Image icon, String title, String message ) {
|
||||
super( icon, title, message);
|
||||
|
||||
add( new TouchArea( chrome ) {
|
||||
TouchArea blocker = new TouchArea( 0, 0, PixelScene.uiCamera.width, PixelScene.uiCamera.height ) {
|
||||
@Override
|
||||
protected void onClick( Touchscreen.Touch touch ) {
|
||||
hide();
|
||||
}
|
||||
} );
|
||||
};
|
||||
blocker.camera = uiCamera;
|
||||
add(blocker);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1407,6 +1407,7 @@ items.weapon.missiles.fishingspear.name=fishing spear
|
|||
items.weapon.missiles.fishingspear.desc=Tiny throwing spears designed for fishing. They work well as an improvised weapon too.
|
||||
|
||||
items.weapon.missiles.forcecube.name=force cube
|
||||
items.weapon.missiles.forcecube.ondeath=You killed yourself with your own Force Cube...
|
||||
items.weapon.missiles.forcecube.desc=This oddly-shaped weapon is small enough to hold in your hand, but is incredibly heavy. When thrown, it will spread the force of its impact over a small area, damaging everything in the blast.
|
||||
|
||||
items.weapon.missiles.heavyboomerang.name=heavy boomerang
|
||||
|
|
Loading…
Reference in New Issue
Block a user