From c186a979e8d73cfd086d56aaea89327ed5ec7121 Mon Sep 17 00:00:00 2001
From: SpunBlue <86245524+SpunBlue@users.noreply.github.com>
Date: Tue, 17 May 2022 12:11:32 -0400
Subject: [PATCH] ass

---
 Project.xml                  |   4 ++--
 assets/images/background.png | Bin 277 -> 0 bytes
 assets/images/ground.png     | Bin 1000 -> 0 bytes
 assets/images/mobilebg.png   | Bin 0 -> 10152 bytes
 source/GameOverState.hx      |  13 +++++++++++++
 source/Main.hx               |   1 +
 source/MainMenuState.hx      |  10 ++++++++++
 source/PlayState.hx          |  17 ++++-------------
 8 files changed, 30 insertions(+), 15 deletions(-)
 delete mode 100644 assets/images/background.png
 delete mode 100644 assets/images/ground.png
 create mode 100644 assets/images/mobilebg.png

diff --git a/Project.xml b/Project.xml
index d0695e1..d3561ed 100644
--- a/Project.xml
+++ b/Project.xml
@@ -22,7 +22,7 @@
 	<window if="html5" resizable="false" />
 
 	<!--Desktop-specific-->
-	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" />
+	<window if="desktop" orientation="landscape" fullscreen="true" resizable="false" />
 
 	<!--Mobile-specific-->
 	<window if="mobile" orientation="portrait" fullscreen="false" width="576" height="1024" resizable="false"/>
@@ -90,4 +90,4 @@
 	<setenv name="GooglePlayID" value="" if="android"/>
 
 	<android target-sdk-version="26" />
-</project>
+</project>
\ No newline at end of file
diff --git a/assets/images/background.png b/assets/images/background.png
deleted file mode 100644
index bb077b3f32c41b86ba68ad93fa6a82a213eac1b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikt0(?ST1qB7UxIktoDk^T>x)sP^7u|FkNU@a!`33(60fx={m+S|Ma29w(
z7BevL9R^{><M}I6fPz(?E{-7<{#Pe>a~)9Naryi8U-&x<HzCD?VY^;N^C;RCn8Zrk
ziA-`WlNH_ch})I3#Y(g2qQg1ygGsH|3c3PB=Wxl)%xh0>jBZ)wAjhrbSZDrx#gael
zFSIvt#gyLT^pY}C(t61)Gn2pN<fTMyjs4n|oUDtBQu11&^4I9_I%@rxoD6gYgQu&X
J%Q~loCIB56SMUG;

