diff options
| author | MilkingChicken <THECHEESEMEISTERS@GMAIL.COM> | 2017-08-23 23:44:49 +1000 |
|---|---|---|
| committer | Aki <nthirtyone@gmail.com> | 2017-08-23 15:44:49 +0200 |
| commit | 7b01c5ccca0b5e1b86b357f2430286d3ac956a36 (patch) | |
| tree | dc9813953302e5fadab0f837f7c130d4191a0881 | |
| parent | d0072815ce95cd8f6a41d6e20df5aabc993081fc (diff) | |
| download | roflnauts-7b01c5ccca0b5e1b86b357f2430286d3ac956a36.zip roflnauts-7b01c5ccca0b5e1b86b357f2430286d3ac956a36.tar.gz roflnauts-7b01c5ccca0b5e1b86b357f2430286d3ac956a36.tar.bz2 | |
Renegades (#30)
Added Deadlift and nauts from Rocket Renegades.
| -rw-r--r-- | assets/nauts/cowman.png | bin | 0 -> 2468 bytes | |||
| -rw-r--r-- | assets/nauts/deadlift.png | bin | 1891 -> 0 bytes | |||
| -rw-r--r-- | assets/nauts/dizzy.png | bin | 1793 -> 0 bytes | |||
| -rw-r--r-- | assets/nauts/dundee.png | bin | 2112 -> 2620 bytes | |||
| -rw-r--r-- | assets/nauts/froggirl.png | bin | 0 -> 1955 bytes | |||
| -rw-r--r-- | assets/nauts/joystick.png | bin | 0 -> 2191 bytes | |||
| -rw-r--r-- | assets/portraits.png | bin | 26695 -> 31939 bytes | |||
| -rw-r--r-- | config/nauts.lua | 11 | ||||
| -rw-r--r-- | iconsList.lua | 4 |
9 files changed, 8 insertions, 7 deletions
diff --git a/assets/nauts/cowman.png b/assets/nauts/cowman.png Binary files differnew file mode 100644 index 0000000..3086827 --- /dev/null +++ b/assets/nauts/cowman.png diff --git a/assets/nauts/deadlift.png b/assets/nauts/deadlift.png Binary files differdeleted file mode 100644 index a97d64a..0000000 --- a/assets/nauts/deadlift.png +++ /dev/null diff --git a/assets/nauts/dizzy.png b/assets/nauts/dizzy.png Binary files differdeleted file mode 100644 index 391f275..0000000 --- a/assets/nauts/dizzy.png +++ /dev/null diff --git a/assets/nauts/dundee.png b/assets/nauts/dundee.png Binary files differindex a02c60c..558b8ff 100644 --- a/assets/nauts/dundee.png +++ 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..ace0e92 --- /dev/null +++ b/assets/nauts/froggirl.png diff --git a/assets/nauts/joystick.png b/assets/nauts/joystick.png Binary files differnew file mode 100644 index 0000000..6be61da --- /dev/null +++ b/assets/nauts/joystick.png diff --git a/assets/portraits.png b/assets/portraits.png Binary files differindex 8e86875..84c6ea4 100644 --- a/assets/portraits.png +++ b/assets/portraits.png 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 |
