Added sprites for all ammo types

This commit is contained in:
Anuken
2018-05-25 23:04:48 -04:00
parent b051a296fc
commit 47b627d669
24 changed files with 260 additions and 176 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 270 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 278 B

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 108 KiB

@@ -7,51 +7,51 @@ import io.anuke.mindustry.type.ItemType;
public class AmmoItems { public class AmmoItems {
public static final Item public static final Item
leadBullet = new Item("lead-bullet", Color.GRAY){{ leadBullet = new Item("lead-bullet", Color.valueOf("8e85a2")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
compositeFlak = new Item("composite-flak", Color.GRAY){{ armorPiercingBullet = new Item("armor-piercing-bullet", Color.valueOf("f9a3c7")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
armorPiercingBullet = new Item("armor-piercing-bullet", Color.GRAY){{ homingBullet = new Item("homing-bullet", Color.valueOf("6a6c72")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
homingBullet = new Item("homing-bullet", Color.GRAY){{ tracerBullet = new Item("tracer-bullet", Color.valueOf("ffe58b")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
tracerBullet = new Item("tracer-bullet", Color.GRAY){{ compositeFlak = new Item("composite-flak", Color.valueOf("e9ead3")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
explosiveShell = new Item("explosive-shell", Color.GRAY){{ explosiveShell = new Item("explosive-shell", Color.valueOf("ff795e")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
fragShell = new Item("frag-shell", Color.GRAY){{ fragShell = new Item("frag-shell", Color.valueOf("e9ead3")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
thoriumShell = new Item("thorium-shell", Color.GRAY){{ thoriumShell = new Item("thorium-shell", Color.valueOf("f9a3c7")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
swarmMissile = new Item("swarm-missile", Color.GRAY){{ swarmMissile = new Item("swarm-missile", Color.valueOf("ff795e")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
scytheMissile = new Item("scythe-missile", Color.GRAY){{ scytheMissile = new Item("scythe-missile", Color.valueOf("f9a3c7")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
incendiaryMortarShell = new Item("incendiary-mortar-shell", Color.GRAY){{ incendiaryMortarShell = new Item("incendiary-mortar-shell", Color.valueOf("ffe58b")){{
type = ItemType.ammo; type = ItemType.ammo;
}}, }},
surgeMortarShell = new Item("surge-mortar-shell", Color.GRAY){{ surgeMortarShell = new Item("surge-mortar-shell", Color.valueOf("bcddff")){{
type = ItemType.ammo; type = ItemType.ammo;
}}; }};
} }
@@ -36,7 +36,7 @@ public class Items {
hardness = 3; hardness = 3;
}}, }},
thorium = new Item("thorium", Color.valueOf("bb80bd")) {{ thorium = new Item("thorium", Color.valueOf("f9a3c7")) {{
explosiveness = 0.1f; explosiveness = 0.1f;
hardness = 4; hardness = 4;
}}, }},
@@ -182,6 +182,10 @@ public class Renderer extends RendererModule{
camera.position.set(lastx - deltax, lasty - deltay, 0); camera.position.set(lastx - deltax, lasty - deltay, 0);
} }
if(debug && !ui.chatfrag.chatOpen()) {
renderer.record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't
}
} }
@Override @Override
-4
View File
@@ -134,10 +134,6 @@ public class UI extends SceneModule{
act(); act();
if(debug && !ui.chatfrag.chatOpen()) {
renderer.record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't
}
for(int i = 0; i < players.length; i ++){ for(int i = 0; i < players.length; i ++){
InputHandler input = control.input(i); InputHandler input = control.input(i);