Getting rid of the swingers library, and making a new kind of moviment.

Author: Rafael Campos Nunes

assets/textures/simple_whale.png

@@ -3,8 +3,9 @@ function love.conf(t)
  t.author = "DaemonLee, MrWhales or Skunk_Giant, Rafael C. Nunes or ranu."
  t.url = "The Escapecraft.net forums or the Escapecraft IRC server"
  t.identity = nil -- The name of the save directory (string)
- t.version = "0.9.1" -- The LÖVE version this game was made for (string)
- t.console = false -- Attach a console (boolean, Windows only)
+ --t.version = "0.9.1" -- The LÖVE version this game was made for (string)
+t.verion = "0.8.0" -- LÖVE on my computer is 0.8.0 (ranu) 
+t.console = false -- Attach a console (boolean, Windows only)
 
  t.window.icon = nil -- Filepath to an image to use as the window's icon (string)
  t.window.width = 800 -- The window width (number)
@@ -34,4 +35,4 @@ function love.conf(t)
  t.modules.system = true -- Enable the system module (boolean)
  t.modules.timer = true -- Enable the timer module (boolean)
  t.modules.window = true -- Enable the window module (boolean)
-end
+end

build/whale-sim.love

@@ -2,13 +2,13 @@ gameover = {}
 
 function gameover.load()
 if state == "gameover" then
-gui.buttons = {}
 gui.newButton("Ressurect!", 100, 200, "ressurect")
 gui.newButton("Back to menu", 360, 200, "menu")
 end
 end
 
 function gameover.draw()
+love.graphics.setBackgroundColor(128, 171, 212)
  love.graphics.printf("Oh whale, you've been krilled!\n\n", 0, 150, 800, "center")
 
 if state == "gameover" then
@@ -29,5 +29,7 @@ function gameover.update(dt)
 ]]
 
 -- TODO: A resurrect and a back to menu button.
-gui.buttonHover()
+if state == "gameover" then
+gui.buttonHover()
+end
 end

src/conf.lua

@@ -2,7 +2,6 @@
 
 ]]
 
-require("libs/swingers")
 require("libs/AnAL")
 require("title")
 require("credits")
@@ -14,11 +13,8 @@ gui = require "libs/GUI"
 debug = false
 
 function love.load()
- state = "title"
- 
- swingers.start()
- gesture = {}
- 
+ state = "game"
+ 
  game.load()
  title.load()
  credits.load()

src/gameover.lua

@@ -23,50 +23,27 @@ function title.draw()
 love.graphics.setFont(openSansBold)
  love.graphics.setBackgroundColor(128, 171, 212)
  love.graphics.printf("Whale Simulator", 0, 80, 300, "center")
- --[[ love.graphics.printf("^\nI\nI\nI\nI\nI\n<--------+-------->\nI\nI\nI\nI\nI\nV", 0, 200, 800, "center")
- if game.dist(mouseX, mouseY, 400, 200) < (32+32) then
- love.graphics.print("\n Swipe up for facts!", mouseX, mouseY)
- elseif game.dist(mouseX, mouseY, 400, 450) < (32+32) then
- love.graphics.print("\n HERP A DERP!", mouseX, mouseY)
- elseif game.dist(mouseX, mouseY, 275, 330) < (32+32) then
- love.graphics.print("\n Swipe for credits!", mouseX, mouseY)
- elseif game.dist(mouseX, mouseY, 525, 330) < (32+32) then
- love.graphics.print("\n Swipe to start!", mouseX, mouseY)
- end ]]
 
 -- One call, and everything will be drawn :P
 gui.buttonDraw()
 end
 
 function title.update(dt)
- --[[ mouseX = love.mouse.getX()
- mouseY = love.mouse.getY()
-	swingers.update()
-if swingers.checkGesture() then
-gesture = swingers.getExtGesture()
- end
- if gesture[1] == "e" then
- state = "game"
- table.remove(gesture)
- elseif gesture[1] == "w" then
- state = "credits"
- table.remove(gesture)
- elseif gesture[1] == "n" then
- state = "facts"
- table.remove(gesture)
- elseif gesture[1] == "s" then
- end
-swingers.checkError() ]]
-
 mouseX = love.mouse.getX()
 mouseY = love.mouse.getY()
 
 -- check for button hover
-gui.buttonHover()
+if state == "title" then
+gui.buttonHover()
+end
 end
 
 function love.mousepressed(x, y)
-if(state == "title") then
+if state == "title" then
+gui.buttonClick(x, y)
+end
+
+if state == "credits" then
 gui.buttonClick(x, y)
 end
 end

src/main.lua

@@ -1,83 +1,49 @@
 whale = {}
 
 function whale.load()
