diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java index 1f3da542..60dfebcb 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java @@ -30,8 +30,8 @@ public enum Asset { tank, world(1.2f), shieldRing("Models/shieldRing/shieldRing.j3o", null), - treeSmall, - treeBig, + treeSmall(1.2f), + treeBig(1.2f), turboCard, turboSymbol("Models/turboCard/turboSymbol.j3o", "Models/turboCard/turboCard_diff.j3o"), swapCard, diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/MapLoader.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/MapLoader.java index 9d283f8f..76b286da 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/MapLoader.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/MapLoader.java @@ -107,8 +107,8 @@ private static Asset getLoadedAsset(String assetName) { case "radar" -> Asset.radar; case "ship" -> Asset.ship; case "tank" -> Asset.tank; - case "tree_small" -> Asset.treeSmall; - case "tree_big" -> Asset.treeBig; + case "treeSmall" -> Asset.treeSmall; + case "treeBig" -> Asset.treeBig; default -> throw new IllegalStateException("Unexpected value: " + assetName); }; } diff --git a/Projekte/mdga/client/src/main/resources/Maps/map.mdga b/Projekte/mdga/client/src/main/resources/Maps/map.mdga index 5e906521..2989a3af 100644 --- a/Projekte/mdga/client/src/main/resources/Maps/map.mdga +++ b/Projekte/mdga/client/src/main/resources/Maps/map.mdga @@ -1,7 +1,5 @@ world 0,0 90 -#tree_small 1,1 0 -#tree_big 0,0 0 #Marine Pos marine 4,-5 270 @@ -131,3 +129,144 @@ node_home_blue 4,0 0 node_home_blue 3,0 0 node_home_blue 2,0 0 node_home_blue 1,0 0 + +# Randomly Distributed Trees within Radius 12 to 40 + +treeSmall 10,15 180 +treeBig -15,12 45 +treeSmall -8,-22 270 +treeBig 22,8 90 +treeSmall -18,-10 135 +treeBig 9,24 300 +treeSmall 17,-9 60 +treeBig -20,5 330 +treeSmall -14,18 200 +treeBig 25,-7 120 +treeBig -12,-18 150 +treeSmall 19,-16 45 +treeBig 7,10 90 +treeBig -19,-9 270 +treeSmall 21,4 110 +treeBig -11,17 300 +treeSmall 3,-21 360 +treeSmall -23,14 100 +treeBig 4,26 330 +treeSmall 12,13 270 +treeBig -18,8 45 +treeBig 11,-10 135 +treeSmall 16,5 180 +treeBig -13,-17 330 +treeSmall -2,14 270 +#treeBig 7,9 300 +treeSmall 23,-10 240 +treeBig -6,18 180 +treeSmall 5,27 270 +treeBig 14,-11 60 +treeSmall 9,-16 180 +treeBig -12,22 240 +treeBig 18,7 360 +treeSmall -24,-4 200 +treeBig -8,21 300 +treeSmall 12,-19 120 +treeBig 6,-12 180 +treeSmall -11,10 75 +treeBig 9,6 270 +treeSmall 8,-14 150 +treeBig 3,18 30 +treeSmall 17,13 100 +treeBig -9,20 90 +treeBig 6,-22 330 +treeSmall -20,7 45 +treeBig 21,11 150 +treeSmall 15,-18 270 +treeBig -3,-12 200 +treeBig 12,-28 330 +treeSmall -17,-7 120 +treeBig -10,9 300 +treeSmall 2,-14 240 +treeBig 24,2 360 +treeSmall 4,-13 300 +treeBig -19,20 90 +#treeSmall -11,5 45 +treeBig 15,9 180 +treeSmall -6,10 240 +treeBig 3,15 30 +treeSmall 9,-19 150 +treeBig -21,-4 330 +treeSmall 19,11 270 +treeSmall 12,24 110 +treeBig -13,15 45 +treeSmall 7,-15 240 +treeBig 26,-8 300 +treeSmall -16,14 120 +treeBig 14,18 360 +treeSmall 8,21 100 +treeBig -8,-18 240 +treeSmall 9,15 180 +treeBig 10,-20 270 +treeSmall 2,27 90 +treeBig 18,12 300 +treeSmall -10,-14 150 +treeBig -15,16 330 +treeSmall -9,19 45 +treeBig 17,-14 120 +treeSmall 5,-25 180 +treeBig 7,23 30 +treeSmall -14,-12 200 +treeBig 6,-16 300 +treeSmall -20,-8 100 +treeBig 4,11 240 +treeSmall 24,-15 90 +treeSmall -19,-19 360 +treeBig 20,8 45 +treeSmall 3,22 270 +treeBig 13,-9 180 +treeSmall -11,18 150 +treeBig -17,-4 300 +treeSmall 5,-14 240 +treeBig 9,17 330 +treeSmall 15,13 90 +treeBig -21,18 30 +treeSmall 6,20 100 +treeBig -16,22 180 +treeSmall -5,18 360 +treeBig 22,11 45 +treeSmall 10,-23 240 +treeBig -10,-16 300 +treeSmall -17,14 120 +treeBig 20,4 150 +treeSmall 11,-22 180 +treeBig -24,-11 200 +treeSmall 14,17 150 +treeBig -8,-12 300 +treeSmall 7,-18 100 +treeBig -5,16 330 +treeSmall 16,-14 200 +treeBig 18,-8 90 +treeSmall -23,-9 45 +treeBig 24,10 300 +treeSmall -4,19 180 +treeBig 12,-5 330 +treeSmall -19,16 100 +treeBig 14,20 150 +treeSmall 9,12 180 +treeBig -22,8 60 +treeSmall 6,18 360 +treeBig 25,-9 45 +treeBig -10,12 240 +treeSmall 19,-17 100 +treeSmall -13,19 90 +treeSmall 16,-12 120 +treeBig 22,-6 45 +treeSmall -18,15 200 +treeBig 14,-10 300 +treeBig 6,10 330 +treeSmall 17,18 90 +treeBig -20,4 180 +treeBig 19,-16 300 +treeSmall -15,9 270 +treeBig 12,22 360 + + + + diff --git a/Projekte/mdga/client/src/main/resources/Models/treeBig/treeBig_diff.png b/Projekte/mdga/client/src/main/resources/Models/treeBig/treeBig_diff.png index e69de29b..b45e9199 100644 Binary files a/Projekte/mdga/client/src/main/resources/Models/treeBig/treeBig_diff.png and b/Projekte/mdga/client/src/main/resources/Models/treeBig/treeBig_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/Models/treeSmall/treeSmall_diff.png b/Projekte/mdga/client/src/main/resources/Models/treeSmall/treeSmall_diff.png index e69de29b..c7bc43fb 100644 Binary files a/Projekte/mdga/client/src/main/resources/Models/treeSmall/treeSmall_diff.png and b/Projekte/mdga/client/src/main/resources/Models/treeSmall/treeSmall_diff.png differ