From 47da46ec33a46826c7afc9c9ac2df400e50b82f1 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Wed, 29 Jun 2016 19:11:33 +0200 Subject: [PATCH] =?UTF-8?q?Vereinfachung=20erweitert/verbessert=20Bisher?= =?UTF-8?q?=20unvollst=C3=A4ndige=20und=20daher=20fehlerverursachende=20Ve?= =?UTF-8?q?reinfachungen=20wurden=20entfernt.=20Alle=20zuk=C3=BCnftigen=20?= =?UTF-8?q?=C3=84nderungen=20f=C3=BCr=20partialle=20Vereinfachungen=20werd?= =?UTF-8?q?en=20fehlerfrei=20sein!=20*.redrawProvince()=20f=C3=BCr=20jede?= =?UTF-8?q?=20Provinz=20wurde=20entfernt=20zusammen=20mit=20der=20For-Schl?= =?UTF-8?q?eife,=20die=20dies=20erledigen=20sollte,=20da=20die=20Provinz?= =?UTF-8?q?=20dies=20selbst=20beim=20Festlegen=20einer=20Einheitenanzahl?= =?UTF-8?q?=20macht.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GeneralMap.java | 133 ------------------------------------------------ 1 file changed, 133 deletions(-) diff --git a/GeneralMap.java b/GeneralMap.java index 5c375bb..5cf4c62 100644 --- a/GeneralMap.java +++ b/GeneralMap.java @@ -105,130 +105,88 @@ public abstract class GeneralMap extends World implements ButtonEvent */ provinces[1].setOwner(1); provinces[1].setEntityCount(1); - provinces[1].redrawProvince(); provinces[2].setOwner(3); provinces[2].setEntityCount(2); - provinces[2].redrawProvince(); provinces[3].setOwner(2); provinces[3].setEntityCount(2); - provinces[3].redrawProvince(); provinces[4].setOwner(2); //Fabrik provinces[4].setEntityCount(1); - provinces[4].redrawProvince(); provinces[5].setOwner(1);//Fabrik provinces[5].setEntityCount(1); - provinces[5].redrawProvince(); provinces[6].setOwner(1);//Fabrik provinces[6].setEntityCount(1); - provinces[6].redrawProvince(); provinces[7].setOwner(3); provinces[7].setEntityCount(2); - provinces[7].redrawProvince(); provinces[8].setOwner(1); provinces[8].setEntityCount(1); - provinces[8].redrawProvince(); provinces[9].setOwner(3); provinces[9].setEntityCount(4); - provinces[9].redrawProvince(); provinces[10].setOwner(3); provinces[10].setEntityCount(1); - provinces[10].redrawProvince(); provinces[11].setOwner(2);//Fabrik provinces[11].setEntityCount(2); - provinces[11].redrawProvince(); provinces[12].setOwner(1); provinces[12].setEntityCount(2); - provinces[12].redrawProvince(); provinces[13].setOwner(1);//Fabrik provinces[13].setEntityCount(2); - provinces[13].redrawProvince(); provinces[14].setOwner(3);//Fabrik provinces[14].setEntityCount(3); - provinces[14].redrawProvince(); provinces[15].setOwner(3);//Fabrik provinces[15].setEntityCount(3); - provinces[15].redrawProvince(); provinces[16].setOwner(3);//Fabrik provinces[16].setEntityCount(3); - provinces[16].redrawProvince(); provinces[17].setOwner(1); provinces[17].setEntityCount(1); - provinces[17].redrawProvince(); provinces[18].setOwner(2); provinces[18].setEntityCount(2); - provinces[18].redrawProvince(); provinces[19].setOwner(2);//Fabrik provinces[19].setEntityCount(4); - provinces[19].redrawProvince(); provinces[20].setOwner(2); provinces[20].setEntityCount(3); - provinces[20].redrawProvince(); provinces[21].setOwner(1); provinces[21].setEntityCount(1); - provinces[21].redrawProvince(); provinces[22].setOwner(3);//Fabrik provinces[22].setEntityCount(4); - provinces[22].redrawProvince(); provinces[23].setOwner(1); provinces[23].setEntityCount(2); - provinces[23].redrawProvince(); provinces[24].setOwner(3); provinces[24].setEntityCount(4); - provinces[24].redrawProvince(); provinces[25].setOwner(2); provinces[25].setEntityCount(2); - provinces[25].redrawProvince(); provinces[26].setOwner(2);//Fabrik provinces[26].setEntityCount(1); - provinces[26].redrawProvince(); provinces[27].setOwner(3); provinces[27].setEntityCount(1); - provinces[27].redrawProvince(); provinces[28].setOwner(1);//Fabrik provinces[28].setEntityCount(3); - provinces[28].redrawProvince(); provinces[29].setOwner(1);//Fabrik provinces[29].setEntityCount(3); - provinces[29].redrawProvince(); provinces[30].setOwner(1); provinces[30].setEntityCount(4); - provinces[30].redrawProvince(); provinces[31].setOwner(3); provinces[31].setEntityCount(1); - provinces[31].redrawProvince(); provinces[32].setOwner(2); provinces[32].setEntityCount(1); - provinces[32].redrawProvince(); provinces[33].setOwner(2); provinces[33].setEntityCount(1); - provinces[33].redrawProvince(); provinces[34].setOwner(1); provinces[34].setEntityCount(2); - provinces[34].redrawProvince(); provinces[35].setOwner(2); provinces[35].setEntityCount(2); - provinces[35].redrawProvince(); provinces[36].setOwner(3); provinces[36].setEntityCount(1); - provinces[36].redrawProvince(); provinces[37].setOwner(2); provinces[37].setEntityCount(2); - provinces[37].redrawProvince(); provinces[38].setOwner(2);//Fabrik provinces[38].setEntityCount(4); - provinces[38].redrawProvince(); provinces[39].setOwner(2); provinces[39].setEntityCount(3); - provinces[39].redrawProvince(); provinces[40].setOwner(1); provinces[40].setEntityCount(4); - provinces[40].redrawProvince(); provinces[41].setOwner(3);//Fabrik provinces[41].setEntityCount(1); - provinces[41].redrawProvince(); provinces[42].setOwner(1); provinces[42].setEntityCount(2); - provinces[42].redrawProvince(); } else if(players.length==4) { /* Spieler 1 darf beginnen; Hauptstadt:22 @@ -238,130 +196,88 @@ public abstract class GeneralMap extends World implements ButtonEvent */ provinces[1].setOwner(1); provinces[1].setEntityCount(1); - provinces[1].redrawProvince(); provinces[2].setOwner(3); provinces[2].setEntityCount(3); - provinces[2].redrawProvince(); provinces[3].setOwner(3); provinces[3].setEntityCount(3); - provinces[3].redrawProvince(); provinces[4].setOwner(3);//Fabrik provinces[4].setEntityCount(2); - provinces[4].redrawProvince(); provinces[5].setOwner(3);//Fabrik provinces[5].setEntityCount(2); - provinces[5].redrawProvince(); provinces[6].setOwner(3);//Fabrik provinces[6].setEntityCount(3); - provinces[6].redrawProvince(); provinces[7].setOwner(2); provinces[7].setEntityCount(2); - provinces[7].redrawProvince(); provinces[8].setOwner(1); provinces[8].setEntityCount(2); - provinces[8].redrawProvince(); provinces[9].setOwner(2); provinces[9].setEntityCount(2); - provinces[9].redrawProvince(); provinces[10].setOwner(3);//Fabrik provinces[10].setEntityCount(2); - provinces[10].redrawProvince(); provinces[11].setOwner(2);//Fabrik provinces[11].setEntityCount(3); - provinces[11].redrawProvince(); provinces[12].setOwner(3); provinces[12].setEntityCount(2); - provinces[12].redrawProvince(); provinces[13].setOwner(2);//Fabrik provinces[13].setEntityCount(3); - provinces[13].redrawProvince(); provinces[14].setOwner(1);//Fabrik provinces[14].setEntityCount(3); - provinces[14].redrawProvince(); provinces[15].setOwner(1);//Fabrik provinces[15].setEntityCount(3); - provinces[15].redrawProvince(); provinces[16].setOwner(1);//Fabrik provinces[16].setEntityCount(3); - provinces[16].redrawProvince(); provinces[17].setOwner(3); provinces[17].setEntityCount(2); - provinces[17].redrawProvince(); provinces[18].setOwner(4); provinces[18].setEntityCount(2); - provinces[18].redrawProvince(); provinces[19].setOwner(2);//Fabrik provinces[19].setEntityCount(4); - provinces[19].redrawProvince(); provinces[20].setOwner(2); provinces[20].setEntityCount(4); - provinces[20].redrawProvince(); provinces[21].setOwner(1); provinces[21].setEntityCount(1); - provinces[21].redrawProvince(); provinces[22].setOwner(1);//Fabrik provinces[22].setEntityCount(2); - provinces[22].redrawProvince(); provinces[23].setOwner(1); provinces[23].setEntityCount(5); - provinces[23].redrawProvince(); provinces[24].setOwner(1); provinces[24].setEntityCount(3); - provinces[24].redrawProvince(); provinces[25].setOwner(2); provinces[25].setEntityCount(2); - provinces[25].redrawProvince(); provinces[26].setOwner(4);//Fabrik provinces[26].setEntityCount(3); - provinces[26].redrawProvince(); provinces[27].setOwner(4); provinces[27].setEntityCount(1); - provinces[27].redrawProvince(); provinces[28].setOwner(4);//Fabrik provinces[28].setEntityCount(2); - provinces[28].redrawProvince(); provinces[29].setOwner(2);//Fabrik provinces[29].setEntityCount(2); - provinces[29].redrawProvince(); provinces[30].setOwner(2); provinces[30].setEntityCount(2); - provinces[30].redrawProvince(); provinces[31].setOwner(4); provinces[31].setEntityCount(1); - provinces[31].redrawProvince(); provinces[32].setOwner(2); provinces[32].setEntityCount(1); - provinces[32].redrawProvince(); provinces[33].setOwner(4); provinces[33].setEntityCount(5); - provinces[33].redrawProvince(); provinces[34].setOwner(3); provinces[34].setEntityCount(2); - provinces[34].redrawProvince(); provinces[35].setOwner(3); provinces[35].setEntityCount(2); - provinces[35].redrawProvince(); provinces[36].setOwner(3); provinces[36].setEntityCount(2); - provinces[36].redrawProvince(); provinces[37].setOwner(4); provinces[37].setEntityCount(1); - provinces[37].redrawProvince(); provinces[38].setOwner(4);//Fabrik provinces[38].setEntityCount(1); - provinces[38].redrawProvince(); provinces[39].setOwner(4); provinces[39].setEntityCount(4); - provinces[39].redrawProvince(); provinces[40].setOwner(4); provinces[40].setEntityCount(1); - provinces[40].redrawProvince(); provinces[41].setOwner(1);//Fabrik provinces[41].setEntityCount(2); - provinces[41].redrawProvince(); provinces[42].setOwner(4); provinces[42].setEntityCount(4); - provinces[42].redrawProvince(); } else if(players.length==5) { /* Spieler 1 darf beginnen; Hauptstadt:13 @@ -370,139 +286,90 @@ public abstract class GeneralMap extends World implements ButtonEvent 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[1].setOwner(3); provinces[1].setEntityCount(1); - provinces[1].redrawProvince(); provinces[2].setOwner(1); provinces[2].setEntityCount(2); - provinces[2].redrawProvince(); provinces[3].setOwner(4); provinces[3].setEntityCount(2); - provinces[3].redrawProvince(); provinces[4].setOwner(2);//Fabrik provinces[4].setEntityCount(2); - provinces[4].redrawProvince(); provinces[5].setOwner(2);//Fabrik provinces[5].setEntityCount(2); - provinces[5].redrawProvince(); provinces[6].setOwner(2);//Fabrik provinces[6].setEntityCount(2); - provinces[6].redrawProvince(); provinces[7].setOwner(2); provinces[7].setEntityCount(4); - provinces[7].redrawProvince(); provinces[8].setOwner(4); provinces[8].setEntityCount(1); - provinces[8].redrawProvince(); provinces[9].setOwner(2); provinces[9].setEntityCount(2); - provinces[9].redrawProvince(); provinces[10].setOwner(4); provinces[10].setEntityCount(1); - provinces[10].redrawProvince(); provinces[11].setOwner(4);//Fabrik provinces[11].setEntityCount(3); - provinces[11].redrawProvince(); provinces[12].setOwner(3); provinces[12].setEntityCount(1); - provinces[12].redrawProvince(); provinces[13].setOwner(1); provinces[13].setEntityCount(4); - provinces[13].redrawProvince(); provinces[14].setOwner(1);//Fabrik provinces[14].setEntityCount(2); - provinces[14].redrawProvince(); provinces[15].setOwner(3);//Fabrik provinces[15].setEntityCount(3); - provinces[15].redrawProvince(); provinces[16].setOwner(1);//Fabrik provinces[16].setEntityCount(2); - provinces[16].redrawProvince(); provinces[17].setOwner(2); provinces[17].setEntityCount(3); - provinces[17].redrawProvince(); provinces[18].setOwner(4); provinces[18].setEntityCount(2); - provinces[18].redrawProvince(); provinces[19].setOwner(4);//Fabrik provinces[19].setEntityCount(5); - provinces[19].redrawProvince(); provinces[20].setOwner(4); provinces[20].setEntityCount(3); - provinces[20].redrawProvince(); provinces[21].setOwner(2); provinces[21].setEntityCount(2); - provinces[21].redrawProvince(); provinces[22].setOwner(3);//Fabrik provinces[22].setEntityCount(5); - provinces[22].redrawProvince(); provinces[23].setOwner(3); provinces[23].setEntityCount(3); - provinces[23].redrawProvince(); provinces[24].setOwner(1); provinces[24].setEntityCount(2); - provinces[24].redrawProvince(); provinces[25].setOwner(3); provinces[25].setEntityCount(3); - provinces[25].redrawProvince(); provinces[26].setOwner(3);//Fabrik provinces[26].setEntityCount(2); - provinces[26].redrawProvince(); provinces[27].setOwner(2); provinces[27].setEntityCount(3); - provinces[27].redrawProvince(); provinces[28].setOwner(5);//Fabrik provinces[28].setEntityCount(2); - provinces[28].redrawProvince(); provinces[29].setOwner(5);//Fabrik provinces[29].setEntityCount(3); - provinces[29].redrawProvince(); provinces[30].setOwner(5); provinces[30].setEntityCount(3); - provinces[30].redrawProvince(); provinces[31].setOwner(1); provinces[31].setEntityCount(3); - provinces[31].redrawProvince(); provinces[32].setOwner(1); provinces[32].setEntityCount(3); - provinces[32].redrawProvince(); provinces[33].setOwner(4); provinces[33].setEntityCount(1); - provinces[33].redrawProvince(); provinces[34].setOwner(5); provinces[34].setEntityCount(1); - provinces[34].redrawProvince(); provinces[35].setOwner(5); provinces[35].setEntityCount(1); - provinces[35].redrawProvince(); provinces[36].setOwner(5); provinces[36].setEntityCount(2); - provinces[36].redrawProvince(); provinces[37].setOwner(3); provinces[37].setEntityCount(2); - provinces[37].redrawProvince(); provinces[38].setOwner(4);//Fabrik provinces[38].setEntityCount(2); - provinces[38].redrawProvince(); provinces[39].setOwner(5); provinces[39].setEntityCount(2); - provinces[39].redrawProvince(); provinces[40].setOwner(1); provinces[40].setEntityCount(2); - provinces[40].redrawProvince(); provinces[41].setOwner(5);//Fabrik provinces[41].setEntityCount(4); - provinces[41].redrawProvince(); provinces[42].setOwner(5); provinces[42].setEntityCount(2); - provinces[42].redrawProvince(); - } - for(int i = 1; i < provinces.length; i++) { - provinces[i].setOwner(ownerL[i-1]); - provinces[i].setEntityCount(entitiesL[i-1]); - provinces[i].redrawProvince(); } }