summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-11-24 14:11:17 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-11-24 15:42:39 -0300
commitcf98a411c154fcc86da556249f11660c08a4467d (patch)
treea5d4d28cb6cdb1475c13ce81f57f5bb89c8714ff
parente0873f9b6d41aeffc38321e7a95e517e7cafd95b (diff)
Remove crouch, crouch down and stand up
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua2
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/animation.lua15
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch.lua11
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch_down.lua25
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/default.lua3
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/frames.lua3
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua23
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/origin.lua19
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/stand_up.lua25
-rw-r--r--src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/transform.lua5
10 files changed, 1 insertions, 130 deletions
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
index 3888c3a..ff20873 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/main.lua
@@ -55,7 +55,7 @@ function love.draw()
character.bola.scale.x,
character.bola.scale.y,
character.bola.origin.x,
- transform.bola.origin.y
+ character.bola.origin.y
)
}
end
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/animation.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/animation.lua
index fb7fddd..eacfe42 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/animation.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/animation.lua
@@ -3,9 +3,6 @@ local animationModule = {}
function animationModule.animation(dt)
character.bola.stand.start = character.bola.stand.start + (dt * character.bola.stand.fps)
character.bola.walk.start = character.bola.walk.start + (dt * character.bola.walk.fps)
- character.bola.crouchDown.start = character.bola.crouchDown.start + (dt * character.bola.crouchDown.fps)
- character.bola.crouch.start = character.bola.crouch.start + (dt * character.bola.crouch.fps)
- character.bola.standUp.start = character.bola.standUp.start + (dt * character.bola.standUp.fps)
frames = {
bola = require 'scripts.bola.frames'
@@ -41,18 +38,6 @@ function animationModule.animation(dt)
character.bola.stand.start = game.animation(character.bola.stand.start, frames.bola.stand, -1, false)
character.bola.walk.start = game.animation(character.bola.walk.start, frames.bola.walk, -1, false)
- character.bola.crouchDown.start = game.animation(character.bola.crouchDown.start, frames.bola.crouchDown, 0, false)
- character.bola.crouch.start = game.animation(character.bola.crouch.start, frames.bola.crouch, -1, false)
- character.bola.standUp.start = game.animation(character.bola.standUp.start, frames.bola.standUp, 0, false)
-
- transform = {
- bola = {
- origin = {
- y = character.bola.origin.y
- }
- }
- }
-
end
return animationModule
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch.lua
deleted file mode 100644
index 37d98a1..0000000
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
- love.graphics.newQuad(
- metaSprites.bola.x * 2,
- metaSprites.bola.y * 2,
- metaSprites.bola.x,
- metaSprites.bola.y / 2,
- metaSprites.bola.image:getDimensions()
- ),
- start = 1,
- fps = 9,
-}
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch_down.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch_down.lua
deleted file mode 100644
index aa06f93..0000000
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/crouch_down.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-return {
- love.graphics.newQuad(
- metaSprites.bola.x * 0,
- metaSprites.bola.y * 2,
- metaSprites.bola.x,
- metaSprites.bola.y,
- metaSprites.bola.image:getDimensions()
- ),
- love.graphics.newQuad(
- metaSprites.bola.x * 1,
- metaSprites.bola.y * 2,
- metaSprites.bola.x,
- metaSprites.bola.y / 4,
- metaSprites.bola.image:getDimensions()
- ),
- love.graphics.newQuad(
- metaSprites.bola.x * 2,
- (metaSprites.bola.y * 2) + (metaSprites.bola.y / 2),
- metaSprites.bola.x,
- metaSprites.bola.y / 2,
- metaSprites.bola.image:getDimensions()
- ),
- start = 1,
- fps = 9,
-}
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
index 00885ad..6ab0b13 100644
--- 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
@@ -8,7 +8,4 @@ return {
stand = require 'scripts.bola.stand',
walk = require 'scripts.bola.walk',
run = require 'scripts.bola.run',
- crouchDown = require 'scripts.bola.crouch_down',
- crouch = require 'scripts.bola.crouch',
- standUp = require 'scripts.bola.stand_up',
}
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/frames.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/frames.lua
index 2f8ba5f..053b8e6 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/frames.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/frames.lua
@@ -1,7 +1,4 @@
return {
stand = # character.bola.stand,
walk = # character.bola.walk,
- crouchDown = # character.bola.crouchDown,
- crouch = # character.bola.crouch,
- standUp = # character.bola.standUp,
}
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua
index d9e0e68..ee7cfd5 100644
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua
+++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/motion.lua
@@ -75,29 +75,6 @@ function walkDown(dt)
}
end
-function crouchDown(dt)
- character.bola.acceleration = 0
- transform.bola.origin.y = character.bola.origin.crouchDown.y[math.floor(character.bola.crouchDown.start)]
- quad = {
- bola = character.bola.crouchDown[math.floor(character.bola.crouchDown.start)]
- }
-end
-
-function crouch(dt)
- character.bola.acceleration = 0
- transform.bola.origin.y = character.bola.origin.crouch.y[math.floor(character.bola.crouch.start)]
- quad = {
- bola = character.bola.crouch[math.floor(character.bola.crouch.start)]
- }
-end
-
-function standUp(dt)
- character.bola.acceleration = 0
- quad = {
- bola = character.bola.standUp[math.floor(character.bola.standUp.start)]
- }
-end
-
function stand(dt)
character.bola.acceleration = 0
quad = {
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/bola/origin.lua
index fa9e079..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/bola/origin.lua
@@ -1,23 +1,4 @@
return {
x = metaSprites.bola.x / 2,
y = metaSprites.bola.y / 2,
- crouchDown = {
- y = {
- metaSprites.bola.y / 2,
- (metaSprites.bola.y / 2) - (metaSprites.bola.y / 4),
- (metaSprites.bola.y / 2) - (metaSprites.bola.y / 2),
- },
- },
- crouch = {
- y = {
- (metaSprites.bola.y / 2) - (metaSprites.bola.y / 2),
- },
- },
- standUp = {
- y = {
- (metaSprites.bola.y / 2) - (metaSprites.bola.y / 2),
- (metaSprites.bola.y / 2) - (metaSprites.bola.y / 4),
- metaSprites.bola.y / 2,
- },
- },
}
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/stand_up.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/stand_up.lua
deleted file mode 100644
index 7eae397..0000000
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/stand_up.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-return {
- love.graphics.newQuad(
- metaSprites.bola.x * 2,
- (metaSprites.bola.y * 2) + (metaSprites.bola.y / 2),
- metaSprites.bola.x,
- metaSprites.bola.y / 2,
- metaSprites.bola.image:getDimensions()
- ),
- love.graphics.newQuad(
- metaSprites.bola.x * 1,
- metaSprites.bola.y * 2,
- metaSprites.bola.x,
- metaSprites.bola.y / 4,
- metaSprites.bola.image:getDimensions()
- ),
- love.graphics.newQuad(
- metaSprites.bola.x * 0,
- metaSprites.bola.y * 2,
- metaSprites.bola.x,
- metaSprites.bola.y,
- metaSprites.bola.image:getDimensions()
- ),
- start = 1,
- fps = 9,
-}
diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/transform.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/transform.lua
deleted file mode 100644
index 995fe65..0000000
--- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/bola/transform.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
- origin = {
- y = character.bola.origin.y
- }
-}