diff --git a/Province.java b/Province.java index 042f91e..0fc9f9e 100644 --- a/Province.java +++ b/Province.java @@ -1,4 +1,5 @@ -import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) +import greenfoot.*; +import java.awt.Color; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) /** * Write a description of class Province here. @@ -156,70 +157,92 @@ public class Province extends Actor public void redrawProvince() { - GreenfootImage province = new GreenfootImage(100,65); - GreenfootImage provinceName = new GreenfootImage(displayName,16,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f)); + GreenfootImage province = new GreenfootImage(100,100); + GreenfootImage provinceName = new GreenfootImage(displayName,25,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f)); province.drawImage(provinceName,0,0); - eCalculate(province); + oDecide(province); + } + + public void oDecide(GreenfootImage province) + { + String ownerString; + switch(owner) + { + case 1: + ownerString = "schwarz"; + eCalculate(province,ownerString); + case 2: + ownerString = "rot"; + eCalculate(province,ownerString); + case 3: + ownerString = "blau"; + eCalculate(province,ownerString); + case 4: + ownerString = "gelb"; + eCalculate(province,ownerString); + case 5: + ownerString = "grün"; + eCalculate(province,ownerString); + case 6: + ownerString = "lila"; + eCalculate(province,ownerString); + + + } + + } - private void eCalculate(GreenfootImage province) + private void eCalculate(GreenfootImage province, String ownerString) { int eCountTanks = eCount / 5; - GreenfootImage tryOut = new GreenfootImage("C:\\Users\\samue\\Documents\\GitHub\\zweiundvierzig\\Tank.jpg"); + GreenfootImage tank = new GreenfootImage("images\\dickebertaskal-" + ownerString + ".png"); + tank.scale(25,25); if(eCountTanks <= 3) { if(eCountTanks == 1) { - province.drawImage(tryOut,0,17); + province.drawImage(tank,0,25); } if(eCountTanks == 2) { - province.drawImage(tryOut,0,17); - province.drawImage(tryOut,17,17); + province.drawImage(tank,0,25); + province.drawImage(tank,17,25); } if(eCountTanks == 3) { - province.drawImage(tryOut,0,17); - province.drawImage(tryOut,17,17); - province.drawImage(tryOut,34,17); + province.drawImage(tank,0,25); + province.drawImage(tank,25,25); + province.drawImage(tank,25,25); } } else { - GreenfootImage eCountTanksImage = new GreenfootImage(Integer.toString(eCountTanks) + "x",16,Color.CYAN,new Color(1.0f,1.0f,1.0f,0.5f)); - province.drawImage(eCountTanksImage,0,17); - province.drawImage(tryOut,22,18); + GreenfootImage eCountTanksImage = new GreenfootImage(Integer.toString(eCountTanks) + "x",25,Color.CYAN,new Color(1.0f,1.0f,1.0f,0.5f)); + province.drawImage(eCountTanksImage,0,25); + province.drawImage(tank,45,25); } int eCountHorse = (eCount - (eCountTanks * 5))/3; + GreenfootImage horse = new GreenfootImage("images\\pferdreiterskal-" + ownerString + ".png"); + horse.scale(25,25); if(eCountHorse == 1) { - province.drawImage(tryOut,0,34); + province.drawImage(horse,0,50); } + GreenfootImage Inf = new GreenfootImage("images\\infanterieskal-" + ownerString + ".png"); int eCountInf = eCount - (eCountTanks * 5) - (eCountHorse * 3); + Inf.scale(25,25); if(eCountInf <= 4) { if(eCountInf == 1) { - province.drawImage(tryOut,0,51); + province.drawImage(Inf,0,75); } if(eCountInf == 2) { - province.drawImage(tryOut,0,51); - province.drawImage(tryOut,17,51); - } - if(eCountInf == 3) - { - province.drawImage(tryOut,0,51); - province.drawImage(tryOut,17,51); - province.drawImage(tryOut,34,51); - } - if(eCountInf == 4) - { - province.drawImage(tryOut,0,51); - province.drawImage(tryOut,17,51); - province.drawImage(tryOut,34,51); - province.drawImage(tryOut,51,51); - } + province.drawImage(Inf,0,75); + province.drawImage(Inf,25,75); + } } setImage(province); } diff --git a/images/Risiko Karte.xcf b/images/Risiko Karte.xcf new file mode 100644 index 0000000..3f79fd1 Binary files /dev/null and b/images/Risiko Karte.xcf differ diff --git a/images/Thumbs.db b/images/Thumbs.db new file mode 100644 index 0000000..cd28b2a Binary files /dev/null and b/images/Thumbs.db differ diff --git a/images/dickebertaskal-blau.png b/images/dickebertaskal-blau.png new file mode 100644 index 0000000..5c5f01c Binary files /dev/null and b/images/dickebertaskal-blau.png differ diff --git a/images/dickebertaskal-gelb.png b/images/dickebertaskal-gelb.png new file mode 100644 index 0000000..41c9cea Binary files /dev/null and b/images/dickebertaskal-gelb.png differ diff --git a/images/dickebertaskal-grün.png b/images/dickebertaskal-grün.png new file mode 100644 index 0000000..6248173 Binary files /dev/null and b/images/dickebertaskal-grün.png differ diff --git a/images/dickebertaskal-lila.png b/images/dickebertaskal-lila.png new file mode 100644 index 0000000..094f832 Binary files /dev/null and b/images/dickebertaskal-lila.png differ diff --git a/images/dickebertaskal-rot.png b/images/dickebertaskal-rot.png new file mode 100644 index 0000000..ec15e33 Binary files /dev/null and b/images/dickebertaskal-rot.png differ diff --git a/images/dickebertaskal-schwarz.png b/images/dickebertaskal-schwarz.png new file mode 100644 index 0000000..d86734f Binary files /dev/null and b/images/dickebertaskal-schwarz.png differ diff --git a/images/infanterieskal-blau.png b/images/infanterieskal-blau.png new file mode 100644 index 0000000..30a1620 Binary files /dev/null and b/images/infanterieskal-blau.png differ diff --git a/images/infanterieskal-gelb.png b/images/infanterieskal-gelb.png new file mode 100644 index 0000000..15d4454 Binary files /dev/null and b/images/infanterieskal-gelb.png differ diff --git a/images/infanterieskal-grün.png b/images/infanterieskal-grün.png new file mode 100644 index 0000000..02bf7a5 Binary files /dev/null and b/images/infanterieskal-grün.png differ diff --git a/images/infanterieskal-lila.png b/images/infanterieskal-lila.png new file mode 100644 index 0000000..12fc9dd Binary files /dev/null and b/images/infanterieskal-lila.png differ diff --git a/images/infanterieskal-rot.png b/images/infanterieskal-rot.png new file mode 100644 index 0000000..0ca7dd7 Binary files /dev/null and b/images/infanterieskal-rot.png differ diff --git a/images/infanterieskal-schwarz.png b/images/infanterieskal-schwarz.png new file mode 100644 index 0000000..6f0f95e Binary files /dev/null and b/images/infanterieskal-schwarz.png differ diff --git a/images/pferdreiterskal-blau.png b/images/pferdreiterskal-blau.png new file mode 100644 index 0000000..20db09c Binary files /dev/null and b/images/pferdreiterskal-blau.png differ diff --git a/images/pferdreiterskal-gelb.png b/images/pferdreiterskal-gelb.png new file mode 100644 index 0000000..9bf4416 Binary files /dev/null and b/images/pferdreiterskal-gelb.png differ diff --git a/images/pferdreiterskal-grün.png b/images/pferdreiterskal-grün.png new file mode 100644 index 0000000..bc9a51a Binary files /dev/null and b/images/pferdreiterskal-grün.png differ diff --git a/images/pferdreiterskal-lila.png b/images/pferdreiterskal-lila.png new file mode 100644 index 0000000..811444b Binary files /dev/null and b/images/pferdreiterskal-lila.png differ diff --git a/images/pferdreiterskal-rot.png b/images/pferdreiterskal-rot.png new file mode 100644 index 0000000..54a8deb Binary files /dev/null and b/images/pferdreiterskal-rot.png differ diff --git a/images/pferdreiterskal-schwarz.png b/images/pferdreiterskal-schwarz.png new file mode 100644 index 0000000..e70515a Binary files /dev/null and b/images/pferdreiterskal-schwarz.png differ