I dont fucking know how to solve this shit i hate git #3

Merged
lustlion merged 11 commits from :master into master 2022-01-18 20:20:36 +00:00
1 changed files with 142 additions and 142 deletions
Showing only changes of commit a42cf7953f - Show all commits

284
main.lua
View File

@ -1,142 +1,142 @@
function love.load() function love.load()
do_pause = false do_pause = false
debug = false debug = false
debug_collision = false debug_collision = false
editor_mode = false editor_mode = false
textScale = 1 textScale = 1
fps_count = 0 fps_count = 0
fps_second = 0 fps_second = 0
fps_draw = 0 fps_draw = 0
fps_total = 0 fps_total = 0
love.graphics.setColor(1,1,1) love.graphics.setColor(1,1,1)
love.keyboard.setKeyRepeat(true) love.keyboard.setKeyRepeat(true)
love.graphics.setDefaultFilter("nearest") -- good pixel love.graphics.setDefaultFilter("nearest") -- good pixel
game = { game = {
scale = 2, scale = 2,
width = love.graphics.getWidth(), width = love.graphics.getWidth(),
height = love.graphics.getHeight(), height = love.graphics.getHeight(),
paused = false paused = false
} }
require "data/scripts" require "data/scripts"
Canvas = { Canvas = {
Darkness = CreateDarkness() Darkness = CreateDarkness()
} }
love.graphics.setCanvas(Canvas.Darkness) love.graphics.setCanvas(Canvas.Darkness)
SetDarkness() SetDarkness()
love.graphics.setCanvas() love.graphics.setCanvas()
Camera.width = game.width Camera.width = game.width
Camera.height = game.height Camera.height = game.height
levelList = {"level1","2","3","ewae","tileset"} levelList = {"level1","2","3","ewae","tileset"}
levelNum = 1 levelNum = 1
currLevel = levelList[levelNum] currLevel = levelList[levelNum]
LoadedEntities = {} LoadedEntities = {}
LevelLoadTiles() LevelLoadTiles()
main_Player = Player:New(75,50) main_Player = Player:New(75,50)
table.insert(LoadedEntities,main_Player) table.insert(LoadedEntities,main_Player)
table.insert(LoadedEntities,Kupo:New(100,150)) table.insert(LoadedEntities,Kupo:New(100,150))
table.insert(LoadedEntities,Kupo:New(300,150)) table.insert(LoadedEntities,Kupo:New(300,150))
table.insert(LoadedEntities,Decoration:New(200,89,animation.decoration.candelabra,80)) table.insert(LoadedEntities,Decoration:New(200,89,animation.decoration.candelabra,80))
table.insert(LoadedEntities,Fairy:New(200,88)) table.insert(LoadedEntities,Fairy:New(200,88))
gravity = 0.05 gravity = 0.05
end end
function love.update(dt) function love.update(dt)
-- fps counter -- fps counter
if fps_second >= 1 then if fps_second >= 1 then
fps_second = fps_second - 1 fps_second = fps_second - 1
fps_draw = fps_count fps_draw = fps_count
fps_count = 0 fps_count = 0
fps_total = fps_total + 1 fps_total = fps_total + 1
end end
fps_second = fps_second + dt fps_second = fps_second + dt
fps_count = fps_count + 1 fps_count = fps_count + 1
current_dt = dt current_dt = dt
if editor_mode then if editor_mode then
stepEditor() stepEditor()
else else
stepGame() stepGame()
end end
end end
function love.wheelmoved(_, y) function love.wheelmoved(_, y)
if editor_mode then if editor_mode then
if palette then if palette then
p_scroll = p_scroll + y p_scroll = p_scroll + y
else else
local oscale = game.scale local oscale = game.scale
game.scale = math.max(0.1,game.scale + y/16) game.scale = math.max(0.1,game.scale + y/16)
end end
end end
end end
function love.keypressed(key) function love.keypressed(key)
if key == "escape" then if key == "escape" then
if do_pause then if do_pause then
do_pause = false do_pause = false
else else
pausepage = 1 pausepage = 1
do_pause = true do_pause = true
end end
end end
if key == "f1" then if key == "f1" then
if debug then if debug then
debug = false debug = false
debug_collision = true debug_collision = true
elseif debug_collision then elseif debug_collision then
debug_collision = false debug_collision = false
else else
debug = true debug = true
end end
end end
if key == "f2" then if key == "f2" then
if editor_mode then if editor_mode then
else else
main_Player.pos.x, main_Player.pos.y = 16,-10 main_Player.pos.x, main_Player.pos.y = 16,-10
end end
end end
if key == "f3" then if key == "f3" then
LoadLevel() LoadLevel()
end end
if key == "f4" then if key == "f4" then
if editor_mode then if editor_mode then
editor_mode = false editor_mode = false
else else
editor_mode = true editor_mode = true
end end
end end
end end
function love.draw() function love.draw()
if game.width ~= love.graphics.getWidth() or game.height ~= love.graphics.getHeight() then if game.width ~= love.graphics.getWidth() or game.height ~= love.graphics.getHeight() then
game.width = love.graphics.getWidth() game.width = love.graphics.getWidth()
game.height = love.graphics.getHeight() game.height = love.graphics.getHeight()
game_resize = true game_resize = true
else else
game_resize = false game_resize = false
end end
if editor_mode then if editor_mode then
drawEditor() drawEditor()
else else
drawGame() drawGame()
end end
end end