summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-08-01 11:58:03 +0200
committerAki <nthirtyone@gmail.com>2016-08-01 11:58:03 +0200
commitba37fefc6794e3a2fb96e732815a7806fda06ed6 (patch)
treeeb9b9aa0d23926eb70cca4066df14b88e2e2e446
parente1bcab1e723ebaa165f1338fc08972e07495a0df (diff)
downloadroflnauts-ba37fefc6794e3a2fb96e732815a7806fda06ed6.zip
roflnauts-ba37fefc6794e3a2fb96e732815a7806fda06ed6.tar.gz
roflnauts-ba37fefc6794e3a2fb96e732815a7806fda06ed6.tar.bz2
Spritesheet update and assets clean up
-rw-r--r--assets/bobito.pngbin1866 -> 0 bytes
-rw-r--r--assets/brainos.pngbin1594 -> 0 bytes
-rw-r--r--assets/cowboy.pngbin1779 -> 0 bytes
-rw-r--r--assets/froggo.pngbin1656 -> 0 bytes
-rw-r--r--assets/girl.pngbin2178 -> 0 bytes
-rw-r--r--assets/gummybear.pngbin2072 -> 0 bytes
-rw-r--r--assets/honic.pngbin1590 -> 0 bytes
-rw-r--r--assets/megoman.pngbin1842 -> 0 bytes
-rw-r--r--assets/nauts/biker.png (renamed from assets/biker.png)bin2209 -> 2209 bytes
-rw-r--r--assets/nauts/bison.png (renamed from assets/bison.png)bin1804 -> 1804 bytes
-rw-r--r--assets/nauts/bobito.pngbin0 -> 2015 bytes
-rw-r--r--assets/nauts/boss.png (renamed from assets/boss.png)bin2126 -> 2126 bytes
-rw-r--r--assets/nauts/brainos.pngbin0 -> 1625 bytes
-rw-r--r--assets/nauts/bug.png (renamed from assets/bug.png)bin2023 -> 2023 bytes
-rw-r--r--assets/nauts/calamari.png (renamed from assets/calamari.png)bin11193 -> 11193 bytes
-rw-r--r--assets/nauts/capone.png (renamed from assets/capone.png)bin1988 -> 1988 bytes
-rw-r--r--assets/nauts/cowboy.pngbin0 -> 1805 bytes
-rw-r--r--assets/nauts/froggo.pngbin0 -> 1850 bytes
-rw-r--r--assets/nauts/gelato.png (renamed from assets/gelato.png)bin2601 -> 2601 bytes
-rw-r--r--assets/nauts/girl.pngbin0 -> 2355 bytes
-rw-r--r--assets/nauts/gorilla.png (renamed from assets/gorilla.png)bin1892 -> 1892 bytes
-rw-r--r--assets/nauts/gramps.png (renamed from assets/gramps.png)bin2199 -> 2199 bytes
-rw-r--r--assets/nauts/gummybear.pngbin0 -> 2047 bytes
-rw-r--r--assets/nauts/honic.pngbin0 -> 1733 bytes
-rw-r--r--assets/nauts/lady.png (renamed from assets/lady.png)bin1912 -> 1912 bytes
-rw-r--r--assets/nauts/link.png (renamed from assets/link.png)bin2290 -> 2290 bytes
-rw-r--r--assets/nauts/marine.png (renamed from assets/marine.png)bin2267 -> 2267 bytes
-rw-r--r--assets/nauts/megoman.pngbin0 -> 2079 bytes
-rw-r--r--assets/nauts/nemo.png (renamed from assets/nemo.png)bin2519 -> 2519 bytes
-rw-r--r--assets/nauts/phonebooth.png (renamed from assets/phonebooth.png)bin2608 -> 2608 bytes
-rw-r--r--assets/nauts/quack.png (renamed from assets/quack.png)bin1959 -> 1959 bytes
-rw-r--r--assets/nauts/rock.png (renamed from assets/rock.png)bin2762 -> 2762 bytes
-rw-r--r--assets/nauts/scissors.png (renamed from assets/scissors.png)bin2086 -> 2086 bytes
-rw-r--r--assets/nauts/scooter.png (renamed from assets/scooter.png)bin2083 -> 2083 bytes
-rw-r--r--assets/nauts/slugzor.pngbin0 -> 1781 bytes
-rw-r--r--assets/nauts/veno.pngbin0 -> 2291 bytes
-rw-r--r--assets/nauts/vrooom.png (renamed from assets/vrooom.png)bin3314 -> 3314 bytes
-rw-r--r--assets/nauts/weed.png (renamed from assets/weed.png)bin2088 -> 2088 bytes
-rw-r--r--assets/nauts/woman.pngbin0 -> 1717 bytes
-rw-r--r--assets/slugzor.pngbin1674 -> 0 bytes
-rw-r--r--assets/veno.pngbin2305 -> 0 bytes
-rw-r--r--assets/woman.pngbin1744 -> 0 bytes
-rw-r--r--player.lua2
43 files changed, 1 insertions, 1 deletions
diff --git a/assets/bobito.png b/assets/bobito.png
deleted file mode 100644
index 5d3c0de..0000000
--- a/assets/bobito.png
+++ /dev/null
Binary files differ
diff --git a/assets/brainos.png b/assets/brainos.png
deleted file mode 100644
index 8ae3879..0000000
--- a/assets/brainos.png
+++ /dev/null
Binary files differ
diff --git a/assets/cowboy.png b/assets/cowboy.png
deleted file mode 100644
index 282c327..0000000
--- a/assets/cowboy.png
+++ /dev/null
Binary files differ
diff --git a/assets/froggo.png b/assets/froggo.png
deleted file mode 100644
index 66a823d..0000000
--- a/assets/froggo.png
+++ /dev/null
Binary files differ
diff --git a/assets/girl.png b/assets/girl.png
deleted file mode 100644
index b393513..0000000
--- a/assets/girl.png
+++ /dev/null
Binary files differ
diff --git a/assets/gummybear.png b/assets/gummybear.png
deleted file mode 100644
index 0abacac..0000000
--- a/assets/gummybear.png
+++ /dev/null
Binary files differ
diff --git a/assets/honic.png b/assets/honic.png
deleted file mode 100644
index 4cf2ac8..0000000
--- a/assets/honic.png
+++ /dev/null
Binary files differ
diff --git a/assets/megoman.png b/assets/megoman.png
deleted file mode 100644
index 29371cb..0000000
--- a/assets/megoman.png
+++ /dev/null
Binary files differ
diff --git a/assets/biker.png b/assets/nauts/biker.png
index 4737a99..4737a99 100644
--- a/assets/biker.png
+++ b/assets/nauts/biker.png
Binary files differ
diff --git a/assets/bison.png b/assets/nauts/bison.png
index 6c9dfc4..6c9dfc4 100644
--- a/assets/bison.png
+++ b/assets/nauts/bison.png
Binary files differ
diff --git a/assets/nauts/bobito.png b/assets/nauts/bobito.png
new file mode 100644
index 0000000..90e6283
--- /dev/null
+++ b/assets/nauts/bobito.png
Binary files differ
diff --git a/assets/boss.png b/assets/nauts/boss.png
index bed5b91..bed5b91 100644
--- a/assets/boss.png
+++ b/assets/nauts/boss.png
Binary files differ
diff --git a/assets/nauts/brainos.png b/assets/nauts/brainos.png
new file mode 100644
index 0000000..c03f66c
--- /dev/null
+++ b/assets/nauts/brainos.png
Binary files differ
diff --git a/assets/bug.png b/assets/nauts/bug.png
index 04961f7..04961f7 100644
--- a/assets/bug.png
+++ b/assets/nauts/bug.png
Binary files differ
diff --git a/assets/calamari.png b/assets/nauts/calamari.png
index 6918325..6918325 100644
--- a/assets/calamari.png
+++ b/assets/nauts/calamari.png
Binary files differ
diff --git a/assets/capone.png b/assets/nauts/capone.png
index 50dbdac..50dbdac 100644
--- a/assets/capone.png
+++ b/assets/nauts/capone.png
Binary files differ
diff --git a/assets/nauts/cowboy.png b/assets/nauts/cowboy.png
new file mode 100644
index 0000000..43b07fe
--- /dev/null
+++ b/assets/nauts/cowboy.png
Binary files differ
diff --git a/assets/nauts/froggo.png b/assets/nauts/froggo.png
new file mode 100644
index 0000000..19b9611
--- /dev/null
+++ b/assets/nauts/froggo.png
Binary files differ
diff --git a/assets/gelato.png b/assets/nauts/gelato.png
index 761f3e1..761f3e1 100644
--- a/assets/gelato.png
+++ b/assets/nauts/gelato.png
Binary files differ
diff --git a/assets/nauts/girl.png b/assets/nauts/girl.png
new file mode 100644
index 0000000..527c79b
--- /dev/null
+++ b/assets/nauts/girl.png
Binary files differ
diff --git a/assets/gorilla.png b/assets/nauts/gorilla.png
index c4f1b20..c4f1b20 100644
--- a/assets/gorilla.png
+++ b/assets/nauts/gorilla.png
Binary files differ
diff --git a/assets/gramps.png b/assets/nauts/gramps.png
index 975c1be..975c1be 100644
--- a/assets/gramps.png
+++ b/assets/nauts/gramps.png
Binary files differ
diff --git a/assets/nauts/gummybear.png b/assets/nauts/gummybear.png
new file mode 100644
index 0000000..e0b21dd
--- /dev/null
+++ b/assets/nauts/gummybear.png
Binary files differ
diff --git a/assets/nauts/honic.png b/assets/nauts/honic.png
new file mode 100644
index 0000000..d228771
--- /dev/null
+++ b/assets/nauts/honic.png
Binary files differ
diff --git a/assets/lady.png b/assets/nauts/lady.png
index 654f2ed..654f2ed 100644
--- a/assets/lady.png
+++ b/assets/nauts/lady.png
Binary files differ
diff --git a/assets/link.png b/assets/nauts/link.png
index f8cadd8..f8cadd8 100644
--- a/assets/link.png
+++ b/assets/nauts/link.png
Binary files differ
diff --git a/assets/marine.png b/assets/nauts/marine.png
index ab388ac..ab388ac 100644
--- a/assets/marine.png
+++ b/assets/nauts/marine.png
Binary files differ
diff --git a/assets/nauts/megoman.png b/assets/nauts/megoman.png
new file mode 100644
index 0000000..3b35f3d
--- /dev/null
+++ b/assets/nauts/megoman.png
Binary files differ
diff --git a/assets/nemo.png b/assets/nauts/nemo.png
index 06c3540..06c3540 100644
--- a/assets/nemo.png
+++ b/assets/nauts/nemo.png
Binary files differ
diff --git a/assets/phonebooth.png b/assets/nauts/phonebooth.png
index c9cace5..c9cace5 100644
--- a/assets/phonebooth.png
+++ b/assets/nauts/phonebooth.png
Binary files differ
diff --git a/assets/quack.png b/assets/nauts/quack.png
index e59d88e..e59d88e 100644
--- a/assets/quack.png
+++ b/assets/nauts/quack.png
Binary files differ
diff --git a/assets/rock.png b/assets/nauts/rock.png
index d6e2156..d6e2156 100644
--- a/assets/rock.png
+++ b/assets/nauts/rock.png
Binary files differ
diff --git a/assets/scissors.png b/assets/nauts/scissors.png
index 37ed9f7..37ed9f7 100644
--- a/assets/scissors.png
+++ b/assets/nauts/scissors.png
Binary files differ
diff --git a/assets/scooter.png b/assets/nauts/scooter.png
index e179b35..e179b35 100644
--- a/assets/scooter.png
+++ b/assets/nauts/scooter.png
Binary files differ
diff --git a/assets/nauts/slugzor.png b/assets/nauts/slugzor.png
new file mode 100644
index 0000000..7055192
--- /dev/null
+++ b/assets/nauts/slugzor.png
Binary files differ
diff --git a/assets/nauts/veno.png b/assets/nauts/veno.png
new file mode 100644
index 0000000..f4e380c
--- /dev/null
+++ b/assets/nauts/veno.png
Binary files differ
diff --git a/assets/vrooom.png b/assets/nauts/vrooom.png
index 0244322..0244322 100644
--- a/assets/vrooom.png
+++ b/assets/nauts/vrooom.png
Binary files differ
diff --git a/assets/weed.png b/assets/nauts/weed.png
index 9dc0e37..9dc0e37 100644
--- a/assets/weed.png
+++ b/assets/nauts/weed.png
Binary files differ
diff --git a/assets/nauts/woman.png b/assets/nauts/woman.png
new file mode 100644
index 0000000..309263c
--- /dev/null
+++ b/assets/nauts/woman.png
Binary files differ
diff --git a/assets/slugzor.png b/assets/slugzor.png
deleted file mode 100644
index 52c6720..0000000
--- a/assets/slugzor.png
+++ /dev/null
Binary files differ
diff --git a/assets/veno.png b/assets/veno.png
deleted file mode 100644
index 3504e21..0000000
--- a/assets/veno.png
+++ /dev/null
Binary files differ
diff --git a/assets/woman.png b/assets/woman.png
deleted file mode 100644
index fccca26..0000000
--- a/assets/woman.png
+++ /dev/null
Binary files differ
diff --git a/player.lua b/player.lua
index 052bbab..b9fbd68 100644
--- a/player.lua
+++ b/player.lua
@@ -63,7 +63,7 @@ function Player:new (game, world, x, y, name)
o.body:setFixedRotation(true)
-- Misc
o.name = name or "empty"
- o.sprite = newImage("assets/"..o.name..".png")
+ o.sprite = newImage("assets/nauts/"..o.name..".png")
o.world = game
-- Animation
o.current = o.animations.idle