Develop #4

Merged
wariosolis merged 35 commits from develop into master 2017-01-04 00:04:34 +01:00
16 changed files with 42 additions and 12 deletions
Showing only changes of commit 296d8850bd - Show all commits
+1 -1
View File
@@ -24,7 +24,7 @@ function arrows.draw()
end
function love.mousepressed(mx, my, button)
function arrows.mousepressed(mx, my, button)
x1,y1,x2,y2,x3,y3,x4,y4 = camera.gcam:getVisibleCorners()
wl, wt, ww, wh = camera.gcam:getWorld()
if button == 1 then
+1 -2
View File
@@ -22,8 +22,7 @@ end
function messages.new_message(cap, time)
local texts = {}
texts.welcome = "I must make decision. I wont leave this room until Ive decided to kill my girlfriend or not. How has it come to this? Ive got little time. Her life is teetering through my fingers."
texts.cap1preview="Shes gorgeous in this picture. My mother has given me more than Ill ever be able to give her back. Not only did she give me the gift of life, but a reason to go on. Her lessons and strong character have made me become the man I am now. What I most want in this world is for her to be proud of me. Proud of my work and my partner. But a bitch had to screw it all up."
texts.cap1stage="She stepped on what I loved most. She attacked all my mother taught me and undermined my deepest beliefs. I dont believe half-way, like my siblings, but truly. And this girl did nothing but ridicule me. Make fun of me in front of my friends; call me a nutter in private; tell me I was wrong; brand me as a brute - a moron. But shes the moron! Shes just an immoral, sinful whore…I need to calm down, clear my mind. Listen to Gods Word. If I go out now, Ill kill her! I must settle down and think straight. God, speak to me!"
texts.cap1preview="Shes gorgeous in this picture. My mother has given me more than Ill ever be able to give her back. Not only did she give me the gift of life, but a reason to go on. Her lessons and strong character have made me become the man I am now. What I most want in this world is for her to be proud of me. Proud of my work and my partner. But a bitch had to screw it all up. She stepped on what I loved most. She attacked all my mother taught me and undermined my deepest beliefs. I dont believe half-way, like my siblings, but truly. And this girl did nothing but ridicule me. Make fun of me in front of my friends; call me a nutter in private; tell me I was wrong; brand me as a brute - a moron. But shes the moron! Shes just an immoral, sinful whore…I need to calm down, clear my mind. Listen to Gods Word. If I go out now, Ill kill her! I must settle down and think straight. God, speak to me!"
texts.cap2stage=" Corinthians 12:10 That is why, for Christ's sake, I delight in weaknesses, in insults, in hardships, in persecutions, in difficulties. For when I am weak, then I am strong uAs strong as she made me. She laughed at me in front of my friends, but to help me overcome my shyness. She said I was a nutter to help me overcome my issues, to make me realise the obsessions Id inherited from my mother. Brute when I wasnt tolerant with others. And I just got upset…like a moron. A part of my soul still belongs to her. But I mustnt forget where I first met her, where I bought her first kisses. My parents must never know the truth. My mother shall never know about the smokes, the drinks I had. I must destroy that sheet of paper. Nobody must see it."
texts.cap3stage="While the smoke went through my nostrils, I remembered the barbecue parties we threw every Saturday with my family. My cousins adored her and she got on really well with my uncle and aunt. She was completely integrated in my family, so we invited her to come to this barbecue party. And then, while we were saying grace, she started to eat. In the silence you could hear her chewing on a greasy sausage. In shock, they all looked at her, and then, at my grimace. I couldnt believe what was happening. I took her outside to the log cabin. She wont easily forget what I said to her. Id never met such an insensitive person, such a…and as an apology she gave us a fucking compact disc as a gift. Does she really think it would make up for what shed done? What a shitty gift!"
texts.cap4stage="I love this song. I remember now why she bought this one. It was our song. A hidden apology for me. Maybe I got too carried away. After all, shes not religious, shed never said grace. She hadnt even seen how its done. She did what anybody would have done: sit down and start to eat. Poor one. I shouldnt have accepted the album, her tears were more than enough. She meant no harm. But I did…and now I must kill her. I must do it before she starts telling lies about me and harms my family's reputation. I can't allow this to happen. I'm not gay. I'm not sick. I'm not using this key. I'll go out that door and I'll do her in. No more memories, I've made up my mind."
+32 -5
View File
@@ -6,8 +6,12 @@ local stage2 = {}
local image
function stage2.load(game, camera)
image = love.graphics.newImage('assets/sprites/background/fondo_mesilla.jpg')
stage2.world = { w = image:getWidth(), h= 720}
image_table = love.graphics.newImage('assets/sprites/table/table.jpg')
image_table_hover = love.graphics.newImage('assets/sprites/table/table_hover.jpg')
image_table_none = love.graphics.newImage('assets/sprites/table/table_none.jpg')
image_cruz = love.graphics.newImage('assets/sprites/table/cruz.png')
image_picture = love.graphics.newImage('assets/sprites/table/picture.png')
stage2.world = { w = image_table:getWidth(), h= 720}
game:setNewSizeWorld(stage2.world.w, stage2.world.h)
arrows.load(game, stage2, camera)
game.canvas.x = game.window.width / 2
@@ -17,9 +21,32 @@ function stage2.update(dt, game)
arrows.update(dt)
end
function stage2.draw()
love.graphics.draw(image)
function stage2.draw(game, camera)
local mos_x, mos_y = love.mouse.getPosition()
-- No object
love.graphics.draw(image_table_none)
if game.status == 2 then
-- Normal
love.graphics.draw(image_table)
-- Hover
cam_x, cam_y = camera.gcam:getVisible()
if mos_x + cam_x > 527 and mos_x + cam_x < 653 and mos_y - cam_y > 335 and mos_y - cam_y < 423 then
love.graphics.draw(image_table_hover)
end
end
arrows.draw()
end
return stage2
function stage2.mousepressed(game, messages, camera)
local mos_x, mos_y = love.mouse.getPosition()
if game.status == 2 then
cam_x, cam_y = camera.gcam:getVisible()
if mos_x + cam_x > 527 and mos_x + cam_x < 653 and mos_y - cam_y > 335 and mos_y - cam_y < 423 then
game.status = 3
messages.new_message('cap1preview', 20)
end
end
end
return stage2
+2 -2
View File
@@ -31,8 +31,8 @@ function stages.update(dt, game, camera)
end
end
function stages.draw()
dynamic_stage.draw()
function stages.draw(game, camera)
dynamic_stage.draw(game, camera)
end
return stages
+1 -1
View File
@@ -35,7 +35,7 @@ MessageBottle.DEFAULT_FGALPHA = 1
MessageBottle.DEFAULT_BGRADIUS = 10 --pixels to draw the rounded corners
MessageBottle.DEFAULT_BGRADIUSSEGMENTS = 32 --how precisely to draw the circle
MessageBottle.DEFAULT_BGCOLOR = {r=0,g=0,b=0}
MessageBottle.DEFAULT_BGALPHA = 0.8
MessageBottle.DEFAULT_BGALPHA = 0.3
MessageBottle.DEFAULT_EASETIME = 0.5 --seconds to ease
MessageBottle.DEFAULT_FADETIME = 0.3 --seconds to fade alpha
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

+5 -1
View File
@@ -6,6 +6,8 @@ local camera = require 'assets/scripts/camera'
local stress = require 'assets/scripts/stress'
local messages = require 'assets/scripts/messages'
local start = require 'assets/scripts/start'
local arrows = require 'assets/scripts/arrows'
local stage2 = require 'assets/scripts/stage2'
-- LOAD
function love.load()
@@ -37,7 +39,7 @@ end
function love.draw()
camera.gcam:draw(
function(l,t,w,h)
stages.draw()
stages.draw(game, camera)
stress.draw()
bells.draw(game)
end
@@ -49,4 +51,6 @@ end
function love.mousepressed(x, y, button, istouch)
start.mousepressed(game)
arrows.mousepressed(x, y, button, istouch)
stage2.mousepressed(game, messages, camera)
end