v0.8.0a: further fixes for the following bugs:
- pitfall traps working on stationary neutral NPCs (such as questgivers) - connection error to pixeldungeoun.watabou.ru due to forced HTTPS
This commit is contained in:
parent
b0b62987fc
commit
00eca29f3c
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon
|
@ -102,7 +102,9 @@ public class PitfallTrap extends Trap {
|
|||
|
||||
Char ch = Actor.findChar(cell);
|
||||
|
||||
if (ch != null && !ch.flying) {
|
||||
//don't trigger on flying chars, or immovable neutral chars
|
||||
if (ch != null && !ch.flying
|
||||
&& !(ch.alignment == Char.Alignment.NEUTRAL && Char.hasProp(ch, Char.Property.IMMOVABLE))) {
|
||||
if (ch == Dungeon.hero) {
|
||||
Chasm.heroFall(cell);
|
||||
} else {
|
||||
|
|
|
@ -137,7 +137,7 @@ public class AboutScene extends PixelScene {
|
|||
PointerArea hotArea = new PointerArea( wataLink.left(), wataLink.top(), wataLink.width(), wataLink.height() ) {
|
||||
@Override
|
||||
protected void onClick( PointerEvent event ) {
|
||||
DeviceCompat.openURI( "https://" + LNK_WATA );
|
||||
DeviceCompat.openURI( "http://" + LNK_WATA );
|
||||
}
|
||||
};
|
||||
add( hotArea );
|
||||
|
|
Loading…
Reference in New Issue
Block a user