From 66b588fdf77378af2e716916205201d351b01347 Mon Sep 17 00:00:00 2001 From: GammelJAN Date: Sat, 20 Mar 2021 16:41:34 +0100 Subject: [PATCH] . --- core/src/com/trs/main/view/UI/DebugUI.java | 8 ++++---- .../com/trs/main/worldobjects/MovingNpc.java | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/core/src/com/trs/main/view/UI/DebugUI.java b/core/src/com/trs/main/view/UI/DebugUI.java index 69f9834..d1328d0 100644 --- a/core/src/com/trs/main/view/UI/DebugUI.java +++ b/core/src/com/trs/main/view/UI/DebugUI.java @@ -77,12 +77,12 @@ public class DebugUI { shapeRenderer.begin(ShapeRenderer.ShapeType.Line); shapeRenderer.setColor(Color.BLACK); shapeRenderer.rect(5, Main.CAMERA_HEIGHT - (strings.size()+1)*textHeight-5, width+10,(strings.size()+1)*textHeight); - shapeRenderer.end(); - shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); shapeRenderer.setColor(Color.RED); - shapeRenderer.rect(Main.CAMERA_WIDTH/2-6, Main.CAMERA_HEIGHT/2-1, 12, 2); + shapeRenderer.line(Main.CAMERA_WIDTH/2-3, Main.CAMERA_HEIGHT/2, Main.CAMERA_WIDTH/2+3, Main.CAMERA_HEIGHT/2); shapeRenderer.setColor(Color.GREEN); - shapeRenderer.rect(Main.CAMERA_WIDTH/2-1, Main.CAMERA_HEIGHT/2-6, 2, 12); + shapeRenderer.line(Main.CAMERA_WIDTH/2, Main.CAMERA_HEIGHT/2-3, Main.CAMERA_WIDTH/2, Main.CAMERA_HEIGHT/2+3); + shapeRenderer.setColor(Color.WHITE); + shapeRenderer.circle(Main.CAMERA_WIDTH/2, Main.CAMERA_HEIGHT/2, 6); shapeRenderer.end(); diff --git a/core/src/com/trs/main/worldobjects/MovingNpc.java b/core/src/com/trs/main/worldobjects/MovingNpc.java index 3ad891d..0e57092 100644 --- a/core/src/com/trs/main/worldobjects/MovingNpc.java +++ b/core/src/com/trs/main/worldobjects/MovingNpc.java @@ -227,6 +227,21 @@ public class MovingNpc extends Actor{ animatedSprite.updateAnimation(delta); + for(Actor a : getStage().getActors()){ + if(a instanceof Player){ + for(Quest quest : ((Player)a).getQuests()){ + if(quest instanceof InformationQuest){ + if(((InformationQuest)quest).hasSpecialDialogue(id, mapId)){ + questBubble.setSpritePosition((int)(getX()-8), (int)(getY() + getHeight() - 16)); + questBubble.updateAnimation(0.01f); + break; + } + } + } + break; + } + } + } @Override @@ -238,8 +253,6 @@ public class MovingNpc extends Actor{ for(Quest quest : ((Player)a).getQuests()){ if(quest instanceof InformationQuest){ if(((InformationQuest)quest).hasSpecialDialogue(id, mapId)){ - questBubble.setSpritePosition((int)(getX()-8), (int)(getY() + getHeight() - 16)); - questBubble.updateAnimation(0.01f); questBubble.draw(batch); break; }