Astaroth-Studio/chuchu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

put the utils stuff in game

Browse Source
This commit is contained in:
Sugarkrap
2021-05-13 18:14:53 +02:00
parent c8481ac464
commit 688a0b9f18
1 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
game.lua
View File

@@ -5,6 +5,7 @@ Physics = require('deps.physics')
-- my own libs -- my own libs
crates = require('crate') crates = require('crate')
utils = require('utils')
GRAVITY = 512 GRAVITY = 512
PLAN_SIZE = { PLAN_SIZE = {
@@ -22,8 +23,6 @@ local player = {
} }
local magnet = { local magnet = {
w = 50,
h = 50,
collider = nil, collider = nil,
side = 'LEFT' side = 'LEFT'
} }
@@ -53,27 +52,22 @@ function Chu.new(x, y, debug)
x - PLAN_SIZE.marginX, y + PLAN_SIZE.h + PLAN_SIZE.marginY x - PLAN_SIZE.marginX, y + PLAN_SIZE.h + PLAN_SIZE.marginY
}):setClass('GamePlan') }):setClass('GamePlan')
obj.pier = world:addRectangle(x + 80 - (PLAN_SIZE.marginX/2), y + PLAN_SIZE.h - 64, 160 + PLAN_SIZE.marginX, 128) local pierWidth, pierHeight = assets.sprites.level.pier:getWidth(), assets.sprites.level.pier:getHeight()
obj.pier:setType('static') obj.pier = utils.spawnStaticRectangleBySize(world, x - PLAN_SIZE.marginX, y + PLAN_SIZE.h - pierHeight, pierWidth + PLAN_SIZE.marginX, pierHeight)
--[[obj.crane = world:addChain(true, { local craneWidth, craneHeight = assets.sprites.crane:getWidth(), assets.sprites.crane:getHeight()
x + 36, y + 80,
x + 36 + assets.sprites.crane:getWidth(), y + 80,
x + 36 + assets.sprites.crane:getWidth(), y + 80 + assets.sprites.crane:getHeight(),
x + 36, y + 80 + assets.sprites.crane:getHeight()
}):setClass('Crane')
obj.moving = world:addRectangle(x + (36/2) + 1, y + 40 + 1, assets.sprites.movingstuff:getWidth() - 2, assets.sprites.movingstuff:getHeight() - 2) obj.crane = {
]]-- top = utils.spawnStaticRectangleBySize(world, x + 36, y + 80, craneWidth, 6),
left = utils.spawnStaticRectangleBySize(world, x + 36, y + 86, 6, craneHeight - 12),
right = utils.spawnStaticRectangleBySize(world, x + 30 + craneWidth, y + 86, 6, craneHeight - 12),
bottom = utils.spawnStaticRectangleBySize(world, x + 36, y + 74 + craneHeight, craneWidth, 6)
}
obj.crane = {} local magnetWidth, magnetHeight = assets.sprites.movingstuff:getWidth(), assets.sprites.movingstuff:getHeight()
obj.crane.top = world:addRectangle(x + (assets.sprites.crane:getWidth()/2) + (18*2), y + 84, assets.sprites.crane:getWidth(), 6) local center = utils.getCenterByXY(x + 43, y + 87, magnetWidth, magnetHeight)
obj.crane.top:setType('static') magnet.collider = world:addRectangle(center.x, center.y, magnetWidth, magnetHeight):setClass('Player')
obj.crane.left = world:addRectangle(x + 36, y + 87, 6, assets.sprites.crane:getHeight() - 12) --magnet.collider:setRestitution(0)
obj.crane.left:setType('static')
magnet.collider = world:addRectangle(x + 50, y + 50, magnet.w, magnet.h):setClass('Player')
magnet.collider:setRestitution(0)
input = Boipus() input = Boipus()
-- Controls -- Controls
@@ -98,22 +92,6 @@ function Chu:update(dt)
world:update(dt) world:update(dt)
crates:update(dt) crates:update(dt)
-- this is temp, ofc, it's ugly af
--[[if input:pressed('switch') then
velocity = {0, 0}
-- first, let's take care of the attached crates
for key in pairs(crates:getAttached()) do
mirrorCollider(crates.attached[key].collider, magnet.side)
end
mirrorCollider(magnet.collider, magnet.side)
if magnet.side == 'LEFT' then
magnet.side = 'RIGHT'
else
magnet.side = 'LEFT'
end]]--
if input:pressed('detach') then if input:pressed('detach') then
velocity = {0, 0} velocity = {0, 0}