diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2016-12-03 19:43:19 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2016-12-03 19:43:19 -0300 |
commit | 245029aab7bee00eba5fab3bcbc6c7ea77bc2f06 (patch) | |
tree | db931905c44d7c29a3fecd0c2ad2002f23c9f169 | |
parent | 61207011c466bc9cd7d4f275d6befabee1b75ae7 (diff) |
Keep the code more KISS - part 4
19 files changed, 29 insertions, 29 deletions
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/default.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/default.lua deleted file mode 100644 index 08d7a10..0000000 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/default.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - orientation = 0, - acceleration = 0, - velocity = 125, - gravity = -500, - position = require 'scripts.bola.position', - scale = require 'scripts.bola.scale', - origin = require 'scripts.bola.origin', - stand = require 'scripts.bola.stand', - walk = require 'scripts.bola.walk', - run = require 'scripts.bola.run', - jump = require 'scripts.bola.jump', - actionLeft = false, - actionRight = false, - actionUp = false, - actionDown = false, - actionA = false, - actionB = false, -} diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button.lua deleted file mode 100644 index b14e80b..0000000 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button.lua +++ /dev/null @@ -1,3 +0,0 @@ -load.button = function() - button = require 'scripts.player.1.button' -end diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button/default.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button/default.lua new file mode 100644 index 0000000..dafde7a --- /dev/null +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button/default.lua @@ -0,0 +1,3 @@ +load.button = function() + button = require 'scripts.load.button.player1' +end diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/player/1/button.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button/player1.lua index 2875f74..2875f74 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/player/1/button.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/button/player1.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character.lua deleted file mode 100644 index bf1cc65..0000000 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character.lua +++ /dev/null @@ -1,5 +0,0 @@ -character = {} - -load.character = function() - character.bola = require 'scripts.bola.default' -end diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/default.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/default.lua new file mode 100644 index 0000000..ce9f92d --- /dev/null +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/default.lua @@ -0,0 +1,19 @@ +return { + orientation = 0, + acceleration = 0, + velocity = 125, + gravity = -500, + position = require 'scripts.load.character.bola.position', + scale = require 'scripts.load.character.bola.scale', + origin = require 'scripts.load.character.bola.origin', + stand = require 'scripts.load.character.bola.stand', + walk = require 'scripts.load.character.bola.walk', + run = require 'scripts.load.character.bola.run', + jump = require 'scripts.load.character.bola.jump', + actionLeft = false, + actionRight = false, + actionUp = false, + actionDown = false, + actionA = false, + actionB = false, +} diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/draw.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/draw.lua index edaad4c..edaad4c 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/draw.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/draw.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/fall.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/fall.lua index 6f3a948..6f3a948 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/fall.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/fall.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/jump.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/jump.lua index 73782e9..73782e9 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/jump.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/jump.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/origin.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/origin.lua index b84ffb5..b84ffb5 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/origin.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/origin.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/position.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/position.lua index fc4a1a9..fc4a1a9 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/position.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/position.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/postJump.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/postJump.lua index 25dd237..25dd237 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/postJump.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/postJump.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/previousJump.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/previousJump.lua index cb3a8fa..cb3a8fa 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/previousJump.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/previousJump.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/run.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/run.lua index f3b5f76..f3b5f76 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/run.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/run.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/scale.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/scale.lua index fefc961..fefc961 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/scale.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/scale.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/stand.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/stand.lua index 8ec58cf..8ec58cf 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/stand.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/stand.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/walk.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/walk.lua index 5ad6282..5ad6282 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/walk.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/bola/walk.lua diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/default.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/default.lua new file mode 100644 index 0000000..b34ba23 --- /dev/null +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/character/default.lua @@ -0,0 +1,5 @@ +character = {} + +load.character = function() + character.bola = require 'scripts.load.character.bola.default' +end diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/default.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/default.lua index e28d82b..45d5339 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/default.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/default.lua @@ -4,9 +4,9 @@ require 'scripts.load.fps' require 'scripts.load.window_profile' require 'scripts.load.graphics' require 'scripts.load.window' -require 'scripts.load.button' +require 'scripts.load.button.default' require 'scripts.load.meta_sprites.default' -require 'scripts.load.character' +require 'scripts.load.character.default' main.load = function() load.fps() |