- whale.isHurt = false
- whale.hurtRemaining = 0
- whale.x = 400
- whale.y = 300
- whale.dir = 0
- whale.speed = 50
- whale.hunger = 100
- whale.health = 100
- local whale_sprite = love.graphics.newImage("assets/textures/whale.png")
- whale_sprite:setFilter("nearest", "nearest")
-whale_anim = newAnimation(whale_sprite, 32, 64, 1, 3)
- local whale_spr = love.graphics.newImage("assets/textures/whale.png")
- whale_spr:setFilter("nearest", "nearest")
-whale_anim = newAnimation(whale_spr, 32, 64, 1, 3)
+ whale.isHurt = false
+ whale.hurtRemaining = 0
+ whale.x = 400
+ whale.y = 300
+ whale.dir = 0
+ whale.speed = 50
+ whale.hunger = 100
+ whale.health = 100
+ local whale_sprite = love.graphics.newImage("assets/textures/whale.png")
+ --whale_sprite:setFilter("nearest", "nearest")
+--whale_anim = newAnimation(whale_sprite, 32, 64, 1, 3)
 end
 
 function whale.draw()
- if whale.isHurt then
- love.graphics.setColor(255, 0, 0)
- else
- love.graphics.setColor(255, 255, 255)
- end
- 
-if whale.dir == "n" then
- whale_anim:draw(whale.x, whale.y, 0, 1, 1, 16, 32)
-elseif whale.dir == "s" then
- whale_anim:draw(whale.x, whale.y, 3.1415926535898, 1, 1, 16, 32)
-elseif whale.dir == "w" then
- whale_anim:draw(whale.x, whale.y, -1.5707963267949, 1, 1, 16, 32)
-elseif whale.dir == "e" then
- whale_anim:draw(whale.x, whale.y, 1.5707963267949, 1, 1, 16, 32)
-elseif whale.dir == "ne" then
- whale_anim:draw(whale.x, whale.y, 0.78539816339745, 1, 1, 16, 32)
-elseif whale.dir == "se" then
- whale_anim:draw(whale.x, whale.y, 2.3561944901923, 1, 1, 16, 32)
-elseif whale.dir == "sw" then
- whale_anim:draw(whale.x, whale.y, -2.3561944901923, 1, 1, 16, 32)
-elseif whale.dir == "nw" then
- whale_anim:draw(whale.x, whale.y, -0.78539816339745, 1, 1, 16, 32)
-else
- whale_anim:draw(whale.x, whale.y, 0, 1, 1, 16, 32)
+ if whale.isHurt then
+ love.graphics.setColor(255, 0, 0)
+ else
+ love.graphics.setColor(255, 255, 255)
+ end
+
+local whaleImage = love.graphics.newImage("assets/textures/simple_whale.png")
+
+if debug == true then
+love.graphics.print("atan2: ", 10, 40)
+love.graphics.print(angle, 100, 40)
+love.graphics.print("MouseX: ", 10, 60)
+love.graphics.print(mouseX, 100, 60)
+love.graphics.print("MouseY: ", 10, 80)
+love.graphics.print(mouseY, 100, 80)
 end
+
+love.graphics.draw(whaleImage, whale.x, whale.y, angle, 1, 1, 16, 32)
+
 end
 
 function whale.update(dt)
- --[[ swingers.update()
- if swingers.checkGesture() then
-	gesture = swingers.getExtGesture()
- end ]]
- 
- --[[ if gesture[1] ~= nil then
- whale.dir = gesture[1]
- end
- 
-if whale.dir == "n" then
- whale.y = whale.y - (whale.speed*dt)
- elseif whale.dir == "s" then
- whale.y = whale.y + (whale.speed*dt)
-elseif whale.dir == "w" then
- whale.x = whale.x - (whale.speed*dt)
- elseif whale.dir == "e" then
- whale.x = whale.x + (whale.speed*dt)
- elseif whale.dir == "ne" then
- whale.y = whale.y - math.sin(whale.speed*dt)
- whale.x = whale.x + math.sin(whale.speed*dt)
- elseif whale.dir == "se" then
- whale.y = whale.y + math.sin(whale.speed*dt)
- whale.x = whale.x + math.sin(whale.speed*dt) -- THIS IS WRONG!
- elseif whale.dir == "sw" then
- whale.y = whale.y + math.sin(whale.speed*dt)
- whale.x = whale.x - math.sin(whale.speed*dt)
- elseif whale.dir == "nw" then
- whale.y = whale.y - math.sin(whale.speed*dt)
- whale.x = whale.x - math.sin(whale.speed*dt)
- end ]]
- whale_anim:update(dt)
---swingers.checkError()
+--whale_anim:update(dt)
+
+mouseX = love.mouse.getX()
+mouseY = love.mouse.getY()
+
+angle = math.atan2(mouseY-whale.y, mouseX-whale.x)
+
 
 
 if whale.x < 0 then