From 36f32cfeb80230c3569b57975fa1854fc49f1eab Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 18 Sep 2019 22:56:52 -0400 Subject: [PATCH] v0.7.5: further adjustments to camera panning --- .../shatteredpixeldungeon/scenes/GameScene.java | 12 +++++++++++- .../shatteredpixeldungeon/sprites/HeroSprite.java | 4 ++-- .../shatteredpixeldungeon/ui/DangerIndicator.java | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index 92dd6bfca..555d1e47b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -413,7 +413,17 @@ public class GameScene extends PixelScene { Dungeon.hero.next(); - Camera.main.snapTo(hero.center()); + switch (InterlevelScene.mode){ + case FALL: case DESCEND: case CONTINUE: + Camera.main.snapTo(hero.center().x, hero.center().y - DungeonTilemap.SIZE * (defaultZoom/Camera.main.zoom)); + break; + case ASCEND: + Camera.main.snapTo(hero.center().x, hero.center().y + DungeonTilemap.SIZE * (defaultZoom/Camera.main.zoom)); + break; + default: + Camera.main.snapTo(hero.center().x, hero.center().y); + } + Camera.main.panTo(hero.center(), 2.5f); if (InterlevelScene.mode != InterlevelScene.Mode.NONE) { if (Dungeon.depth == Statistics.deepestFloor diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java index ecc8ef550..1af7e2f8f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java @@ -96,7 +96,7 @@ public class HeroSprite extends CharSprite { @Override public void place( int p ) { super.place( p ); - Camera.main.panTo(center(), 10f); + Camera.main.panTo(center(), 5f); } @Override @@ -105,7 +105,7 @@ public class HeroSprite extends CharSprite { if (ch.flying) { play( fly ); } - Camera.main.panFollow(this, 10f); + Camera.main.panFollow(this, 15f); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java index 7a608e700..9f5b61ba5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java @@ -105,7 +105,7 @@ public class DangerIndicator extends Tag { TargetHealthIndicator.instance.target(target == TargetHealthIndicator.instance.target() ? null : target); if (Dungeon.hero.curAction == null) { - Camera.main.panTo(target.sprite.center(), 10f); + Camera.main.panTo(target.sprite.center(), 5f); } } }