zocker
/
zweiundvierzig
mirror of https://github.com/HGE-IT-Course-2016/zweiundvierzig
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Einbringung der Anpassung bei der Provinz-Initialisierung

Browse Source 
Dies bringt die Verbesserungen bei der GeneralMap für die Provinz-Initialisierung aus dem "GruenRoteBranch" manuell in diese Datei.
pull/64/head
Zocker1999NET 8 years ago
parent f5d5b1cd38
commit 05d33955cc
1 changed files with 275 additions and 276 deletions
Show Stats Download Patch File Download Diff File

551
GeneralMap.java
Unescape Escape View File

@ -112,282 +112,281 @@ public abstract class GeneralMap extends World implements ButtonEvent
3. [...] 3. [...]
*/ */
if(players.length==3) { if(players.length==3) {
/* /*
Spieler 1 darf beginnen; Hauptstadt: 40 Spieler 1 darf beginnen; Hauptstadt: 40
Spieler 2 ist als zweites dran; Hauptstadt: 20 Spieler 2 ist als zweites dran; Hauptstadt: 20
Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt: 9 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[01].setOwner(0);
provinces[1].setOwner(1); provinces[01].setEntityCount(1);
provinces[1].setEntityCount(1); provinces[02].setOwner(2);
provinces[2].setOwner(3); provinces[02].setEntityCount(2);
provinces[2].setEntityCount(2); provinces[03].setOwner(1);
provinces[3].setOwner(2); provinces[03].setEntityCount(2);
provinces[3].setEntityCount(2); provinces[04].setOwner(1); //Fabrik
provinces[4].setOwner(2); //Fabrik provinces[04].setEntityCount(1);
provinces[4].setEntityCount(1); provinces[05].setOwner(0);//Fabrik
provinces[5].setOwner(1);//Fabrik provinces[05].setEntityCount(1);
provinces[5].setEntityCount(1); provinces[06].setOwner(0);//Fabrik
provinces[6].setOwner(1);//Fabrik provinces[06].setEntityCount(1);
provinces[6].setEntityCount(1); provinces[07].setOwner(2);
provinces[7].setOwner(3); provinces[07].setEntityCount(2);
provinces[7].setEntityCount(2); provinces[08].setOwner(0);
provinces[8].setOwner(1); provinces[08].setEntityCount(1);
provinces[8].setEntityCount(1); provinces[09].setOwner(2);
provinces[9].setOwner(3); provinces[09].setEntityCount(4);
provinces[9].setEntityCount(4); provinces[10].setOwner(2);
provinces[10].setOwner(3); provinces[10].setEntityCount(1);
provinces[10].setEntityCount(1); provinces[11].setOwner(1);//Fabrik
provinces[11].setOwner(2);//Fabrik provinces[11].setEntityCount(2);
provinces[11].setEntityCount(2); provinces[12].setOwner(0);
provinces[12].setOwner(1); provinces[12].setEntityCount(2);
provinces[12].setEntityCount(2); provinces[13].setOwner(0);//Fabrik
provinces[13].setOwner(1);//Fabrik provinces[13].setEntityCount(2);
provinces[13].setEntityCount(2); provinces[14].setOwner(2);//Fabrik
provinces[14].setOwner(3);//Fabrik provinces[14].setEntityCount(3);
provinces[14].setEntityCount(3); provinces[15].setOwner(2);//Fabrik
provinces[15].setOwner(3);//Fabrik provinces[15].setEntityCount(3);
provinces[15].setEntityCount(3); provinces[16].setOwner(2);//Fabrik
provinces[16].setOwner(3);//Fabrik provinces[16].setEntityCount(3);
provinces[16].setEntityCount(3); provinces[17].setOwner(0);
provinces[17].setOwner(1); provinces[17].setEntityCount(1);
provinces[17].setEntityCount(1); provinces[18].setOwner(1);
provinces[18].setOwner(2); provinces[18].setEntityCount(2);
provinces[18].setEntityCount(2); provinces[19].setOwner(1);//Fabrik
provinces[19].setOwner(2);//Fabrik provinces[19].setEntityCount(4);
provinces[19].setEntityCount(4); provinces[20].setOwner(1);
provinces[20].setOwner(2); provinces[20].setEntityCount(3);
provinces[20].setEntityCount(3); provinces[21].setOwner(0);
provinces[21].setOwner(1); provinces[21].setEntityCount(1);
provinces[21].setEntityCount(1); provinces[22].setOwner(2);//Fabrik
provinces[22].setOwner(3);//Fabrik provinces[22].setEntityCount(4);
provinces[22].setEntityCount(4); provinces[23].setOwner(0);
provinces[23].setOwner(1); provinces[23].setEntityCount(2);
provinces[23].setEntityCount(2); provinces[24].setOwner(2);
provinces[24].setOwner(3); provinces[24].setEntityCount(4);
provinces[24].setEntityCount(4); provinces[25].setOwner(1);
provinces[25].setOwner(2); provinces[25].setEntityCount(2);
provinces[25].setEntityCount(2); provinces[26].setOwner(1);//Fabrik
provinces[26].setOwner(2);//Fabrik provinces[26].setEntityCount(1);
provinces[26].setEntityCount(1); provinces[27].setOwner(2);
provinces[27].setOwner(3); provinces[27].setEntityCount(1);
provinces[27].setEntityCount(1); provinces[28].setOwner(0);//Fabrik
provinces[28].setOwner(1);//Fabrik provinces[28].setEntityCount(3);
provinces[28].setEntityCount(3); provinces[29].setOwner(0);//Fabrik
provinces[29].setOwner(1);//Fabrik provinces[29].setEntityCount(3);
provinces[29].setEntityCount(3); provinces[30].setOwner(0);
provinces[30].setOwner(1); provinces[30].setEntityCount(4);
provinces[30].setEntityCount(4); provinces[31].setOwner(2);
provinces[31].setOwner(3); provinces[31].setEntityCount(1);
provinces[31].setEntityCount(1); provinces[32].setOwner(1);
provinces[32].setOwner(2); provinces[32].setEntityCount(1);
provinces[32].setEntityCount(1); provinces[33].setOwner(1);
provinces[33].setOwner(2); provinces[33].setEntityCount(1);
provinces[33].setEntityCount(1); provinces[34].setOwner(0);
provinces[34].setOwner(1); provinces[34].setEntityCount(2);
provinces[34].setEntityCount(2); provinces[35].setOwner(1);
provinces[35].setOwner(2); provinces[35].setEntityCount(2);
provinces[35].setEntityCount(2); provinces[36].setOwner(2);
provinces[36].setOwner(3); provinces[36].setEntityCount(1);
provinces[36].setEntityCount(1); provinces[37].setOwner(1);
provinces[37].setOwner(2); provinces[37].setEntityCount(2);
provinces[37].setEntityCount(2); provinces[38].setOwner(1);//Fabrik
provinces[38].setOwner(2);//Fabrik provinces[38].setEntityCount(4);
provinces[38].setEntityCount(4); provinces[39].setOwner(1);
provinces[39].setOwner(2); provinces[39].setEntityCount(3);
provinces[39].setEntityCount(3); provinces[40].setOwner(0);
provinces[40].setOwner(1); provinces[40].setEntityCount(4);
provinces[40].setEntityCount(4); provinces[41].setOwner(2);//Fabrik
provinces[41].setOwner(3);//Fabrik provinces[41].setEntityCount(1);
provinces[41].setEntityCount(1); provinces[42].setOwner(0);
provinces[42].setOwner(1); provinces[42].setEntityCount(2);
provinces[42].setEntityCount(2); } else if(players.length==4) {
} else if(players.length==4) { /*
/* Spieler 1 darf beginnen; Hauptstadt:22
Spieler 1 darf beginnen; Hauptstadt:22 Spieler 2 ist als zweites dran; Hauptstadt:20
Spieler 2 ist als zweites dran; Hauptstadt:20 Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:2
Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:2 Spieler 4 ist als viertes dran und bekommt eine Karte; Hauptstadt:39
Spieler 4 ist als viertes dran und bekommt eine Karte; Hauptstadt:39 */
*/ provinces[01].setOwner(0);
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[01].setEntityCount(1);
provinces[1].setOwner(1); provinces[02].setOwner(2);
provinces[1].setEntityCount(1); provinces[02].setEntityCount(3);
provinces[2].setOwner(3); provinces[03].setOwner(2);
provinces[2].setEntityCount(3); provinces[03].setEntityCount(3);
provinces[3].setOwner(3); provinces[04].setOwner(2);//Fabrik
provinces[3].setEntityCount(3); provinces[04].setEntityCount(2);
provinces[4].setOwner(3);//Fabrik provinces[05].setOwner(2);//Fabrik
provinces[4].setEntityCount(2); provinces[05].setEntityCount(2);
provinces[5].setOwner(3);//Fabrik provinces[06].setOwner(2);//Fabrik
provinces[5].setEntityCount(2); provinces[06].setEntityCount(3);
provinces[6].setOwner(3);//Fabrik provinces[07].setOwner(1);
provinces[6].setEntityCount(3); provinces[07].setEntityCount(2);
provinces[7].setOwner(2); provinces[08].setOwner(0);
provinces[7].setEntityCount(2); provinces[08].setEntityCount(2);
provinces[8].setOwner(1); provinces[09].setOwner(1);
provinces[8].setEntityCount(2); provinces[09].setEntityCount(2);
provinces[9].setOwner(2); provinces[10].setOwner(2);//Fabrik
provinces[9].setEntityCount(2); provinces[10].setEntityCount(2);
provinces[10].setOwner(3);//Fabrik provinces[11].setOwner(1);//Fabrik
provinces[10].setEntityCount(2); provinces[11].setEntityCount(3);
provinces[11].setOwner(2);//Fabrik provinces[12].setOwner(2);
provinces[11].setEntityCount(3); provinces[12].setEntityCount(2);
provinces[12].setOwner(3); provinces[13].setOwner(1);//Fabrik
provinces[12].setEntityCount(2); provinces[13].setEntityCount(3);
provinces[13].setOwner(2);//Fabrik provinces[14].setOwner(0);//Fabrik
provinces[13].setEntityCount(3); provinces[14].setEntityCount(3);
provinces[14].setOwner(1);//Fabrik provinces[15].setOwner(0);//Fabrik
provinces[14].setEntityCount(3); provinces[15].setEntityCount(3);
provinces[15].setOwner(1);//Fabrik provinces[16].setOwner(0);//Fabrik
provinces[15].setEntityCount(3); provinces[16].setEntityCount(3);
provinces[16].setOwner(1);//Fabrik provinces[17].setOwner(2);
provinces[16].setEntityCount(3); provinces[17].setEntityCount(2);
provinces[17].setOwner(3); provinces[18].setOwner(3);
provinces[17].setEntityCount(2); provinces[18].setEntityCount(2);
provinces[18].setOwner(4); provinces[19].setOwner(1);//Fabrik
provinces[18].setEntityCount(2); provinces[19].setEntityCount(4);
provinces[19].setOwner(2);//Fabrik provinces[20].setOwner(1);
provinces[19].setEntityCount(4); provinces[20].setEntityCount(4);
provinces[20].setOwner(2); provinces[21].setOwner(0);
provinces[20].setEntityCount(4); provinces[21].setEntityCount(1);
provinces[21].setOwner(1); provinces[22].setOwner(0);//Fabrik
provinces[21].setEntityCount(1); provinces[22].setEntityCount(2);
provinces[22].setOwner(1);//Fabrik provinces[23].setOwner(0);
provinces[22].setEntityCount(2); provinces[23].setEntityCount(5);
provinces[23].setOwner(1); provinces[24].setOwner(0);
provinces[23].setEntityCount(5); provinces[24].setEntityCount(3);
provinces[24].setOwner(1); provinces[25].setOwner(1);
provinces[24].setEntityCount(3); provinces[25].setEntityCount(2);
provinces[25].setOwner(2); provinces[26].setOwner(3);//Fabrik
provinces[25].setEntityCount(2); provinces[26].setEntityCount(3);
provinces[26].setOwner(4);//Fabrik provinces[27].setOwner(3);
provinces[26].setEntityCount(3); provinces[27].setEntityCount(1);
provinces[27].setOwner(4); provinces[28].setOwner(3);//Fabrik
provinces[27].setEntityCount(1); provinces[28].setEntityCount(2);
provinces[28].setOwner(4);//Fabrik provinces[29].setOwner(1);//Fabrik
provinces[28].setEntityCount(2); provinces[29].setEntityCount(2);
provinces[29].setOwner(2);//Fabrik provinces[30].setOwner(1);
provinces[29].setEntityCount(2); provinces[30].setEntityCount(2);
provinces[30].setOwner(2); provinces[31].setOwner(3);
provinces[30].setEntityCount(2); provinces[31].setEntityCount(1);
provinces[31].setOwner(4); provinces[32].setOwner(1);
provinces[31].setEntityCount(1); provinces[32].setEntityCount(1);
provinces[32].setOwner(2); provinces[33].setOwner(3);
provinces[32].setEntityCount(1); provinces[33].setEntityCount(5);
provinces[33].setOwner(4); provinces[34].setOwner(2);
provinces[33].setEntityCount(5); provinces[34].setEntityCount(2);
provinces[34].setOwner(3); provinces[35].setOwner(2);
provinces[34].setEntityCount(2); provinces[35].setEntityCount(2);
provinces[35].setOwner(3); provinces[36].setOwner(2);
provinces[35].setEntityCount(2); provinces[36].setEntityCount(2);
provinces[36].setOwner(3); provinces[37].setOwner(3);
provinces[36].setEntityCount(2); provinces[37].setEntityCount(1);
provinces[37].setOwner(4); provinces[38].setOwner(3);//Fabrik
provinces[37].setEntityCount(1); provinces[38].setEntityCount(1);
provinces[38].setOwner(4);//Fabrik provinces[39].setOwner(3);
provinces[38].setEntityCount(1); provinces[39].setEntityCount(4);
provinces[39].setOwner(4); provinces[40].setOwner(3);
provinces[39].setEntityCount(4); provinces[40].setEntityCount(1);
provinces[40].setOwner(4); provinces[41].setOwner(0);//Fabrik
provinces[40].setEntityCount(1); provinces[41].setEntityCount(2);
provinces[41].setOwner(1);//Fabrik provinces[42].setOwner(3);
provinces[41].setEntityCount(2); provinces[42].setEntityCount(4);
provinces[42].setOwner(4); } else if(players.length==5) {
provinces[42].setEntityCount(4); /*
} else if(players.length==5) { Spieler 1 darf beginnen; Hauptstadt:13
/* Spieler 2 ist als zweites dran; Hauptstadt:7
Spieler 1 darf beginnen; Hauptstadt:13 Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:22
Spieler 2 ist als zweites dran; Hauptstadt:7 Spieler 4 ist als viertes dran und bekommt eine Karte; Hauptstadt:20
Spieler 3 ist als drittes dran und bekommt eine Karte; Hauptstadt:22 Spieler 5 ist als fünftes dran und bekommt zwei Karte; Hauptstadt:41
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 = {};
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[01].setOwner(2);
provinces[1].setOwner(3); provinces[01].setEntityCount(1);
provinces[1].setEntityCount(1); provinces[02].setOwner(0);
provinces[2].setOwner(1); provinces[02].setEntityCount(2);
provinces[2].setEntityCount(2); provinces[03].setOwner(3);
provinces[3].setOwner(4); provinces[03].setEntityCount(2);
provinces[3].setEntityCount(2); provinces[04].setOwner(1);//Fabrik
provinces[4].setOwner(2);//Fabrik provinces[04].setEntityCount(2);
provinces[4].setEntityCount(2); provinces[05].setOwner(1);//Fabrik
provinces[5].setOwner(2);//Fabrik provinces[05].setEntityCount(2);
provinces[5].setEntityCount(2); provinces[06].setOwner(1);//Fabrik
provinces[6].setOwner(2);//Fabrik provinces[06].setEntityCount(2);
provinces[6].setEntityCount(2); provinces[07].setOwner(1);
provinces[7].setOwner(2); provinces[07].setEntityCount(4);
provinces[7].setEntityCount(4); provinces[08].setOwner(3);
provinces[8].setOwner(4); provinces[08].setEntityCount(1);
provinces[8].setEntityCount(1); provinces[09].setOwner(1);
provinces[9].setOwner(2); provinces[09].setEntityCount(2);
provinces[9].setEntityCount(2); provinces[10].setOwner(3);
provinces[10].setOwner(4); provinces[10].setEntityCount(1);
provinces[10].setEntityCount(1); provinces[11].setOwner(3);//Fabrik
provinces[11].setOwner(4);//Fabrik provinces[11].setEntityCount(3);
provinces[11].setEntityCount(3); provinces[12].setOwner(2);
provinces[12].setOwner(3); provinces[12].setEntityCount(1);
provinces[12].setEntityCount(1); provinces[13].setOwner(0);
provinces[13].setOwner(1); provinces[13].setEntityCount(4);
provinces[13].setEntityCount(4); provinces[14].setOwner(0);//Fabrik
provinces[14].setOwner(1);//Fabrik provinces[14].setEntityCount(2);
provinces[14].setEntityCount(2); provinces[15].setOwner(2);//Fabrik
provinces[15].setOwner(3);//Fabrik provinces[15].setEntityCount(3);
provinces[15].setEntityCount(3); provinces[16].setOwner(0);//Fabrik
provinces[16].setOwner(1);//Fabrik provinces[16].setEntityCount(2);
provinces[16].setEntityCount(2); provinces[17].setOwner(1);
provinces[17].setOwner(2); provinces[17].setEntityCount(3);
provinces[17].setEntityCount(3); provinces[18].setOwner(3);
provinces[18].setOwner(4); provinces[18].setEntityCount(2);
provinces[18].setEntityCount(2); provinces[19].setOwner(3);//Fabrik
provinces[19].setOwner(4);//Fabrik provinces[19].setEntityCount(5);
provinces[19].setEntityCount(5); provinces[20].setOwner(3);
provinces[20].setOwner(4); provinces[20].setEntityCount(3);
provinces[20].setEntityCount(3); provinces[21].setOwner(1);
provinces[21].setOwner(2); provinces[21].setEntityCount(2);
provinces[21].setEntityCount(2); provinces[22].setOwner(2);//Fabrik
provinces[22].setOwner(3);//Fabrik provinces[22].setEntityCount(5);
provinces[22].setEntityCount(5); provinces[23].setOwner(2);
provinces[23].setOwner(3); provinces[23].setEntityCount(3);
provinces[23].setEntityCount(3); provinces[24].setOwner(0);
provinces[24].setOwner(1); provinces[24].setEntityCount(2);
provinces[24].setEntityCount(2); provinces[25].setOwner(2);
provinces[25].setOwner(3); provinces[25].setEntityCount(3);
provinces[25].setEntityCount(3); provinces[26].setOwner(2);//Fabrik
provinces[26].setOwner(3);//Fabrik provinces[26].setEntityCount(2);
provinces[26].setEntityCount(2); provinces[27].setOwner(1);
provinces[27].setOwner(2); provinces[27].setEntityCount(3);
provinces[27].setEntityCount(3); provinces[28].setOwner(4);//Fabrik
provinces[28].setOwner(5);//Fabrik provinces[28].setEntityCount(2);
provinces[28].setEntityCount(2); provinces[29].setOwner(4);//Fabrik
provinces[29].setOwner(5);//Fabrik provinces[29].setEntityCount(3);
provinces[29].setEntityCount(3); provinces[30].setOwner(4);
provinces[30].setOwner(5); provinces[30].setEntityCount(3);
provinces[30].setEntityCount(3); provinces[31].setOwner(0);
provinces[31].setOwner(1); provinces[31].setEntityCount(3);
provinces[31].setEntityCount(3); provinces[32].setOwner(0);
provinces[32].setOwner(1); provinces[32].setEntityCount(3);
provinces[32].setEntityCount(3); provinces[33].setOwner(3);
provinces[33].setOwner(4); provinces[33].setEntityCount(1);
provinces[33].setEntityCount(1); provinces[34].setOwner(4);
provinces[34].setOwner(5); provinces[34].setEntityCount(1);
provinces[34].setEntityCount(1); provinces[35].setOwner(4);
provinces[35].setOwner(5); provinces[35].setEntityCount(1);
provinces[35].setEntityCount(1); provinces[36].setOwner(4);
provinces[36].setOwner(5); provinces[36].setEntityCount(2);
provinces[36].setEntityCount(2); provinces[37].setOwner(2);
provinces[37].setOwner(3); provinces[37].setEntityCount(2);
provinces[37].setEntityCount(2); provinces[38].setOwner(3);//Fabrik
provinces[38].setOwner(4);//Fabrik provinces[38].setEntityCount(2);
provinces[38].setEntityCount(2); provinces[39].setOwner(4);
provinces[39].setOwner(5); provinces[39].setEntityCount(2);
provinces[39].setEntityCount(2); provinces[40].setOwner(0);
provinces[40].setOwner(1); provinces[40].setEntityCount(2);
provinces[40].setEntityCount(2); provinces[41].setOwner(4);//Fabrik
provinces[41].setOwner(5);//Fabrik provinces[41].setEntityCount(4);
provinces[41].setEntityCount(4); provinces[42].setOwner(4);
provinces[42].setOwner(5); provinces[42].setEntityCount(2);
provinces[42].setEntityCount(2); }
}
int errors = 0; int errors = 0;
for(int i = 1; i < provinces.length; i++) { for(int i = 1; i < provinces.length; i++) {
Province p = provinces[i]; Province p = provinces[i];

Write Preview
Loading…
Cancel
Save