From ba37fefc6794e3a2fb96e732815a7806fda06ed6 Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 1 Aug 2016 11:58:03 +0200 Subject: Spritesheet update and assets clean up --- assets/biker.png | Bin 2209 -> 0 bytes assets/bison.png | Bin 1804 -> 0 bytes assets/bobito.png | Bin 1866 -> 0 bytes assets/boss.png | Bin 2126 -> 0 bytes assets/brainos.png | Bin 1594 -> 0 bytes assets/bug.png | Bin 2023 -> 0 bytes assets/calamari.png | Bin 11193 -> 0 bytes assets/capone.png | Bin 1988 -> 0 bytes assets/cowboy.png | Bin 1779 -> 0 bytes assets/froggo.png | Bin 1656 -> 0 bytes assets/gelato.png | Bin 2601 -> 0 bytes assets/girl.png | Bin 2178 -> 0 bytes assets/gorilla.png | Bin 1892 -> 0 bytes assets/gramps.png | Bin 2199 -> 0 bytes assets/gummybear.png | Bin 2072 -> 0 bytes assets/honic.png | Bin 1590 -> 0 bytes assets/lady.png | Bin 1912 -> 0 bytes assets/link.png | Bin 2290 -> 0 bytes assets/marine.png | Bin 2267 -> 0 bytes assets/megoman.png | Bin 1842 -> 0 bytes assets/nauts/biker.png | Bin 0 -> 2209 bytes assets/nauts/bison.png | Bin 0 -> 1804 bytes assets/nauts/bobito.png | Bin 0 -> 2015 bytes assets/nauts/boss.png | Bin 0 -> 2126 bytes assets/nauts/brainos.png | Bin 0 -> 1625 bytes assets/nauts/bug.png | Bin 0 -> 2023 bytes assets/nauts/calamari.png | Bin 0 -> 11193 bytes assets/nauts/capone.png | Bin 0 -> 1988 bytes assets/nauts/cowboy.png | Bin 0 -> 1805 bytes assets/nauts/froggo.png | Bin 0 -> 1850 bytes assets/nauts/gelato.png | Bin 0 -> 2601 bytes assets/nauts/girl.png | Bin 0 -> 2355 bytes assets/nauts/gorilla.png | Bin 0 -> 1892 bytes assets/nauts/gramps.png | Bin 0 -> 2199 bytes assets/nauts/gummybear.png | Bin 0 -> 2047 bytes assets/nauts/honic.png | Bin 0 -> 1733 bytes assets/nauts/lady.png | Bin 0 -> 1912 bytes assets/nauts/link.png | Bin 0 -> 2290 bytes assets/nauts/marine.png | Bin 0 -> 2267 bytes assets/nauts/megoman.png | Bin 0 -> 2079 bytes assets/nauts/nemo.png | Bin 0 -> 2519 bytes assets/nauts/phonebooth.png | Bin 0 -> 2608 bytes assets/nauts/quack.png | Bin 0 -> 1959 bytes assets/nauts/rock.png | Bin 0 -> 2762 bytes assets/nauts/scissors.png | Bin 0 -> 2086 bytes assets/nauts/scooter.png | Bin 0 -> 2083 bytes assets/nauts/slugzor.png | Bin 0 -> 1781 bytes assets/nauts/veno.png | Bin 0 -> 2291 bytes assets/nauts/vrooom.png | Bin 0 -> 3314 bytes assets/nauts/weed.png | Bin 0 -> 2088 bytes assets/nauts/woman.png | Bin 0 -> 1717 bytes assets/nemo.png | Bin 2519 -> 0 bytes assets/phonebooth.png | Bin 2608 -> 0 bytes assets/quack.png | Bin 1959 -> 0 bytes assets/rock.png | Bin 2762 -> 0 bytes assets/scissors.png | Bin 2086 -> 0 bytes assets/scooter.png | Bin 2083 -> 0 bytes assets/slugzor.png | Bin 1674 -> 0 bytes assets/veno.png | Bin 2305 -> 0 bytes assets/vrooom.png | Bin 3314 -> 0 bytes assets/weed.png | Bin 2088 -> 0 bytes assets/woman.png | Bin 1744 -> 0 bytes player.lua | 2 +- 63 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 assets/biker.png delete mode 100644 assets/bison.png delete mode 100644 assets/bobito.png delete mode 100644 assets/boss.png delete mode 100644 assets/brainos.png delete mode 100644 assets/bug.png delete mode 100644 assets/calamari.png delete mode 100644 assets/capone.png delete mode 100644 assets/cowboy.png delete mode 100644 assets/froggo.png delete mode 100644 assets/gelato.png delete mode 100644 assets/girl.png delete mode 100644 assets/gorilla.png delete mode 100644 assets/gramps.png delete mode 100644 assets/gummybear.png delete mode 100644 assets/honic.png delete mode 100644 assets/lady.png delete mode 100644 assets/link.png delete mode 100644 assets/marine.png delete mode 100644 assets/megoman.png create mode 100644 assets/nauts/biker.png create mode 100644 assets/nauts/bison.png create mode 100644 assets/nauts/bobito.png create mode 100644 assets/nauts/boss.png create mode 100644 assets/nauts/brainos.png create mode 100644 assets/nauts/bug.png create mode 100644 assets/nauts/calamari.png create mode 100644 assets/nauts/capone.png create mode 100644 assets/nauts/cowboy.png create mode 100644 assets/nauts/froggo.png create mode 100644 assets/nauts/gelato.png create mode 100644 assets/nauts/girl.png create mode 100644 assets/nauts/gorilla.png create mode 100644 assets/nauts/gramps.png create mode 100644 assets/nauts/gummybear.png create mode 100644 assets/nauts/honic.png create mode 100644 assets/nauts/lady.png create mode 100644 assets/nauts/link.png create mode 100644 assets/nauts/marine.png create mode 100644 assets/nauts/megoman.png create mode 100644 assets/nauts/nemo.png create mode 100644 assets/nauts/phonebooth.png create mode 100644 assets/nauts/quack.png create mode 100644 assets/nauts/rock.png create mode 100644 assets/nauts/scissors.png create mode 100644 assets/nauts/scooter.png create mode 100644 assets/nauts/slugzor.png create mode 100644 assets/nauts/veno.png create mode 100644 assets/nauts/vrooom.png create mode 100644 assets/nauts/weed.png create mode 100644 assets/nauts/woman.png delete mode 100644 assets/nemo.png delete mode 100644 assets/phonebooth.png delete mode 100644 assets/quack.png delete mode 100644 assets/rock.png delete mode 100644 assets/scissors.png delete mode 100644 assets/scooter.png delete mode 100644 assets/slugzor.png delete mode 100644 assets/veno.png delete mode 100644 assets/vrooom.png delete mode 100644 assets/weed.png delete mode 100644 assets/woman.png diff --git a/assets/biker.png b/assets/biker.png deleted file mode 100644 index 4737a99..0000000 Binary files a/assets/biker.png and /dev/null differ diff --git a/assets/bison.png b/assets/bison.png deleted file mode 100644 index 6c9dfc4..0000000 Binary files a/assets/bison.png and /dev/null differ diff --git a/assets/bobito.png b/assets/bobito.png deleted file mode 100644 index 5d3c0de..0000000 Binary files a/assets/bobito.png and /dev/null differ diff --git a/assets/boss.png b/assets/boss.png deleted file mode 100644 index bed5b91..0000000 Binary files a/assets/boss.png and /dev/null differ diff --git a/assets/brainos.png b/assets/brainos.png deleted file mode 100644 index 8ae3879..0000000 Binary files a/assets/brainos.png and /dev/null differ diff --git a/assets/bug.png b/assets/bug.png deleted file mode 100644 index 04961f7..0000000 Binary files a/assets/bug.png and /dev/null differ diff --git a/assets/calamari.png b/assets/calamari.png deleted file mode 100644 index 6918325..0000000 Binary files a/assets/calamari.png and /dev/null differ diff --git a/assets/capone.png b/assets/capone.png deleted file mode 100644 index 50dbdac..0000000 Binary files a/assets/capone.png and /dev/null differ diff --git a/assets/cowboy.png b/assets/cowboy.png deleted file mode 100644 index 282c327..0000000 Binary files a/assets/cowboy.png and /dev/null differ diff --git a/assets/froggo.png b/assets/froggo.png deleted file mode 100644 index 66a823d..0000000 Binary files a/assets/froggo.png and /dev/null differ diff --git a/assets/gelato.png b/assets/gelato.png deleted file mode 100644 index 761f3e1..0000000 Binary files a/assets/gelato.png and /dev/null differ diff --git a/assets/girl.png b/assets/girl.png deleted file mode 100644 index b393513..0000000 Binary files a/assets/girl.png and /dev/null differ diff --git a/assets/gorilla.png b/assets/gorilla.png deleted file mode 100644 index c4f1b20..0000000 Binary files a/assets/gorilla.png and /dev/null differ diff --git a/assets/gramps.png b/assets/gramps.png deleted file mode 100644 index 975c1be..0000000 Binary files a/assets/gramps.png and /dev/null differ diff --git a/assets/gummybear.png b/assets/gummybear.png deleted file mode 100644 index 0abacac..0000000 Binary files a/assets/gummybear.png and /dev/null differ diff --git a/assets/honic.png b/assets/honic.png deleted file mode 100644 index 4cf2ac8..0000000 Binary files a/assets/honic.png and /dev/null differ diff --git a/assets/lady.png b/assets/lady.png deleted file mode 100644 index 654f2ed..0000000 Binary files a/assets/lady.png and /dev/null differ diff --git a/assets/link.png b/assets/link.png deleted file mode 100644 index f8cadd8..0000000 Binary files a/assets/link.png and /dev/null differ diff --git a/assets/marine.png b/assets/marine.png deleted file mode 100644 index ab388ac..0000000 Binary files a/assets/marine.png and /dev/null differ diff --git a/assets/megoman.png b/assets/megoman.png deleted file mode 100644 index 29371cb..0000000 Binary files a/assets/megoman.png and /dev/null differ diff --git a/assets/nauts/biker.png b/assets/nauts/biker.png new file mode 100644 index 0000000..4737a99 Binary files /dev/null and b/assets/nauts/biker.png differ diff --git a/assets/nauts/bison.png b/assets/nauts/bison.png new file mode 100644 index 0000000..6c9dfc4 Binary files /dev/null and b/assets/nauts/bison.png differ diff --git a/assets/nauts/bobito.png b/assets/nauts/bobito.png new file mode 100644 index 0000000..90e6283 Binary files /dev/null and b/assets/nauts/bobito.png differ diff --git a/assets/nauts/boss.png b/assets/nauts/boss.png new file mode 100644 index 0000000..bed5b91 Binary files /dev/null and b/assets/nauts/boss.png differ diff --git a/assets/nauts/brainos.png b/assets/nauts/brainos.png new file mode 100644 index 0000000..c03f66c Binary files /dev/null and b/assets/nauts/brainos.png differ diff --git a/assets/nauts/bug.png b/assets/nauts/bug.png new file mode 100644 index 0000000..04961f7 Binary files /dev/null and b/assets/nauts/bug.png differ diff --git a/assets/nauts/calamari.png b/assets/nauts/calamari.png new file mode 100644 index 0000000..6918325 Binary files /dev/null and b/assets/nauts/calamari.png differ diff --git a/assets/nauts/capone.png b/assets/nauts/capone.png new file mode 100644 index 0000000..50dbdac Binary files /dev/null and b/assets/nauts/capone.png differ diff --git a/assets/nauts/cowboy.png b/assets/nauts/cowboy.png new file mode 100644 index 0000000..43b07fe Binary files /dev/null and b/assets/nauts/cowboy.png differ diff --git a/assets/nauts/froggo.png b/assets/nauts/froggo.png new file mode 100644 index 0000000..19b9611 Binary files /dev/null and b/assets/nauts/froggo.png differ diff --git a/assets/nauts/gelato.png b/assets/nauts/gelato.png new file mode 100644 index 0000000..761f3e1 Binary files /dev/null and b/assets/nauts/gelato.png differ diff --git a/assets/nauts/girl.png b/assets/nauts/girl.png new file mode 100644 index 0000000..527c79b Binary files /dev/null and b/assets/nauts/girl.png differ diff --git a/assets/nauts/gorilla.png b/assets/nauts/gorilla.png new file mode 100644 index 0000000..c4f1b20 Binary files /dev/null and b/assets/nauts/gorilla.png differ diff --git a/assets/nauts/gramps.png b/assets/nauts/gramps.png new file mode 100644 index 0000000..975c1be Binary files /dev/null and b/assets/nauts/gramps.png differ diff --git a/assets/nauts/gummybear.png b/assets/nauts/gummybear.png new file mode 100644 index 0000000..e0b21dd Binary files /dev/null and b/assets/nauts/gummybear.png differ diff --git a/assets/nauts/honic.png b/assets/nauts/honic.png new file mode 100644 index 0000000..d228771 Binary files /dev/null and b/assets/nauts/honic.png differ diff --git a/assets/nauts/lady.png b/assets/nauts/lady.png new file mode 100644 index 0000000..654f2ed Binary files /dev/null and b/assets/nauts/lady.png differ diff --git a/assets/nauts/link.png b/assets/nauts/link.png new file mode 100644 index 0000000..f8cadd8 Binary files /dev/null and b/assets/nauts/link.png differ diff --git a/assets/nauts/marine.png b/assets/nauts/marine.png new file mode 100644 index 0000000..ab388ac Binary files /dev/null and b/assets/nauts/marine.png differ diff --git a/assets/nauts/megoman.png b/assets/nauts/megoman.png new file mode 100644 index 0000000..3b35f3d Binary files /dev/null and b/assets/nauts/megoman.png differ diff --git a/assets/nauts/nemo.png b/assets/nauts/nemo.png new file mode 100644 index 0000000..06c3540 Binary files /dev/null and b/assets/nauts/nemo.png differ diff --git a/assets/nauts/phonebooth.png b/assets/nauts/phonebooth.png new file mode 100644 index 0000000..c9cace5 Binary files /dev/null and b/assets/nauts/phonebooth.png differ diff --git a/assets/nauts/quack.png b/assets/nauts/quack.png new file mode 100644 index 0000000..e59d88e Binary files /dev/null and b/assets/nauts/quack.png differ diff --git a/assets/nauts/rock.png b/assets/nauts/rock.png new file mode 100644 index 0000000..d6e2156 Binary files /dev/null and b/assets/nauts/rock.png differ diff --git a/assets/nauts/scissors.png b/assets/nauts/scissors.png new file mode 100644 index 0000000..37ed9f7 Binary files /dev/null and b/assets/nauts/scissors.png differ diff --git a/assets/nauts/scooter.png b/assets/nauts/scooter.png new file mode 100644 index 0000000..e179b35 Binary files /dev/null and b/assets/nauts/scooter.png differ diff --git a/assets/nauts/slugzor.png b/assets/nauts/slugzor.png new file mode 100644 index 0000000..7055192 Binary files /dev/null and b/assets/nauts/slugzor.png differ diff --git a/assets/nauts/veno.png b/assets/nauts/veno.png new file mode 100644 index 0000000..f4e380c Binary files /dev/null and b/assets/nauts/veno.png differ diff --git a/assets/nauts/vrooom.png b/assets/nauts/vrooom.png new file mode 100644 index 0000000..0244322 Binary files /dev/null and b/assets/nauts/vrooom.png differ diff --git a/assets/nauts/weed.png b/assets/nauts/weed.png new file mode 100644 index 0000000..9dc0e37 Binary files /dev/null and b/assets/nauts/weed.png differ diff --git a/assets/nauts/woman.png b/assets/nauts/woman.png new file mode 100644 index 0000000..309263c Binary files /dev/null and b/assets/nauts/woman.png differ diff --git a/assets/nemo.png b/assets/nemo.png deleted file mode 100644 index 06c3540..0000000 Binary files a/assets/nemo.png and /dev/null differ diff --git a/assets/phonebooth.png b/assets/phonebooth.png deleted file mode 100644 index c9cace5..0000000 Binary files a/assets/phonebooth.png and /dev/null differ diff --git a/assets/quack.png b/assets/quack.png deleted file mode 100644 index e59d88e..0000000 Binary files a/assets/quack.png and /dev/null differ diff --git a/assets/rock.png b/assets/rock.png deleted file mode 100644 index d6e2156..0000000 Binary files a/assets/rock.png and /dev/null differ diff --git a/assets/scissors.png b/assets/scissors.png deleted file mode 100644 index 37ed9f7..0000000 Binary files a/assets/scissors.png and /dev/null differ diff --git a/assets/scooter.png b/assets/scooter.png deleted file mode 100644 index e179b35..0000000 Binary files a/assets/scooter.png and /dev/null differ diff --git a/assets/slugzor.png b/assets/slugzor.png deleted file mode 100644 index 52c6720..0000000 Binary files a/assets/slugzor.png and /dev/null differ diff --git a/assets/veno.png b/assets/veno.png deleted file mode 100644 index 3504e21..0000000 Binary files a/assets/veno.png and /dev/null differ diff --git a/assets/vrooom.png b/assets/vrooom.png deleted file mode 100644 index 0244322..0000000 Binary files a/assets/vrooom.png and /dev/null differ diff --git a/assets/weed.png b/assets/weed.png deleted file mode 100644 index 9dc0e37..0000000 Binary files a/assets/weed.png and /dev/null differ diff --git a/assets/woman.png b/assets/woman.png deleted file mode 100644 index fccca26..0000000 Binary files a/assets/woman.png and /dev/null 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 -- cgit v1.1