summaryrefslogtreecommitdiffstats
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
parentf7fc93ed732e344ce1b08ba0e436479157c2e65a (diff)
downloadRustAndDust-6bfdd9ced7d32dcc6ef4f4add53ad1e003a120bc.zip
RustAndDust-6bfdd9ced7d32dcc6ef4f4add53ad1e003a120bc.tar.gz
update assets
-rw-r--r--android/assets/data/hex-overlays.atlas32
-rw-r--r--android/assets/data/hex-overlays.pngbin155589 -> 140296 bytes
-rw-r--r--android/assets/data/hex.pngbin37056 -> 0 bytes
-rw-r--r--android/assets/data/selected.pngbin0 -> 72595 bytes
-rw-r--r--android/assets/data/unit-overlays0.atlas16
-rw-r--r--android/assets/data/unit-overlays0.pngbin61409 -> 50905 bytes
-rw-r--r--android/assets/data/units0.atlas14
-rw-r--r--android/assets/data/units0.pngbin265527 -> 265984 bytes
-rw-r--r--assets/hex-overlays/01_select.pngbin16313 -> 16443 bytes
-rw-r--r--assets/hex-overlays/05_exit.pngbin3530 -> 4004 bytes
-rw-r--r--assets/hex-overlays/06_objective.pngbin24482 -> 25007 bytes
-rw-r--r--assets/hex-overlays/07_hold_objective.pngbin23747 -> 24803 bytes
-rw-r--r--assets/images/hex.pngbin37056 -> 0 bytes
-rw-r--r--assets/images/selected.pngbin0 -> 72595 bytes
-rw-r--r--assets/unit-overlays0/00_move.pngbin27747 -> 16443 bytes
-rw-r--r--assets/units0/us-head.pngbin703 -> 818 bytes
-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
19 files changed, 35 insertions, 35 deletions
diff --git a/android/assets/data/hex-overlays.atlas b/android/assets/data/hex-overlays.atlas
index f2a929b..4a4f2e0 100644
--- a/android/assets/data/hex-overlays.atlas
+++ b/android/assets/data/hex-overlays.atlas
@@ -6,70 +6,70 @@ filter: Nearest,Nearest
repeat: none
00_fog
rotate: false
- xy: 2, 2
+ xy: 690, 271
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
01_select
rotate: false
- xy: 304, 265
- size: 190, 217
- orig: 190, 217
+ xy: 2, 2
+ size: 193, 223
+ orig: 193, 223
offset: 0, 0
index: -1
02_area
rotate: false
- xy: 496, 265
+ xy: 197, 8
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
03_move
rotate: false
- xy: 880, 368
+ xy: 882, 374
size: 100, 114
orig: 100, 114
offset: 0, 0
index: -1
04_directions
rotate: false
- xy: 2, 221
+ xy: 2, 227
size: 300, 261
orig: 300, 261
offset: 0, 0
index: -1
05_exit
rotate: false
- xy: 541, 149
+ xy: 544, 151
size: 100, 114
orig: 100, 114
offset: 0, 0
index: -1
06_objective
rotate: false
- xy: 688, 265
- size: 190, 217
- orig: 190, 217
+ xy: 304, 267
+ size: 191, 221
+ orig: 191, 221
offset: 0, 0
index: -1
07_hold_objective
rotate: false
- xy: 194, 2
- size: 190, 217
- orig: 190, 217
+ xy: 497, 267
+ size: 191, 221
+ orig: 191, 221
offset: 0, 0
index: -1
08_objective_ge
rotate: false
- xy: 386, 162
+ xy: 389, 164
size: 153, 101
orig: 153, 101
offset: 0, 0
index: -1
09_objective_us
rotate: false
- xy: 386, 62
+ xy: 389, 64
size: 153, 98
orig: 153, 98
offset: 0, 0
diff --git a/android/assets/data/hex-overlays.png b/android/assets/data/hex-overlays.png
index d39570f..1d373b2 100644
--- a/android/assets/data/hex-overlays.png
+++ b/android/assets/data/hex-overlays.png
Binary files differ
diff --git a/android/assets/data/hex.png b/android/assets/data/hex.png
deleted file mode 100644
index a3b28b2..0000000
--- a/android/assets/data/hex.png
+++ /dev/null
Binary files differ
diff --git a/android/assets/data/selected.png b/android/assets/data/selected.png
new file mode 100644
index 0000000..1a88176
--- /dev/null
+++ b/android/assets/data/selected.png
Binary files differ
diff --git a/android/assets/data/unit-overlays0.atlas b/android/assets/data/unit-overlays0.atlas
index 6eb726b..46e7802 100644
--- a/android/assets/data/unit-overlays0.atlas
+++ b/android/assets/data/unit-overlays0.atlas
@@ -7,34 +7,34 @@ repeat: none
00_move
rotate: false
xy: 2, 24
- size: 190, 217
- orig: 190, 217
+ size: 193, 223
+ orig: 193, 223
offset: 0, 0
index: -1
01_target
rotate: false
- xy: 608, 151
+ xy: 611, 157
size: 90, 90
orig: 90, 90
offset: 0, 0
index: -1
02_fire
rotate: false
- xy: 194, 91
+ xy: 197, 97
size: 100, 150
orig: 100, 150
offset: 0, 0
index: -1
03_may_fire
rotate: false
- xy: 296, 91
+ xy: 299, 97
size: 100, 150
orig: 100, 150
offset: 0, 0
index: -1
04_ace
rotate: false
- xy: 700, 106
+ xy: 703, 112
size: 29, 135
orig: 29, 135
offset: 0, 0
@@ -48,14 +48,14 @@ repeat: none
index: -1
06_fired
rotate: false
- xy: 398, 120
+ xy: 401, 126
size: 112, 121
orig: 112, 121
offset: 0, 0
index: -1
07_moved
rotate: false
- xy: 512, 122
+ xy: 515, 128
size: 94, 119
orig: 94, 119
offset: 0, 0
diff --git a/android/assets/data/unit-overlays0.png b/android/assets/data/unit-overlays0.png
index ec98e91..014f7e2 100644
--- a/android/assets/data/unit-overlays0.png
+++ b/android/assets/data/unit-overlays0.png
Binary files differ
diff --git a/android/assets/data/units0.atlas b/android/assets/data/units0.atlas
index 0e16a9a..02a221a 100644
--- a/android/assets/data/units0.atlas
+++ b/android/assets/data/units0.atlas
@@ -18,13 +18,6 @@ ge-head
orig: 25, 195
offset: 0, 0
index: -1
-us-head
- rotate: false
- xy: 392, 2
- size: 25, 195
- orig: 25, 195
- offset: 0, 0
- index: -1
ge-infantry
rotate: false
xy: 2, 199
@@ -67,6 +60,13 @@ us-at-gun
orig: 128, 128
offset: 0, 0
index: -1
+us-head
+ rotate: false
+ xy: 419, 2
+ size: 25, 195
+ orig: 25, 195
+ offset: 0, 0
+ index: -1
us-infantry
rotate: false
xy: 262, 199
diff --git a/android/assets/data/units0.png b/android/assets/data/units0.png
index 557be91..50ae64e 100644
--- a/android/assets/data/units0.png
+++ b/android/assets/data/units0.png
Binary files differ
diff --git a/assets/hex-overlays/01_select.png b/assets/hex-overlays/01_select.png
index f0b4320..51d9974 100644
--- a/assets/hex-overlays/01_select.png
+++ b/assets/hex-overlays/01_select.png
Binary files differ
diff --git a/assets/hex-overlays/05_exit.png b/assets/hex-overlays/05_exit.png
index 8aacfd9..65544ad 100644
--- a/assets/hex-overlays/05_exit.png
+++ b/assets/hex-overlays/05_exit.png
Binary files differ
diff --git a/assets/hex-overlays/06_objective.png b/assets/hex-overlays/06_objective.png
index 11e5178..abcc43d 100644
--- a/assets/hex-overlays/06_objective.png
+++ b/assets/hex-overlays/06_objective.png
Binary files differ
diff --git a/assets/hex-overlays/07_hold_objective.png b/assets/hex-overlays/07_hold_objective.png
index e076771..1d72fa5 100644
--- a/assets/hex-overlays/07_hold_objective.png
+++ b/assets/hex-overlays/07_hold_objective.png
Binary files differ
diff --git a/assets/images/hex.png b/assets/images/hex.png
deleted file mode 100644
index a3b28b2..0000000
--- a/assets/images/hex.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/selected.png b/assets/images/selected.png
new file mode 100644
index 0000000..1a88176
--- /dev/null
+++ b/assets/images/selected.png
Binary files differ
diff --git a/assets/unit-overlays0/00_move.png b/assets/unit-overlays0/00_move.png
index 5303cce..51d9974 100644
--- a/assets/unit-overlays0/00_move.png
+++ b/assets/unit-overlays0/00_move.png
Binary files differ
diff --git a/assets/units0/us-head.png b/assets/units0/us-head.png
index 3928060..2f1eb07 100644
--- a/assets/units0/us-head.png
+++ b/assets/units0/us-head.png
Binary files differ
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;
}