summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2018-04-13 13:25:59 +0200
committerPaweł Redman <pawel.redman@gmail.com>2018-04-13 13:25:59 +0200
commit88ab09fbd5cbcc6173e5d7d370a0ad4886d13bf7 (patch)
tree74fdbd11720a60cc3faf4d9d36a3d5dacbdc7fa7
parentce40f40ce6c7b7b44f1e1aea1cd1cb4d917b24c3 (diff)
Better replicator assets.
-rw-r--r--LICENSE3
-rw-r--r--assets/units/repl/idle_0.pngbin6076 -> 2785 bytes
-rw-r--r--assets/units/repl/idle_1.pngbin0 -> 2752 bytes
-rw-r--r--assets/units/repl/idle_2.pngbin0 -> 2693 bytes
-rw-r--r--assets/units/repl/idle_3.pngbin0 -> 3050 bytes
-rw-r--r--assets/units/repl/sound.oggbin10892 -> 16029 bytes
-rw-r--r--src/game/assets.cpp3
-rw-r--r--src/game/unit_repl.cpp2
8 files changed, 4 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index ed7c749..3a856df 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,6 +13,7 @@ assets/ambience/chasm.ogg
assets/ambience/nexus.ogg
assets/ambience/water.ogg
assets/src/
+assets/units/repl/sound.ogg
assets/units/soldier/fire.ogg
assets/units/soldier/fire_far.ogg
assets/units/soldier/step_stone_*.ogg
@@ -23,7 +24,7 @@ The following assets are from Tremulous and are licensed under CC-BY-SA:
FILE
assets/ambience/wind.ogg
assets/units/nest/*.ogg
-assets/units/repl/*.ogg
+assets/units/repl/damage*.ogg
assets/units/soldier/death*.ogg
assets/units/soldier/gibbing.ogg
assets/units/soldier/pain.ogg
diff --git a/assets/units/repl/idle_0.png b/assets/units/repl/idle_0.png
index 5894995..7079665 100644
--- a/assets/units/repl/idle_0.png
+++ b/assets/units/repl/idle_0.png
Binary files differ
diff --git a/assets/units/repl/idle_1.png b/assets/units/repl/idle_1.png
new file mode 100644
index 0000000..be0da87
--- /dev/null
+++ b/assets/units/repl/idle_1.png
Binary files differ
diff --git a/assets/units/repl/idle_2.png b/assets/units/repl/idle_2.png
new file mode 100644
index 0000000..e962fe1
--- /dev/null
+++ b/assets/units/repl/idle_2.png
Binary files differ
diff --git a/assets/units/repl/idle_3.png b/assets/units/repl/idle_3.png
new file mode 100644
index 0000000..e54eaa8
--- /dev/null
+++ b/assets/units/repl/idle_3.png
Binary files differ
diff --git a/assets/units/repl/sound.ogg b/assets/units/repl/sound.ogg
index 48e0f3d..2963f8a 100644
--- a/assets/units/repl/sound.ogg
+++ b/assets/units/repl/sound.ogg
Binary files differ
diff --git a/src/game/assets.cpp b/src/game/assets.cpp
index e8ad153..31c4427 100644
--- a/src/game/assets.cpp
+++ b/src/game/assets.cpp
@@ -74,8 +74,7 @@ void load(void)
nest.pain.load("assets/units/nest/pain.ogg");
nest.death.load("assets/units/nest/death.ogg");
- repl.idle.load("assets/units/repl/idle_", 1);
- repl.dead.load("assets/units/repl/dead_", 1);
+ repl.idle.load("assets/units/repl/idle_", 4);
repl.sound.load("assets/units/repl/sound.ogg");
repl.damage.load("assets/units/repl/damage1.ogg");
repl.damage.load("assets/units/repl/damage2.ogg");
diff --git a/src/game/unit_repl.cpp b/src/game/unit_repl.cpp
index c8c6f00..be3e8fa 100644
--- a/src/game/unit_repl.cpp
+++ b/src/game/unit_repl.cpp
@@ -22,7 +22,7 @@ namespace game {
unit_repl_t::unit_repl_t(game::state_t *game_) : unit_t(game_, UNIT_REPL)
{
size[0] = {-0.4f, -0.2f};
- size[1] = {+0.4f, +0.6f};
+ size[1] = {+0.4f, +0.4f};
render_size = size;
render_layer = render::LAYER_FLAT;
cmodel.cflags = CF_BODY_SMALL;