aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-08-04 17:01:23 -0700
committer1029chris <1029chris@gmail.com>2016-08-04 17:01:23 -0700
commit5a5df103bfc3b023cd17d42a7136d4f397aac107 (patch)
treecfc88a3529800d0fe16a4557aa3df2122907490a
parent8333ef2e02bcdec3ad7fa5874da46036b651f3af (diff)
Animated Virus 2, load the assets
-rw-r--r--assets.lua13
-rw-r--r--assets/Virus_2.blendbin726828 -> 735248 bytes
-rw-r--r--assets/virus2_hands_idle.pngbin0 -> 22952 bytes
-rw-r--r--assets/virus2_idle.pngbin0 -> 555275 bytes
-rw-r--r--assets/virus2_idle_mask.pngbin0 -> 15206 bytes
-rw-r--r--assets/virus2_pupil.pngbin0 -> 228 bytes
6 files changed, 13 insertions, 0 deletions
diff --git a/assets.lua b/assets.lua
index d75a13b..96915ee 100644
--- a/assets.lua
+++ b/assets.lua
@@ -230,6 +230,19 @@ function loadAssets(id)
v1.c.shine.sm2 = true
v1.c.shine.ct = 0
v1.c.shine.opa = 255
+ v2.c = {}
+ v2.c.idle = {}
+ v2.c.idle.fs = {}
+ v2.c.idle.pic = love.graphics.newImage("assets/virus2_idle.png")
+ v2.c.pupil = love.graphics.newImage("assets/virus2_pupil.png")
+ v2.c.idle.hands = love.graphics.newImage("assets/eye_thing.png")
+ v2.c.idle.f = 1
+ loadAnimation(v2.c.idle.pic, v2.c.idle.fs, 37, 10, 250, 250)
+ v2.c.idle.mask = {}
+ v2.c.idle.mask.fs = {}
+ v2.c.idle.mask.pic = love.graphics.newImage("assets/virus2_idle_mask.png")
+ v2.c.idle.mask.f = 1
+ loadAnimation(v2.c.idle.mask.pic, v2.c.idle.mask.fs, 37, 10, 250, 250)
end
if id == 15 then
expl = {}
diff --git a/assets/Virus_2.blend b/assets/Virus_2.blend
index 90d8b14..68a2200 100644
--- a/assets/Virus_2.blend
+++ b/assets/Virus_2.blend
Binary files differ
diff --git a/assets/virus2_hands_idle.png b/assets/virus2_hands_idle.png
new file mode 100644
index 0000000..57baed9
--- /dev/null
+++ b/assets/virus2_hands_idle.png
Binary files differ
diff --git a/assets/virus2_idle.png b/assets/virus2_idle.png
new file mode 100644
index 0000000..671d044
--- /dev/null
+++ b/assets/virus2_idle.png
Binary files differ
diff --git a/assets/virus2_idle_mask.png b/assets/virus2_idle_mask.png
new file mode 100644
index 0000000..ba97367
--- /dev/null
+++ b/assets/virus2_idle_mask.png
Binary files differ
diff --git a/assets/virus2_pupil.png b/assets/virus2_pupil.png
new file mode 100644
index 0000000..5465c48
--- /dev/null
+++ b/assets/virus2_pupil.png
Binary files differ