diff --git a/assets/images/ground.png b/assets/images/ground.png
deleted file mode 100644
index 27ad982046408a9b44570f6241517ff40be3649b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1000
zcmeAS@N?(olHy`uVBq!ia0y~yVEheaH*l~4Ngl}qDL{&`ILO_JVcj{Imp~3nx}&cn
z1H;CC?mvmFKt5-IM`SSr1K&XqX529``z-?lbFHU~V@O5Z+dGb3!hs?V7gb(du<c+r
zSNFTqu)}xz!+^}Cvx<~7cU$kb_q;oYdH%YY7xatj#rMeYTYvxf`r-Fq6%*gz=iB{X
zmf^tvj=eYDPrJ!%b3XGgCxc6;EyEFX%)4H$cb$Fjudm6qJ1)#Fe|?xGZ1=NGRqP*Z
zlJvic8~@JL6Dr>M;;wq}{yEowFbJrB!^Gt>v8fWV^;M@1pZ}UT>GJKbiA^(C$98A0
zpBS<CcG}i#J?)6^C-3O1e=C=%-W)HlR&a6lY1j8wXKHV+J%2a5hM_~a8WUUB{V>|*
zWms+d>cfVAb5b9bra#NNp7gEidhnWixtpuZr;Dz6ZSXyJyIuLl{f}?-|2u97bZS*{
z%$IGwE=S9=*YFG9`E*A-?lH5&oEw<<PG)4Ogk}HhK;!c{&;Okbw|ZU|zrJ#s>5PfY
z2Wl<${kQp{%IST>BL7qM<co7JK0Rb`<jwZGKi;_W)|bsQ`n}n-&~E!5S?<NtYl`oe
zoi2{A=;dc9Ou~Yf9}jJxcz9d!{`KKD_21v>+cMl~fBf6Ox%yko`4`nQpI$m(7yEne
zob%_lo!l&W^SRu<C$oQVlb-kc5UyYm{%so#G{=tN4r}!{hH9fv>a)E6)$#tze5a2k
z5D@{}VEgm?>5XwkH`W(_t~n@(S1o2_Aj}!oavs(){}_t@%vaHFyMG#(I~hD({an^L
HB{Ts5RvnJb

diff --git a/assets/images/mobilebg.png b/assets/images/mobilebg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac7997b9a6c0035e3a8bb1a7262b0abcc1f04e61
GIT binary patch
literal 10152
zcmeHN3s6&68onVUln@Bf3nUhKSs75NNmJcQGyx6u0R>95*wD%&YG{=ei;KD<$%X;K
zL+EZ>n?7P9oti!dlqpzgr^W;b?Jgqe1F1R-$SjR3C844ONOJd_1Q1>On67rECUY~H
zb8_$hfB$#?^Z(zuNm+8@T5r-k5`rM!>(}v85X3D8LEMpt@L-11?hhsqTwcoB)ks}O
z;1w`%7sWmmiy-yYUe-(k7>6b&Y>dOY5h|5RB0)2up`ne9jp1S>>?I^52MO5$=8&&~
zY7c=AuRSS=d~EuKY)HcW0H!^2*FBquAU@6TjceQW-c|$&A6w6h-MDYd_ZR;0w{0I+
zZF_ptw$D;9Oxvn|oShp#P=h}7$t#sB1m^=oeDX7{*V)I@US!0)$h`efTdsx=uB55>
zxo@&hT+5IoYF`*S(@}(rCa9b6YzonczCGaMI>E(*D<53z!c`ycVVztTMRXl523!oR
zi&7JeVk^_qdy%eE>O6Wn5F5&|<P(i*v-V?F47ZqaT7esnEHHmh?o8?{+9i?{l7b7^
z_!0iEyF?MJ!p7V=$9kcu(;mTmhnt?F>PUw@leP_Y_!{jMk{mb=n3)8J!&Mf!)Bz@_
zAVCX(9;Dn8Gi+`QHhe!K+$)sW&kt{I=oKCjN={}Nq}BVYa2KR;UYvmy#B4ABD2x0%
znkwoyJ%KBM2rvZtx8b4p5lRLGcMra(b~lPKe1koHWmPtaQe_UrH=OC0bpZxQ=a?~G
zuIc{^C%()_YZ?#jrq=!yC+OYH+o7!?6wAOcr?MjZ5V_N>dVv7sW&{rmbA-?Fc5IdS
z?+Y{tPGrZ1W`W_u{b7OyH*X{r3@_3G4D;wJLeSa<|0RNC85myBpOSTbjzpQCsA&Y5
zzq$nsm+Rvio+M`frHxuksPIR_!0;r%vh1<xRG1CW3=444-Vpwf|5TJY4hlb=4krzA
zb@`9elsZT`l{U?tBYM~6FhPFD)CGC^rUx3vmkv9ZfG+Rm+FIE*y)tIOwB268QdD@M
zgIjXHkada6Cf6@$YEy-w5A?ICWj(v5#n^RjQX7Gkzx32r-c?P@WP5txs@mP{1vXni
z@V>eET$-y+I(vlCq_G5lciD|lTvYGs4O3F%PJMAwD#Nk}zuxCm%up}Ft_lkc6epm7
zIy#3_KRc8qY^wj;#Vk)>Y=vN|3V5L?2?(0sm3noRHJ8M_U)A?3h@u3nIUhaTj<~cm
z+!o#QisyVR@pH9SG$+J<KtHAY0wN+%uyeP)KDjBJz1r`lW}T&5(Yq_!9+VCIeaxES
zkr;KKOC<j6!;>G=d1K!oHYFz2nZS;Y<RLUjb$MGnedAHIka#!Lp~vTTlQ=e0+N3E5
zooZ3x2P!iQKG%HvVYe2!Y$1unBLCCK4UgxK(+882ji7+jRDN|EljRvh$L*=PMB^Va
zN~Nn`$6e4NwYl#~b?$lIos_I!JaxWD%rq6@6KonRX#U)GMd&iZ0l!J3=lA1kQW)Dy
zdX5|wmNc=fAMqNtTQ@qfMpD@*8cv%yM^hcQh|03hTHc4g#eV#-{D_DI#tkJiCVlwa
z9K)N#d_uA3fPK+19>6cp7~~2ir!OlP)-3B+lSp&hZJQFxx{s<D+HSEPIoQgL=k3rZ
z`Jv(Ri4Wy->em2o^;jityj*-()>Wxo1Wb>nG8cjXb?!opjvw*EmQZWy+)WNbvNp8%
z0B?Fbi)dVIe>P0O0(>&Gm(p8bmCXm<Ds3WiXX>2;vDyNzah^Eywb(vt1muzzi$*%k
zUaURsjJ+k|!<3hvpA4n&-vQY1BRxSOg)fY!VXe1vw1jGiZe7~m$<$t=Cyr@*79VRj
zf5qC9z{oG}E&x<*4y*Z7dAj_lP};<587R`ECcM$776E^QX#E%?CcU1=yNYTUYueoN
zM6$CU;^Xqinv>1}bKQ|y*D@uiv&v*$k%gHhRh|PKzHd?NTbSEQl;HMA>-jAM&49l-
z)LOn(M|RxG<-yj^vi?ryt^($SYT4ORK;yzNf!b0`j}Di!*X-n24z#{XFZ?qwr%$B5
zMFDKa^BNL|LDUH#>h1#bXn7>dIs(j9D#Dfr15yvmvK5yDwmTTAAL}*w@wZ#90CO~U
z+)fVQb|wK?*KQ+Vl44WyCHgZRMnxaAlQ~4j5`O}8n}gtiQE=W&Y@Z&Si7l%_haA+-
zh`n#aEwOjk0B%pr;P%v)w{Uwhg4`J}6MEgqEzqM#_z}WP_ltj9_vIS-C~NbIcSa!%
zGwHfhoMsbxGYM}Gq`cpa_pee&1-uJGH(;37<&}zQ1~rsCk&~StE`qF`irmg=S4=wF
z)!ZF9McDWR$P*_S8gHR`nrCR->H2OOw|tAtFBPk0T|K2utmm%4<ujH;W4HPj<D%#7
zo#-`jiviv}k3-L5QW{D$X2Y{E6v8#YsIbVLPt#QI?0%PGxAP&|wf!JdZ0ZwnnUX5~
zYaGi&QYOfy`G;UkN}a=S>iB;feo%fi_QuAPSTHf@<ql6}iwgWR4p|?U$g5kOA^i^s
CQ772|

literal 0
HcmV?d00001

diff --git a/source/GameOverState.hx b/source/GameOverState.hx
index bb4c7c2..b95a965 100644
--- a/source/GameOverState.hx
+++ b/source/GameOverState.hx
@@ -4,6 +4,7 @@ import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.FlxState;
 import flixel.text.FlxText;
+import openfl.system.System;
 
 class GameOverState extends FlxState
 {
@@ -37,6 +38,13 @@ class GameOverState extends FlxState
 		var enterText:FlxText = new FlxText(0, FlxG.height / 2 + 150, FlxG.width, "Press Enter or Tap to Play Again");
 		enterText.setFormat(AssetPaths.prstart__ttf, 20, 0xffffffff, "center");
 		add(enterText);
+
+		// press x to exit
+		#if desktop
+		var exitText:FlxText = new FlxText(0, FlxG.height - 50, FlxG.width, "Press X to Exit");
+		exitText.setFormat(AssetPaths.prstart__ttf, 20, 0xffffffff, "center");
+		add(exitText);
+		#end
 	}
 
 	override public function update(elapsed)
@@ -58,5 +66,10 @@ class GameOverState extends FlxState
 			PlayState.score = 0;
 			FlxG.switchState(new PlayState());
 		}
+
+		#if desktop
+		if (FlxG.keys.anyJustPressed([X, ESCAPE]))
+			System.exit(0);
+		#end
 	}
 }
diff --git a/source/Main.hx b/source/Main.hx
index 4890464..4dd517f 100644
--- a/source/Main.hx
+++ b/source/Main.hx
@@ -8,6 +8,7 @@ class Main extends Sprite
 	public function new()
 	{
 		super();
+
 		addChild(new FlxGame(0, 0, MainMenuState));
 	}
 }
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
index 52cd383..66a9439 100644
--- a/source/MainMenuState.hx
+++ b/source/MainMenuState.hx
@@ -4,6 +4,7 @@ import flixel.FlxG;
 import flixel.FlxState;
 import flixel.text.FlxText;
 import flixel.ui.FlxButton;
+import openfl.system.System;
 
 class MainMenuState extends FlxState
 {
@@ -25,6 +26,10 @@ class MainMenuState extends FlxState
 		creditsText.setFormat(AssetPaths.prstart__ttf, 8, 0xFFFFFFFF, "center");
 		add(creditsText);
 
+		// exit game button
+		var exitButton:FlxButton = new FlxButton(FlxG.width - 50, 0, "X", exitGame);
+		add(exitButton);
+
 		// settings button
 		/*var settingsButton:FlxButton = new FlxButton(FlxG.width / 2 - 50, FlxG.height / 2 + 100, "Settings", settingsButt);
 			add(settingsButton); */
@@ -46,4 +51,9 @@ class MainMenuState extends FlxState
 		FlxG.switchState(new SettingsState());
 		#end
 	}
+
+	function exitGame()
+	{
+		System.exit(0);
+	}
 }
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 1df7d9d..653ac58 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -11,7 +11,6 @@ class PlayState extends FlxState
 {
 	var player:Player;
 
-	var ground:FlxSprite;
 	var pipeTop:FlxSprite;
 	var pipeBottom:FlxSprite;
 	var pipePieceBottom:FlxSprite;
@@ -35,29 +34,21 @@ class PlayState extends FlxState
 	{
 		super.create();
 
-		// create background
 		var backgroundCol:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, 0xFF96FFFF);
 		add(backgroundCol);
 
-		var background:FlxSprite = new FlxSprite(0, 0, AssetPaths.background__png);
-		background.setGraphicSize(FlxG.width);
+		var background:FlxSprite = new FlxSprite(0, 0, AssetPaths.mobilebg__png);
+		background.setGraphicSize(FlxG.width, FlxG.height);
 		background.updateHitbox();
-		background.setPosition(0, FlxG.height - background.height);
 		add(background);
 
-		ground = new FlxSprite(0, 0, AssetPaths.ground__png);
-		ground.setGraphicSize(FlxG.width);
-		ground.updateHitbox();
-		ground.y = FlxG.height - ground.height;
-		add(ground);
-
 		scoreUI = new FlxText(0, 0, FlxG.width, "0");
 		scoreUI.setFormat(AssetPaths.prstart__ttf, 64, 0xFFFFFFFF, "center");
 		scoreUI.y = FlxG.height - scoreUI.height;
 		uiTextGroup.add(scoreUI);
 		add(scoreUI);
 
-		player = new Player(24, FlxG.height * 0.5);
+		player = new Player(FlxG.width * 0.5, FlxG.height * 0.5);
 		add(player);
 
 		createPipe();
@@ -71,7 +62,7 @@ class PlayState extends FlxState
 
 		scoreUI.text = "" + score;
 
-		if (player.y <= 0 || player.y >= FlxG.height - (ground.height * 0.5))
+		if (player.y <= 0 || player.y >= FlxG.height - 124)
 		{
 			FlxG.switchState(new GameOverState());
 		}