From 36823d8ad757283ceac95751d0bde896c4110244 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Sun, 3 Jul 2016 17:03:20 +0200 Subject: [PATCH 1/3] Debug Player-Klasse - Funktionen teilweise architektur-konform gemacht - Die Funktion getProvinceCount() debuggt (Anpassungen parallel in GeneralMap gemacht) --- GeneralMap.java | 2 +- Player.java | 120 +++++++++++++++++------------------------------- 2 files changed, 42 insertions(+), 80 deletions(-) diff --git a/GeneralMap.java b/GeneralMap.java index 0b27088..fa4b0ef 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -490,7 +490,7 @@ public abstract class GeneralMap extends World implements ButtonEvent public int[] getProvinceOwners() { int[] prOwners = new int[provinces.length]; - for (int i = 1; i > provinces.length; i++) { + for (int i = 1; i < provinces.length; i++) { prOwners[i] = provinces[i].getOwner(); } return prOwners; diff --git a/Player.java b/Player.java index ea9c1f6..f59f7de 100644 --- a/Player.java +++ b/Player.java @@ -17,10 +17,7 @@ public class Player extends Actor int id=0; int provZahl=0; int provVgl=0; - int [] stats = new int [6]; - boolean [] pBesitzer = new boolean [42]; - boolean gotProv = false; - boolean lostProv = false; + int[] stats = new int [6]; String n; int color; int textsize; @@ -45,14 +42,16 @@ public class Player extends Actor return n; } //gibt die Sternenanzahl zurück - public int getStars () + public int getStars() { return stars; } - // erhöht die Sternenzahl um eine random ausgewählte Anzahl von 1-3 - public void addToStars () - { - + + // Von Felix: Methode nicht architektur-konform + + /* // erhöht die Sternenzahl um eine random ausgewählte Anzahl von 1-3 + public void addToStars() + { int rand; int pre; rand = (int)(1+6*Math.random()); @@ -80,56 +79,56 @@ public class Player extends Actor System.out.println("Deine aktuelle Sternenanzahl beträgt " + stars + "."); redrawPlayer(); } - + } */ + + private void checkStars() { + if(stars < 0) { + stars = 0; + } } - //eine Methode um addToStars zu testen - public void add () - { - addToStars(); + + // Von Felix: Architektur-konforme Funktion + public int addToStars(int s) { + stars += s; + checkStars(); redrawPlayer(); + return stars; } //eine für das Testen gedachte Methode, die die Anzahl der Sterne auf ein gewünschtes Maß setzt public int setStars (int set) { stars = set; + checkStars(); redrawPlayer(); return stars; - } //eine Methode, die das Abziehen von Sternen testet und, wenn das Ergebnis >= 0 ist, die Sternenanzahl um eine gewählte Anzahl verringert public int removeFromStars(int sub) { - int s; - - s = stars - sub; - if (s>=0) - { - stars = s; - } - else - { - System.out.println ("Du hast nur " + stars + " Sterne, du kannst also nicht " + sub + " Sterne abziehen"); - } + int stars; + stars -= sub; + checkStars(); redrawPlayer(); return stars; - + } + + public int canStarsRemoved(int s) { + return (stars - s) >= 0; } - public int getProvinceCount () + public int getProvinceCount() { - GeneralMap w= getWorld(); - // int[] provinces = w.getProvinceOwners(); - for (int x=1; x<=42; x++ ) + int p = 0; + int[] provinces = getWorld().getProvinceOwners(); + for (int x=1; x < provinces.length; x++) { - c = w.provinces[x].getOwner(); - if (c ==id+1) + if (provinces[i] == id) { - provZahl++; - stats[2] = provZahl; + p++; redrawPlayer(); } } - return provZahl; + return p; } public void gotEntities(int gotEnt) @@ -140,7 +139,6 @@ public class Player extends Actor public void lostEntity() { - stats[4]+=1; redrawPlayer(); } @@ -156,58 +154,22 @@ public class Player extends Actor public boolean[] getMyProvinces() { - GeneralMap w= getWorld(); - int[] provinces = w.getProvinceOwners(); - for (int x=0; x<=42; x++) + int[] provinces = getWorld().getProvinceOwners(); + boolean[] myProvinces = new boolean[provinces.length]; + for (int x=0; x < provinces.length; x++) { if (provinces[x]== id) { - pBesitzer[x]=true; + myProvinces[x]=true; } else { - pBesitzer[x]=false; + myProvinces[x]=false; } } redrawPlayer(); - return pBesitzer; - } - - private void gotlostProvince() - { - if (provVgl== provZahl) - { - gotProv = false; - lostProv =false; - - } - if(provVgl< provZahl) - { - gotProv = true; - lostProv = false; - stats[0]+=1; - } - if (provVgl > provZahl) - { - gotProv = false; - lostProv = true; - stats[1]+=1; - } - redrawPlayer(); - provVgl = provZahl; - } - - public boolean getGotProvince () - { - redrawPlayer(); - return gotProv; - } - - public boolean getLostProvince() - { - redrawPlayer(); - return lostProv; + return myProvinces; } public int[] getStatistics() From 3f7a41fced3777cd258e6c80f6e487e8b9d74713 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Sun, 3 Jul 2016 17:05:21 +0200 Subject: [PATCH 2/3] Debug Player --- Player.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Player.java b/Player.java index f59f7de..e850afb 100644 --- a/Player.java +++ b/Player.java @@ -112,7 +112,7 @@ public class Player extends Actor return stars; } - public int canStarsRemoved(int s) { + public boolean canStarsRemoved(int s) { return (stars - s) >= 0; } @@ -122,7 +122,7 @@ public class Player extends Actor int[] provinces = getWorld().getProvinceOwners(); for (int x=1; x < provinces.length; x++) { - if (provinces[i] == id) + if (provinces[x] == id) { p++; redrawPlayer(); From 427622cb65ebde8f7953c72c5f0376834659e068 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Sun, 3 Jul 2016 17:06:26 +0200 Subject: [PATCH 3/3] Debug Player 2 --- Player.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Player.java b/Player.java index e850afb..c9f3898 100644 --- a/Player.java +++ b/Player.java @@ -105,7 +105,6 @@ public class Player extends Actor //eine Methode, die das Abziehen von Sternen testet und, wenn das Ergebnis >= 0 ist, die Sternenanzahl um eine gewählte Anzahl verringert public int removeFromStars(int sub) { - int stars; stars -= sub; checkStars(); redrawPlayer();