From e355e5d3fed91528f1eaa8c764fc9e0941f54dba Mon Sep 17 00:00:00 2001
From: Martijn de Boer <git@sexybiggetje.nl>
Date: Thu, 13 Oct 2022 18:18:27 +0200
Subject: [PATCH] player ship

---
 assets.lua                      |   8 ++-
 assets/captains/john-danger.png | Bin 3277 -> 3966 bytes
 assets/ships/blackstar-5.png    | Bin 0 -> 397 bytes
 assets/ships/blackstar-5.psd    | Bin 0 -> 24389 bytes
 assets/ships/decorator.png      | Bin 0 -> 397 bytes
 assets/ships/excalibur-iv.png   | Bin 0 -> 401 bytes
 captain/johndanger.lua          |   3 +-
 captain/player.lua              |  11 ++++
 captain/robertdavis.lua         |   3 +-
 captain/stevelayer.lua          |   3 +-
 main.lua                        |   8 +++
 scene/game.lua                  | 106 +++++++++++++++++++++++++++++---
 scene/load.lua                  |   4 +-
 scene/title.lua                 |   1 +
 ship/blackstar5.lua             |   7 +++
 ship/decorator.lua              |   7 +++
 ship/excaliburiv.lua            |   7 +++
 ship/ship.lua                   |   6 ++
 vendor/math.lua                 |  64 +++++++++++++++++++
 19 files changed, 225 insertions(+), 13 deletions(-)
 create mode 100644 assets/ships/blackstar-5.png
 create mode 100644 assets/ships/blackstar-5.psd
 create mode 100644 assets/ships/decorator.png
 create mode 100644 assets/ships/excalibur-iv.png
 create mode 100644 ship/blackstar5.lua
 create mode 100644 ship/decorator.lua
 create mode 100644 ship/excaliburiv.lua
 create mode 100644 ship/ship.lua
 create mode 100644 vendor/math.lua

