Skip to content

Commit

Permalink
varios fix
Browse files Browse the repository at this point in the history
  • Loading branch information
BuildTools committed Dec 22, 2022
1 parent c0c9023 commit c1bbfd7
Show file tree
Hide file tree
Showing 20 changed files with 522 additions and 531 deletions.
323 changes: 40 additions & 283 deletions eggtoast_factorit/Agame.lua
View file
Original file line number Diff line number Diff line change
@@ -1,272 +1,70 @@
function gamekey(key)
if love.keyboard.isDown("c") then
spdrun = spdrun + 1
if spdrun==6 then
spdrun=1
end
end
if key == "=" then
---@diagnostic disable-next-line: undefined-field
---@diagnostic disable-next-line: undefined-field
donut.toggle()
end
if love.keyboard.isDown("escape") then
if love.keyboard.isDown("l") then
savesys.savegame()
title=true
else
plr.craftopen=false
crafteruse=false
plr.craftopeni=nil
print("craftoff")
plr.craftopen=false
for i = 1,#obj.list do
if table.haskey(obj.list[i].nbt,"craftopen") then
if obj.list[i].nbt.craftopen==true then
obj.list[i].nbt.craftopen=false
end
end
end
inv.open = 0
end
if love.keyboard.isDown("1") then
plr.hotselect=1
end
if love.keyboard.isDown("2") then
plr.hotselect=2
end
if love.keyboard.isDown("3") then
plr.hotselect=3
end
if love.keyboard.isDown("4") then
plr.hotselect=4
end
if love.keyboard.isDown("5") then
plr.hotselect=5
end
if love.keyboard.isDown("6") then
plr.hotselect=6
end
if love.keyboard.isDown("7") then
plr.hotselect=7
end
if love.keyboard.isDown("8") then
plr.hotselect=8
end
if love.keyboard.isDown("9") then
plr.hotselect=9
end
end
end

function gamepad(button)
if button=="x" then
if inv.open==1 then
inv.open=0
else
inv.open=1
end
end
if button=="back" then
spdrun = spdrun + 1
if spdrun==6 then
spdrun=1
end
end
if button=="start" then
savesys.savegame()
title=true
end
if button=="b" then
plr.craftopen=false
crafteruse=false
plr.craftopeni=nil
print("craftoff")
plr.craftopen=false
for i = 1,#obj.list do
if table.haskey(obj.list[i].nbt,"craftopen") then
if obj.list[i].nbt.craftopen==true then
obj.list[i].nbt.craftopen=false
end
end
end
inv.open = 0
end
local y = 0
if button=="dpup" then
y = y + 1
end
if button=="dpdown" then
y = y - 1
end
if title then
if y <= 0 then
saveselecter =saveselecter-1
else
saveselecter=saveselecter+1
end
if saveselecter<=0 then
saveselecter=1
end
else
if crafteruse then
crafter.wheel(y)
else
if plr.craftopen then
craftbench.wheel(y)
else
if y < 0 then
plr.hotselect=plr.hotselect+1
if plr.hotselect>9 then
plr.hotselect=1
end
elseif y > 0 then
plr.hotselect= plr.hotselect-1
if plr.hotselect<1 then
plr.hotselect=9
end
end
end
end
end
end

function padtick(dt)
if joysticks:isGamepadDown("y") then
if spdrun == 1 then
spd = 300
end
if spdrun == 2 then
spd = 500
end
if spdrun == 3 then
spd = 750
end
if spdrun == 4 then
spd = 1000
end
if spdrun==5 then
spd= 1500
end
end
plr.y=plr.y+((dt*spd)*joysticks:getGamepadAxis("lefty"))
plr.x=plr.x+((dt*spd)*joysticks:getGamepadAxis("leftx"))
if joysticks:getGamepadAxis("leftx") > 0 then
plr.rot="right"
else
plr.rot="left"
end
if joysticks:isGamepadDown("a")then
plr.handrot=1
keyspacepress=1
else
plr.handrot=0
keyspacepress=0
end
function gameload()
yesspd = 1
upd = false
dwd = false
require("api.spec.controller")
end

