From ddca90be604bc0e08aecca92a8ee6b526107a5fe Mon Sep 17 00:00:00 2001 From: SariusRu Date: Mon, 4 Jul 2016 22:53:26 +0200 Subject: [PATCH] 2 --- GeneralMap.java | 10 +++++----- project.greenfoot | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/GeneralMap.java b/GeneralMap.java index 67e4bda..7def8b3 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -69,9 +69,9 @@ public abstract class GeneralMap extends World implements ButtonEvent createPlayerObjects(playerList.length); } - public int currentPlayer() + public void currentPlayer() { - return currentPlayer; + } public void redrawGameStates() @@ -83,7 +83,7 @@ public abstract class GeneralMap extends World implements ButtonEvent if(status == GameStates.KAMPF) { GreenfootImage GameStatesEmpty = new GreenfootImage(750,textSize); - GreenfootImage GameStates = new GreenfootImage("KAMPF!!! Wähle die Provinz aus, die du angreifen möchtest!",textSize,new Color(255,255,255),new Color(0,0,0)); + GreenfootImage GameStates = new GreenfootImage("KAMPF!!! Wähle die Provinz aus, die du angreifen möchtest, Spieler " + currentPlayer,textSize,new Color(255,255,255),new Color(0,0,0)); GameStatesEmpty.drawImage(GameStates,0,0); GreenfootImage States = new GreenfootImage("MapWorldFight.png"); States.drawImage(GameStatesEmpty,X,Y); @@ -92,7 +92,7 @@ public abstract class GeneralMap extends World implements ButtonEvent if(status == GameStates.VERSCHIEBEN) { GreenfootImage GameStatesEmpty = new GreenfootImage(500,textSize); - GreenfootImage GameStates = new GreenfootImage("VERSCHIEBEN! Wähle die Provinz aus!",textSize,new Color(255,255,255),new Color(0,0,0)); + GreenfootImage GameStates = new GreenfootImage("VERSCHIEBEN! Wähle die Provinz aus, Spieler " + currentPlayer,textSize,new Color(255,255,255),new Color(0,0,0)); GameStatesEmpty.drawImage(GameStates,0,0); GreenfootImage States = new GreenfootImage("MapWorldMove.png"); States.drawImage(GameStatesEmpty,X,Y); @@ -101,7 +101,7 @@ public abstract class GeneralMap extends World implements ButtonEvent if(status == GameStates.SETZEN) { GreenfootImage GameStatesEmpty = new GreenfootImage(500,textSize); - GreenfootImage GameStates = new GreenfootImage("Setzten! Wähle die Provinz aus!",textSize,new Color(255,255,255),new Color(0,0,0)); + GreenfootImage GameStates = new GreenfootImage("Setzten! Wähle die Provinz aus, Spieler " + currentPlayer,textSize,new Color(255,255,255),new Color(0,0,0)); GameStatesEmpty.drawImage(GameStates,0,0); GreenfootImage States = new GreenfootImage("MapWorld.png"); States.drawImage(GameStatesEmpty,X,Y); diff --git a/project.greenfoot b/project.greenfoot index 8d13426..956d6ca 100644 --- a/project.greenfoot +++ b/project.greenfoot @@ -1,8 +1,8 @@ #Greenfoot properties -#Mon Jul 04 22:10:56 CEST 2016 +#Mon Jul 04 22:50:43 CEST 2016 target16.name=Button -editor.swing.0.y=0 -editor.swing.0.x=0 +editor.swing.0.y=-8 +editor.swing.0.x=-8 target2.name=Debug5 target9.name=DicesList class.Weltenauswahl.superclass=Spieloptionen @@ -267,7 +267,7 @@ target23.type=ClassTarget target20.y=610 target20.x=10 dependency31.from=Colours -editor.swing.0.height=0 +editor.swing.0.height=744 target6.showInterface=false target15.showInterface=false readme.y=10 @@ -281,7 +281,7 @@ target6.width=100 readme.width=47 target20.width=80 mainWindow.height=744 -editor.swing.0.width=0 +editor.swing.0.width=1383 target5.showInterface=false target14.showInterface=false target18.height=50 @@ -331,7 +331,7 @@ dependency6.from=Menue_Button target12.height=50 target21.typeParameters= class.Dice.superclass=GUI_Interface -world.lastInstantiated=Map_World +world.lastInstantiated=Start_Load dependency14.to=ButtonEvent target18.typeParameters= target19.showInterface=false