diff options
| -rw-r--r-- | assets/nauts/biker.png | bin | 2209 -> 2581 bytes | |||
| -rw-r--r-- | assets/nauts/bison.png | bin | 1962 -> 2217 bytes | |||
| -rw-r--r-- | assets/nauts/blblal.png | bin | 0 -> 2303 bytes | |||
| -rw-r--r-- | assets/nauts/bobito.png | bin | 2015 -> 2252 bytes | |||
| -rw-r--r-- | assets/nauts/boss.png | bin | 2126 -> 0 bytes | |||
| -rw-r--r-- | assets/nauts/brainos.png | bin | 1625 -> 2029 bytes | |||
| -rw-r--r-- | assets/nauts/bug.png | bin | 2023 -> 2353 bytes | |||
| -rw-r--r-- | assets/nauts/calamari.png | bin | 10967 -> 11378 bytes | |||
| -rw-r--r-- | assets/nauts/capone.png | bin | 1988 -> 2273 bytes | |||
| -rw-r--r-- | assets/nauts/cowboy.png | bin | 1805 -> 2233 bytes | |||
| -rw-r--r-- | assets/nauts/cowman.png | bin | 0 -> 2763 bytes | |||
| -rw-r--r-- | assets/nauts/disco.png | bin | 0 -> 2429 bytes | |||
| -rw-r--r-- | assets/nauts/dundee.png | bin | 0 -> 2951 bytes | |||
| -rw-r--r-- | assets/nauts/froggirl.png | bin | 0 -> 2238 bytes | |||
| -rw-r--r-- | assets/nauts/froggo.png | bin | 1850 -> 2201 bytes | |||
| -rw-r--r-- | assets/nauts/gelato.png | bin | 2539 -> 2725 bytes | |||
| -rw-r--r-- | assets/nauts/girl.png | bin | 2350 -> 2772 bytes | |||
| -rw-r--r-- | assets/nauts/gorilla.png | bin | 1892 -> 0 bytes | |||
| -rw-r--r-- | assets/nauts/gramps.png | bin | 2199 -> 2614 bytes | |||
| -rw-r--r-- | assets/nauts/gummybear.png | bin | 2010 -> 2395 bytes | |||
| -rw-r--r-- | assets/nauts/honic.png | bin | 1733 -> 2105 bytes | |||
| -rw-r--r-- | assets/nauts/joystick.png | bin | 0 -> 2568 bytes | |||
| -rw-r--r-- | assets/nauts/kong.png | bin | 0 -> 2153 bytes | |||
| -rw-r--r-- | assets/nauts/lady.png | bin | 1912 -> 2173 bytes | |||
| -rw-r--r-- | assets/nauts/link.png | bin | 2152 -> 2470 bytes | |||
| -rw-r--r-- | assets/nauts/marine.png | bin | 2109 -> 2672 bytes | |||
| -rw-r--r-- | assets/nauts/megoman.png | bin | 2079 -> 2416 bytes | |||
| -rw-r--r-- | assets/nauts/missile.png | bin | 0 -> 2842 bytes | |||
| -rw-r--r-- | assets/nauts/nemo.png | bin | 2519 -> 2877 bytes | |||
| -rw-r--r-- | assets/nauts/phonebooth.png | bin | 2608 -> 2892 bytes | |||
| -rw-r--r-- | assets/nauts/quack.png | bin | 1859 -> 2094 bytes | |||
| -rw-r--r-- | assets/nauts/rock.png | bin | 2762 -> 3107 bytes | |||
| -rw-r--r-- | assets/nauts/scissors.png | bin | 2086 -> 2431 bytes | |||
| -rw-r--r-- | assets/nauts/scooter.png | bin | 2187 -> 2590 bytes | |||
| -rw-r--r-- | assets/nauts/shutter.png | bin | 2288 -> 2532 bytes | |||
| -rw-r--r-- | assets/nauts/slugzor.png | bin | 1781 -> 2106 bytes | |||
| -rw-r--r-- | assets/nauts/swarm.png | bin | 0 -> 774 bytes | |||
| -rw-r--r-- | assets/nauts/veno.png | bin | 2291 -> 2672 bytes | |||
| -rw-r--r-- | assets/nauts/vrooom.png | bin | 3088 -> 3448 bytes | |||
| -rw-r--r-- | assets/nauts/weed.png | bin | 2088 -> 2376 bytes | |||
| -rw-r--r-- | assets/nauts/woman.png | bin | 1717 -> 2187 bytes | |||
| -rw-r--r-- | assets/nauts/yarr.png | bin | 0 -> 2521 bytes | |||
| -rw-r--r-- | assets/portraits.png | bin | 23640 -> 29915 bytes | |||
| -rw-r--r-- | config/animations/hero.lua | 45 | ||||
| -rw-r--r-- | config/nauts.lua | 6 | ||||
| -rw-r--r-- | iconsList.lua | 4 |
46 files changed, 34 insertions, 21 deletions
diff --git a/assets/nauts/biker.png b/assets/nauts/biker.png Binary files differindex 4737a99..0094cbb 100644 --- a/assets/nauts/biker.png +++ b/assets/nauts/biker.png diff --git a/assets/nauts/bison.png b/assets/nauts/bison.png Binary files differindex cb5f98a..330af46 100644 --- a/assets/nauts/bison.png +++ b/assets/nauts/bison.png diff --git a/assets/nauts/blblal.png b/assets/nauts/blblal.png Binary files differnew file mode 100644 index 0000000..fc891e2 --- /dev/null +++ b/assets/nauts/blblal.png diff --git a/assets/nauts/bobito.png b/assets/nauts/bobito.png Binary files differindex 90e6283..f5a97d1 100644 --- a/assets/nauts/bobito.png +++ b/assets/nauts/bobito.png diff --git a/assets/nauts/boss.png b/assets/nauts/boss.png Binary files differdeleted file mode 100644 index bed5b91..0000000 --- a/assets/nauts/boss.png +++ /dev/null diff --git a/assets/nauts/brainos.png b/assets/nauts/brainos.png Binary files differindex c03f66c..7a3ea17 100644 --- a/assets/nauts/brainos.png +++ b/assets/nauts/brainos.png diff --git a/assets/nauts/bug.png b/assets/nauts/bug.png Binary files differindex 04961f7..21ba685 100644 --- a/assets/nauts/bug.png +++ b/assets/nauts/bug.png diff --git a/assets/nauts/calamari.png b/assets/nauts/calamari.png Binary files differindex 31748bc..4422a1c 100644 --- a/assets/nauts/calamari.png +++ b/assets/nauts/calamari.png diff --git a/assets/nauts/capone.png b/assets/nauts/capone.png Binary files differindex 50dbdac..9d14ec0 100644 --- a/assets/nauts/capone.png +++ b/assets/nauts/capone.png diff --git a/assets/nauts/cowboy.png b/assets/nauts/cowboy.png Binary files differindex 43b07fe..4e61992 100644 --- a/assets/nauts/cowboy.png +++ b/assets/nauts/cowboy.png diff --git a/assets/nauts/cowman.png b/assets/nauts/cowman.png Binary files differnew file mode 100644 index 0000000..f81b114 --- /dev/null +++ b/assets/nauts/cowman.png diff --git a/assets/nauts/disco.png b/assets/nauts/disco.png Binary files differnew file mode 100644 index 0000000..28ac0c2 --- /dev/null +++ b/assets/nauts/disco.png diff --git a/assets/nauts/dundee.png b/assets/nauts/dundee.png Binary files differnew file mode 100644 index 0000000..e46193c --- /dev/null +++ b/assets/nauts/dundee.png diff --git a/assets/nauts/froggirl.png b/assets/nauts/froggirl.png Binary files differnew file mode 100644 index 0000000..9495f3e --- /dev/null +++ b/assets/nauts/froggirl.png diff --git a/assets/nauts/froggo.png b/assets/nauts/froggo.png Binary files differindex 19b9611..24deacf 100644 --- a/assets/nauts/froggo.png +++ b/assets/nauts/froggo.png diff --git a/assets/nauts/gelato.png b/assets/nauts/gelato.png Binary files differindex f934773..18eb278 100644 --- a/assets/nauts/gelato.png +++ b/assets/nauts/gelato.png diff --git a/assets/nauts/girl.png b/assets/nauts/girl.png Binary files differindex 9f9df17..7f6310d 100644 --- a/assets/nauts/girl.png +++ b/assets/nauts/girl.png diff --git a/assets/nauts/gorilla.png b/assets/nauts/gorilla.png Binary files differdeleted file mode 100644 index c4f1b20..0000000 --- a/assets/nauts/gorilla.png +++ /dev/null diff --git a/assets/nauts/gramps.png b/assets/nauts/gramps.png Binary files differindex 975c1be..254eb91 100644 --- a/assets/nauts/gramps.png +++ b/assets/nauts/gramps.png diff --git a/assets/nauts/gummybear.png b/assets/nauts/gummybear.png Binary files differindex 4fedc96..9e95bf4 100644 --- a/assets/nauts/gummybear.png +++ b/assets/nauts/gummybear.png diff --git a/assets/nauts/honic.png b/assets/nauts/honic.png Binary files differindex d228771..8dee1dc 100644 --- a/assets/nauts/honic.png +++ b/assets/nauts/honic.png diff --git a/assets/nauts/joystick.png b/assets/nauts/joystick.png Binary files differnew file mode 100644 index 0000000..40d872e --- /dev/null +++ b/assets/nauts/joystick.png diff --git a/assets/nauts/kong.png b/assets/nauts/kong.png Binary files differnew file mode 100644 index 0000000..bb41ff8 --- /dev/null +++ b/assets/nauts/kong.png diff --git a/assets/nauts/lady.png b/assets/nauts/lady.png Binary files differindex 654f2ed..5334dee 100644 --- a/assets/nauts/lady.png +++ b/assets/nauts/lady.png diff --git a/assets/nauts/link.png b/assets/nauts/link.png Binary files differindex 93b51f3..36a9cb3 100644 --- a/assets/nauts/link.png +++ b/assets/nauts/link.png diff --git a/assets/nauts/marine.png b/assets/nauts/marine.png Binary files differindex 9eec49b..069a659 100644 --- a/assets/nauts/marine.png +++ b/assets/nauts/marine.png diff --git a/assets/nauts/megoman.png b/assets/nauts/megoman.png Binary files differindex 3b35f3d..cdff6f1 100644 --- a/assets/nauts/megoman.png +++ b/assets/nauts/megoman.png diff --git a/assets/nauts/missile.png b/assets/nauts/missile.png Binary files differnew file mode 100644 index 0000000..abaaad3 --- /dev/null +++ b/assets/nauts/missile.png diff --git a/assets/nauts/nemo.png b/assets/nauts/nemo.png Binary files differindex 06c3540..24818a4 100644 --- a/assets/nauts/nemo.png +++ b/assets/nauts/nemo.png diff --git a/assets/nauts/phonebooth.png b/assets/nauts/phonebooth.png Binary files differindex c9cace5..019ab8b 100644 --- a/assets/nauts/phonebooth.png +++ b/assets/nauts/phonebooth.png diff --git a/assets/nauts/quack.png b/assets/nauts/quack.png Binary files differindex 654a9b2..268c9a1 100644 --- a/assets/nauts/quack.png +++ b/assets/nauts/quack.png diff --git a/assets/nauts/rock.png b/assets/nauts/rock.png Binary files differindex d6e2156..5e6be78 100644 --- a/assets/nauts/rock.png +++ b/assets/nauts/rock.png diff --git a/assets/nauts/scissors.png b/assets/nauts/scissors.png Binary files differindex 37ed9f7..735b70b 100644 --- a/assets/nauts/scissors.png +++ b/assets/nauts/scissors.png diff --git a/assets/nauts/scooter.png b/assets/nauts/scooter.png Binary files differindex 6f7a25f..685460b 100644 --- a/assets/nauts/scooter.png +++ b/assets/nauts/scooter.png diff --git a/assets/nauts/shutter.png b/assets/nauts/shutter.png Binary files differindex 6a74651..72a0a0e 100644 --- a/assets/nauts/shutter.png +++ b/assets/nauts/shutter.png diff --git a/assets/nauts/slugzor.png b/assets/nauts/slugzor.png Binary files differindex 7055192..63a5b82 100644 --- a/assets/nauts/slugzor.png +++ b/assets/nauts/slugzor.png diff --git a/assets/nauts/swarm.png b/assets/nauts/swarm.png Binary files differnew file mode 100644 index 0000000..cd6668c --- /dev/null +++ b/assets/nauts/swarm.png diff --git a/assets/nauts/veno.png b/assets/nauts/veno.png Binary files differindex f4e380c..1113a0c 100644 --- a/assets/nauts/veno.png +++ b/assets/nauts/veno.png diff --git a/assets/nauts/vrooom.png b/assets/nauts/vrooom.png Binary files differindex 714325b..daa8cf9 100644 --- a/assets/nauts/vrooom.png +++ b/assets/nauts/vrooom.png diff --git a/assets/nauts/weed.png b/assets/nauts/weed.png Binary files differindex 9dc0e37..22a9b52 100644 --- a/assets/nauts/weed.png +++ b/assets/nauts/weed.png diff --git a/assets/nauts/woman.png b/assets/nauts/woman.png Binary files differindex 309263c..8241a68 100644 --- a/assets/nauts/woman.png +++ b/assets/nauts/woman.png diff --git a/assets/nauts/yarr.png b/assets/nauts/yarr.png Binary files differnew file mode 100644 index 0000000..18cf807 --- /dev/null +++ b/assets/nauts/yarr.png diff --git a/assets/portraits.png b/assets/portraits.png Binary files differindex c9bbfed..8bb54e2 100644 --- a/assets/portraits.png +++ b/assets/portraits.png diff --git a/config/animations/hero.lua b/config/animations/hero.lua index 881da49..4872525 100644 --- a/config/animations/hero.lua +++ b/config/animations/hero.lua @@ -3,44 +3,51 @@ -- From the left: default (walk0), walk1, walk2, walk3, attack0, attack1, attack3, attack_up0, attack_up1, attack_up2, attack_down0, attack_down1, attack_down2, damage0, damage1 local animations = { default = { - [1] = love.graphics.newQuad( 1, 1, 24,24, 376,26), - frames = 1, + [1] = love.graphics.newQuad(376, 1, 24,24, 476,26), + [2] = love.graphics.newQuad(376, 1, 24,24, 476,26), + [3] = love.graphics.newQuad(401, 1, 24,24, 476,26), + [4] = love.graphics.newQuad(401, 1, 24,24, 476,26), + [5] = love.graphics.newQuad(426, 1, 24,24, 476,26), + [6] = love.graphics.newQuad(426, 1, 24,24, 476,26), + [7] = love.graphics.newQuad(451, 1, 24,24, 476,26), + [8] = love.graphics.newQuad(451, 1, 24,24, 476,26), + frames = 8, repeated = true }, walk = { - [1] = love.graphics.newQuad( 1, 1, 24,24, 376,26), - [2] = love.graphics.newQuad( 26, 1, 24,24, 376,26), - [3] = love.graphics.newQuad( 51, 1, 24,24, 376,26), - [4] = love.graphics.newQuad( 76, 1, 24,24, 376,26), + [1] = love.graphics.newQuad( 1, 1, 24,24, 476,26), + [2] = love.graphics.newQuad( 26, 1, 24,24, 476,26), + [3] = love.graphics.newQuad( 51, 1, 24,24, 476,26), + [4] = love.graphics.newQuad( 76, 1, 24,24, 476,26), frames = 4, repeated = true }, attack = { - [1] = love.graphics.newQuad(101, 1, 24,24, 376,26), - [2] = love.graphics.newQuad(126, 1, 24,24, 376,26), - [3] = love.graphics.newQuad(151, 1, 24,24, 376,26), + [1] = love.graphics.newQuad(101, 1, 24,24, 476,26), + [2] = love.graphics.newQuad(126, 1, 24,24, 476,26), + [3] = love.graphics.newQuad(151, 1, 24,24, 476,26), frames = 3, repeated = false }, attack_up = { - [1] = love.graphics.newQuad(176, 1, 24,24, 376,26), - [2] = love.graphics.newQuad(201, 1, 24,24, 376,26), - [3] = love.graphics.newQuad(226, 1, 24,24, 376,26), + [1] = love.graphics.newQuad(176, 1, 24,24, 476,26), + [2] = love.graphics.newQuad(201, 1, 24,24, 476,26), + [3] = love.graphics.newQuad(226, 1, 24,24, 476,26), frames = 3, repeated = false }, attack_down = { - [1] = love.graphics.newQuad(251, 1, 24,24, 376,26), - [2] = love.graphics.newQuad(276, 1, 24,24, 376,26), - [3] = love.graphics.newQuad(301, 1, 24,24, 376,26), + [1] = love.graphics.newQuad(251, 1, 24,24, 476,26), + [2] = love.graphics.newQuad(276, 1, 24,24, 476,26), + [3] = love.graphics.newQuad(301, 1, 24,24, 476,26), frames = 3, repeated = false }, damage = { - [1] = love.graphics.newQuad(326, 1, 24,24, 376,26), - [2] = love.graphics.newQuad(351, 1, 24,24, 376,26), - [3] = love.graphics.newQuad(326, 1, 24,24, 376,26), - [4] = love.graphics.newQuad(351, 1, 24,24, 376,26), + [1] = love.graphics.newQuad(326, 1, 24,24, 476,26), + [2] = love.graphics.newQuad(351, 1, 24,24, 476,26), + [3] = love.graphics.newQuad(326, 1, 24,24, 476,26), + [4] = love.graphics.newQuad(351, 1, 24,24, 476,26), frames = 4, repeated = false }, diff --git a/config/nauts.lua b/config/nauts.lua index 2eea71a..aa351b9 100644 --- a/config/nauts.lua +++ b/config/nauts.lua @@ -23,6 +23,7 @@ return { "quack", -- rocco "scissors", -- ksenia "link", -- ix + "cowman", -- deadlift "marine", -- ted "scooter", -- penny "phonebooth", -- sentry @@ -32,7 +33,12 @@ return { "biker", -- chucho "vrooom", -- lux "shutter", -- max + "froggirl", -- dizzy + "dundee", -- smiles + "missile", -- commander rocket + "swarm", -- qi'tara "disco", -- esc rocco + "joystick", -- 8-bit yoolip "yarr", -- ted pirate "blblal", -- blabl zork "kong", -- ronimo diff --git a/iconsList.lua b/iconsList.lua index 4a384dc..a3239b8 100644 --- a/iconsList.lua +++ b/iconsList.lua @@ -24,9 +24,9 @@ function createIconsList (sheetWidth, sheetHeight, iconWidth, keysList, avoidLis end function getNautsIconsList (avoidList) - local avoidList = avoidList or {32,33,34,35,36} + local avoidList = avoidList or {37,38,39,40,41,42} local keysList = require "config.nauts" - local iconsList, newKeysList = createIconsList(1008, 27, 28, keysList, avoidList) + local iconsList, newKeysList = createIconsList(1176, 27, 28, keysList, avoidList) return iconsList, newKeysList end |