function gamedraw()
if not loading then
local sx,sy = love.graphics.getDimensions()
if not loading then
love.graphics.setBackgroundColor(1,1,1)
love.graphics.setColor(1,1,1)
if not device.console then
donut.draw()
end
cam:attach()
obj.draw()
--love.graphics.draw(gr.texture.gettex("slider"),100,0)
love.graphics.setBackgroundColor(255,255,255)
if plr.rot=="left"then ---@diagnostic disable-next-line: param-type-mismatch
love.graphics.draw(gr.texture.gettex("character1"),plr.x-25,plr.y-50,0,0.1,0.1)
else ---@diagnostic disable-next-line: param-type-mismatch
love.graphics.draw(gr.texture.gettex("character1reverse"),plr.x-25,plr.y-50,0,0.1,0.1)
end
if plr.handrot==1 then
if plr.rot=="left"then
love.graphics.draw(gr.texture.gettex("handud"),plr.x+4-25,plr.y+22-50,0,0.1,0.1)
else
love.graphics.draw(gr.texture.gettex("handreverseud"),plr.x-4-25,plr.y+22-50,0,0.1,0.1)
end
else
if plr.rot=="left"then
love.graphics.draw(gr.texture.gettex("hand"),plr.x+10-25,plr.y+22-50,0,0.1,0.1)
else
love.graphics.draw(gr.texture.gettex("handreverse"),plr.x-10-25,plr.y+22-50,0,0.1,0.1)
end
end
end
plr.itemdraw()
cam:detach()

love.graphics.setColor(0,0,0)
love.graphics.setColor(0,0,0,0.25)
love.graphics.rectangle("fill",0,0,900,100)
love.graphics.setColor(0,0,0,0.5)
love.graphics.rectangle("fill",100*plr.hotselect-100,0,100,100)
love.graphics.setColor(255,255,255)
love.graphics.draw(gr.texture.gettex("hotbar"),0,0)
love.graphics.setColor(1,1,1)
for i = 1,9 do
ia = i + 32
if plr.inventory[ia].id == nil then
else
tmp = i-1
love.graphics.draw(gr.texture.gettex(plr.inventory[ia].id),tmp*100,0,0,0.2,0.2)
if plr.inventory[i+32].id == nil then else
love.graphics.draw(gr.texture.gettex(plr.inventory[i+32].id),(i-1)*100,0,0,0.2,0.2)
end
end
end
inv.draw()
if inv.open==1 then
love.graphics.setColor(0,0,0)
for i = 1,9 do
love.graphics.line(i*100,0,i*100,100)
end
love.graphics.rectangle("line",1,1,900,100)
love.graphics.setColor(1,1,1)
love.graphics.draw(gr.texture.gettex("crafttable"),295,170,0,0.065,0.065)
end
love.graphics.setColor(255,255,255)
---@diagnostic disable-next-line: undefined-field
if not device.console then
donut.draw(10,200)
end
obj.drawobjgui()
local sx,sy = love.graphics.getDimensions()
love.graphics.setColor(.25,.25,.25)
love.graphics.rectangle("fill",sx-(150/512)*sx,110,(150/512)*sx,(150/512)*sx)
--love.graphics.print(tostring(sx),0,500)
--love.graphics.print(tostring(sy),0,525)
--love.graphics.setColor(0,1,0)
--love.graphics.circle('fill',sx/2,sy/2,15)
love.graphics.stencil(function ()
--love.graphics.rectangle("fill",sx-145,115,(1024/140)*sx,140)
--love.graphics.rectangle("fill",0,0,10000,10000)
love.graphics.rectangle("fill",sx-(145/512)*sx,115,(145/512)*sx,(145/512)*sx)
end
,"replace",1)
inv.draw()
if inv.open==1 then
love.graphics.draw(gr.texture.gettex("crafttable"),295,170,0,0.065,0.065)
end
obj.drawobjgui()
love.graphics.setColor(.25,.25,.25)
love.graphics.rectangle("fill",sx-(150/512)*sx,110,(150/512)*sx,(150/512)*sx)
love.graphics.stencil(function ()
love.graphics.rectangle("fill",sx-(145/512)*sx,115,(145/512)*sx,(145/512)*sx)
end,"replace",1)
love.graphics.setStencilTest("greater", 0)
love.graphics.setColor(1,1,1)
--love.graphics.rectangle("fill",0,0,10000,10000)
mnm:attach()
mnm:zoomTo(0.25)
mnm:move(0,0)
mnm:lookAt(plr.x-(425/1215)*sx*4.17,plr.y-(-275/1715)*sy*3.8)
--cam:lookAt(plr.x+(sx-145),plr.y+115)
--love.graphics.draw(gr.texture.gettex("slider"),(425/1024)*sx,(-275/1024)*sy)
for i = 1,#obj.list do
local this = obj.list[i]
--if not table.contains(obj.plctag.nature,this.id) then
local cx,cy = cam:cameraCoords(this.x,this.y)
local dx,dy = love.graphics.getDimensions()
if cx>=-1000 and cx<=dx+1000 and cy >= -1000 and cy <= dy+1000 then
if table.contains(obj.sizemapid,obj.list[i].id) then
love.graphics.draw(gr.texture.gettex(obj.list[i].id),obj.list[i].x,obj.list[i].y,0,obj.sizemap[indexOf(obj.sizemapid,obj.list[i].id)]/2,obj.sizemap[indexOf(obj.sizemapid,obj.list[i].id)]/2)
else
love.graphics.draw(gr.texture.gettex(obj.list[i].id),obj.list[i].x,obj.list[i].y,0,0.4/2,0.4/2)
end
obj.customdraw(this)
end
--end
end
--love.graphics.circle('fill',sx/2,sy/2,15)
mnm:detach()
love.graphics.setColor(0,1,0,0.5)
love.graphics.circle('fill',sx/1.27+(145/2000)*sx,sy/2+(-275/1700)*sy,15)
love.graphics.setStencilTest()
if not device.console then
donut.draw(0,100)
end
end
end


