From d8a9484970a0c67bcf9264de74194bc888299e71 Mon Sep 17 00:00:00 2001 From: Dangrain Date: Sun, 12 Jan 2025 01:28:15 +0100 Subject: [PATCH] Very-minor-I-did-a-shitload-of-things-but-none-of-them-worked update! Ok, here's the thing. You fix one thing, try to implement another, and poof, there went my evening and worst thing Is I fixed something very *unimportant* Anyways I commented out all the faulty code, If anyone's reading this, I beg you for help. ~ Dan --- actual game/main.lua | 140 +++++++++++++++++------- actual game/sprites/agent_jump_left.png | Bin 0 -> 1192 bytes actual game/sprites/guard.png | Bin 0 -> 1629 bytes actual game/sprites/guard_body.png | Bin 0 -> 1964 bytes actual game/sprites/pouncing.png | Bin 0 -> 1649 bytes 5 files changed, 99 insertions(+), 41 deletions(-) create mode 100644 actual game/sprites/agent_jump_left.png create mode 100644 actual game/sprites/guard.png create mode 100644 actual game/sprites/guard_body.png create mode 100644 actual game/sprites/pouncing.png diff --git a/actual game/main.lua b/actual game/main.lua index 8a6d0c6..1e84835 100644 --- a/actual game/main.lua +++ b/actual game/main.lua @@ -15,8 +15,14 @@ function love.load() -- collision thing - wall = {x = 100, y = 100, width = 50, height = 50} - wall.sprite = love.graphics.newImage('sprites/white.png') + guard = {x = 100, y = 100, width = 64, height = 64} + guard.sprite = love.graphics.newImage('sprites/guard.png') + guard.dead = false + guard.uncons = false + guard.ok = true + guard.body = love.graphics.newImage('sprites/guard_body.png') + + -- If you installed transform.lua local transform = require 'libs/transform' @@ -41,11 +47,16 @@ function love.load() --agent.animations.nul = anim8.newAnimation(agent.grid('1-3', 2), 0.15) agent.width = 64 agent.height = 64 + agent.jumped_left = love.graphics.newImage('sprites/agent_jump_left.png') + agent.pouncing = love.graphics.newImage('sprites/pouncing.png') + agent.anim = agent.animations.right isMouseDown = false mouseX, mouseY = 0, 0 + disableShooting = false + --pouncing = false gun = {} --gun.x = agent.x + 5 @@ -144,22 +155,25 @@ function love.update(dt) agent.x = agent.x + agent.vx * dt agent.y = agent.y + agent.vy * dt + --if pouncing == false then + if love.mouse.isDown(1) then + isMouseDown = true + mouseX, mouseY = love.mouse.getPosition() + disableShooting = true + else - if love.mouse.isDown(1) then - isMouseDown = true - mouseX, mouseY = love.mouse.getPosition() - else - - if isMouseDown then - local dx = mouseX - agent.x - local dy = mouseY - agent.y - local distance = math.sqrt(dx * dx + dy * dy) + if isMouseDown then + local dx = mouseX - agent.x + local dy = mouseY - agent.y + local distance = math.sqrt(dx * dx + dy * dy) - agent.vx = (dx / distance) * agent.speed - agent.vy = (dy / distance) * agent.speed - end - isMouseDown = false - end + agent.vx = (dx / distance) * agent.speed + agent.vy = (dy / distance) * agent.speed + end + isMouseDown = false + disableShooting = false + --end +end local damping = 0.98 @@ -178,24 +192,33 @@ function love.update(dt) agent.vy = 0 end - if checkCollision(agent, wall) then - t = 0 + 1 + --if checkCollision(agent, guard) then + --t = 0 + 1 + --pouncing = true + --if pouncing == true then + --love.graphics.print("You're poucing, up to kill, down to knock out", 280, 10) + --end - end + --end -- collision checker thingy -- pain, suffering and bullets if love.mouse.isDown(2) then - if agent.anim == agent.animations.right then - spawnBullets(gun.x, gun.y, 500, 0, 0, 0, 2) - bullet_numer = bullet_numer + 1 - elseif agent.anim == agent.animations.left then - spawnBullets(gun.x, gun.y, -500, 0, 0, 0, 2) - bullet_numer = bullet_numer + 1 - end + --if pouncing == false then + if disableShooting == false then + if agent.anim == agent.animations.right then + spawnBullets(gun.x, gun.y, 500, 0, 0, 0, 2) + bullet_numer = bullet_numer + 1 + elseif agent.anim == agent.animations.left then + spawnBullets(gun.x, gun.y, -500, 0, 0, 0, 2) + bullet_numer = bullet_numer + 1 + end + --end end +end + -- I swear, these monkey wrenched solutions will stop working at some point, but for now we shall enjoy @@ -206,15 +229,13 @@ end - - -- Draw a coloured rectangle. function love.draw() -- In versions prior to 11.0, color component values are (0, 102, 102) love.graphics.print(agent.x, 10, 210) love.graphics.print(int, 350, 0) --agent.anim:draw(agent.spriteSheet, agent.x, agent.y, nil, 1) - love.graphics.rectangle("fill", wall.x, wall.y, wall.width, wall.height) + --love.graphics.rectangle("fill", guard.x, guard.y, guard.width, guard.height) love.graphics.print(t) love.graphics.circle("fill", gun.x, gun.y, 2) love.graphics.print(gun.x, 10, 250) @@ -223,20 +244,57 @@ function love.draw() love.graphics.setColor(255, 174, 66) drawBullets() - - - if isMouseDown then - drawDottedArc(agent.x, agent.y, mouseX, mouseY) - love.graphics.draw(agent.jumped, agent.x, agent.y, nil, 1) - end collider.draw() - - if not isMouseDown then - agent.anim:draw(agent.spriteSheet, agent.x, agent.y, nil, 1) - end - -end + + + --if pouncing == false then + + if isMouseDown then + drawDottedArc(agent.x, agent.y, mouseX, mouseY) + if mouseX > agent.x + 2 then + love.graphics.draw(agent.jumped, agent.x, agent.y, nil, 1) + elseif mouseX < agent.x - 2 then + love.graphics.draw(agent.jumped_left, agent.x, agent.y, nil, 1) + end + end + -- if guard.ok == true then + love.graphics.draw(guard.sprite, guard.x, guard.y, nil, 1 ) + -- elseif guard.dead or guard.uncons then + -- love.graphics.draw(guard.body, guard.x, guard.y, nil, 1) + --end + + + if not isMouseDown then + agent.anim:draw(agent.spriteSheet, agent.x, agent.y, nil, 1) + end + + + --elseif pouncing == true and guard.ok == true then + --love.graphics.draw(agent.pouncing, agent.x, agent.y, nil, 1) + --guard.x, guard.y = agent.x, agent.y + --if love.keyboard.isDown("down") then + --guard.uncons = true + --guard.dead = false + --guard.ok = false + --love.graphics.print("Non-lethal", 250, 10) + --pouncing = false + --guard.x, guard.y = guard.x - 20, guard.y + --love.graphics.draw(guard.body, guard.x, guard.y, nil, 1) + --agent.x = agent.x + 20 + --elseif love.keyboard.isDown("up") then + --guard.dead = true + --love.graphics.print("Lethal", 250, 10) + --guard.uncons = false + --guard.ok = false + --pouncing = false + --guard.x, guard.y = guard.x - 20, guard.y + 0 + --endMysuffering() + --love.graphics.draw(guard.body, guard.x, guard.y, nil, 1) +end + --end +--end + function drawDottedArc(x1, y1, x2, y2) local numDots = 20 diff --git a/actual game/sprites/agent_jump_left.png b/actual game/sprites/agent_jump_left.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee13dd9d5b4091c79d3f2e4733bf20a009ebae4 GIT binary patch literal 1192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4NziffKP}kkY-?D1Va!3Mqn`@8_WX|Gj6_`dGpoN z)zwc|SIxNbYHpP6+-TdGH($?&pI;ky}(iY%^=e0R{%9)1EGlArXhCPVX(dWx&&#yqj~OY+}H+GHGRA%{9Lp18?p9 zzgl-&>hWny1@zdxoWA^gb*k~Q&Sjyy%u|}X7F{^M$XeA{h12!PONN9cCssF^bHz3? z{$t*|Kq*{~b3xAP7w07$E_vK?W}1-M(aA2j<2B>t69)xYEj8S?JebCBRH*IaC>#(M zCHczayVvDphGoCPn7eE)m}H#djhK=NKxZuwfFX@c;9U=5jsOV%2XctSFcoOycq%&Jw-re1Tua42JE z!MU94NB+&Zd!Knh7lSr)L~YT<0_PKH_Z(dlr6V zME{%1#!V`2xZFH;k%@_P9Waasezbmvb_|2EE&XwT$ zE~ZJPvSCrz<>=%d=0~qXeqLsIpwFc7>~}=Z`GyW<&cGuLlXu5mm~b!Ty#tShz(MON zkF`107hSWGJAbpm$70)`x26$?N-Ee=n}d3ory4dqsMjwSVOa9sPl(}@yHS}yuQX%G z{yLSD?LYE@_DpEZeYm#zU-7lM*FV3U%O&V@r$_R!=k@t_KGsL^EPKLZ*W(RL>8d5J z5hW>!C8<`)MX5lF!N|bKRM)^z*U&J;$k58r%*x0}+rYrez+len_s%F9a`RI%(<*Um pc)Kn9KTv}P+=i0O+|=Td#M}bhdUh=?Qvm8=@O1TaS?83{1OWGG(Bl9A literal 0 HcmV?d00001 diff --git a/actual game/sprites/guard.png b/actual game/sprites/guard.png new file mode 100644 index 0000000000000000000000000000000000000000..408ea0298f2b70322e1b18c848ef1a6e7f4e8d34 GIT binary patch literal 1629 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