From bcf6734a0730a8d1d3b0f1beda632a5caba03598 Mon Sep 17 00:00:00 2001
From: GammelJAN <jan.ehehalt@gmail.com>
Date: Tue, 26 Jan 2021 20:47:15 +0100
Subject: [PATCH] speechbubble added

---
 .../textureData/sprites/questbubble.png       | Bin 0 -> 829 bytes
 .../com/trs/main/worldobjects/MovingNpc.java  |  25 ++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 core/assets/textureData/sprites/questbubble.png

diff --git a/core/assets/textureData/sprites/questbubble.png b/core/assets/textureData/sprites/questbubble.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0f73aa09b77509b36827a0f29e73b5ef270b7d2
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ>7wRhju8%AwzYtAS&W0RV;#q(pG5I!Q`cX(8Q3W
zxHt-~1qXi?s}3&Cx;nTDg5VE`o12rOi<Ed@QfLw5g~$6i@1DbZ_W?q)##FOs98fjO
z$RrbDzOW(&Ug1L&Aw)1JF;h=v7jp2duY2mIx{LEH@4i24Kq;CG@QK8;OgAjzb>itw
zOXs{#9A*_sAwDM_Gw6cEk6f2se&bwrSm2pqBbS*Y4ik&zE|$BPRScDQia4gI8s!Ul
zmle)ioYh*LweQJa7%XbbS+3I>MiPriAq^2S>Zqay3vt>tQcPs%JmKMwI{q}dWO7x(
z$T5!%sE`~#_#gb9ty!9!aFc=wp!dbLKSqGSF3@V&_V=-Ew@v{6GjOGK{2NVR=9BbB
zM~fW+L)*Z`bw`u;fXf{q@}x_K<Vb#6La7A2pV2oJfY2?_zv|AdeU8%yAV;%Wx&aOj
zfzdK$uX((?uX}F)_O$2s176#5pYYb0*Z=?k24YJ`L;yDcHvl(t+lli4000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2ju}86D=N0+{AwX000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0003LNkl<ZSi@svAQ3njF#Jd6@4LXj$Up&LVi;h+0%M4Y
ziT%f?P)F(&0|NsCgPtOW)PDvB28Juo#7MIE)vH&GgCYbN(S6?5)`nH#vMDJjAs{6T
zp?92t&`~*ah_bM%s%ns?0d$`$Dk_p>5V7hnUcAV_z`($uudhGILV#SKQwjz=1ju%P
zhAae++z=Qx4qzcw1FQrbje?Pz2B?wu2UQ4Qv<H?iUyfHpYq2v5zq)rXUiDg9S}1&2
zEjV~WfY>%6E`Te<U_M9p@t|uHvY@+&)P6x^WF%2(2bcMSCk+tmb6l-rSib<)=EIfh
z(L-YBm4r?PsC-xmp!*mW66md9SZ*6UJtJ!Oj!7*~20R1+H~vocn2x!K00000NkvXX
Hu0mjf_J~_S

literal 0
HcmV?d00001

diff --git a/core/src/com/trs/main/worldobjects/MovingNpc.java b/core/src/com/trs/main/worldobjects/MovingNpc.java
index 0b5558d..0eedbac 100644
--- a/core/src/com/trs/main/worldobjects/MovingNpc.java
+++ b/core/src/com/trs/main/worldobjects/MovingNpc.java
@@ -8,13 +8,16 @@ package com.trs.main.worldobjects;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.math.Intersector;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.trs.main.Dialogue;
 import com.trs.main.DialogueParser;
+import com.trs.main.InformationQuest;
 import com.trs.main.Main;
+import com.trs.main.Quest;
 import com.trs.main.StaticMath;
 import com.trs.main.Textbox;
 
@@ -48,12 +51,16 @@ public class MovingNpc extends Actor{
     
     String dialoguePath;
     
+    Texture questBubble;//= new Texture("textureData/sprites/questbubble.png");
+    
     public MovingNpc(Rectangle area, float xPos, float yPos, int id, int mapId, String texture){
         setName("npc");
         this.id = id;
         this.mapId = mapId;
         Texture t = new Texture(Gdx.files.internal("textureData/sprites/"+texture));
         
+        questBubble = new Texture("textureData/sprites/questbubble.png");
+        
         currentlyTalking = false;
         specialDialogue = false;
         animatedSprite = new AnimatedSprite(t, 64, 64, true);
@@ -211,6 +218,23 @@ public class MovingNpc extends Actor{
     @Override
     public void draw(Batch batch, float parentAlpha) {
         animatedSprite.draw(batch);
+        
+        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)){
+                            batch.draw(questBubble, getX()-8, getY() + getHeight() - 16);
+                            break;
+                        }   
+                    }
+                }
+                break;
+            }
+        }
+        
+        
+        
         super.draw(batch, parentAlpha); //To change body of generated methods, choose Tools | Templates.
     }
     
@@ -240,4 +264,5 @@ public class MovingNpc extends Actor{
         return t;
     }
     
+    
 }