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