diff --git a/assets/Interface/ingame.xml b/assets/Interface/ingame.xml index 7d80430..b87500a 100644 --- a/assets/Interface/ingame.xml +++ b/assets/Interface/ingame.xml @@ -20,8 +20,8 @@ - - + + @@ -30,10 +30,11 @@ - - - - + + + + diff --git a/src/mygame/controls/PlayerControl.java b/src/mygame/controls/PlayerControl.java index 8aa9bcb..db00097 100644 --- a/src/mygame/controls/PlayerControl.java +++ b/src/mygame/controls/PlayerControl.java @@ -88,11 +88,12 @@ public void onAction(String name, boolean isPressed, float tpf) { return; } if(isPressed && name.equals("EE")){ - //TODO implement GUI stuff instead of printing what they say - if(target!=null) - System.out.println(target.talk()); - else - System.out.println("*No target*"); + if(target!=null){ + app.getGui().onChat(target.talk()); + } + else{ + app.getGui().onChat("*No target*"); + } return; } } diff --git a/src/mygame/gui/InGameScreenController.java b/src/mygame/gui/InGameScreenController.java index 61e1d34..393b233 100644 --- a/src/mygame/gui/InGameScreenController.java +++ b/src/mygame/gui/InGameScreenController.java @@ -1,7 +1,6 @@ package mygame.gui; import de.lessvoid.nifty.Nifty; -import de.lessvoid.nifty.elements.Element; import de.lessvoid.nifty.elements.render.TextRenderer; import de.lessvoid.nifty.screen.Screen; import de.lessvoid.nifty.screen.ScreenController; @@ -13,12 +12,12 @@ */ public class InGameScreenController implements ScreenController{ - private TextRenderer target_name; + private TextRenderer targetName; + private TextRenderer chatArea; public void bind(Nifty nifty, Screen screen) { - Element text = screen.findElementByName("target_name"); - target_name = text.getRenderer(TextRenderer.class); - target_name.setText("1234567890"); + targetName = screen.findElementByName("target_name").getRenderer(TextRenderer.class); + chatArea = screen.findElementByName("chat_area").getRenderer(TextRenderer.class); } public void onStartScreen() { @@ -28,7 +27,11 @@ public void onEndScreen() { } public void onTargetChange(Npc target) { - target_name.setText(target.getName()); + targetName.setText(target.getName()); + } + + public void onChat(String message){ + chatArea.setText(message); } } diff --git a/src/mygame/npc/NpcManager.java b/src/mygame/npc/NpcManager.java index 1bf79c2..c28a3ab 100644 --- a/src/mygame/npc/NpcManager.java +++ b/src/mygame/npc/NpcManager.java @@ -88,7 +88,7 @@ public List loadNpcs(){ } //TODO Some class like QuestFactory or a more organized way to initialize quests - DeliveryQuest dq2 = new DeliveryQuest(sandy, sandberg, "Void Salts", null); + DeliveryQuest dq2 = new DeliveryQuest(sandy, sandberg, "Sword", null); DeliveryQuest dq1 = new DeliveryQuest(sandberg, mcSand, "Staff", dq2); dq1.onStart(); diff --git a/src/mygame/states/GuiAppState.java b/src/mygame/states/GuiAppState.java index d8ad6ed..472c3b4 100644 --- a/src/mygame/states/GuiAppState.java +++ b/src/mygame/states/GuiAppState.java @@ -49,7 +49,7 @@ public void initialize(AppStateManager stateManager, Application app) { nifty.addXml("Interface/ingame.xml"); app.getGuiViewPort().addProcessor(niftyDisplay); - niftyDisplay.getNifty().gotoScreen("mainmenu"); + nifty.gotoScreen("mainmenu"); setClickModeEnabled(true); initKeys(); @@ -118,4 +118,8 @@ public void onTargetChange(Npc target) { ingame.onTargetChange(target); } + public void onChat(String message){ + ingame.onChat(message); + } + }