From d2bbfd9a3639130f3cc35dc0cb3bf95046b5189d Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 17 Aug 2017 04:37:27 +0200 Subject: Added stuf from Silv, Chicken and Wisp. Renegades and Deadlift added --- assets/nauts/deadlift.png | Bin 0 -> 1891 bytes assets/nauts/dizzy.png | Bin 0 -> 1793 bytes assets/nauts/dundee.png | Bin 0 -> 2112 bytes assets/nauts/missile.png | Bin 0 -> 2133 bytes assets/nauts/swarm.png | Bin 0 -> 739 bytes assets/portraits.png | Bin 23640 -> 26695 bytes config/nauts.lua | 5 +++++ 7 files changed, 5 insertions(+) create mode 100644 assets/nauts/deadlift.png create mode 100644 assets/nauts/dizzy.png create mode 100644 assets/nauts/dundee.png create mode 100644 assets/nauts/missile.png create mode 100644 assets/nauts/swarm.png diff --git a/assets/nauts/deadlift.png b/assets/nauts/deadlift.png new file mode 100644 index 0000000..a97d64a Binary files /dev/null and b/assets/nauts/deadlift.png differ diff --git a/assets/nauts/dizzy.png b/assets/nauts/dizzy.png new file mode 100644 index 0000000..391f275 Binary files /dev/null and b/assets/nauts/dizzy.png differ diff --git a/assets/nauts/dundee.png b/assets/nauts/dundee.png new file mode 100644 index 0000000..a02c60c Binary files /dev/null and b/assets/nauts/dundee.png differ diff --git a/assets/nauts/missile.png b/assets/nauts/missile.png new file mode 100644 index 0000000..2b9700d Binary files /dev/null and b/assets/nauts/missile.png differ diff --git a/assets/nauts/swarm.png b/assets/nauts/swarm.png new file mode 100644 index 0000000..83838a1 Binary files /dev/null and b/assets/nauts/swarm.png differ diff --git a/assets/portraits.png b/assets/portraits.png index c9bbfed..8e86875 100644 Binary files a/assets/portraits.png and b/assets/portraits.png differ diff --git a/config/nauts.lua b/config/nauts.lua index 2eea71a..8a10343 100644 --- a/config/nauts.lua +++ b/config/nauts.lua @@ -37,4 +37,9 @@ return { "blblal", -- blabl zork "kong", -- ronimo "rock", -- rock + "deadlift", -- deadlift + "dizzy", -- dizzy + "dundee", -- smiles + "missile", -- cmdr rocket + "swarm", -- qi'tara } -- cgit v1.1 From d0072815ce95cd8f6a41d6e20df5aabc993081fc Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 17 Aug 2017 04:40:49 +0200 Subject: Changed width of portrait sheet in hardcoded script --- iconsList.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iconsList.lua b/iconsList.lua index 4a384dc..636b4cb 100644 --- a/iconsList.lua +++ b/iconsList.lua @@ -26,7 +26,7 @@ end function getNautsIconsList (avoidList) local avoidList = avoidList or {32,33,34,35,36} local keysList = require "config.nauts" - local iconsList, newKeysList = createIconsList(1008, 27, 28, keysList, avoidList) + local iconsList, newKeysList = createIconsList(1148, 27, 28, keysList, avoidList) return iconsList, newKeysList end -- cgit v1.1 From 7b01c5ccca0b5e1b86b357f2430286d3ac956a36 Mon Sep 17 00:00:00 2001 From: MilkingChicken Date: Wed, 23 Aug 2017 23:44:49 +1000 Subject: Renegades (#30) Added Deadlift and nauts from Rocket Renegades. --- assets/nauts/cowman.png | Bin 0 -> 2468 bytes assets/nauts/deadlift.png | Bin 1891 -> 0 bytes assets/nauts/dizzy.png | Bin 1793 -> 0 bytes assets/nauts/dundee.png | Bin 2112 -> 2620 bytes assets/nauts/froggirl.png | Bin 0 -> 1955 bytes assets/nauts/joystick.png | Bin 0 -> 2191 bytes assets/portraits.png | Bin 26695 -> 31939 bytes config/nauts.lua | 11 ++++++----- iconsList.lua | 4 ++-- 9 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 assets/nauts/cowman.png delete mode 100644 assets/nauts/deadlift.png delete mode 100644 assets/nauts/dizzy.png create mode 100644 assets/nauts/froggirl.png create mode 100644 assets/nauts/joystick.png diff --git a/assets/nauts/cowman.png b/assets/nauts/cowman.png new file mode 100644 index 0000000..3086827 Binary files /dev/null and b/assets/nauts/cowman.png differ diff --git a/assets/nauts/deadlift.png b/assets/nauts/deadlift.png deleted file mode 100644 index a97d64a..0000000 Binary files a/assets/nauts/deadlift.png and /dev/null differ diff --git a/assets/nauts/dizzy.png b/assets/nauts/dizzy.png deleted file mode 100644 index 391f275..0000000 Binary files a/assets/nauts/dizzy.png and /dev/null differ diff --git a/assets/nauts/dundee.png b/assets/nauts/dundee.png index a02c60c..558b8ff 100644 Binary files a/assets/nauts/dundee.png and b/assets/nauts/dundee.png differ diff --git a/assets/nauts/froggirl.png b/assets/nauts/froggirl.png new file mode 100644 index 0000000..ace0e92 Binary files /dev/null and b/assets/nauts/froggirl.png differ diff --git a/assets/nauts/joystick.png b/assets/nauts/joystick.png new file mode 100644 index 0000000..6be61da Binary files /dev/null and b/assets/nauts/joystick.png differ diff --git a/assets/portraits.png b/assets/portraits.png index 8e86875..84c6ea4 100644 Binary files a/assets/portraits.png and b/assets/portraits.png differ diff --git a/config/nauts.lua b/config/nauts.lua index 8a10343..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,14 +33,14 @@ 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 "rock", -- rock - "deadlift", -- deadlift - "dizzy", -- dizzy - "dundee", -- smiles - "missile", -- cmdr rocket - "swarm", -- qi'tara } diff --git a/iconsList.lua b/iconsList.lua index 636b4cb..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(1148, 27, 28, keysList, avoidList) + local iconsList, newKeysList = createIconsList(1176, 27, 28, keysList, avoidList) return iconsList, newKeysList end -- cgit v1.1 From 2b18c5a3ae169828601a8207a90394a44f0b6a3e Mon Sep 17 00:00:00 2001 From: MilkingChicken Date: Wed, 30 Aug 2017 02:07:16 +1000 Subject: New Portraits --- assets/portraits.png | Bin 23640 -> 29915 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/portraits.png b/assets/portraits.png index c9bbfed..8bb54e2 100644 Binary files a/assets/portraits.png and b/assets/portraits.png differ -- cgit v1.1 From 2ef022a90e7bded7e65df2d9922e6d321f0f3ec6 Mon Sep 17 00:00:00 2001 From: MilkingChicken Date: Wed, 30 Aug 2017 03:50:00 +1000 Subject: Idle animations (#32) * New polished sprites with idle frames. * Renamed boss > blblal (or whatever), gorilla > kong --- assets/nauts/biker.png | Bin 2209 -> 2581 bytes assets/nauts/bison.png | Bin 1962 -> 2217 bytes assets/nauts/blblal.png | Bin 0 -> 2303 bytes assets/nauts/bobito.png | Bin 2015 -> 2252 bytes assets/nauts/boss.png | Bin 2126 -> 0 bytes assets/nauts/brainos.png | Bin 1625 -> 2029 bytes assets/nauts/bug.png | Bin 2023 -> 2353 bytes assets/nauts/calamari.png | Bin 10967 -> 11378 bytes assets/nauts/capone.png | Bin 1988 -> 2273 bytes assets/nauts/cowboy.png | Bin 1805 -> 2233 bytes assets/nauts/cowman.png | Bin 2468 -> 2763 bytes assets/nauts/disco.png | Bin 0 -> 2429 bytes assets/nauts/dundee.png | Bin 2620 -> 2951 bytes assets/nauts/froggirl.png | Bin 1955 -> 2238 bytes assets/nauts/froggo.png | Bin 1850 -> 2201 bytes assets/nauts/gelato.png | Bin 2539 -> 2725 bytes assets/nauts/girl.png | Bin 2350 -> 2772 bytes assets/nauts/gorilla.png | Bin 1892 -> 0 bytes assets/nauts/gramps.png | Bin 2199 -> 2614 bytes assets/nauts/gummybear.png | Bin 2010 -> 2395 bytes assets/nauts/honic.png | Bin 1733 -> 2105 bytes assets/nauts/joystick.png | Bin 2191 -> 2568 bytes assets/nauts/kong.png | Bin 0 -> 2153 bytes assets/nauts/lady.png | Bin 1912 -> 2173 bytes assets/nauts/link.png | Bin 2152 -> 2470 bytes assets/nauts/marine.png | Bin 2109 -> 2672 bytes assets/nauts/megoman.png | Bin 2079 -> 2416 bytes assets/nauts/missile.png | Bin 2133 -> 2842 bytes assets/nauts/nemo.png | Bin 2519 -> 2877 bytes assets/nauts/phonebooth.png | Bin 2608 -> 2892 bytes assets/nauts/quack.png | Bin 1859 -> 2094 bytes assets/nauts/rock.png | Bin 2762 -> 3107 bytes assets/nauts/scissors.png | Bin 2086 -> 2431 bytes assets/nauts/scooter.png | Bin 2187 -> 2590 bytes assets/nauts/shutter.png | Bin 2288 -> 2532 bytes assets/nauts/slugzor.png | Bin 1781 -> 2106 bytes assets/nauts/swarm.png | Bin 739 -> 774 bytes assets/nauts/veno.png | Bin 2291 -> 2672 bytes assets/nauts/vrooom.png | Bin 3088 -> 3448 bytes assets/nauts/weed.png | Bin 2088 -> 2376 bytes assets/nauts/woman.png | Bin 1717 -> 2187 bytes assets/nauts/yarr.png | Bin 0 -> 2521 bytes config/animations/hero.lua | 45 +++++++++++++++++++++++++------------------- 43 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 assets/nauts/blblal.png delete mode 100644 assets/nauts/boss.png create mode 100644 assets/nauts/disco.png delete mode 100644 assets/nauts/gorilla.png create mode 100644 assets/nauts/kong.png create mode 100644 assets/nauts/yarr.png diff --git a/assets/nauts/biker.png b/assets/nauts/biker.png index 4737a99..0094cbb 100644 Binary files a/assets/nauts/biker.png and b/assets/nauts/biker.png differ diff --git a/assets/nauts/bison.png b/assets/nauts/bison.png index cb5f98a..330af46 100644 Binary files a/assets/nauts/bison.png and b/assets/nauts/bison.png differ diff --git a/assets/nauts/blblal.png b/assets/nauts/blblal.png new file mode 100644 index 0000000..fc891e2 Binary files /dev/null and b/assets/nauts/blblal.png differ diff --git a/assets/nauts/bobito.png b/assets/nauts/bobito.png index 90e6283..f5a97d1 100644 Binary files a/assets/nauts/bobito.png and b/assets/nauts/bobito.png differ diff --git a/assets/nauts/boss.png b/assets/nauts/boss.png deleted file mode 100644 index bed5b91..0000000 Binary files a/assets/nauts/boss.png and /dev/null differ diff --git a/assets/nauts/brainos.png b/assets/nauts/brainos.png index c03f66c..7a3ea17 100644 Binary files a/assets/nauts/brainos.png and b/assets/nauts/brainos.png differ diff --git a/assets/nauts/bug.png b/assets/nauts/bug.png index 04961f7..21ba685 100644 Binary files a/assets/nauts/bug.png and b/assets/nauts/bug.png differ diff --git a/assets/nauts/calamari.png b/assets/nauts/calamari.png index 31748bc..4422a1c 100644 Binary files a/assets/nauts/calamari.png and b/assets/nauts/calamari.png differ diff --git a/assets/nauts/capone.png b/assets/nauts/capone.png index 50dbdac..9d14ec0 100644 Binary files a/assets/nauts/capone.png and b/assets/nauts/capone.png differ diff --git a/assets/nauts/cowboy.png b/assets/nauts/cowboy.png index 43b07fe..4e61992 100644 Binary files a/assets/nauts/cowboy.png and b/assets/nauts/cowboy.png differ diff --git a/assets/nauts/cowman.png b/assets/nauts/cowman.png index 3086827..f81b114 100644 Binary files a/assets/nauts/cowman.png and b/assets/nauts/cowman.png differ diff --git a/assets/nauts/disco.png b/assets/nauts/disco.png new file mode 100644 index 0000000..28ac0c2 Binary files /dev/null and b/assets/nauts/disco.png differ diff --git a/assets/nauts/dundee.png b/assets/nauts/dundee.png index 558b8ff..e46193c 100644 Binary files a/assets/nauts/dundee.png and b/assets/nauts/dundee.png differ diff --git a/assets/nauts/froggirl.png b/assets/nauts/froggirl.png index ace0e92..9495f3e 100644 Binary files a/assets/nauts/froggirl.png and b/assets/nauts/froggirl.png differ diff --git a/assets/nauts/froggo.png b/assets/nauts/froggo.png index 19b9611..24deacf 100644 Binary files a/assets/nauts/froggo.png and b/assets/nauts/froggo.png differ diff --git a/assets/nauts/gelato.png b/assets/nauts/gelato.png index f934773..18eb278 100644 Binary files a/assets/nauts/gelato.png and b/assets/nauts/gelato.png differ diff --git a/assets/nauts/girl.png b/assets/nauts/girl.png index 9f9df17..7f6310d 100644 Binary files a/assets/nauts/girl.png and b/assets/nauts/girl.png differ diff --git a/assets/nauts/gorilla.png b/assets/nauts/gorilla.png deleted file mode 100644 index c4f1b20..0000000 Binary files a/assets/nauts/gorilla.png and /dev/null differ diff --git a/assets/nauts/gramps.png b/assets/nauts/gramps.png index 975c1be..254eb91 100644 Binary files a/assets/nauts/gramps.png and b/assets/nauts/gramps.png differ diff --git a/assets/nauts/gummybear.png b/assets/nauts/gummybear.png index 4fedc96..9e95bf4 100644 Binary files a/assets/nauts/gummybear.png and b/assets/nauts/gummybear.png differ diff --git a/assets/nauts/honic.png b/assets/nauts/honic.png index d228771..8dee1dc 100644 Binary files a/assets/nauts/honic.png and b/assets/nauts/honic.png differ diff --git a/assets/nauts/joystick.png b/assets/nauts/joystick.png index 6be61da..40d872e 100644 Binary files a/assets/nauts/joystick.png and b/assets/nauts/joystick.png differ diff --git a/assets/nauts/kong.png b/assets/nauts/kong.png new file mode 100644 index 0000000..bb41ff8 Binary files /dev/null and b/assets/nauts/kong.png differ diff --git a/assets/nauts/lady.png b/assets/nauts/lady.png index 654f2ed..5334dee 100644 Binary files a/assets/nauts/lady.png and b/assets/nauts/lady.png differ diff --git a/assets/nauts/link.png b/assets/nauts/link.png index 93b51f3..36a9cb3 100644 Binary files a/assets/nauts/link.png and b/assets/nauts/link.png differ diff --git a/assets/nauts/marine.png b/assets/nauts/marine.png index 9eec49b..069a659 100644 Binary files a/assets/nauts/marine.png and b/assets/nauts/marine.png differ diff --git a/assets/nauts/megoman.png b/assets/nauts/megoman.png index 3b35f3d..cdff6f1 100644 Binary files a/assets/nauts/megoman.png and b/assets/nauts/megoman.png differ diff --git a/assets/nauts/missile.png b/assets/nauts/missile.png index 2b9700d..abaaad3 100644 Binary files a/assets/nauts/missile.png and b/assets/nauts/missile.png differ diff --git a/assets/nauts/nemo.png b/assets/nauts/nemo.png index 06c3540..24818a4 100644 Binary files a/assets/nauts/nemo.png and b/assets/nauts/nemo.png differ diff --git a/assets/nauts/phonebooth.png b/assets/nauts/phonebooth.png index c9cace5..019ab8b 100644 Binary files a/assets/nauts/phonebooth.png and b/assets/nauts/phonebooth.png differ diff --git a/assets/nauts/quack.png b/assets/nauts/quack.png index 654a9b2..268c9a1 100644 Binary files a/assets/nauts/quack.png and b/assets/nauts/quack.png differ diff --git a/assets/nauts/rock.png b/assets/nauts/rock.png index d6e2156..5e6be78 100644 Binary files a/assets/nauts/rock.png and b/assets/nauts/rock.png differ diff --git a/assets/nauts/scissors.png b/assets/nauts/scissors.png index 37ed9f7..735b70b 100644 Binary files a/assets/nauts/scissors.png and b/assets/nauts/scissors.png differ diff --git a/assets/nauts/scooter.png b/assets/nauts/scooter.png index 6f7a25f..685460b 100644 Binary files a/assets/nauts/scooter.png and b/assets/nauts/scooter.png differ diff --git a/assets/nauts/shutter.png b/assets/nauts/shutter.png index 6a74651..72a0a0e 100644 Binary files a/assets/nauts/shutter.png and b/assets/nauts/shutter.png differ diff --git a/assets/nauts/slugzor.png b/assets/nauts/slugzor.png index 7055192..63a5b82 100644 Binary files a/assets/nauts/slugzor.png and b/assets/nauts/slugzor.png differ diff --git a/assets/nauts/swarm.png b/assets/nauts/swarm.png index 83838a1..cd6668c 100644 Binary files a/assets/nauts/swarm.png and b/assets/nauts/swarm.png differ diff --git a/assets/nauts/veno.png b/assets/nauts/veno.png index f4e380c..1113a0c 100644 Binary files a/assets/nauts/veno.png and b/assets/nauts/veno.png differ diff --git a/assets/nauts/vrooom.png b/assets/nauts/vrooom.png index 714325b..daa8cf9 100644 Binary files a/assets/nauts/vrooom.png and b/assets/nauts/vrooom.png differ diff --git a/assets/nauts/weed.png b/assets/nauts/weed.png index 9dc0e37..22a9b52 100644 Binary files a/assets/nauts/weed.png and b/assets/nauts/weed.png differ diff --git a/assets/nauts/woman.png b/assets/nauts/woman.png index 309263c..8241a68 100644 Binary files a/assets/nauts/woman.png and b/assets/nauts/woman.png differ diff --git a/assets/nauts/yarr.png b/assets/nauts/yarr.png new file mode 100644 index 0000000..18cf807 Binary files /dev/null and b/assets/nauts/yarr.png differ 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 }, -- cgit v1.1