Fehlerbehebung Province

Sorry habs zu spät gelesen, das man eigene Branches machen soll

GeneralMap.java

@@ -9,7 +9,7 @@ import java.awt.Color;
 Oberklasse für verschiedene Maps;
 neue Maps werden als Unterklasse dieser Klasse eingefügt.
 
-@author GruenerWal, MaxiJohl, Felix Stupp
+@author GruenerWal, MaxiJohl, Felix Stupp, Samuel
 @version 0.3.0
  */
 public abstract class GeneralMap extends World implements ButtonEvent
@@ -21,7 +21,7 @@ public abstract class GeneralMap extends World implements ButtonEvent
     Button modus = new Button("Kampf",25,this);
 
     private final int X_OFFSET = 200; // Verschiebt die Provinzen nach rechts
-    private final int Y_OFFSET = 25; // Verschiebt die Provinzen nach unten
+    private final int Y_OFFSET = 0; // Verschiebt die Provinzen nach unten
 
     /*
     Die einzelnen Positionen der Provinzen wird mit SCALE_VALUE/10000 multipliziert.
@@ -74,6 +74,13 @@ public abstract class GeneralMap extends World implements ButtonEvent
         createPlayerObjects(playerList.length);
     }
     
+    public int currentPlayer()
+    {
+        return currentPlayer;
+    }
+    
+   
+
     
     public void redrawGameStates()
     {

Player.java

@@ -22,6 +22,7 @@ public class Player extends Actor
     int color;
     int textsize;
     int c;
+    public int active;
 
     //definiert die ID und Namens Variable
     public Player(int identity,String name, int c)
@@ -233,16 +234,31 @@ public class Player extends Actor
             break;
             case 3:
             flag = new GreenfootImage("images\\GrueneArmee.jpg");
-
+            redrawArrow(statistics,flag,textSize);
-            redraw(statistics,flag,textSize);
             break;
         }
 
     }
 
-    private void redraw(GreenfootImage statistics,GreenfootImage flag, int textSize)
+    private void redrawArrow(GreenfootImage statistics,GreenfootImage flag, int textSize)
+    {
+        // redraw(statistics,flag,textSize);
+        GreenfootImage Arrow = new GreenfootImage(137,120);           
+        if(id == 0 || id == 1|| id == 2)
+        {
+            Arrow.setColor(Color.GRAY);    
+            Arrow.fill();
+            Arrow.drawImage(statistics,0,0);
+            redraw(Arrow,flag,textSize);
+        }
+        else
         {
+            redraw(statistics,flag,textSize);
+        }
+    }
 
+    private void redraw(GreenfootImage statistics,GreenfootImage flag, int textSize)
+    {
         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));

Province.java

@@ -22,6 +22,7 @@ public class Province extends Actor
     private int xPos;
     private int yPos;
     private int eCount;
+    public int textSize;
 
     private boolean clicked = false;
     /**
@@ -171,13 +172,14 @@ public class Province extends Actor
 
     public void redrawProvince(int ColorInt)
     {
-        int textSize;
+        
         textSize = 20;
-        GreenfootImage province = new GreenfootImage(120,100);   
+         
 
         if(ColorInt ==1)
         {
             GreenfootImage provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f));
+            GreenfootImage province = new GreenfootImage(120,2*textSize);  
             province.drawImage(provinceName,0,0);
             setImage(province);
             oDecide(province,textSize,owner,eCount);
@@ -185,6 +187,7 @@ public class Province extends Actor
         if(ColorInt ==2)
         {
             GreenfootImage provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),Color.GREEN);
+            GreenfootImage province = new GreenfootImage(120,2*textSize);  
             province.drawImage(provinceName,0,0);
             setImage(province);
             oDecide(province,textSize,owner,eCount);
@@ -192,6 +195,7 @@ public class Province extends Actor
         if(ColorInt == 3)
         {
             GreenfootImage provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),Color.RED);
+            GreenfootImage province = new GreenfootImage(120,2*textSize);  
             province.drawImage(provinceName,0,0);
             setImage(province);
             oDecide(province,textSize,owner,eCount);