From 05d33955cc107b2db87a57fbd56e37809ed96afe Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Sat, 2 Jul 2016 21:36:36 +0200 Subject: [PATCH] =?UTF-8?q?Einbringung=20der=20Anpassung=20bei=20der=20Pro?= =?UTF-8?q?vinz-Initialisierung=20Dies=20bringt=20die=20Verbesserungen=20b?= =?UTF-8?q?ei=20der=20GeneralMap=20f=C3=BCr=20die=20Provinz-Initialisierun?= =?UTF-8?q?g=20aus=20dem=20"GruenRoteBranch"=20manuell=20in=20diese=20Date?= =?UTF-8?q?i.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GeneralMap.java | 551 ++++++++++++++++++++++++------------------------ 1 file changed, 275 insertions(+), 276 deletions(-) diff --git a/GeneralMap.java b/GeneralMap.java index d5aadf5..9fdefe9 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -112,282 +112,281 @@ public abstract class GeneralMap extends World implements ButtonEvent 3. [...] */ if(players.length==3) { - /* - Spieler 1 darf beginnen; Hauptstadt: 40 - Spieler 2 ist als zweites dran; Hauptstadt: 20 - Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt: 9 - */ - dataL = new int[] {1,1,3,2,2,2,2,1,1,1,1,1,3,2,1,1,3,4,3,1,2,2,1,2,1,2,3,3,3,3,3,3,1,1,2,2,2,4,2,3,1,1,3,4,1,2,3,4,2,2,2,1,3,1,1,3,1,3,1,4,3,1,2,1,2,1,1,2,2,2,3,1,2,2,2,4,2,3,1,4,3,1,1,2}; - provinces[1].setOwner(1); - provinces[1].setEntityCount(1); - provinces[2].setOwner(3); - provinces[2].setEntityCount(2); - provinces[3].setOwner(2); - provinces[3].setEntityCount(2); - provinces[4].setOwner(2); //Fabrik - provinces[4].setEntityCount(1); - provinces[5].setOwner(1);//Fabrik - provinces[5].setEntityCount(1); - provinces[6].setOwner(1);//Fabrik - provinces[6].setEntityCount(1); - provinces[7].setOwner(3); - provinces[7].setEntityCount(2); - provinces[8].setOwner(1); - provinces[8].setEntityCount(1); - provinces[9].setOwner(3); - provinces[9].setEntityCount(4); - provinces[10].setOwner(3); - provinces[10].setEntityCount(1); - provinces[11].setOwner(2);//Fabrik - provinces[11].setEntityCount(2); - provinces[12].setOwner(1); - provinces[12].setEntityCount(2); - provinces[13].setOwner(1);//Fabrik - provinces[13].setEntityCount(2); - provinces[14].setOwner(3);//Fabrik - provinces[14].setEntityCount(3); - provinces[15].setOwner(3);//Fabrik - provinces[15].setEntityCount(3); - provinces[16].setOwner(3);//Fabrik - provinces[16].setEntityCount(3); - provinces[17].setOwner(1); - provinces[17].setEntityCount(1); - provinces[18].setOwner(2); - provinces[18].setEntityCount(2); - provinces[19].setOwner(2);//Fabrik - provinces[19].setEntityCount(4); - provinces[20].setOwner(2); - provinces[20].setEntityCount(3); - provinces[21].setOwner(1); - provinces[21].setEntityCount(1); - provinces[22].setOwner(3);//Fabrik - provinces[22].setEntityCount(4); - provinces[23].setOwner(1); - provinces[23].setEntityCount(2); - provinces[24].setOwner(3); - provinces[24].setEntityCount(4); - provinces[25].setOwner(2); - provinces[25].setEntityCount(2); - provinces[26].setOwner(2);//Fabrik - provinces[26].setEntityCount(1); - provinces[27].setOwner(3); - provinces[27].setEntityCount(1); - provinces[28].setOwner(1);//Fabrik - provinces[28].setEntityCount(3); - provinces[29].setOwner(1);//Fabrik - provinces[29].setEntityCount(3); - provinces[30].setOwner(1); - provinces[30].setEntityCount(4); - provinces[31].setOwner(3); - provinces[31].setEntityCount(1); - provinces[32].setOwner(2); - provinces[32].setEntityCount(1); - provinces[33].setOwner(2); - provinces[33].setEntityCount(1); - provinces[34].setOwner(1); - provinces[34].setEntityCount(2); - provinces[35].setOwner(2); - provinces[35].setEntityCount(2); - provinces[36].setOwner(3); - provinces[36].setEntityCount(1); - provinces[37].setOwner(2); - provinces[37].setEntityCount(2); - provinces[38].setOwner(2);//Fabrik - provinces[38].setEntityCount(4); - provinces[39].setOwner(2); - provinces[39].setEntityCount(3); - provinces[40].setOwner(1); - provinces[40].setEntityCount(4); - provinces[41].setOwner(3);//Fabrik - provinces[41].setEntityCount(1); - provinces[42].setOwner(1); - provinces[42].setEntityCount(2); - } else if(players.length==4) { - /* - Spieler 1 darf beginnen; Hauptstadt:22 - Spieler 2 ist als zweites dran; Hauptstadt:20 - Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:2 - Spieler 4 ist als viertes dran und bekommt eine Karte; Hauptstadt:39 - */ - dataL = new int[] {1,1,3,3,3,3,3,2,3,2,3,3,2,2,1,2,2,2,3,2,2,3,3,2,2,3,1,3,1,3,1,3,3,2,4,2,2,4,2,4,1,1,1,2,1,5,1,3,2,2,4,3,4,1,4,2,2,2,2,2,4,1,2,1,4,5,3,2,3,2,3,2,4,1,4,1,4,4,4,1,1,2,4,4}; - provinces[1].setOwner(1); - provinces[1].setEntityCount(1); - provinces[2].setOwner(3); - provinces[2].setEntityCount(3); - provinces[3].setOwner(3); - provinces[3].setEntityCount(3); - provinces[4].setOwner(3);//Fabrik - provinces[4].setEntityCount(2); - provinces[5].setOwner(3);//Fabrik - provinces[5].setEntityCount(2); - provinces[6].setOwner(3);//Fabrik - provinces[6].setEntityCount(3); - provinces[7].setOwner(2); - provinces[7].setEntityCount(2); - provinces[8].setOwner(1); - provinces[8].setEntityCount(2); - provinces[9].setOwner(2); - provinces[9].setEntityCount(2); - provinces[10].setOwner(3);//Fabrik - provinces[10].setEntityCount(2); - provinces[11].setOwner(2);//Fabrik - provinces[11].setEntityCount(3); - provinces[12].setOwner(3); - provinces[12].setEntityCount(2); - provinces[13].setOwner(2);//Fabrik - provinces[13].setEntityCount(3); - provinces[14].setOwner(1);//Fabrik - provinces[14].setEntityCount(3); - provinces[15].setOwner(1);//Fabrik - provinces[15].setEntityCount(3); - provinces[16].setOwner(1);//Fabrik - provinces[16].setEntityCount(3); - provinces[17].setOwner(3); - provinces[17].setEntityCount(2); - provinces[18].setOwner(4); - provinces[18].setEntityCount(2); - provinces[19].setOwner(2);//Fabrik - provinces[19].setEntityCount(4); - provinces[20].setOwner(2); - provinces[20].setEntityCount(4); - provinces[21].setOwner(1); - provinces[21].setEntityCount(1); - provinces[22].setOwner(1);//Fabrik - provinces[22].setEntityCount(2); - provinces[23].setOwner(1); - provinces[23].setEntityCount(5); - provinces[24].setOwner(1); - provinces[24].setEntityCount(3); - provinces[25].setOwner(2); - provinces[25].setEntityCount(2); - provinces[26].setOwner(4);//Fabrik - provinces[26].setEntityCount(3); - provinces[27].setOwner(4); - provinces[27].setEntityCount(1); - provinces[28].setOwner(4);//Fabrik - provinces[28].setEntityCount(2); - provinces[29].setOwner(2);//Fabrik - provinces[29].setEntityCount(2); - provinces[30].setOwner(2); - provinces[30].setEntityCount(2); - provinces[31].setOwner(4); - provinces[31].setEntityCount(1); - provinces[32].setOwner(2); - provinces[32].setEntityCount(1); - provinces[33].setOwner(4); - provinces[33].setEntityCount(5); - provinces[34].setOwner(3); - provinces[34].setEntityCount(2); - provinces[35].setOwner(3); - provinces[35].setEntityCount(2); - provinces[36].setOwner(3); - provinces[36].setEntityCount(2); - provinces[37].setOwner(4); - provinces[37].setEntityCount(1); - provinces[38].setOwner(4);//Fabrik - provinces[38].setEntityCount(1); - provinces[39].setOwner(4); - provinces[39].setEntityCount(4); - provinces[40].setOwner(4); - provinces[40].setEntityCount(1); - provinces[41].setOwner(1);//Fabrik - provinces[41].setEntityCount(2); - provinces[42].setOwner(4); - provinces[42].setEntityCount(4); - } else if(players.length==5) { - /* - Spieler 1 darf beginnen; Hauptstadt:13 - Spieler 2 ist als zweites dran; Hauptstadt:7 - Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:22 - Spieler 4 ist als viertes dran und bekommt eine Karte; Hauptstadt:20 - Spieler 5 ist als fünftes dran und bekommt zwei Karte; Hauptstadt:41 - */ - dataL = new int[] {3,1,1,2,4,2,2,2,2,2,2,2,2,4,4,1,2,2,4,1,4,3,3,1,1,4,1,2,3,3,1,2,2,3,4,2,4,5,4,3,2,2,3,5,3,3,1,2,3,3,3,2,2,3,5,2,5,3,5,3,1,3,1,3,4,1,5,1,5,1,5,2,3,2,4,2,5,2,1,2,5,4,5,2}; - provinces[1].setOwner(3); - provinces[1].setEntityCount(1); - provinces[2].setOwner(1); - provinces[2].setEntityCount(2); - provinces[3].setOwner(4); - provinces[3].setEntityCount(2); - provinces[4].setOwner(2);//Fabrik - provinces[4].setEntityCount(2); - provinces[5].setOwner(2);//Fabrik - provinces[5].setEntityCount(2); - provinces[6].setOwner(2);//Fabrik - provinces[6].setEntityCount(2); - provinces[7].setOwner(2); - provinces[7].setEntityCount(4); - provinces[8].setOwner(4); - provinces[8].setEntityCount(1); - provinces[9].setOwner(2); - provinces[9].setEntityCount(2); - provinces[10].setOwner(4); - provinces[10].setEntityCount(1); - provinces[11].setOwner(4);//Fabrik - provinces[11].setEntityCount(3); - provinces[12].setOwner(3); - provinces[12].setEntityCount(1); - provinces[13].setOwner(1); - provinces[13].setEntityCount(4); - provinces[14].setOwner(1);//Fabrik - provinces[14].setEntityCount(2); - provinces[15].setOwner(3);//Fabrik - provinces[15].setEntityCount(3); - provinces[16].setOwner(1);//Fabrik - provinces[16].setEntityCount(2); - provinces[17].setOwner(2); - provinces[17].setEntityCount(3); - provinces[18].setOwner(4); - provinces[18].setEntityCount(2); - provinces[19].setOwner(4);//Fabrik - provinces[19].setEntityCount(5); - provinces[20].setOwner(4); - provinces[20].setEntityCount(3); - provinces[21].setOwner(2); - provinces[21].setEntityCount(2); - provinces[22].setOwner(3);//Fabrik - provinces[22].setEntityCount(5); - provinces[23].setOwner(3); - provinces[23].setEntityCount(3); - provinces[24].setOwner(1); - provinces[24].setEntityCount(2); - provinces[25].setOwner(3); - provinces[25].setEntityCount(3); - provinces[26].setOwner(3);//Fabrik - provinces[26].setEntityCount(2); - provinces[27].setOwner(2); - provinces[27].setEntityCount(3); - provinces[28].setOwner(5);//Fabrik - provinces[28].setEntityCount(2); - provinces[29].setOwner(5);//Fabrik - provinces[29].setEntityCount(3); - provinces[30].setOwner(5); - provinces[30].setEntityCount(3); - provinces[31].setOwner(1); - provinces[31].setEntityCount(3); - provinces[32].setOwner(1); - provinces[32].setEntityCount(3); - provinces[33].setOwner(4); - provinces[33].setEntityCount(1); - provinces[34].setOwner(5); - provinces[34].setEntityCount(1); - provinces[35].setOwner(5); - provinces[35].setEntityCount(1); - provinces[36].setOwner(5); - provinces[36].setEntityCount(2); - provinces[37].setOwner(3); - provinces[37].setEntityCount(2); - provinces[38].setOwner(4);//Fabrik - provinces[38].setEntityCount(2); - provinces[39].setOwner(5); - provinces[39].setEntityCount(2); - provinces[40].setOwner(1); - provinces[40].setEntityCount(2); - provinces[41].setOwner(5);//Fabrik - provinces[41].setEntityCount(4); - provinces[42].setOwner(5); - provinces[42].setEntityCount(2); - } + /* + Spieler 1 darf beginnen; Hauptstadt: 40 + Spieler 2 ist als zweites dran; Hauptstadt: 20 + Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt: 9 + */ + provinces[01].setOwner(0); + provinces[01].setEntityCount(1); + provinces[02].setOwner(2); + provinces[02].setEntityCount(2); + provinces[03].setOwner(1); + provinces[03].setEntityCount(2); + provinces[04].setOwner(1); //Fabrik + provinces[04].setEntityCount(1); + provinces[05].setOwner(0);//Fabrik + provinces[05].setEntityCount(1); + provinces[06].setOwner(0);//Fabrik + provinces[06].setEntityCount(1); + provinces[07].setOwner(2); + provinces[07].setEntityCount(2); + provinces[08].setOwner(0); + provinces[08].setEntityCount(1); + provinces[09].setOwner(2); + provinces[09].setEntityCount(4); + provinces[10].setOwner(2); + provinces[10].setEntityCount(1); + provinces[11].setOwner(1);//Fabrik + provinces[11].setEntityCount(2); + provinces[12].setOwner(0); + provinces[12].setEntityCount(2); + provinces[13].setOwner(0);//Fabrik + provinces[13].setEntityCount(2); + provinces[14].setOwner(2);//Fabrik + provinces[14].setEntityCount(3); + provinces[15].setOwner(2);//Fabrik + provinces[15].setEntityCount(3); + provinces[16].setOwner(2);//Fabrik + provinces[16].setEntityCount(3); + provinces[17].setOwner(0); + provinces[17].setEntityCount(1); + provinces[18].setOwner(1); + provinces[18].setEntityCount(2); + provinces[19].setOwner(1);//Fabrik + provinces[19].setEntityCount(4); + provinces[20].setOwner(1); + provinces[20].setEntityCount(3); + provinces[21].setOwner(0); + provinces[21].setEntityCount(1); + provinces[22].setOwner(2);//Fabrik + provinces[22].setEntityCount(4); + provinces[23].setOwner(0); + provinces[23].setEntityCount(2); + provinces[24].setOwner(2); + provinces[24].setEntityCount(4); + provinces[25].setOwner(1); + provinces[25].setEntityCount(2); + provinces[26].setOwner(1);//Fabrik + provinces[26].setEntityCount(1); + provinces[27].setOwner(2); + provinces[27].setEntityCount(1); + provinces[28].setOwner(0);//Fabrik + provinces[28].setEntityCount(3); + provinces[29].setOwner(0);//Fabrik + provinces[29].setEntityCount(3); + provinces[30].setOwner(0); + provinces[30].setEntityCount(4); + provinces[31].setOwner(2); + provinces[31].setEntityCount(1); + provinces[32].setOwner(1); + provinces[32].setEntityCount(1); + provinces[33].setOwner(1); + provinces[33].setEntityCount(1); + provinces[34].setOwner(0); + provinces[34].setEntityCount(2); + provinces[35].setOwner(1); + provinces[35].setEntityCount(2); + provinces[36].setOwner(2); + provinces[36].setEntityCount(1); + provinces[37].setOwner(1); + provinces[37].setEntityCount(2); + provinces[38].setOwner(1);//Fabrik + provinces[38].setEntityCount(4); + provinces[39].setOwner(1); + provinces[39].setEntityCount(3); + provinces[40].setOwner(0); + provinces[40].setEntityCount(4); + provinces[41].setOwner(2);//Fabrik + provinces[41].setEntityCount(1); + provinces[42].setOwner(0); + provinces[42].setEntityCount(2); + } else if(players.length==4) { + /* + Spieler 1 darf beginnen; Hauptstadt:22 + Spieler 2 ist als zweites dran; Hauptstadt:20 + Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:2 + Spieler 4 ist als viertes dran und bekommt eine Karte; Hauptstadt:39 + */ + provinces[01].setOwner(0); + provinces[01].setEntityCount(1); + provinces[02].setOwner(2); + provinces[02].setEntityCount(3); + provinces[03].setOwner(2); + provinces[03].setEntityCount(3); + provinces[04].setOwner(2);//Fabrik + provinces[04].setEntityCount(2); + provinces[05].setOwner(2);//Fabrik + provinces[05].setEntityCount(2); + provinces[06].setOwner(2);//Fabrik + provinces[06].setEntityCount(3); + provinces[07].setOwner(1); + provinces[07].setEntityCount(2); + provinces[08].setOwner(0); + provinces[08].setEntityCount(2); + provinces[09].setOwner(1); + provinces[09].setEntityCount(2); + provinces[10].setOwner(2);//Fabrik + provinces[10].setEntityCount(2); + provinces[11].setOwner(1);//Fabrik + provinces[11].setEntityCount(3); + provinces[12].setOwner(2); + provinces[12].setEntityCount(2); + provinces[13].setOwner(1);//Fabrik + provinces[13].setEntityCount(3); + provinces[14].setOwner(0);//Fabrik + provinces[14].setEntityCount(3); + provinces[15].setOwner(0);//Fabrik + provinces[15].setEntityCount(3); + provinces[16].setOwner(0);//Fabrik + provinces[16].setEntityCount(3); + provinces[17].setOwner(2); + provinces[17].setEntityCount(2); + provinces[18].setOwner(3); + provinces[18].setEntityCount(2); + provinces[19].setOwner(1);//Fabrik + provinces[19].setEntityCount(4); + provinces[20].setOwner(1); + provinces[20].setEntityCount(4); + provinces[21].setOwner(0); + provinces[21].setEntityCount(1); + provinces[22].setOwner(0);//Fabrik + provinces[22].setEntityCount(2); + provinces[23].setOwner(0); + provinces[23].setEntityCount(5); + provinces[24].setOwner(0); + provinces[24].setEntityCount(3); + provinces[25].setOwner(1); + provinces[25].setEntityCount(2); + provinces[26].setOwner(3);//Fabrik + provinces[26].setEntityCount(3); + provinces[27].setOwner(3); + provinces[27].setEntityCount(1); + provinces[28].setOwner(3);//Fabrik + provinces[28].setEntityCount(2); + provinces[29].setOwner(1);//Fabrik + provinces[29].setEntityCount(2); + provinces[30].setOwner(1); + provinces[30].setEntityCount(2); + provinces[31].setOwner(3); + provinces[31].setEntityCount(1); + provinces[32].setOwner(1); + provinces[32].setEntityCount(1); + provinces[33].setOwner(3); + provinces[33].setEntityCount(5); + provinces[34].setOwner(2); + provinces[34].setEntityCount(2); + provinces[35].setOwner(2); + provinces[35].setEntityCount(2); + provinces[36].setOwner(2); + provinces[36].setEntityCount(2); + provinces[37].setOwner(3); + provinces[37].setEntityCount(1); + provinces[38].setOwner(3);//Fabrik + provinces[38].setEntityCount(1); + provinces[39].setOwner(3); + provinces[39].setEntityCount(4); + provinces[40].setOwner(3); + provinces[40].setEntityCount(1); + provinces[41].setOwner(0);//Fabrik + provinces[41].setEntityCount(2); + provinces[42].setOwner(3); + provinces[42].setEntityCount(4); + } else if(players.length==5) { + /* + Spieler 1 darf beginnen; Hauptstadt:13 + Spieler 2 ist als zweites dran; Hauptstadt:7 + Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:22 + Spieler 4 ist als viertes dran und bekommt eine Karte; Hauptstadt:20 + Spieler 5 ist als fünftes dran und bekommt zwei Karte; Hauptstadt:41 + */ + // ownerL = {3,1,4,2,2,2,2,4,2,4,4,3,1,1,3,1,2,4,4,4,2,3,3,1,3,3,2,5,5,5,1,1,4,5,5,5,3,4,5,1,5,5}; + // entitiesL = {}; + provinces[01].setOwner(2); + provinces[01].setEntityCount(1); + provinces[02].setOwner(0); + provinces[02].setEntityCount(2); + provinces[03].setOwner(3); + provinces[03].setEntityCount(2); + provinces[04].setOwner(1);//Fabrik + provinces[04].setEntityCount(2); + provinces[05].setOwner(1);//Fabrik + provinces[05].setEntityCount(2); + provinces[06].setOwner(1);//Fabrik + provinces[06].setEntityCount(2); + provinces[07].setOwner(1); + provinces[07].setEntityCount(4); + provinces[08].setOwner(3); + provinces[08].setEntityCount(1); + provinces[09].setOwner(1); + provinces[09].setEntityCount(2); + provinces[10].setOwner(3); + provinces[10].setEntityCount(1); + provinces[11].setOwner(3);//Fabrik + provinces[11].setEntityCount(3); + provinces[12].setOwner(2); + provinces[12].setEntityCount(1); + provinces[13].setOwner(0); + provinces[13].setEntityCount(4); + provinces[14].setOwner(0);//Fabrik + provinces[14].setEntityCount(2); + provinces[15].setOwner(2);//Fabrik + provinces[15].setEntityCount(3); + provinces[16].setOwner(0);//Fabrik + provinces[16].setEntityCount(2); + provinces[17].setOwner(1); + provinces[17].setEntityCount(3); + provinces[18].setOwner(3); + provinces[18].setEntityCount(2); + provinces[19].setOwner(3);//Fabrik + provinces[19].setEntityCount(5); + provinces[20].setOwner(3); + provinces[20].setEntityCount(3); + provinces[21].setOwner(1); + provinces[21].setEntityCount(2); + provinces[22].setOwner(2);//Fabrik + provinces[22].setEntityCount(5); + provinces[23].setOwner(2); + provinces[23].setEntityCount(3); + provinces[24].setOwner(0); + provinces[24].setEntityCount(2); + provinces[25].setOwner(2); + provinces[25].setEntityCount(3); + provinces[26].setOwner(2);//Fabrik + provinces[26].setEntityCount(2); + provinces[27].setOwner(1); + provinces[27].setEntityCount(3); + provinces[28].setOwner(4);//Fabrik + provinces[28].setEntityCount(2); + provinces[29].setOwner(4);//Fabrik + provinces[29].setEntityCount(3); + provinces[30].setOwner(4); + provinces[30].setEntityCount(3); + provinces[31].setOwner(0); + provinces[31].setEntityCount(3); + provinces[32].setOwner(0); + provinces[32].setEntityCount(3); + provinces[33].setOwner(3); + provinces[33].setEntityCount(1); + provinces[34].setOwner(4); + provinces[34].setEntityCount(1); + provinces[35].setOwner(4); + provinces[35].setEntityCount(1); + provinces[36].setOwner(4); + provinces[36].setEntityCount(2); + provinces[37].setOwner(2); + provinces[37].setEntityCount(2); + provinces[38].setOwner(3);//Fabrik + provinces[38].setEntityCount(2); + provinces[39].setOwner(4); + provinces[39].setEntityCount(2); + provinces[40].setOwner(0); + provinces[40].setEntityCount(2); + provinces[41].setOwner(4);//Fabrik + provinces[41].setEntityCount(4); + provinces[42].setOwner(4); + provinces[42].setEntityCount(2); + } int errors = 0; for(int i = 1; i < provinces.length; i++) { Province p = provinces[i];