summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-10-03 15:44:07 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-10-03 15:44:07 +0200
commit465d4b3ad58eb596fe1e309992a3f0db50617391 (patch)
treeab17160b360ec398578ff281b24b61f7e146a05b
parent0a83731af59a7d89eafefe11970aabd9c73b2daa (diff)
downloadRustAndDust-465d4b3ad58eb596fe1e309992a3f0db50617391.zip
RustAndDust-465d4b3ad58eb596fe1e309992a3f0db50617391.tar.gz
try new sherman png
-rw-r--r--android/assets/images/us.atlas23
-rw-r--r--android/assets/images/us.pngbin299232 -> 326967 bytes
-rw-r--r--core/src/ch/asynk/tankontank/game/GameFactory.java2
-rw-r--r--data/us/sherman.pngbin25072 -> 13506 bytes
4 files changed, 16 insertions, 9 deletions
diff --git a/android/assets/images/us.atlas b/android/assets/images/us.atlas
index a6ddabd..48fa56b 100644
--- a/android/assets/images/us.atlas
+++ b/android/assets/images/us.atlas
@@ -5,7 +5,7 @@ filter: Nearest,Nearest
repeat: none
at-gun
rotate: false
- xy: 179, 128
+ xy: 321, 128
size: 124, 124
orig: 124, 124
offset: 0, 0
@@ -19,49 +19,56 @@ head
index: -1
infantry
rotate: false
- xy: 305, 128
+ xy: 447, 128
size: 124, 124
orig: 124, 124
offset: 0, 0
index: -1
pershing
rotate: false
- xy: 557, 128
+ xy: 699, 128
size: 124, 124
orig: 124, 124
offset: 0, 0
index: -1
pershing-hq
rotate: false
- xy: 431, 128
+ xy: 573, 128
size: 124, 124
orig: 124, 124
offset: 0, 0
index: -1
priest
rotate: false
- xy: 683, 128
+ xy: 825, 128
size: 124, 124
orig: 124, 124
offset: 0, 0
index: -1
sherman
rotate: false
- xy: 179, 2
+ xy: 179, 112
+ size: 140, 140
+ orig: 140, 140
+ offset: 0, 0
+ index: -1
+sherman-head
+ rotate: false
+ xy: 321, 2
size: 124, 124
orig: 124, 124
offset: 0, 0
index: -1
sherman-hq
rotate: false
- xy: 809, 128
+ xy: 447, 2
size: 124, 124
orig: 124, 124
offset: 0, 0
index: -1
wolverine
rotate: false
- xy: 305, 2
+ xy: 573, 2
size: 124, 124
orig: 124, 124
offset: 0, 0
diff --git a/android/assets/images/us.png b/android/assets/images/us.png
index a9f2db7..078978c 100644
--- a/android/assets/images/us.png
+++ b/android/assets/images/us.png
Binary files differ
diff --git a/core/src/ch/asynk/tankontank/game/GameFactory.java b/core/src/ch/asynk/tankontank/game/GameFactory.java
index 46d0872..cb0ad2f 100644
--- a/core/src/ch/asynk/tankontank/game/GameFactory.java
+++ b/core/src/ch/asynk/tankontank/game/GameFactory.java
@@ -93,7 +93,7 @@ public class GameFactory implements Board.TileBuilder, Disposable
u = new Unit(Army.US, false, 5, 8, 1, usAtlas.findRegion("priest"), usAtlas.findRegion("head"), unitAtlas);
break;
case US_SHERMAN:
- u = new Unit(Army.US, false, 2, 9, 2, usAtlas.findRegion("sherman"), usAtlas.findRegion("head"), unitAtlas);
+ u = new Unit(Army.US, false, 2, 9, 2, usAtlas.findRegion("sherman"), usAtlas.findRegion("sherman-head"), unitAtlas);
break;
case US_SHERMAN_HQ:
u = new Unit(Army.US, true, 2, 9, 2, usAtlas.findRegion("sherman-hq"), usAtlas.findRegion("head"), unitAtlas);
diff --git a/data/us/sherman.png b/data/us/sherman.png
index 03306d8..4c62be2 100644
--- a/data/us/sherman.png
+++ b/data/us/sherman.png
Binary files differ