diff --git a/assets.lua b/assets.lua
index 548908c..b041cdd 100644
--- a/assets.lua
+++ b/assets.lua
@@ -4,7 +4,10 @@ multilily = lily.loadMulti({
 	{lily.newImage, "assets/hud.png"},
 	{lily.newImage, "assets/captains/steve-layer.png"},
 	{lily.newImage, "assets/captains/robert-davis.png"},
-	{lily.newImage, "assets/captains/john-danger.png"}
+	{lily.newImage, "assets/captains/john-danger.png"},
+	{lily.newImage, "assets/ships/blackstar-5.png"},
+	{lily.newImage, "assets/ships/excalibur-iv.png"},
+	{lily.newImage, "assets/ships/decorator.png"}
 })
 multilily:onComplete(function(_, lilies)
 	gameLogo = lilies[1][1]
@@ -13,6 +16,9 @@ multilily:onComplete(function(_, lilies)
 	CaptainSteve.image = lilies[4][1]
 	CaptainRobert.image = lilies[5][1]
 	CaptainJohn.image = lilies[6][1]
+	CaptainSteve.ship.image = lilies[7][1]
+	CaptainRobert.ship.image = lilies[8][1]
+	CaptainJohn.ship.image = lilies[9][1]
 
 	windowWidth = love.graphics.getWidth()
 	windowHeight = love.graphics.getHeight()
diff --git a/assets/captains/john-danger.png b/assets/captains/john-danger.png
index d4f4c270e9bc542adc58610108d6a1af5e36be76..204c968c38a555017facd299743c2b2379a1c09e 100644
GIT binary patch
delta 3947
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
FV1i^Div9oq

delta 3253
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

diff --git a/assets/ships/blackstar-5.png b/assets/ships/blackstar-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5945beea7a73d58b34b92de949c16fbffe433999
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPKS@MER9J=WS39nQFc2I^uXqg&2Z-Ep06L!{SBaDqR2CJ*i<DbX
zr{x0fasWES0n+3EPGw{V^YNyzp2BuEcxKq$u@<JaM$FhnW#0q<`1$0p5W+MNQ%aFA
z$Qckq==14_^XUix<W6Q37Z~#WqXGc*X@S4X6(D3HI0H6$o+Ze$1p7xdWI_lLgh%QD
zLvA9^5}>UB{03u1cflsW+XH1;4*r%>eoQil7d-<(0<4>FE`qE$D#06xZkmQErPh+$
zB7Enxl#<N~007Q80HEtS0~WyTi16V#@xOXt6JW(Hs(?N%4)^vstncj;eOizNjOKy0
zcAJ<77DFlJ*w7~cn4WOh%(KOJIOnXcYiDn29$*vuHkh-1^SJl?s(XMsTv8)=CR|aX
rppT&1aFk-s`C{3;K-<6J*9&+7wZ49L8N#J$00000NkvXXu0mjfs#T-)

literal 0
HcmV?d00001

diff --git a/assets/ships/blackstar-5.psd b/assets/ships/blackstar-5.psd
new file mode 100644
index 0000000000000000000000000000000000000000..33bcd4581a3aa9d9400e23397cc1ecf070d1fcb3
GIT binary patch
literal 24389
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
J(C-iZ{{sd=eP{px

literal 0
HcmV?d00001

diff --git a/assets/ships/decorator.png b/assets/ships/decorator.png
new file mode 100644
index 0000000000000000000000000000000000000000..30267f68eaa83468491380c082aa9135188ae085
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPKS@MER9J=WSG#S)Fc5tV3=bez>Nv+`iOi4<3`lMTwQ_)LkWzJ)
z$jzZnl{|nNr3nd2ran9)AcE+1q;+>skN2pv8ioNe@f5ZCP5{8+kzgV+4WyV^ltZil
z5e<2EMxLDkK-|e91x#_iT>t=iRv9&dl?YbAEuNl^NKZ%b?P8T6qTeL|z!o<!BqWIL
zf}McZ1!Y-Ue-}mZaFL~a(G>_H;M{ym2(qG@evUmw6f=+ZpI_UN4FRC-dVGDPi*W$J
z%*tJRdq8Uq0BD*95L_-luyK=oBmAu%*a<lJj7or#>ZR>^yKcK4lvE-DTWsisI}cD&
z;rjNzso>OxJ_5k}grgRITYW}rt?IfS?afU@YG&U}Hd;?S?v3Ac4@iegDejJ74I7Rq
r=q02!ypvdKy?SikMEifke^1~W%9()&qRqW;00000NkvXXu0mjfn%SQH

literal 0
HcmV?d00001

diff --git a/assets/ships/excalibur-iv.png b/assets/ships/excalibur-iv.png
new file mode 100644
index 0000000000000000000000000000000000000000..8385fa410ee05f3782e69b79e9ff05d21488230e
GIT binary patch
literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPLrFwIR9J=WS38b_Fc5uSZ4_;tD%!^9@F}+C7?GfHgJ@_rQf@)o
zJ%!If6H!sG5Cz+;Et{B+Ct6vn@H#up%;R~UnXq9P5ECy^t8WAVygm{vgwPGdlv1P|
zWCer}LzbS9r6&L&cQQ!<U3_;f0RUMlwHm=n1S?<{KOXit9`@K>OQVDk;%^B6FvT@A
z2@0aSU?bplK~WUO-+7)tTx2d^bOnM4SU2Asf~?5KpJPuErj&B_<@>i|LjY*n4(07_
zHVy!kQp{d^dw_Ee0I2I4AY3lLFma=N4*pjUYy>QPMJ3QD@}p@xvu@fBeIiK&*4WSs
zdmiW$iO=(8Rl%_heFT8%35U)6w)hO^oK;oj>`hHXY+~O|=B!5^_r|Zf2dKj(6?aFl
vgcU~=^b%AX-bu_kUpzK%qV2!o(-Zgs1TlUQi55&;00000NkvXXu0mjfl;D}=

literal 0
HcmV?d00001

diff --git a/captain/johndanger.lua b/captain/johndanger.lua
index bb7cf2a..488b77a 100644
--- a/captain/johndanger.lua
+++ b/captain/johndanger.lua
@@ -1,7 +1,8 @@
 JohnDanger = Object.extend(Player)
 
 function JohnDanger:new()
+	JohnDanger.super.new(self)
 	self.name = "John Danger";
-	self.shipName = "The Decorator"
 	self.image = nil
+	self.ship = Decorator()
 end
diff --git a/captain/player.lua b/captain/player.lua
index b7b0535..71f70ce 100644
--- a/captain/player.lua
+++ b/captain/player.lua
@@ -4,4 +4,15 @@ function Player:new()
 	self.name = "";
 	self.shipName = ""
 	self.image = nil
+	self.ship = nil
+	self.px = 0
+	self.py = 0
+	self.rot = 0
+	self.speed = 5
+	self.acc = 0
+	self.accIncr = 0.1
 end
+
+function Player:getShipname()
+	return self.ship.name
+end
\ No newline at end of file
diff --git a/captain/robertdavis.lua b/captain/robertdavis.lua
index 98c7316..4b0c2b3 100644
--- a/captain/robertdavis.lua
+++ b/captain/robertdavis.lua
@@ -1,7 +1,8 @@
 RobertDavis = Object.extend(Player)
 
 function RobertDavis:new()
+	RobertDavis.super.new(self)
 	self.name = "Robert Davis";
-	self.shipName = "Excalibur IV"
 	self.image = nil
+	self.ship = ExcaliburIV()
 end
diff --git a/captain/stevelayer.lua b/captain/stevelayer.lua
index 4fe8d0a..e0ccc26 100644
--- a/captain/stevelayer.lua
+++ b/captain/stevelayer.lua
@@ -1,7 +1,8 @@
 SteveLayer = Object.extend(Player)
 
 function SteveLayer:new()
+	SteveLayer.super.new(self)
 	self.name = "Steve Layer"
-	self.shipName = "Blackstar 5"
 	self.image = nil
+	self.ship = Blackstar5()
 end
diff --git a/main.lua b/main.lua
index 6e66955..e3a6ca2 100644
--- a/main.lua
+++ b/main.lua
@@ -17,6 +17,8 @@ function love.load()
 
 	Object = require "vendor/classic"
 
+	require "vendor/math"
+
 	moonshine = require "shaders"
 	effect = moonshine(moonshine.effects.vignette).chain(moonshine.effects.filmgrain)
 	effect.vignette.softness = 0.4
@@ -26,11 +28,17 @@ function love.load()
 	require "scene/load"
 	require "scene/title"
 	require "scene/game"
+
 	require "captain/player"
 	require "captain/robertdavis"
 	require "captain/stevelayer"
 	require "captain/johndanger"
 
+	require "ship/ship"
+	require "ship/blackstar5"
+	require "ship/excaliburiv"
+	require "ship/decorator"
+
 	LoadScene = LoadScene()
 	TitleScene = TitleScene()
 	GameScene = GameScene()
diff --git a/scene/game.lua b/scene/game.lua
index 3484c1f..84153dd 100644
--- a/scene/game.lua
+++ b/scene/game.lua
@@ -4,37 +4,129 @@ function GameScene:new()
 end
 
 function GameScene:init()
+	GameScene:playerChanged(currentPlayer)
+	movementDelta = 0
 end
 
 function GameScene:update(dt)
-
+	GameScene:updateInput(dt)
+	GameScene:updateBounds(dt)
 end
 
 function GameScene:draw()
+	love.graphics.setColor(255,255,255, 1)
+	love.graphics.draw(
+		currentPlayer.ship.image,
+		currentPlayer.px,
+		currentPlayer.py,
+		currentPlayer.rot*(math.pi/180),
+		1, 1,
+		currentPlayer.ship.image:getWidth()/2,
+		currentPlayer.ship.image:getHeight()/2
+	 )
 
+	love.graphics.print(currentPlayer.px..","..currentPlayer.py.." s: " .. currentPlayer.speed .. " a: " ..currentPlayer.acc,10,10)
 end
 
 function GameScene:drawHud()
 
-	-- Draw images
 	love.graphics.setColor(255,255,255, 1)
 	love.graphics.draw( gameHud, 0, 600-66 )
 
 	love.graphics.setColor(255,255,255, 0.75)
-	love.graphics.draw( currentPlayer.image, 14, 550,0,0.5,0.5 )
+	love.graphics.draw( currentPlayer.image, 14, 550, 0, 0.5, 0.5 )
 
 	love.graphics.setColor( text.r, text.g, text.b, text.alpha )
 	love.graphics.print( currentPlayer.name, 48, 550 )
-	love.graphics.print( currentPlayer.shipName, 48, 566 )
+	love.graphics.print( currentPlayer:getShipname(), 48, 566 )
 
 end
 
 function GameScene:keypressed(key,unicode)
 	if key == "1" then
-		currentPlayer = CaptainSteve
+		GameScene:playerChanged(CaptainSteve)
 	elseif key == "2" then
-		currentPlayer = CaptainRobert
+		GameScene:playerChanged(CaptainRobert)
 	elseif key == "3" then
-		currentPlayer = CaptainJohn
+		GameScene:playerChanged(CaptainJohn)
 	end
 end
+
+function GameScene:playerChanged(to)
+	currentPlayer = to
+	currentPlayer.px = windowWidth/2
+	currentPlayer.py = windowHeight/2
+	currentPlayer.rot = 0
+	currentPlayer.acc = 0
+	currentPlayer.bounds = { x1= 20, y1= 20, x2= windowWidth-30, y2= windowHeight - 86}
+end
+
+function GameScene:updateInput(dt)
+	movementDelta = movementDelta + dt
+	if (movementDelta > 0.02) then
+		movementDelta = 0
+
+		local isUp = false
+		local isLeft = false
+		local isDown = false
+		local isRight = false
+		local rotation = 0
+
+		--local hAxis, vAxis, hAxis2, vAxis2 = love.joystick.getAxes(1)
+		--local axisMargin = 0.5
+
+		isUp = love.keyboard.isDown( "w" )-- or (not (vAxis == nil) and vAxis < -(1-axisMargin)) or (not (vAxis2 == nil) and vAxis2 < -(1-axisMargin)) or love.joystick.isDown(1, 1)
+		isDown = love.keyboard.isDown( "s" )-- or (not (vAxis == nil) and vAxis > (1-axisMargin)) or (not (vAxis2 == nil) and vAxis2 > (1-axisMargin)) or love.joystick.isDown(1, 2)
+		isLeft = love.keyboard.isDown( "a" )-- or (not (hAxis == nil) and hAxis < -(1-axisMargin)) or (not (hAxis2 == nil) and hAxis2 < -(1-axisMargin)) or love.joystick.isDown(1, 3)
+		isRight = love.keyboard.isDown( "d" )-- or (not (hAxis == nil) and hAxis > (1-axisMargin)) or (not (hAxis2 == nil) and hAxis2 > (1-axisMargin)) or love.joystick.isDown(1, 4)
+
+		if isUp and isLeft then
+			rotation = 315
+		elseif isUp and isRight then
+			rotation = 45
+		elseif isUp then
+			rotation = 0
+		elseif isDown and isLeft then
+			rotation = 225
+		elseif isDown and isRight then
+			rotation = 135
+		elseif isDown then
+			rotation = 180
+		elseif isLeft then
+			rotation = 270
+		elseif isRight then
+			rotation = 90
+		end
+
+		currentPlayer.rot = rotation
+
+		if isUp or isDown or isLeft or isRight then
+			currentPlayer.acc = currentPlayer.acc + currentPlayer.accIncr
+		elseif currentPlayer.acc > 0 then
+			currentPlayer.acc = currentPlayer.acc - currentPlayer.accIncr
+		end
+
+		currentPlayer.acc = math.clamp(0, currentPlayer.acc, 1)
+
+		if isUp then
+			currentPlayer.py = currentPlayer.py - (currentPlayer.speed*currentPlayer.acc)
+		end
+
+		if isDown then
+			currentPlayer.py = currentPlayer.py + (currentPlayer.speed*currentPlayer.acc)
+		end
+
+		if isLeft then
+			currentPlayer.px = currentPlayer.px - (currentPlayer.speed*currentPlayer.acc)
+		end
+
+		if isRight then
+			currentPlayer.px = currentPlayer.px + (currentPlayer.speed*currentPlayer.acc)
+		end
+	end
+end
+
+function GameScene:updateBounds(dt)
+	currentPlayer.px = math.clamp( currentPlayer.bounds.x1,  currentPlayer.px, currentPlayer.bounds.x2 )
+	currentPlayer.py = math.clamp( currentPlayer.bounds.y1,  currentPlayer.py, currentPlayer.bounds.y2 )
+end
\ No newline at end of file
diff --git a/scene/load.lua b/scene/load.lua
index 98b5338..e4bbcd6 100644
--- a/scene/load.lua
+++ b/scene/load.lua
@@ -7,8 +7,8 @@ function LoadScene:update(dt)
 end
 
 function LoadScene:draw()
-	love.graphics.setColor( text.r, text.g, text.b, text.a )
-	love.graphics.print("Loading assets", 10, 10)
+	--love.graphics.setColor( text.r, text.g, text.b, text.a )
+	--love.graphics.print("Loading assets", 10, 10)
 end
 
 function LoadScene:drawHud()
diff --git a/scene/title.lua b/scene/title.lua
index 860e448..69ab083 100644
--- a/scene/title.lua
+++ b/scene/title.lua
@@ -43,6 +43,7 @@ function TitleScene:update(dt)
 
 	if state == "complete" then
 		currentScene = GameScene
+		currentScene:init()
 	end
 end
 
diff --git a/ship/blackstar5.lua b/ship/blackstar5.lua
new file mode 100644
index 0000000..96d4afd
--- /dev/null
+++ b/ship/blackstar5.lua
@@ -0,0 +1,7 @@
+Blackstar5 = Object.extend(Ship)
+
+function Blackstar5:new()
+	Blackstar5.super.new(self)
+	self.name = "Blackstar 5";
+	self.image = nil
+end
diff --git a/ship/decorator.lua b/ship/decorator.lua
new file mode 100644
index 0000000..3b03f6c
--- /dev/null
+++ b/ship/decorator.lua
@@ -0,0 +1,7 @@
+Decorator = Object.extend(Ship)
+
+function Decorator:new()
+	Decorator.super.new(self)
+	self.name = "The Decorator";
+	self.image = nil
+end
diff --git a/ship/excaliburiv.lua b/ship/excaliburiv.lua
new file mode 100644
index 0000000..06ed0b3
--- /dev/null
+++ b/ship/excaliburiv.lua
@@ -0,0 +1,7 @@
+ExcaliburIV = Object.extend(Ship)
+
+function ExcaliburIV:new()
+	ExcaliburIV.super.new(self)
+	self.name = "Excalibur IV";
+	self.image = nil
+end
diff --git a/ship/ship.lua b/ship/ship.lua
new file mode 100644
index 0000000..7658c68
--- /dev/null
+++ b/ship/ship.lua
@@ -0,0 +1,6 @@
+Ship = Object.extend(Object)
+
+function Ship:new()
+	self.name = "";
+	self.image = nil
+end
diff --git a/vendor/math.lua b/vendor/math.lua
new file mode 100644
index 0000000..ec46adc
--- /dev/null
+++ b/vendor/math.lua
@@ -0,0 +1,64 @@
+-- Averages an arbitrary number of angles (in radians).
+function math.averageAngles(...)
+    local x,y = 0,0
+    for i=1,select('#',...) do local a= select(i,...) x, y = x+math.cos(a), y+math.sin(a) end
+    return math.atan2(y, x)
+end
+
+
+-- Returns the distance between two points.
+function math.dist(x1,y1, x2,y2) return ((x2-x1)^2+(y2-y1)^2)^0.5 end
+
+
+-- Returns the angle between two points.
+function math.angle(x1,y1, x2,y2) return math.atan2(x2-x1, y2-y1) end
+
+
+-- Returns the closest multiple of 'size' (defaulting to 10).
+function math.multiple(n, size) size = size or 10 return math.round(n/size)*size end
+
+
+-- Clamps a number to within a certain range.
+function math.clamp(low, n, high) return math.min(math.max(low, n), high) end
+
+
+-- Linear interpolation between two numbers.
+function lerp(a,b,t) return a+(b-a)*t end
+
+-- Cosine interpolation between two numbers.
+function cerp(a,b,t) local f=(1-math.cos(t*math.pi))*.5 return a*(1-f)+b*f end
+
+
+-- Normalize two numbers.
+function math.normalize(x,y) local l=(x*x+y*y)^.5 if l==0 then return 0,0,0 else return x/l,y/l,l end end
+
+
+-- Returns 'n' rounded to the nearest 'deci'th (defaulting whole numbers).
+function math.round(n, deci) deci = 10^(deci or 0) return math.floor(n*deci+.5)/deci end
+
+
+-- Randomly returns either -1 or 1.
+function math.rsign() return math.random(2) == 2 and 1 or -1 end
+
+
+-- Returns 1 if number is positive, -1 if it's negative, or 0 if it's 0.
+function math.sign(n) return n>0 and 1 or n<0 and -1 or 0 end
+
+
+-- Checks if two lines intersect (or line segments if seg is true)
+-- Lines are given as four numbers (two coordinates)
+function findIntersect(l1p1x,l1p1y, l1p2x,l1p2y, l2p1x,l2p1y, l2p2x,l2p2y, seg1, seg2)
+    local a1,b1,a2,b2 = l1p2y-l1p1y, l1p1x-l1p2x, l2p2y-l2p1y, l2p1x-l2p2x
+    local c1,c2 = a1*l1p1x+b1*l1p1y, a2*l2p1x+b2*l2p1y
+    local det,x,y = a1*b2 - a2*b1
+    if det==0 then return false, "The lines are parallel." end
+    x,y = (b2*c1-b1*c2)/det, (a1*c2-a2*c1)/det
+    if seg1 or seg2 then
+        local min,max = math.min, math.max
+        if seg1 and not (min(l1p1x,l1p2x) <= x and x <= max(l1p1x,l1p2x) and min(l1p1y,l1p2y) <= y and y <= max(l1p1y,l1p2y)) or
+           seg2 and not (min(l2p1x,l2p2x) <= x and x <= max(l2p1x,l2p2x) and min(l2p1y,l2p2y) <= y and y <= max(l2p1y,l2p2y)) then
+            return false, "The lines don't intersect."
+        end
+    end
+    return x,y
+end
\ No newline at end of file