diff --git a/src/data/map/asfalt.png b/src/data/map/asfalt.png index 88de132..720fcf6 100644 Binary files a/src/data/map/asfalt.png and b/src/data/map/asfalt.png differ diff --git a/src/data/map/default.map b/src/data/map/default.map index e959e75..bd9441f 100644 --- a/src/data/map/default.map +++ b/src/data/map/default.map @@ -6,35 +6,35 @@ 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 +0000000000344400000000000000000000000000 +0000000000344400000000000000000000000000 +0000000000344400000000000000000000000000 +0000000000303300000000000000000000000000 +0000000000303300000000000000000000000000 +0000000000333300000000000000000000000000 0000000000003000000000000000000000000000 0000000000003000000000000000000000000000 -0000000000003444000000000000000000000000 -0000000000003444000000000000000000000000 -0000000000003444000000000000000000000000 0000000000003333333333333333333333333330 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 +0000000000003000000000000030000000000000 +0000000000003000000000000030000000000000 +0000000000003111000000000030000000000000 +0000000000003111000000000030000000000000 +0000000000003111000000000030000000000000 +0000333333333333333333333330000000000000 +0000300000000000000000000030000000000000 +0000300000000000000000000030000000000000 +0000300000000000000000000030000000000000 +0000300000000000000000000030000000000000 +0000300000000000000000000030000000000000 +0000300000000000000000000030000000000000 +0000300044400000000000000030000000000000 +0000300044400000000000000030000000000000 +0000300044400000000000000030000000000000 +0000333333333333333333333333333330000000 +0000000000000000003000000000000030000000 +0000000000000000003000000000000030000000 +0000000000000000003000000000000030000000 +0000000000000000003000000000000030000000 +0000000000000000003000000000000030000000 +0000000000000000003333333333333330000000 0000000000000000000000000000000000000000 \ No newline at end of file diff --git a/src/data/map/default.obj b/src/data/map/default.obj index 714fe5f..03be82b 100644 --- a/src/data/map/default.obj +++ b/src/data/map/default.obj @@ -16,7 +16,7 @@ 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 +0000000000000000000200020000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 diff --git a/src/data/map/grass.png b/src/data/map/grass.png index 5004adb..0b7b261 100644 Binary files a/src/data/map/grass.png and b/src/data/map/grass.png differ diff --git a/src/ei/engine/effects/Particles.java b/src/ei/engine/effects/Particles.java index f090379..38a8e34 100644 --- a/src/ei/engine/effects/Particles.java +++ b/src/ei/engine/effects/Particles.java @@ -46,7 +46,7 @@ public class Particles extends Entity{ {{1.0f,0.0f,1.0f},{1.0f,0.0f,0.0f}} }; - private int maxParticles = 1000; + private int maxParticles = 300; private boolean enabled = true; private Particle particle[]; private int col; // Current Color Selection diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java index bdbca57..1ef3ae9 100644 --- a/src/ei/game/scene/Map.java +++ b/src/ei/game/scene/Map.java @@ -103,19 +103,19 @@ public class Map { for(int j=0; j= parking.length){ parkingIndex = 0; @@ -142,10 +142,10 @@ public class Map { } } - private Entity getPosSprite(int x, int y, String file){ + private Entity getPosSprite(int x, int y, String file, int overlap){ Sprite s = new Sprite("MapPos("+x+","+y+")", file); s.setLocation(new Vector3f(x*POS_SIZE,y*POS_SIZE,0)); - s.setSize(new Vector2f(POS_SIZE,POS_SIZE)); + s.setSize(new Vector2f((overlap*2)+POS_SIZE, (overlap*2)+POS_SIZE)); return s; }