From 5a5df103bfc3b023cd17d42a7136d4f397aac107 Mon Sep 17 00:00:00 2001
From: 1029chris <1029chris@gmail.com>
Date: Thu, 4 Aug 2016 17:01:23 -0700
Subject: Animated Virus 2, load the assets

---
 assets.lua                   |  13 +++++++++++++
 assets/Virus_2.blend         | Bin 726828 -> 735248 bytes
 assets/virus2_hands_idle.png | Bin 0 -> 22952 bytes
 assets/virus2_idle.png       | Bin 0 -> 555275 bytes
 assets/virus2_idle_mask.png  | Bin 0 -> 15206 bytes
 assets/virus2_pupil.png      | Bin 0 -> 228 bytes
 6 files changed, 13 insertions(+)
 create mode 100644 assets/virus2_hands_idle.png
 create mode 100644 assets/virus2_idle.png
 create mode 100644 assets/virus2_idle_mask.png
 create mode 100644 assets/virus2_pupil.png

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
Binary files a/assets/Virus_2.blend and b/assets/Virus_2.blend differ
diff --git a/assets/virus2_hands_idle.png b/assets/virus2_hands_idle.png
new file mode 100644
index 0000000..57baed9
Binary files /dev/null and b/assets/virus2_hands_idle.png differ
diff --git a/assets/virus2_idle.png b/assets/virus2_idle.png
new file mode 100644
index 0000000..671d044
Binary files /dev/null and b/assets/virus2_idle.png differ
diff --git a/assets/virus2_idle_mask.png b/assets/virus2_idle_mask.png
new file mode 100644
index 0000000..ba97367
Binary files /dev/null and b/assets/virus2_idle_mask.png differ
diff --git a/assets/virus2_pupil.png b/assets/virus2_pupil.png
new file mode 100644
index 0000000..5465c48
Binary files /dev/null and b/assets/virus2_pupil.png differ
-- 
cgit