From a93b958a2941bad111b1320c63655f0972fbd60f Mon Sep 17 00:00:00 2001 From: craftxbox Date: Fri, 24 Feb 2017 16:39:20 -0330 Subject: [PATCH 1/2] NO ONE LIKES BEING YELLED AT BY MICHAEL --- ShiftOS.WinForms/Applications/Pong.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs index 7f9a0d6..f7153a1 100644 --- a/ShiftOS.WinForms/Applications/Pong.cs +++ b/ShiftOS.WinForms/Applications/Pong.cs @@ -72,6 +72,8 @@ namespace ShiftOS.WinForms.Applications setuplevelrewards(); } + + // Move the paddle according to the mouse position. private void pongMain_MouseMove(object sender, MouseEventArgs e) { @@ -89,10 +91,15 @@ namespace ShiftOS.WinForms.Applications paddleComputer.BackColor = SkinEngine.LoadedSkin.ControlTextColor; paddleHuman.BackColor = SkinEngine.LoadedSkin.ControlTextColor; - + //Check if paddle upgrade has been bought and change paddles accordingly + if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")) + { + paddleHuman.Height = 150; + paddleComputer.Height = 150; + } //Set the computer player to move according to the ball's position. - if(aiShouldIsbeEnabled) + if (aiShouldIsbeEnabled) if (ball.Location.X > 500 - xVel * 10 && xVel > 0) { if (ball.Location.Y > paddleComputer.Location.Y + 50) @@ -245,7 +252,7 @@ namespace ShiftOS.WinForms.Applications if (this.Left < Screen.PrimaryScreen.Bounds.Width) { secondsleft = secondsleft - 1; - if (secondsleft == 0) + if (secondsleft == 1) { secondsleft = 60; level = level + 1; From c3ecf8a946ffd824d485a42112c56bda68adc1df Mon Sep 17 00:00:00 2001 From: craftxbox Date: Fri, 24 Feb 2017 16:40:40 -0330 Subject: [PATCH 2/2] NO ONE LIKES BEING YELLED AT BY MICHAEL --- ShiftOS.WinForms/Applications/Pong.Designer.cs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/ShiftOS.WinForms/Applications/Pong.Designer.cs b/ShiftOS.WinForms/Applications/Pong.Designer.cs index 5882549..7f2466f 100644 --- a/ShiftOS.WinForms/Applications/Pong.Designer.cs +++ b/ShiftOS.WinForms/Applications/Pong.Designer.cs @@ -555,14 +555,7 @@ namespace ShiftOS.WinForms.Applications this.paddleHuman.Location = new System.Drawing.Point(10, 134); this.paddleComputer.MaximumSize = new System.Drawing.Size(20, 150); this.paddleHuman.Name = "paddleHuman"; - if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")) - { - this.paddleHuman.Size = new System.Drawing.Size(20, 150); - } - else - { - this.paddleHuman.Size = new System.Drawing.Size(20, 100); - } + this.paddleHuman.Size = new System.Drawing.Size(20, 100); this.paddleHuman.TabIndex = 3; this.paddleHuman.TabStop = false; // @@ -573,14 +566,7 @@ namespace ShiftOS.WinForms.Applications this.paddleComputer.Location = new System.Drawing.Point(666, 134); this.paddleComputer.MaximumSize = new System.Drawing.Size(20, 150); this.paddleComputer.Name = "paddleComputer"; - if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")) - { - this.paddleComputer.Size = new System.Drawing.Size(20, 150); - } - else - { - this.paddleComputer.Size = new System.Drawing.Size(20, 100); - } + this.paddleComputer.Size = new System.Drawing.Size(20, 100); this.paddleComputer.TabIndex = 1; // // lbllevelandtime