function gameupdate(dt)
--mulplay.join()
obj.tick(dt)
plr.itemsys()
inv.sys()
Expand All @@ -275,62 +73,21 @@ function gameupdate(dt)
donut.update(xdebug,plr.x)
donut.update(ydebug,plr.y)
end
tmp1,tmp2=love.graphics.getDimensions()
dividewidth =tmp1/2
divideheight =tmp2/2
local sx,sy=love.graphics.getDimensions()
dividewidth =sx/2
divideheight =sy/2
controller.tick(dt)
if plr.x>mapx then
plr.x=mapx
end
if plr.y>mapx then
plr.y=mapx
if plr.y>mapy then
plr.y=mapy
end
if plr.x<0 then
plr.x=0
end
if plr.y<0 then
plr.y=0
end
spd=100
if love.keyboard.isDown("lshift") then
if spdrun == 1 then
spd = 300
end
if spdrun == 2 then
spd = 500
end
if spdrun == 3 then
spd = 750
end
if spdrun == 4 then
spd = 1000
end
if spdrun==5 then
spd= 1500
end
end
if love.keyboard.isDown("w") then
plr.y=plr.y-dt*spd
end
if love.keyboard.isDown("a") then
plr.x=plr.x-dt*spd
plr.rot="left"
end
if love.keyboard.isDown("s") then
plr.y=plr.y+dt*spd
end
if love.keyboard.isDown("d") then
plr.x=plr.x+dt*spd
plr.rot="right"
end
if love.keyboard.isDown("space")then
plr.handrot=1
keyspacepress=1
else
plr.handrot=0
keyspacepress=0
end
if joymode then
padtick(dt)
end
cam:lookAt(plr.x,plr.y)
end
Loading

0 comments on commit c1bbfd7

Please sign in to comment.