Merge branch 'renegades'

46 files changed, 34 insertions, 21 deletions

diff --git a/assets/nauts/biker.png b/assets/nauts/biker.png
index 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
index 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
new 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
index 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
deleted 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
index 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
index 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
index 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
index 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
index 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
new 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
new 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
new 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
new 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
index 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
index 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
index 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
deleted 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
index 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
index 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
index 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
new 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
new 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
index 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
index 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
index 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
index 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
new 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
index 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
index 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
index 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
index 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
index 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
index 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
index 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
index 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
new 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
index 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
index 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
index 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
index 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
new file mode 100644
index 0000000..18cf807
--- /dev/null
+++ b/assets/nauts/yarr.png
diff --git a/assets/portraits.png b/assets/portraits.png
index 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