diff options
| author | Aki <nthirtyone@gmail.com> | 2017-09-21 21:04:53 +0200 |
|---|---|---|
| committer | Aki <nthirtyone@gmail.com> | 2017-09-21 21:04:53 +0200 |
| commit | eb8302723cd85adca0fbaf505cfb315f1db0299a (patch) | |
| tree | 0c30cdb61f3d5e50bdda21afd4004d5e206923b8 /config | |
| parent | b1cf14d64a2d3e28683db87190c4b2c7799c259d (diff) | |
| parent | 2ef022a90e7bded7e65df2d9922e6d321f0f3ec6 (diff) | |
| download | roflnauts-eb8302723cd85adca0fbaf505cfb315f1db0299a.zip roflnauts-eb8302723cd85adca0fbaf505cfb315f1db0299a.tar.gz roflnauts-eb8302723cd85adca0fbaf505cfb315f1db0299a.tar.bz2 | |
Merge branch 'renegades'
Diffstat (limited to 'config')
| -rw-r--r-- | config/animations/hero.lua | 45 | ||||
| -rw-r--r-- | config/nauts.lua | 6 |
2 files changed, 32 insertions, 19 deletions
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 |