summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-07 21:56:55 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-07 21:56:55 +0100
commit6bfdd9ced7d32dcc6ef4f4add53ad1e003a120bc (patch)
treec71fa8aee164355d97007a51c05e4e1a1da99da9 /core
parentf7fc93ed732e344ce1b08ba0e436479157c2e65a (diff)
downloadRustAndDust-6bfdd9ced7d32dcc6ef4f4add53ad1e003a120bc.zip
RustAndDust-6bfdd9ced7d32dcc6ef4f4add53ad1e003a120bc.tar.gz
update assets
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/rustanddust/RustAndDust.java4
-rw-r--r--core/src/ch/asynk/rustanddust/game/Map.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/battles/Factory.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java
index c36c856..e71de91 100644
--- a/core/src/ch/asynk/rustanddust/RustAndDust.java
+++ b/core/src/ch/asynk/rustanddust/RustAndDust.java
@@ -93,7 +93,7 @@ public class RustAndDust extends Game
int i = config.graphics.i;
manager.load(String.format("data/units%d.atlas",i), TextureAtlas.class);
manager.load(String.format("data/unit-overlays%d.atlas", i), TextureAtlas.class);
- manager.load("data/hex.png", Texture.class);
+ manager.load("data/selected.png", Texture.class);
manager.load("data/hud.atlas", TextureAtlas.class);
manager.load("data/hex-overlays.atlas", TextureAtlas.class);
manager.load("data/dice.png", Texture.class);
@@ -120,7 +120,7 @@ public class RustAndDust extends Game
int i = config.graphics.i;
manager.unload(String.format("data/units%d.atlas",i));
manager.unload(String.format("data/unit-overlays%d.atlas", i));
- manager.unload("data/hex.png");
+ manager.unload("data/selected.png");
manager.unload("data/hud.atlas");
manager.unload("data/hex-overlays.atlas");
manager.unload("data/dice.png");
diff --git a/core/src/ch/asynk/rustanddust/game/Map.java b/core/src/ch/asynk/rustanddust/game/Map.java
index d11525a..8c7c9ba 100644
--- a/core/src/ch/asynk/rustanddust/game/Map.java
+++ b/core/src/ch/asynk/rustanddust/game/Map.java
@@ -64,7 +64,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS
public Map(final RustAndDust game, String map, String hex)
{
super(game.factory, game.manager.get(map, Texture.class),
- new SelectedTile(game.manager.get(hex, Texture.class), new float[] {.2f, .1f, .1f, .1f, .2f, .1f} ));
+ new SelectedTile(game.manager.get(hex, Texture.class), new float[] {.1f, .1f, .1f, .1f, .3f, .1f} ));
this.ctrl = game.ctrl;
this.destroy = new DestroyAnimation();
this.tankMoveSound = game.manager.get("sounds/tank_move.mp3", Sound.class);
diff --git a/core/src/ch/asynk/rustanddust/game/battles/Factory.java b/core/src/ch/asynk/rustanddust/game/battles/Factory.java
index fbe6d20..7026237 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/Factory.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/Factory.java
@@ -73,7 +73,7 @@ public class Factory implements Board.TileBuilder, Disposable
Map m = null;
switch(t) {
case MAP_00:
- m = new Map00(game, "data/map_00.png", "data/hex.png");
+ m = new Map00(game, "data/map_00.png", "data/selected.png");
break;
}