Merge branch 'Fehlerkorrekturen-by-SR'

GeneralMap.java

@@ -4,13 +4,14 @@ import java.util.Arrays;
 import java.awt.Color;
 import greenfoot.MouseInfo.*;
 import javax.swing.JOptionPane;
+import java.awt.Color;
 
 /**
-    Oberklasse für verschiedene Maps;
-    neue Maps werden als Unterklasse dieser Klasse eingefügt.
+Oberklasse für verschiedene Maps;
+neue Maps werden als Unterklasse dieser Klasse eingefügt.
 
-    @author GruenerWal, MaxiJohl, Felix Stupp
-    @version 1.1.0
+@author GruenerWal, MaxiJohl, Felix Stupp, Samuel
+@version 0.3.0
 */
 public abstract class GeneralMap extends World implements ButtonEvent
 {
@@ -21,7 +22,7 @@ public abstract class GeneralMap extends World implements ButtonEvent
     Button modus = new Button("Kampf\nbeginnen",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.
@@ -68,6 +69,47 @@ public abstract class GeneralMap extends World implements ButtonEvent
         createPlayerObjects(playerList.length);
     }
     
+    public int currentPlayer()
+    {
+        return currentPlayer;
+    }
+    
+    public void redrawGameStates()
+    {
+        int textSize = 20;
+        int X = 422;
+        int Y = 677;
+
+        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));
+            GameStatesEmpty.drawImage(GameStates,0,0);
+            GreenfootImage States = new GreenfootImage("MapWorldFight.png");
+            States.drawImage(GameStatesEmpty,X,Y);
+            setBackground(States);
+        }
+        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));
+            GameStatesEmpty.drawImage(GameStates,0,0);
+            GreenfootImage States = new GreenfootImage("MapWorldMove.png");
+            States.drawImage(GameStatesEmpty,X,Y);
+            setBackground(States);
+        }
+        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));
+            GameStatesEmpty.drawImage(GameStates,0,0);
+            GreenfootImage States = new GreenfootImage("MapWorld.png");
+            States.drawImage(GameStatesEmpty,X,Y);
+            setBackground(States);
+        }        
+
+    }
+
     private void createPlayerObjects(int playerCount)
     {
         if(playerCount > 6) {
@@ -155,6 +197,7 @@ public abstract class GeneralMap extends World implements ButtonEvent
         } else if (status == GameStates.VERSCHIEBEN) {
             actMove();
         }
+       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)
@@ -243,16 +244,31 @@ public class Player extends Actor
             break;
             case 3:
             flag = new GreenfootImage("images\\GrueneArmee.jpg");
-
-            redraw(statistics,flag,textSize);
+            redrawArrow(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,7 +22,8 @@ public class Province extends Actor
     private int xPos;
     private int yPos;
     private int eCount;
-
+    public int textSize;
+    private GreenfootImage province;
     private boolean clicked = false;
     /**
      * Überprüft, ob die Provinz angeklickt wurde.
@@ -171,27 +172,37 @@ public class Province extends Actor
 
     public void redrawProvince(int ColorInt)
     {
-        int textSize;
         textSize = 20;
-        GreenfootImage province = new GreenfootImage(120,100);   
+        GreenfootImage provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f));
+        int eCountTanks = eCount / 5;
+        GreenfootImage LenghtCalculate = new GreenfootImage((eCount / 5) + "x",textSize, new Color(0,0,0), new Color(0,0,0));
+        int lenght = LenghtCalculate.getWidth() + (textSize *3); 
+
+        if(lenght < provinceName.getWidth())
+        {
+            province = new GreenfootImage(provinceName.getWidth(),2*textSize);
+        }
+        else
+        {
+            province = new GreenfootImage(lenght,2*textSize); 
+        }
 
         if(ColorInt ==1)
         {
-            GreenfootImage provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f));
             province.drawImage(provinceName,0,0);
             setImage(province);
             oDecide(province,textSize,owner,eCount);
         }
         if(ColorInt ==2)
         {
-            GreenfootImage provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),Color.GREEN);
+            provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),Color.GREEN);
             province.drawImage(provinceName,0,0);
             setImage(province);
             oDecide(province,textSize,owner,eCount);
         }
         if(ColorInt == 3)
         {
-            GreenfootImage provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),Color.RED);
+            provinceName = new GreenfootImage(displayName,textSize,new Color(0,0,0),Color.RED);  
             province.drawImage(provinceName,0,0);
             setImage(province);
             oDecide(province,textSize,owner,eCount);
@@ -202,7 +213,6 @@ public class Province extends Actor
     /**
      * Weist dem Owner der Provinz sein entsprechendes Color-Tag zu.
      */
-    
     public void oDecide(GreenfootImage province,int textSize, int owner, int eCount)
     {
         String ownerString;