From 859fc88cb777bd73d5ca92afdfb499843139953c Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Mon, 25 Jul 2016 18:57:40 +0200 Subject: [PATCH 1/5] Neue Methode: getCurrentPlayerID() Diese gibt die PlayerID des aktuellen Spielers aus. --- GeneralMap.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/GeneralMap.java b/GeneralMap.java index 9945feb..1a1912f 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -190,6 +190,14 @@ public abstract class GeneralMap extends World implements ButtonEvent return players[pID].getColor(); } + /** + Gibt die PlayerID des aktuellen Spielers an. + @return PlayerID des aktuellen Spielers + */ + public int getCurrentPlayerID() { + return currentPlayer; + } + /** Gibt den Namen des aktuellen Spielers aus. @return Der Name des aktuellen Spielers From 3d807abb83f6bbbdcd380b43c808aa5e475b4fd4 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Mon, 25 Jul 2016 19:01:04 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Umsetzung=20#107=20*=20Neue=20Methoden=20ge?= =?UTF-8?q?tTextCol()=20&=20getTransBackCol(),=20welche=20nun=20passend=20?= =?UTF-8?q?f=C3=BCr=20den=20aktuellen=20Spieler=20die=20Text-=20und=20Hint?= =?UTF-8?q?ergrundfarbe=20der=20Textobjekte=20festlegt=20*=20Einsetzen=20d?= =?UTF-8?q?ieser=20Methoden=20in=20die=20bisherige=20Darstellungsmethode?= =?UTF-8?q?=20*=20Verschnellerung=20der=20vielen=20Redraws=20bei=20dem=20s?= =?UTF-8?q?witch=20case=20*=20Entfernung=20der=20nun=20unn=C3=B6tigen=20Me?= =?UTF-8?q?thode=20redrawArrow()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Player.java | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/Player.java b/Player.java index 284b47c..a91dc91 100644 --- a/Player.java +++ b/Player.java @@ -223,6 +223,14 @@ public class Player extends Actor } + private Color getTextCol() { + return (getWorld().getCurrentPlayerID() == id) ? new Color(255,255,255) : new Color(0,0,0); + } + + private Color getTransBackCol() { + return (getWorld().getCurrentPlayerID() == id) ? new Color(0.0f,0.0f,0.0f,0.5f) : new Color(1.0f,1.0f,1.0f,0.5f); + } + public void redrawPlayer() { int textSize = 20; @@ -231,8 +239,8 @@ public class Player extends Actor n = "leererSpieler"; } GreenfootImage statistics = new GreenfootImage(137,120); - GreenfootImage Name = new GreenfootImage(n,textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f)); - statistics.drawImage(Name,0,0); + GreenfootImage name = new GreenfootImage(n,textSize,getTextCol(),getTransBackCol()); + statistics.drawImage(name,0,0); setImage(statistics); oDecide(statistics,textSize); @@ -241,45 +249,27 @@ public class Player extends Actor private void oDecide(GreenfootImage statistics,int textSize) { GreenfootImage flag = new GreenfootImage("images\\BlaueArmee.jpg"); - redraw(statistics,flag,textSize); switch(color) { case 2: flag = new GreenfootImage("images\\BlaueArmee.jpg"); - - redraw(statistics,flag,textSize); break; case 5: flag = new GreenfootImage("images\\GelbeArmee.jpg"); - - redraw(statistics,flag,textSize); break; case 6: flag = new GreenfootImage("images\\LilaArmee.jpg"); - - redraw(statistics,flag,textSize); break; case 4: flag = new GreenfootImage("images\\RoteArmee.jpg"); - - redraw(statistics,flag,textSize); break; case 1: flag = new GreenfootImage("images\\SchwarzeArmee.jpg"); - - redraw(statistics,flag,textSize); break; case 3: flag = new GreenfootImage("images\\GrueneArmee.jpg"); - redrawArrow(statistics,flag,textSize); break; } - - } - - private void redrawArrow(GreenfootImage statistics,GreenfootImage flag, int textSize) - { - // redraw(statistics,flag,textSize); redraw(statistics,flag,textSize); } @@ -287,7 +277,7 @@ public class Player extends Actor { flag.scale(137,83); statistics.drawImage(flag,0,textSize); - GreenfootImage playerStatistics = new GreenfootImage(stats[0] + "||" + stats[1] + "||" + stats[2] + "||" +stats[3] + "||" + stats[4] + "||" + stats[5],textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f)); + GreenfootImage playerStatistics = new GreenfootImage(stats[0] + "||" + stats[1] + "||" + stats[2] + "||" +stats[3] + "||" + stats[4] + "||" + stats[5],textSize,getTextCol(),getTransBackCol()); statistics.drawImage(playerStatistics, 0, 103); setImage(statistics); From 983a9767c3ee07f9ff75677f74b1d45b774533e8 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Mon, 25 Jul 2016 19:06:13 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Umstellung=20Player=20Positionierung=20Da?= =?UTF-8?q?=20f=C3=BCr=20den=20Redraw=20es=20vorher=20n=C3=B6tig=20ist,=20?= =?UTF-8?q?dass=20der=20Player=20der=20Welt=20hinzugef=C3=BCgt=20wird,=20w?= =?UTF-8?q?ird=20dies=20nun=20vor=20dem=20Erledigen=20der=20Positionierung?= =?UTF-8?q?=20gemacht.=20Stattdessen=20an=20der=20Stelle,=20wo=20die=20Pos?= =?UTF-8?q?itionen=20hinterlegt=20sind=20nun=20nur=20noch=20die=20Position?= =?UTF-8?q?=20der=20bereits=20hinzugef=C3=BCgten=20Actoren=20verbessert,?= =?UTF-8?q?=20um=20die=20alte=20Code-Struktur=20beizubehalten.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GeneralMap.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/GeneralMap.java b/GeneralMap.java index 1a1912f..be16a93 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -63,6 +63,7 @@ public abstract class GeneralMap extends World implements ButtonEvent addObject( modus, 1500, 808); for (int i = 0; i < playerList.length; i++) { players[i] = new Player(i,playerList[i],colorList[i]); + addObject(players[i],0,0); players[i].redrawPlayer(); } @@ -118,17 +119,17 @@ public abstract class GeneralMap extends World implements ButtonEvent } switch (playerCount) { case 6: - addObject(players[5],1512,350); + players[5].setLocation(1512,350); case 5: - addObject(players[4],1512,230); + players[4].setLocation(1512,230); case 4: - addObject(players[3],1512,110); + players[3].setLocation(1512,110); case 3: - addObject(players[2],82,350); + players[2].setLocation(82,350); case 2: - addObject(players[1],82,230); + players[1].setLocation(,82,230); } - addObject(players[0],82,110); + players[0].setLocation(82,110); } /** From ddc3547485bef681cb0e4e877bbb9ffaf213138f Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Mon, 25 Jul 2016 19:07:25 +0200 Subject: [PATCH 4/5] Syntax Fehler: Komma zu viel --- GeneralMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneralMap.java b/GeneralMap.java index be16a93..0975229 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -127,7 +127,7 @@ public abstract class GeneralMap extends World implements ButtonEvent case 3: players[2].setLocation(82,350); case 2: - players[1].setLocation(,82,230); + players[1].setLocation(82,230); } players[0].setLocation(82,110); } From 24a48552145b6eb7c778b260a7ea27b903ac8268 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Mon, 25 Jul 2016 19:09:07 +0200 Subject: [PATCH 5/5] Umstellung der Farben Um die Darstellung zu verbessern --- Player.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Player.java b/Player.java index a91dc91..b566c6b 100644 --- a/Player.java +++ b/Player.java @@ -224,11 +224,11 @@ public class Player extends Actor } private Color getTextCol() { - return (getWorld().getCurrentPlayerID() == id) ? new Color(255,255,255) : new Color(0,0,0); + return (getWorld().getCurrentPlayerID() == id) ? new Color(0,0,0) : new Color(255,255,255); } private Color getTransBackCol() { - return (getWorld().getCurrentPlayerID() == id) ? new Color(0.0f,0.0f,0.0f,0.5f) : new Color(1.0f,1.0f,1.0f,0.5f); + return (getWorld().getCurrentPlayerID() == id) ? new Color(255,255,255) : new Color(0,0,0); } public void redrawPlayer()