From e41a42fda4e890b37d7b854b5d57f64ff965f5f8 Mon Sep 17 00:00:00 2001
From: "theo@manjaro" <ayte@tutanota.com>
Date: Fri, 4 Mar 2022 14:34:54 +0100
Subject: [PATCH] Added ending screen

---
 assets/text/win/blue.png | Bin 0 -> 1742 bytes
 assets/text/win/pink.png | Bin 0 -> 1726 bytes
 game.lua                 |   1 +
 objects/end.lua          |  22 ++++++++++++++++++++++
 objects/grid.lua         |   2 +-
 scenes.lua               |   6 ++++++
 6 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 assets/text/win/blue.png
 create mode 100644 assets/text/win/pink.png
 create mode 100644 objects/end.lua

diff --git a/assets/text/win/blue.png b/assets/text/win/blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac1eb16789fe914d8bc5b235686e9101bbb807d2
GIT binary patch
literal 1742
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

literal 0
HcmV?d00001

diff --git a/assets/text/win/pink.png b/assets/text/win/pink.png
new file mode 100644
index 0000000000000000000000000000000000000000..c52f0b73fa5f967e74f3c15ba18d5a8b4287dac1
GIT binary patch
literal 1726
zcmV;v20{6WP)<h;3K|Lk000e1NJLTq009gD001xu1^@s6<U>U90004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(~2T34rUN>$WWbH5EXIMDionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWEwqU7;J6>}?mh0_0Yam~bUQQ-=!RpZ
zlL;xCTa|iW5kv?Ph=?i7Hs@qH1>f;?j{slq;yla$+@B+&<!uH8B;r|SS`P6B@${x+
za^5EvSxM1|&xvCeU6A;Z>uQVNI2Sz@c&2D&((}Y3u~h70wToHF(ut>tqnd6|zL0IP
z#(9ggUa7J6J^2g6d1Gan>oiA@#3Gg;LxPGL%Ba9WoK}Mr8)@24`1prCzf3NbTxBqF
zET9S<isuLagWuiSg~^FlQaAzhytwYiDA2nLH0!SWeeAl;6Cn5uTp1mIwE@h0l3wp<
z(Ia4B8@RacXzCttxdRM6nTn-&Qjn%lC;;zg^i4Tn@D}J_YxUON$LRx*p{`Olz`-Ff
zR;288pLh3l_xA6Zc7H!Wy>gQYP(!T%000JJOGiWi`vAKDt*6TrmjD0&32;bRa{vG?
zBLDy{BLR4&KXw2B00(qQO+^Rh0|X5jC-T`am;e9(8FWQhbVF}#ZDnqB07G(RVRU6=
zAa`kWXdp*PO;A^X4i^9b1eZxfK~#9!?Oi)=+%OPb2|CPfV_@stB~@DAz@=~CHdXGD
z+JGDTHk(R-LW>e9zWIsoRYAPcP@LiLy%9+b7lI(V!0mc}9J%iE>wTF2J+K=Ig2|#Z
zX)s|BL`TWu<L#yD+NbB&|B?n120<`c6eo=VNn2X!j)dllrV$B3A|{u~VwnK8uy)O8
zoh)*;TiRpsEYaFa^oi1Bk^Ak0qAjftaJ$|g^Gu7-T+91K(1@DtC5XR2e{KH#$DiM;
z|36wLi`3@rdVjRGC%vC{ji}vTf@s0CrB}3)#mC#rH=8Y*Yk5DdL5ON^4|=*5=o(k<
z{@!YM9x=9P91T6ys=1<RL?(-}YmtLHWww#}#*AUqYMfT28fl(wbAzZ>b7{#dRC{|#
z7Kj=TQbunvTg~{1Qo|a(HOQil(o=gQC5!YLM2&0f{vK+0VHt)6g<ooV4Oy_qYHDf_
zn)Fm^CXx(Tbd3j5bIbY9B7UMU4Oa{Uq3LUD2rV|PY7i0wTWfYh*LcwW^AJCtnT8p|
zNHsoM)7RDzYHK#=_Li~~iJ8da)%wvIPp*Av|7pih%2vEG4R<vRLRa%zufvf@s`T%P
zYZ%e7R)dkQxk#+rXsIzA*_)uzJ}v*D?W6oFk#NW`jP$vbrq`}9Xt!Uo53JY4Ani-B
zlfw+7R>QZh>(H)o)L!4(K5y$b&>H@1{__?;tunLJzI%pILle0sg6JK{n$+6$lf;1T
zX~{DYi>mj6qcxws@jQBWF85|ISrB&pmmbk4_Lc;_7e!hlx4xIJ)%enTb<PHK|D%D9
zAM5^06V1FPgl|a%sUSg|0m}ts%?#sgl=0}k0)&1f7(bqq1sMiG5LGzLFubj+u-35J
znwXI7ujuh31y>9MeZIlj=`MlqFZQtz!;p09)AOs#eFq-F)5c{d9oC>6GYmTDSl{rp
zal)KoXzvx62LpQTdsOW0HIP0(0lkidXPnvs)xV>qhD&WptbOl^f+LuQr#@soLAMV}
zemkwz4Nw}c<`gOP+V_@V^DK*`&QFl=zeSRW_Nj?*HH;;Vwb%!e{sy`B{p`+0v{lmo
zJ;GZbqW5A=bI{Cmwzif~s<~@BvUTk{x`tq_xh2m}K=|Jp)@QOti=U(I8P{eSqCd?|
z|J(a7Li|j*nMNxxqrVcAsG(RUjox0-TKg~Bc{1Efa&iqz#PVNy{)B6WLD&VF_q_|P
z>vCFaFw)<V@pb^PSBXf5LAcS?YqliqdzFoz>q%r7M0Up0SeLP-;U(;QuNinRK9gY(
z*?_eeNK2dA-(lgKA|S)ies3&&zCmyHYm>&_x(xL5<dOr*erwGjlK&*zv&%40+sq}d
zDfw;f{my0|O^uPyll$A}*ZY95Ut{lV{*xL{-#SX-<Gfq64`DAiJ82cQJlRLnYK@OI
zOUH+`Jx%|i$5Yy#K{`lEI-|wj+Wj@1?$JIPlFuU@AJ+CP{D&S-y9pyTDoJrs_N-Ts
zdb2N?G%VU5Egr4?haOM62?N<_rJZrqUdc>h;cRRBQIdvqd|2DF@*jFUT`rf)KV@_3
U;pVJ6g8%>k07*qoM6N<$f{K(%E&u=k

literal 0
HcmV?d00001

diff --git a/game.lua b/game.lua
index 94edad8..c15b7e4 100644
--- a/game.lua
+++ b/game.lua
@@ -9,6 +9,7 @@ function Game:reinit()
 	self.objects.base = require "objects/base"
 	self.objects.grid = require "objects/grid"
 	self.objects.circle = require "objects/circle"
+	self.objects.ending = require "objects/end"
 	self.rect = require "lib/rect"
 	self.maxobjects = 0
 	self.camerax = 0
diff --git a/objects/end.lua b/objects/end.lua
new file mode 100644
index 0000000..4b351c8
--- /dev/null
+++ b/objects/end.lua
@@ -0,0 +1,22 @@
+local gen= {}
+
+function gen:new(game,winner)
+
+	local End = game.objects.base:new(game,0,0,0,0)
+	End.sprite = game:newImage("text/win/"..winner..".png")
+	End:register("End")
+
+	function End:step(dt) end
+
+	function End:draw()
+		lg.draw(self.sprite,(self.game.WIDTH-self.sprite:getWidth())/2,(self.game.HEIGHT-self.sprite:getHeight())/2)
+	end
+
+	function End:MouseCallback(x,y)
+		self.game.scenes:main(game)
+	end
+
+	return End
+end
+
+return gen 
diff --git a/objects/grid.lua b/objects/grid.lua
index 71dfca3..3a6479b 100644
--- a/objects/grid.lua
+++ b/objects/grid.lua
@@ -62,7 +62,7 @@ function gridgen:new(game,x,y,cellsize)
 
 	function Grid:endgame(winner)
 		print(winner.." won !")
-		self.game.scenes:main(self.game)
+		self.game.scenes:ending(self.game,winner)
 	end
 
 	function Grid:draw()
diff --git a/scenes.lua b/scenes.lua
index eaaa169..486523f 100644
--- a/scenes.lua
+++ b/scenes.lua
@@ -9,4 +9,10 @@ function scenes:main(game)
 	game:summon(grid)
 end
 
+function scenes:ending(game,winner)
+	game.gameloop = {}
+	local ending = game.objects.ending:new(game,winner)
+	game:summon(ending)
+end
+
 return scenes