From 3faf550e324cf3e3d5ebefc7fd49b68b0daaa7ce Mon Sep 17 00:00:00 2001 From: MaxiJohl Date: Fri, 13 May 2016 17:12:28 +0200 Subject: [PATCH] Provinz-Implementierung Teil 2 - Implementierung der bisher noch fehlenden Provinzen - Bugfixing - Removed Herobrine --- Map_World.java | 165 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 161 insertions(+), 4 deletions(-) diff --git a/Map_World.java b/Map_World.java index e0ab523..bf36975 100644 --- a/Map_World.java +++ b/Map_World.java @@ -50,15 +50,13 @@ public class Map_World extends GeneralMap */ // Festlegung der Provinz-Anzahl - + provinces = new Province[provinceCount + 1]; // Implementierung sämtlicher Provinzen // ACHTUNG! Gaaaaanz viel Code! - // cID 1 - Nordamerika - neighbours = new int[3]; neighbours[0] = 2; neighbours[1] = 3; @@ -202,9 +200,168 @@ public class Map_World extends GeneralMap neighbours[1] = 19; provinces[20] = new Province(20,3,274,572,1,"Argentinien",neighbours); + // cID 4 - Afrika + + neighbours = new int[2]; + neighbours [0] = 24; + neighbours [1] = 22; + provinces[21] = new Province (21,4,680,630,1,"Madagaskar",neighbours); + + neighbours = new int[3]; + neighbours [0] = 21; + neighbours [1] = 23; + neighbours [2] = 24; + provinces[22] = new Province (22,4,580,624,1,"Südafrika",neighbours); + + neighbours = new int[3]; + neighbours [0] = 22; + neighbours [1] = 25; + neighbours [2] = 24; + provinces[23] = new Province (23,4,572,537,2,"Zentralafrika",neighbours); + + neighbours = new int[5]; + neighbours [0] = 21; + neighbours [1] = 22; + neighbours [2] = 25; + neighbours [3] = 23; + neighbours [4] = 26; + provinces[24] = new Province (24,4,632,500,2,"Ostafrika",neighbours); + addObject(provinces[24],632,500); + + neighbours = new int[5]; + neighbours [0] = 15; + neighbours [1] = 16; + neighbours [2] = 26; + neighbours [3] = 23; + neighbours [4] = 24; + provinces[25] = new Province (25,4,491,444,1,"Nordafrika",neighbours); + + neighbours = new int[4]; + neighbours [0] = 27; + neighbours [1] = 25; + neighbours [2] = 24; + neighbours [3] = 16; + provinces[26] = new Province (26,4,574,414,1,"Aegypten",neighbours); + + // cID 5 - Asien + + neighbours = new int[6]; + neighbours [0] = 24; + neighbours [1] = 26; + neighbours [2] = 16; + neighbours [3] = 13; + neighbours [4] = 31; + neighbours [5] = 28; + provinces[27] = new Province (27,5,664,345,2,"Mittlerer Osten",neighbours); + + neighbours = new int[4]; + neighbours [0] = 29; + neighbours [1] = 31; + neighbours [2] = 27; + neighbours [3] = 30; + provinces[28] = new Province (28,5,784,370,2,"Indien",neighbours); + + neighbours = new int[6]; + neighbours [0] = 30; + neighbours [1] = 28; + neighbours [2] = 31; + neighbours [3] = 32; + neighbours [4] = 33; + neighbours [5] = 37; + provinces[29] = new Province (29,5,863,322,2,"China",neighbours); + + neighbours = new int[3]; + neighbours [0] = 29; + neighbours [1] = 39; + neighbours [2] = 28; + provinces[30] = new Province (30,5,867,400,1,"Südost Asien",neighbours); + + neighbours = new int[5]; + neighbours [0] = 29; + neighbours [1] = 28; + neighbours [2] = 27; + neighbours [3] = 13; + neighbours [4] = 32; + provinces[31] = new Province (31,5,724,262,1,"Afganistan",neighbours); + + neighbours = new int[4]; + neighbours [0] = 29; + neighbours [1] = 33; + neighbours [2] = 31; + neighbours [3] = 13; + provinces[32] = new Province (32,5,740,163,1,"Ural",neighbours); + + neighbours = new int[5]; + neighbours [0] = 34; + neighbours [1] = 35; + neighbours [2] = 37; + neighbours [3] = 29; + neighbours [4] = 32; + provinces[33] = new Province (33,5,802,128,1,"Sibirien",neighbours); + + neighbours = new int[3]; + neighbours [0] = 36; + neighbours [1] = 35; + neighbours [2] = 33; + provinces[34] = new Province (34,5,884,82,1,"Jakutien",neighbours); + + neighbours = new int[4]; + neighbours [0] = 34; + neighbours [1] = 36; + neighbours [2] = 37; + neighbours [3] = 33; + provinces[35] = new Province (35,5,867,176,2,"Irkutsk",neighbours); + + neighbours = new int[5]; + neighbours [0] = 1; + neighbours [1] = 38; + neighbours [2] = 37; + neighbours [3] = 35; + neighbours [4] = 34; + provinces[36] = new Province (36,5,973,89,1,"Kamtschatka",neighbours); + + neighbours = new int[5]; + neighbours [0] = 29; + neighbours [1] = 33; + neighbours [2] = 35; + neighbours [3] = 36; + neighbours [4] = 38; + provinces[37] = new Province (37,5,882,243,1,"Mongolei",neighbours); + + neighbours = new int[2]; + neighbours [0] = 37; + neighbours [1] = 36; + provinces[38] = new Province (38,5,994,249,2,"Japan",neighbours); + + // cID 6 - Ozeanien + + neighbours = new int[3]; + neighbours [0] = 30; + neighbours [1] = 40; + neighbours [2] = 42; + provinces[39] = new Province (39,6,889,519,1,"Indonesien",neighbours); + + neighbours = new int[3]; + neighbours [0] = 39; + neighbours [1] = 41; + neighbours [2] = 42; + provinces[40] = new Province (40,6,983,492,2,"Neuguinea",neighbours); + + neighbours = new int[2]; + neighbours [0] = 40; + neighbours [1] = 42; + provinces[41] = new Province (41,6,1000,595,1,"Ost Australien",neighbours); + + neighbours = new int[3]; + neighbours [0] = 40; + neighbours [1] = 41; + neighbours [2] = 39; + provinces[42] = new Province (42,6,934,628,1,"West Australien",neighbours); + + for (int c = 1; c <= provinceCount; c++) { - addObject(provinces[c],provinces[c].getXPos(),provinces[c].getYPos()); + addObject(provinces[c],provinces[c].getXPos(),provinces[c].getYPos()); } } }