diff options
Diffstat (limited to 'config')
39 files changed, 43 insertions, 43 deletions
diff --git a/config/menus/select.lua b/config/menus/select.lua index 0d8bef9..fb99780 100644 --- a/config/menus/select.lua +++ b/config/menus/select.lua @@ -14,7 +14,7 @@ if background == nil or not background:is(require "not.MenuBackground") then background = require "not.MenuBackground"(menu) end --- TODO: Icons for nauts and maps are still waiting to get their assets split. +-- TODO: Clean-up menus/select, menus/host and Hero after portraits split. local group, get do local atlas = love.graphics.newImage("assets/portraits.png") @@ -26,16 +26,16 @@ do local naut = love.filesystem.load(path)() local i, name = naut.portrait, naut.name if naut.available then - table.insert(icons, love.graphics.newQuad((i-1)*28, 0, 28, 27, 1176, 27)) + table.insert(icons, love.graphics.newImage(naut.portrait)) table.insert(nauts, naut) end end end -- TODO: Find a better way to add empty and random entries to naut Selector. - table.insert(icons, 1, love.graphics.newQuad((1-1)*28, 0, 28, 27, 1176, 27)) + table.insert(icons, 1, false) table.insert(nauts, 1, {name = "empty"}) - table.insert(icons, 2, love.graphics.newQuad((2-1)*28, 0, 28, 27, 1176, 27)) + table.insert(icons, 2, love.graphics.newImage("assets/portraits/random.png")) table.insert(nauts, 2, {name = "random"}) group = Group(menu) @@ -59,7 +59,7 @@ do for i,_ in pairs(Controller.getSets()) do group:addChild(Selector(nauts, group, menu)) :set("icons_atlas", atlas) - :set("icons_quads", icons) + :set("icons", icons) :set("attack", attack) :set("getText", function (self) return string.upper(self:getSelected().name) diff --git a/config/nauts/biker.lua b/config/nauts/biker.lua index c139e87..2a9fb2b 100644 --- a/config/nauts/biker.lua +++ b/config/nauts/biker.lua @@ -3,6 +3,6 @@ return { name = "biker", image = "assets/nauts/biker.png", - portrait = 30, + portrait = "assets/portraits/biker.png", available = true } diff --git a/config/nauts/bison.lua b/config/nauts/bison.lua index 35c08ca..023d9f8 100644 --- a/config/nauts/bison.lua +++ b/config/nauts/bison.lua @@ -3,6 +3,6 @@ return { name = "bison", image = "assets/nauts/bison.png", - portrait = 13, + portrait = "assets/portraits/bison.png", available = true } diff --git a/config/nauts/blblal.lua b/config/nauts/blblal.lua index 4bc9884..7be25ef 100644 --- a/config/nauts/blblal.lua +++ b/config/nauts/blblal.lua @@ -3,6 +3,6 @@ return { name = "blblal", image = "assets/nauts/blblal.png", - portrait = 40, + portrait = "assets/portraits/blblal.png", available = false } diff --git a/config/nauts/bobito.lua b/config/nauts/bobito.lua index f00fa7f..fde84ae 100644 --- a/config/nauts/bobito.lua +++ b/config/nauts/bobito.lua @@ -3,6 +3,6 @@ return { name = "bobito", image = "assets/nauts/bobito.png", - portrait = 14, + portrait = "assets/portraits/bobito.png", available = true } diff --git a/config/nauts/brainos.lua b/config/nauts/brainos.lua index 908f57a..64a94b2 100644 --- a/config/nauts/brainos.lua +++ b/config/nauts/brainos.lua @@ -3,6 +3,6 @@ return { name = "brainos", image = "assets/nauts/brainos.png", - portrait = 11, + portrait = "assets/portraits/brainos.png", available = true } diff --git a/config/nauts/bug.lua b/config/nauts/bug.lua index 3989ade..676d2fa 100644 --- a/config/nauts/bug.lua +++ b/config/nauts/bug.lua @@ -3,6 +3,6 @@ return { name = "bug", image = "assets/nauts/bug.png", - portrait = 18, + portrait = "assets/portraits/bug.png", available = true } diff --git a/config/nauts/calamari.lua b/config/nauts/calamari.lua index 3168023..ef41720 100644 --- a/config/nauts/calamari.lua +++ b/config/nauts/calamari.lua @@ -3,6 +3,6 @@ return { name = "calamari", image = "assets/nauts/calamari.png", - portrait = 19, + portrait = "assets/portraits/calamari.png", available = true } diff --git a/config/nauts/capone.lua b/config/nauts/capone.lua index edd5f35..459760f 100644 --- a/config/nauts/capone.lua +++ b/config/nauts/capone.lua @@ -3,6 +3,6 @@ return { name = "capone", image = "assets/nauts/capone.png", - portrait = 16, + portrait = "assets/portraits/capone.png", available = true } diff --git a/config/nauts/cowboy.lua b/config/nauts/cowboy.lua index d7ac120..e3e9c19 100644 --- a/config/nauts/cowboy.lua +++ b/config/nauts/cowboy.lua @@ -3,6 +3,6 @@ return { name = "cowboy", image = "assets/nauts/cowboy.png", - portrait = 4, + portrait = "assets/portraits/cowboy.png", available = true } diff --git a/config/nauts/cowman.lua b/config/nauts/cowman.lua index 5bbde57..6e2c4aa 100644 --- a/config/nauts/cowman.lua +++ b/config/nauts/cowman.lua @@ -3,6 +3,6 @@ return { name = "cowman", image = "assets/nauts/cowman.png", - portrait = 23, + portrait = "assets/portraits/cowman.png", available = true } diff --git a/config/nauts/disco.lua b/config/nauts/disco.lua index e579257..fb21110 100644 --- a/config/nauts/disco.lua +++ b/config/nauts/disco.lua @@ -3,6 +3,6 @@ return { name = "disco", image = "assets/nauts/disco.png", - portrait = 37, + portrait = "assets/portraits/disco.png", available = false } diff --git a/config/nauts/dundee.lua b/config/nauts/dundee.lua index 3299db8..e9f7c5d 100644 --- a/config/nauts/dundee.lua +++ b/config/nauts/dundee.lua @@ -3,6 +3,6 @@ return { name = "dundee", image = "assets/nauts/dundee.png", - portrait = 34, + portrait = "assets/portraits/dundee.png", available = true } diff --git a/config/nauts/froggirl.lua b/config/nauts/froggirl.lua index b587043..9734f1d 100644 --- a/config/nauts/froggirl.lua +++ b/config/nauts/froggirl.lua @@ -3,6 +3,6 @@ return { name = "froggirl", image = "assets/nauts/froggirl.png", - portrait = 33, + portrait = "assets/portraits/froggirl.png", available = true } diff --git a/config/nauts/froggo.lua b/config/nauts/froggo.lua index e1c7d85..03fc9a2 100644 --- a/config/nauts/froggo.lua +++ b/config/nauts/froggo.lua @@ -3,6 +3,6 @@ return { name = "froggo", image = "assets/nauts/froggo.png", - portrait = 3, + portrait = "assets/portraits/froggo.png", available = true } diff --git a/config/nauts/gelato.lua b/config/nauts/gelato.lua index f3f4ed5..4313fef 100644 --- a/config/nauts/gelato.lua +++ b/config/nauts/gelato.lua @@ -3,6 +3,6 @@ return { name = "gelato", image = "assets/nauts/gelato.png", - portrait = 6, + portrait = "assets/portraits/gelato.png", available = true } diff --git a/config/nauts/girl.lua b/config/nauts/girl.lua index b1d9d8a..32c7f11 100644 --- a/config/nauts/girl.lua +++ b/config/nauts/girl.lua @@ -3,6 +3,6 @@ return { name = "girl", image = "assets/nauts/girl.png", - portrait = 9, + portrait = "assets/portraits/girl.png", available = true } diff --git a/config/nauts/gramps.lua b/config/nauts/gramps.lua index 51aa672..7bf7b29 100644 --- a/config/nauts/gramps.lua +++ b/config/nauts/gramps.lua @@ -3,6 +3,6 @@ return { name = "gramps", image = "assets/nauts/gramps.png", - portrait = 29, + portrait = "assets/portraits/gramps.png", available = true } diff --git a/config/nauts/gummybear.lua b/config/nauts/gummybear.lua index a39287f..83294ed 100644 --- a/config/nauts/gummybear.lua +++ b/config/nauts/gummybear.lua @@ -3,6 +3,6 @@ return { name = "gummybear", image = "assets/nauts/gummybear.png", - portrait = 28, + portrait = "assets/portraits/gummybear.png", available = true } diff --git a/config/nauts/honic.lua b/config/nauts/honic.lua index 2ff6584..463409f 100644 --- a/config/nauts/honic.lua +++ b/config/nauts/honic.lua @@ -3,6 +3,6 @@ return { name = "honic", image = "assets/nauts/honic.png", - portrait = 5, + portrait = "assets/portraits/honic.png", available = true } diff --git a/config/nauts/kong.lua b/config/nauts/kong.lua index 731f7f1..28bcc70 100644 --- a/config/nauts/kong.lua +++ b/config/nauts/kong.lua @@ -3,6 +3,6 @@ return { name = "kong", image = "assets/nauts/kong.png", - portrait = 41, + portrait = "assets/portraits/kong.png", available = false } diff --git a/config/nauts/lady.lua b/config/nauts/lady.lua index 77ef7a3..1faf330 100644 --- a/config/nauts/lady.lua +++ b/config/nauts/lady.lua @@ -3,6 +3,6 @@ return { name = "lady", image = "assets/nauts/lady.png", - portrait = 8, + portrait = "assets/portraits/lady.png", available = true } diff --git a/config/nauts/link.lua b/config/nauts/link.lua index 1f6b430..105d543 100644 --- a/config/nauts/link.lua +++ b/config/nauts/link.lua @@ -3,6 +3,6 @@ return { name = "link", image = "assets/nauts/link.png", - portrait = 22, + portrait = "assets/portraits/link.png", available = true } diff --git a/config/nauts/marine.lua b/config/nauts/marine.lua index a0c0647..88ecbcc 100644 --- a/config/nauts/marine.lua +++ b/config/nauts/marine.lua @@ -3,6 +3,6 @@ return { name = "marine", image = "assets/nauts/marine.png", - portrait = 24, + portrait = "assets/portraits/marine.png", available = true } diff --git a/config/nauts/megoman.lua b/config/nauts/megoman.lua index 119e0fc..28e6744 100644 --- a/config/nauts/megoman.lua +++ b/config/nauts/megoman.lua @@ -3,6 +3,6 @@ return { name = "megoman", image = "assets/nauts/megoman.png", - portrait = 10, + portrait = "assets/portraits/megoman.png", available = true } diff --git a/config/nauts/missile.lua b/config/nauts/missile.lua index 5fb4d49..7c65822 100644 --- a/config/nauts/missile.lua +++ b/config/nauts/missile.lua @@ -3,6 +3,6 @@ return { name = "missile", image = "assets/nauts/missile.png", - portrait = 35, + portrait = "assets/portraits/missile.png", available = true } diff --git a/config/nauts/nemo.lua b/config/nauts/nemo.lua index fabcae6..e1d5048 100644 --- a/config/nauts/nemo.lua +++ b/config/nauts/nemo.lua @@ -3,6 +3,6 @@ return { name = "nemo", image = "assets/nauts/nemo.png", - portrait = 17, + portrait = "assets/portraits/nemo.png", available = true } diff --git a/config/nauts/phonebooth.lua b/config/nauts/phonebooth.lua index 3c1ad10..d0577ff 100644 --- a/config/nauts/phonebooth.lua +++ b/config/nauts/phonebooth.lua @@ -3,6 +3,6 @@ return { name = "phonebooth", image = "assets/nauts/phonebooth.png", - portrait = 26, + portrait = "assets/portraits/phonebooth.png", available = true } diff --git a/config/nauts/quack.lua b/config/nauts/quack.lua index e4a0d7a..6fb11ab 100644 --- a/config/nauts/quack.lua +++ b/config/nauts/quack.lua @@ -3,6 +3,6 @@ return { name = "quack", image = "assets/nauts/quack.png", - portrait = 20, + portrait = "assets/portraits/quack.png", available = true } diff --git a/config/nauts/rock.lua b/config/nauts/rock.lua index 758e62a..9a7efe4 100644 --- a/config/nauts/rock.lua +++ b/config/nauts/rock.lua @@ -3,6 +3,6 @@ return { name = "rock", image = "assets/nauts/rock.png", - portrait = 42, + portrait = "assets/portraits/rock.png", available = false } diff --git a/config/nauts/scissors.lua b/config/nauts/scissors.lua index 7526e47..0fd4e28 100644 --- a/config/nauts/scissors.lua +++ b/config/nauts/scissors.lua @@ -3,6 +3,6 @@ return { name = "scissors", image = "assets/nauts/scissors.png", - portrait = 21, + portrait = "assets/portraits/scissors.png", available = true } diff --git a/config/nauts/scooter.lua b/config/nauts/scooter.lua index 7b1a2aa..321563c 100644 --- a/config/nauts/scooter.lua +++ b/config/nauts/scooter.lua @@ -3,6 +3,6 @@ return { name = "scooter", image = "assets/nauts/scooter.png", - portrait = 25, + portrait = "assets/portraits/scooter.png", available = true } diff --git a/config/nauts/shutter.lua b/config/nauts/shutter.lua index d0e7787..40ab49b 100644 --- a/config/nauts/shutter.lua +++ b/config/nauts/shutter.lua @@ -3,6 +3,6 @@ return { name = "shutter", image = "assets/nauts/shutter.png", - portrait = 32, + portrait = "assets/portraits/shutter.png", available = true } diff --git a/config/nauts/slugzor.lua b/config/nauts/slugzor.lua index f51c5d3..7dead62 100644 --- a/config/nauts/slugzor.lua +++ b/config/nauts/slugzor.lua @@ -3,6 +3,6 @@ return { name = "slugzor", image = "assets/nauts/slugzor.png", - portrait = 15, + portrait = "assets/portraits/slugzor.png", available = true } diff --git a/config/nauts/veno.lua b/config/nauts/veno.lua index 8973173..6663a37 100644 --- a/config/nauts/veno.lua +++ b/config/nauts/veno.lua @@ -3,6 +3,6 @@ return { name = "veno", image = "assets/nauts/veno.png", - portrait = 7, + portrait = "assets/portraits/veno.png", available = true } diff --git a/config/nauts/vrooom.lua b/config/nauts/vrooom.lua index fa02a68..5d6e17f 100644 --- a/config/nauts/vrooom.lua +++ b/config/nauts/vrooom.lua @@ -3,6 +3,6 @@ return { name = "vrooom", image = "assets/nauts/vrooom.png", - portrait = 31, + portrait = "assets/portraits/vrooom.png", available = true } diff --git a/config/nauts/weed.lua b/config/nauts/weed.lua index 4c2216e..767a118 100644 --- a/config/nauts/weed.lua +++ b/config/nauts/weed.lua @@ -3,6 +3,6 @@ return { name = "weed", image = "assets/nauts/weed.png", - portrait = 27, + portrait = "assets/portraits/weed.png", available = true } diff --git a/config/nauts/woman.lua b/config/nauts/woman.lua index 88ac22e..9c12d8a 100644 --- a/config/nauts/woman.lua +++ b/config/nauts/woman.lua @@ -3,6 +3,6 @@ return { name = "woman", image = "assets/nauts/woman.png", - portrait = 12, + portrait = "assets/portraits/woman.png", available = true } diff --git a/config/nauts/yarr.lua b/config/nauts/yarr.lua index cd8e724..b471d4b 100644 --- a/config/nauts/yarr.lua +++ b/config/nauts/yarr.lua @@ -3,6 +3,6 @@ return { name = "yarr", image = "assets/nauts/yarr.png", - portrait = 39, + portrait = "assets/portraits/yarr.png", available = false } |