Merge pull request #65 from HGE-IT-Course-2016/Fehlerkorrekturen-by-SR

Fehlerkorrektur Player laden

Colours.java

@@ -65,13 +65,13 @@ public class Colours extends World implements ButtonEvent
     //der per Konstruktor die Daten der Colorklasse übertragen werden, dannach wird die Map die aktive Welt
     public void buttonClicked (Button b)
     {
-	
         if ( b == schwarz && possw == true)
         {
-			color [x] = sw;
+            color[x] = sw;
             pn[x]="Schwarz";
             x+=1;
             possw = false;
+            
         }
         if (b == blau && posbl == true)
         {
@@ -79,6 +79,7 @@ public class Colours extends World implements ButtonEvent
             pn[x] = "Blau";
             x+=1;
             posbl = false;
+            
         }
         if (b == grün && posgr == true )
         {
@@ -86,6 +87,7 @@ public class Colours extends World implements ButtonEvent
             pn[x]="Grün";
             x+=1;
             posgr = false;
+            
         }
         if ( b == rot && posrt == true)
         {
@@ -93,6 +95,7 @@ public class Colours extends World implements ButtonEvent
             pn[x]="Rot";
             x+=1;
             posrt = false;
+            
         }
         if ( b == gelb && posgb == true)
         {
@@ -100,6 +103,7 @@ public class Colours extends World implements ButtonEvent
             pn[x]="Gelb";
             x+=1;
             posgb = false;
+            
         }
         if ( b == lila && posli == true)
         {
@@ -107,6 +111,7 @@ public class Colours extends World implements ButtonEvent
             pn[x]="Lila";
             x+=1;
             posli = false;
+            
         }
         if ( b == weiter && x >=2 )
         {
@@ -116,10 +121,14 @@ public class Colours extends World implements ButtonEvent
             {
                 newpn[i] = pn[i];
                 newcolor[i] = color[i];
+
             }
-			World m = new Map(newcolor, x,newpn);
+
+            World m = new Map(newcolor,x,newpn);
             Greenfoot.setWorld(m);
         }
-	}
 
+    }
 }
+
+

Debug3.java

@@ -2,7 +2,7 @@ public class Debug3 extends Map_World {
 	public Debug3() {
 		super(
 			new String[] {"Spieler Nr. 1", "Player No. 2", "Spieler Nr. 3"},
-			new int[] {0,1,2}
+			new int[] {1,2,3}
 		);
 	}
 }

Map.java

@@ -11,8 +11,8 @@ public class Map extends World implements ButtonEvent
     private Button map1 = new Button ("map1",16,this);
     private Button map2 = new Button ("map2",16,this);
     private Button fertigst = new Button (" Fertigstellen",16,this);
-    int [] colour = new int[6];
-    String [] pn = new String [6];
+    int[] colour;
+    String[] pn;
     int pnu;
     //private int x;
     //private int y;
@@ -20,11 +20,12 @@ public class Map extends World implements ButtonEvent
     private Map_World MW ;
     // int [] newcolour = new int [pnu];
     // String [] newpn = new String [pnu];
-    public Map( int [] bunt, int zahl , String [] name)
+    public Map( int[] bunt, int zahl , String [] name)
     {
-
         super (1600,900,1);
-        for (int i=0; i<pnu; i++)
+        colour = new int[zahl];
+        pn = new String[zahl];        
+        for (int i=0; i<zahl; i++)
         {
             colour[i] = bunt[i];
             pn[i] = name[i];

Player.java

@@ -24,6 +24,7 @@ public class Player extends Actor
     String n;
     int color;
     int textsize;
+    int c;
 
     //definiert die ID und Namens Variable
     public Player(int identity,String name, int c)
@@ -117,31 +118,31 @@ public class Player extends Actor
     public int getProvinceCount ()
     { 
         GeneralMap w= getWorld();
-        int[] provinces = w.getProvinceOwners();
-        for (int x=0; x<=42; x++ )
+        // int[] provinces = w.getProvinceOwners();
+        for (int x=1; x<=42; x++ )
         {
-            if ( provinces [x] ==id)
+            c = w.provinces[x].getOwner();
+            if (c ==id+1)
             {
                 provZahl++;
-
+                stats[2] = provZahl;
+                redrawPlayer();
             }
         }
-        if(stats[2] < provZahl)
-        {
-            stats[2]=provZahl;
-
-        }
         return provZahl;
     }
 
     public void gotEntities(int gotEnt)
     {
         stats[3]+= gotEnt;
+        redrawPlayer();
     }
 
     public void lostEntity()
     {
+        
         stats[4]+=1;
+        redrawPlayer();
     }
 
     private void maxEntities(int entNumber)
@@ -149,6 +150,7 @@ public class Player extends Actor
         if (stats[5]< entNumber)
         {
             stats[5]=entNumber;
+            redrawPlayer();
         }
     }
 
@@ -168,6 +170,7 @@ public class Player extends Actor
             }
 
         }
+        redrawPlayer();
         return pBesitzer;
     }
 
@@ -191,23 +194,28 @@ public class Player extends Actor
             lostProv = true;
             stats[1]+=1;
         }
+        redrawPlayer();
         provVgl = provZahl;
     }
 
     public boolean getGotProvince ()
     {
+        redrawPlayer();
         return gotProv;  
     }
 
     public boolean getLostProvince()
     {
+        redrawPlayer();
         return lostProv; 
     }
 
     public int[] getStatistics()
     {
+        redrawPlayer();
         return stats;
     }
+
     public int setColor(int c)
     {
         color = c;
@@ -219,6 +227,10 @@ public class Player extends Actor
     public void redrawPlayer()
     {
         int textSize = 20;
+        if(n == null)
+        {
+            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);
@@ -272,10 +284,8 @@ public class Player extends Actor
 
         flag.scale(137,83);
         statistics.drawImage(flag,0,textSize);
-        GreenfootImage playerStatistics = new GreenfootImage(stats[0] + "||" + stats[1] + "||" + stats[2],textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f));
-        GreenfootImage playerStatistics2 = new GreenfootImage(stats[3] + "||" + stats[4] + "||" + stats[5],textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f));
-        statistics.drawImage(playerStatistics, 0, 123);
-        statistics.drawImage(playerStatistics2, 0, 123 + 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));
+        statistics.drawImage(playerStatistics, 0, 103);
 
         setImage(statistics);
     }