From 281382f120dcaba79b082d010771e193d7a6e9cc Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 11:52:38 -0500 Subject: ShiftSweeper basics --- ShiftOS.WinForms/Resources/Shiftorium.txt | 19 ++++++++++++------- ShiftOS.WinForms/Resources/SweeperClickFace.png | Bin 0 -> 680 bytes ShiftOS.WinForms/Resources/SweeperLoseFace.png | Bin 0 -> 713 bytes ShiftOS.WinForms/Resources/SweeperNormalFace.png | Bin 0 -> 680 bytes ShiftOS.WinForms/Resources/SweeperWinFace.png | Bin 0 -> 670 bytes 5 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 ShiftOS.WinForms/Resources/SweeperClickFace.png create mode 100644 ShiftOS.WinForms/Resources/SweeperLoseFace.png create mode 100644 ShiftOS.WinForms/Resources/SweeperNormalFace.png create mode 100644 ShiftOS.WinForms/Resources/SweeperWinFace.png (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 04cf6ac..2968883 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -6,12 +6,6 @@ Dependencies: "wm_free_placement;desktop", Description: "Crazy math problems getting you down? Well, this calculator will take care of that!" }, - { - Name: "SL Operating Systems Wordlist", - Cost: 500, - Dependencies: "shiftletters", - Description: "Know a lot about computer operating systems? This upgrade adds a wordlist to ShiftLetters, full of various Linux distros, Windows codenames and other OS names. All for the low price of 500 Codepoints! It's an incredible value but it's true! Upgrade today... except out of ShiftOS!" - }, { Name: "AL Calculator", Cost: 350, @@ -98,6 +92,12 @@ Dependencies: "shiftletters", Description: "This nice wordlist lets you find out the people who contributed to the development of ShiftOS!" }, + { + Name: "SL Operating Systems Wordlist", + Cost: 500, + Dependencies: "shiftletters", + Description: "Know a lot about computer operating systems? This upgrade adds a wordlist to ShiftLetters, full of various Linux distros, Windows codenames and other OS names. All for the low price of 500 Codepoints! It's an incredible value but it's true! Upgrade today... except out of ShiftOS!" + }, { Name: "Panel Notifications", Cost: 150, @@ -779,5 +779,10 @@ Dependencies: "shiftorium_gui", Description: "In the shiftorium GUI but dont know what you can spend because you can't see how many code points are on hand? Well shop easy, because with this upgrade that is now possible! You have to restart the shiftorium for it to work." } - + { + Name: "ShiftSweeper", + Cost: 800, + Dependencies: "app_launcher;shiftletters", + Description: "Getting bored with Pong and ShiftLetters? Try this BRAND NEW game called ShiftSweeper!" + }, ] \ No newline at end of file diff --git a/ShiftOS.WinForms/Resources/SweeperClickFace.png b/ShiftOS.WinForms/Resources/SweeperClickFace.png new file mode 100644 index 0000000..c7dee96 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperClickFace.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperLoseFace.png b/ShiftOS.WinForms/Resources/SweeperLoseFace.png new file mode 100644 index 0000000..37003cf Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperLoseFace.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperNormalFace.png b/ShiftOS.WinForms/Resources/SweeperNormalFace.png new file mode 100644 index 0000000..4756298 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperNormalFace.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperWinFace.png b/ShiftOS.WinForms/Resources/SweeperWinFace.png new file mode 100644 index 0000000..6d86035 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperWinFace.png differ -- cgit v1.2.3 From f765e3ef33129f6a21641f7ccdb667ea157d7eed Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 12:09:52 -0500 Subject: ss things 2 --- .../Applications/ShiftSweeper.Designer.cs | 54 +++++++++++++++++++++- ShiftOS.WinForms/Resources/Shiftorium.txt | 11 ++++- 2 files changed, 63 insertions(+), 2 deletions(-) (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index 374784a..1b75d75 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -29,6 +29,10 @@ private void InitializeComponent() { this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.buttonE = new System.Windows.Forms.Button(); + this.buttonM = new System.Windows.Forms.Button(); + this.buttonH = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -42,13 +46,57 @@ this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 39); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 215); + this.tableLayoutPanel1.TabIndex = 1; + // + // buttonE + // + this.buttonE.Location = new System.Drawing.Point(4, 261); + this.buttonE.Name = "buttonE"; + this.buttonE.Size = new System.Drawing.Size(75, 23); + this.buttonE.TabIndex = 2; + this.buttonE.Text = "Easy"; + this.buttonE.UseVisualStyleBackColor = true; + // + // buttonM + // + this.buttonM.Location = new System.Drawing.Point(86, 261); + this.buttonM.Name = "buttonM"; + this.buttonM.Size = new System.Drawing.Size(75, 23); + this.buttonM.TabIndex = 3; + this.buttonM.Text = "Medium"; + this.buttonM.UseVisualStyleBackColor = true; + // + // buttonH + // + this.buttonH.Location = new System.Drawing.Point(168, 261); + this.buttonH.Name = "buttonH"; + this.buttonH.Size = new System.Drawing.Size(75, 23); + this.buttonH.TabIndex = 4; + this.buttonH.Text = "Hard"; + this.buttonH.UseVisualStyleBackColor = true; + // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.buttonH); + this.Controls.Add(this.buttonM); + this.Controls.Add(this.buttonE); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.pictureBox1); this.Name = "ShiftSweeper"; - this.Size = new System.Drawing.Size(270, 333); + this.Size = new System.Drawing.Size(275, 333); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); @@ -57,5 +105,9 @@ #endregion private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Button buttonE; + private System.Windows.Forms.Button buttonM; + private System.Windows.Forms.Button buttonH; } } diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 2968883..1c8ca17 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -778,11 +778,20 @@ Cost: 2500, Dependencies: "shiftorium_gui", Description: "In the shiftorium GUI but dont know what you can spend because you can't see how many code points are on hand? Well shop easy, because with this upgrade that is now possible! You have to restart the shiftorium for it to work." - } + }, + + // SHIFTSWEEPER + { Name: "ShiftSweeper", Cost: 800, Dependencies: "app_launcher;shiftletters", Description: "Getting bored with Pong and ShiftLetters? Try this BRAND NEW game called ShiftSweeper!" }, + { + Name: "ShiftSweeper Medium", + Cost: 900, + Dependencies: "shiftsweeper", + Description: "ShiftSweeper getting too easy? Obviously, since you can only play Easy difficulty! However, with this Medium button, you can get a better challenge, and more codepoints!" + }, ] \ No newline at end of file -- cgit v1.2.3 From 4fba2d86af9c960fb78b1c0a912b6371f21b487d Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 13:36:01 -0500 Subject: setting up minefield --- .../Applications/ShiftSweeper.Designer.cs | 64 ++++++++++++++++------ ShiftOS.WinForms/Applications/ShiftSweeper.cs | 27 ++++++++- ShiftOS.WinForms/Resources/Shiftorium.txt | 6 ++ ShiftOS.WinForms/ShiftOS.WinForms.csproj | 27 +++++++-- 4 files changed, 98 insertions(+), 26 deletions(-) (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index 1b75d75..f5d7ddd 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -29,10 +29,11 @@ private void InitializeComponent() { this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.minefieldPanel = new System.Windows.Forms.TableLayoutPanel(); this.buttonE = new System.Windows.Forms.Button(); this.buttonM = new System.Windows.Forms.Button(); this.buttonH = new System.Windows.Forms.Button(); + this.lblmines = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -40,24 +41,38 @@ // this.pictureBox1.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace; this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pictureBox1.Location = new System.Drawing.Point(110, 3); + this.pictureBox1.Location = new System.Drawing.Point(150, 3); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(32, 32); this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // - // tableLayoutPanel1 + // minefieldPanel // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 39); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 215); - this.tableLayoutPanel1.TabIndex = 1; + this.minefieldPanel.ColumnCount = 9; + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.Location = new System.Drawing.Point(4, 40); + this.minefieldPanel.Name = "minefieldPanel"; + this.minefieldPanel.RowCount = 9; + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.Size = new System.Drawing.Size(329, 215); + this.minefieldPanel.TabIndex = 1; // // buttonE // @@ -67,10 +82,11 @@ this.buttonE.TabIndex = 2; this.buttonE.Text = "Easy"; this.buttonE.UseVisualStyleBackColor = true; + this.buttonE.Click += new System.EventHandler(this.buttonE_Click); // // buttonM // - this.buttonM.Location = new System.Drawing.Point(86, 261); + this.buttonM.Location = new System.Drawing.Point(129, 261); this.buttonM.Name = "buttonM"; this.buttonM.Size = new System.Drawing.Size(75, 23); this.buttonM.TabIndex = 3; @@ -79,35 +95,47 @@ // // buttonH // - this.buttonH.Location = new System.Drawing.Point(168, 261); + this.buttonH.Location = new System.Drawing.Point(258, 261); this.buttonH.Name = "buttonH"; this.buttonH.Size = new System.Drawing.Size(75, 23); this.buttonH.TabIndex = 4; this.buttonH.Text = "Hard"; this.buttonH.UseVisualStyleBackColor = true; // + // lblmines + // + this.lblmines.AutoSize = true; + this.lblmines.Location = new System.Drawing.Point(188, 3); + this.lblmines.Name = "lblmines"; + this.lblmines.Size = new System.Drawing.Size(47, 13); + this.lblmines.TabIndex = 5; + this.lblmines.Text = "Mines: 0"; + // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblmines); this.Controls.Add(this.buttonH); this.Controls.Add(this.buttonM); this.Controls.Add(this.buttonE); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.minefieldPanel); this.Controls.Add(this.pictureBox1); this.Name = "ShiftSweeper"; - this.Size = new System.Drawing.Size(275, 333); + this.Size = new System.Drawing.Size(366, 328); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.TableLayoutPanel minefieldPanel; private System.Windows.Forms.Button buttonE; private System.Windows.Forms.Button buttonM; private System.Windows.Forms.Button buttonH; + private System.Windows.Forms.Label lblmines; } } diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index c61f3eb..d7c22b4 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -11,13 +11,14 @@ using ShiftOS.Engine; namespace ShiftOS.WinForms.Applications { - [Launcher("ShiftSweeper", false, null, "Games")] + [Launcher("ShiftSweeper", true, "shiftsweeper", "Games")] [RequiresUpgrade("shiftsweeper")] [WinOpen("shiftsweeper")] [DefaultIcon("iconShiftSweeper")] public partial class ShiftSweeper : UserControl, IShiftOSWindow { private bool gameplayed = false; + private int mineCount = 0; public ShiftSweeper() { @@ -26,7 +27,9 @@ namespace ShiftOS.WinForms.Applications public void OnLoad() { - + buttonE.Visible = true; + buttonM.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_medium"); + buttonH.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_hard"); } public void OnSkinLoad() { } @@ -37,5 +40,25 @@ namespace ShiftOS.WinForms.Applications { } + + private void buttonE_Click(object sender, EventArgs e) + { + startGame(0); + } + + private void startGame(int d) + { + switch (d) + { + case 0: + mineCount = 10; + minefieldPanel.ColumnCount = 9; + minefieldPanel.RowCount = 9; + break; + + default: + throw new NullReferenceException(); + } + } } } diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 1c8ca17..dccbd9d 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -794,4 +794,10 @@ Dependencies: "shiftsweeper", Description: "ShiftSweeper getting too easy? Obviously, since you can only play Easy difficulty! However, with this Medium button, you can get a better challenge, and more codepoints!" }, + { + Name: "ShiftSweeper Hard", + Cost: 900, + Dependencies: "shiftsweeper_medium", + Description: "Is ShiftSweeper still too easy for you? Buy the Hard difficulty and you can try to find 99 mines! It may be extremely difficult, but the reward is massive!" + }, ] \ No newline at end of file diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index e458704..1802675 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -178,6 +178,12 @@ ShiftoriumFrontend.cs + + UserControl + + + ShiftSweeper.cs + UserControl @@ -239,6 +245,11 @@ Oobe.cs + + True + True + Resources.resx + @@ -322,6 +333,9 @@ ShiftoriumFrontend.cs + + ShiftSweeper.cs + ShopItemCreator.cs @@ -345,14 +359,9 @@ ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - WindowBorder.cs @@ -528,6 +537,10 @@ + + + + @@ -551,8 +564,10 @@ + + -- cgit v1.2.3 From c49c7ac9c68a1815910a80afc45b43e05009137f Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 15:02:40 -0500 Subject: more shiftsweeper stuffs --- ShiftOS.WinForms/Applications/ShiftSweeper.cs | 53 ++++++++++ ShiftOS.WinForms/Properties/Resources.Designer.cs | 120 ++++++++++++++++++++++ ShiftOS.WinForms/Properties/Resources.resx | 36 +++++++ ShiftOS.WinForms/Resources/SweeperTile0.png | Bin 0 -> 259 bytes ShiftOS.WinForms/Resources/SweeperTile1.png | Bin 0 -> 285 bytes ShiftOS.WinForms/Resources/SweeperTile2.png | Bin 0 -> 286 bytes ShiftOS.WinForms/Resources/SweeperTile3.png | Bin 0 -> 284 bytes ShiftOS.WinForms/Resources/SweeperTile4.png | Bin 0 -> 285 bytes ShiftOS.WinForms/Resources/SweeperTile5.png | Bin 0 -> 287 bytes ShiftOS.WinForms/Resources/SweeperTile6.png | Bin 0 -> 292 bytes ShiftOS.WinForms/Resources/SweeperTile7.png | Bin 0 -> 282 bytes ShiftOS.WinForms/Resources/SweeperTile8.png | Bin 0 -> 293 bytes ShiftOS.WinForms/Resources/SweeperTileBlock.png | Bin 0 -> 185 bytes ShiftOS.WinForms/Resources/SweeperTileBomb.png | Bin 0 -> 284 bytes ShiftOS.WinForms/Resources/SweeperTileFlag.png | Bin 0 -> 243 bytes 15 files changed, 209 insertions(+) create mode 100644 ShiftOS.WinForms/Resources/SweeperTile0.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile1.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile2.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile3.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile4.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile5.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile6.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile7.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile8.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTileBlock.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTileBomb.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTileFlag.png (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index d7c22b4..70c69d7 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -19,6 +19,7 @@ namespace ShiftOS.WinForms.Applications { private bool gameplayed = false; private int mineCount = 0; + private int[,] minemap; public ShiftSweeper() { @@ -59,6 +60,58 @@ namespace ShiftOS.WinForms.Applications default: throw new NullReferenceException(); } + makegrid(); + } + + private void makegrid() + { + Random rnd1 = new Random(); + minemap = new int[minefieldPanel.ColumnCount, minefieldPanel.RowCount]; + + for (int x = 0; x < minefieldPanel.ColumnCount; x++) + { + for (int y = 0; y < minefieldPanel.RowCount; y++) + { + minemap[x, y] = 0; + minefieldPanel.Controls.Add(makeButton(x, y), x, y); + } + } + } + + private Button makeButton(int col, int row) + { + Button bttn = new Button(); + + bttn.Text = ""; + bttn.Name = col.ToString() + " " + row.ToString(); + Controls.AddRange(new System.Windows.Forms.Control[] { bttn, }); + bttn.Click += new System.EventHandler(bttnOnclick); + bttn.MouseDown += new MouseEventHandler(mouseDwn); + bttn.MouseUp += new MouseEventHandler(mauseUp); + bttn.MouseHover += new EventHandler(mauseHov); + bttn.BackgroundImage = Properties.Resources.SweeperTileBlock; + + return bttn; + } + + private void mauseHov(object sender, EventArgs e) + { + pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; + } + + private void mauseUp(object sender, MouseEventArgs e) + { + pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; + } + + private void mouseDwn(object sender, EventArgs e) + { + pictureBox1.BackgroundImage = Properties.Resources.SweeperClickFace; + } + + private void bttnOnclick(object sender, EventArgs e) + { + } } } diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index 05c6c07..beef6ff 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -1026,6 +1026,126 @@ namespace ShiftOS.WinForms.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile0 { + get { + object obj = ResourceManager.GetObject("SweeperTile0", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile1 { + get { + object obj = ResourceManager.GetObject("SweeperTile1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile2 { + get { + object obj = ResourceManager.GetObject("SweeperTile2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile3 { + get { + object obj = ResourceManager.GetObject("SweeperTile3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile4 { + get { + object obj = ResourceManager.GetObject("SweeperTile4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile5 { + get { + object obj = ResourceManager.GetObject("SweeperTile5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile6 { + get { + object obj = ResourceManager.GetObject("SweeperTile6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile7 { + get { + object obj = ResourceManager.GetObject("SweeperTile7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile8 { + get { + object obj = ResourceManager.GetObject("SweeperTile8", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTileBlock { + get { + object obj = ResourceManager.GetObject("SweeperTileBlock", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTileBomb { + get { + object obj = ResourceManager.GetObject("SweeperTileBomb", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTileFlag { + get { + object obj = ResourceManager.GetObject("SweeperTileFlag", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index aad84ee..8c4b52b 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -403,4 +403,40 @@ ..\SystemIcons\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SweeperTile0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTileBlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTileBomb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTileFlag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShiftOS.WinForms/Resources/SweeperTile0.png b/ShiftOS.WinForms/Resources/SweeperTile0.png new file mode 100644 index 0000000..c48c377 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile0.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile1.png b/ShiftOS.WinForms/Resources/SweeperTile1.png new file mode 100644 index 0000000..06819d0 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile1.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile2.png b/ShiftOS.WinForms/Resources/SweeperTile2.png new file mode 100644 index 0000000..eec00e9 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile2.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile3.png b/ShiftOS.WinForms/Resources/SweeperTile3.png new file mode 100644 index 0000000..acc7530 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile3.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile4.png b/ShiftOS.WinForms/Resources/SweeperTile4.png new file mode 100644 index 0000000..f8c3d2b Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile4.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile5.png b/ShiftOS.WinForms/Resources/SweeperTile5.png new file mode 100644 index 0000000..2b2e4fd Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile5.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile6.png b/ShiftOS.WinForms/Resources/SweeperTile6.png new file mode 100644 index 0000000..d8698d0 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile6.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile7.png b/ShiftOS.WinForms/Resources/SweeperTile7.png new file mode 100644 index 0000000..ff02afd Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile7.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile8.png b/ShiftOS.WinForms/Resources/SweeperTile8.png new file mode 100644 index 0000000..9703491 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile8.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTileBlock.png b/ShiftOS.WinForms/Resources/SweeperTileBlock.png new file mode 100644 index 0000000..dc664a9 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTileBlock.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTileBomb.png b/ShiftOS.WinForms/Resources/SweeperTileBomb.png new file mode 100644 index 0000000..c03a4a3 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTileBomb.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTileFlag.png b/ShiftOS.WinForms/Resources/SweeperTileFlag.png new file mode 100644 index 0000000..11cedbe Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTileFlag.png differ -- cgit v1.2.3 From 077e0e527106a6d6ab27b31dc07cfd980198d757 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 17:31:19 -0500 Subject: working so hard --- .../Applications/ShiftSweeper.Designer.cs | 14 ++ ShiftOS.WinForms/Applications/ShiftSweeper.cs | 174 +++++++++++++++++++-- ShiftOS.WinForms/Resources/SweeperTile1.png | Bin 285 -> 273 bytes ShiftOS.WinForms/Resources/SweeperTile2.png | Bin 286 -> 275 bytes 4 files changed, 174 insertions(+), 14 deletions(-) (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index f5d7ddd..729bc95 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -34,6 +34,7 @@ this.buttonM = new System.Windows.Forms.Button(); this.buttonH = new System.Windows.Forms.Button(); this.lblmines = new System.Windows.Forms.Label(); + this.lbltime = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -92,6 +93,7 @@ this.buttonM.TabIndex = 3; this.buttonM.Text = "Medium"; this.buttonM.UseVisualStyleBackColor = true; + this.buttonM.Click += new System.EventHandler(this.buttonM_Click); // // buttonH // @@ -101,6 +103,7 @@ this.buttonH.TabIndex = 4; this.buttonH.Text = "Hard"; this.buttonH.UseVisualStyleBackColor = true; + this.buttonH.Click += new System.EventHandler(this.buttonH_Click); // // lblmines // @@ -111,10 +114,20 @@ this.lblmines.TabIndex = 5; this.lblmines.Text = "Mines: 0"; // + // lbltime + // + this.lbltime.AutoSize = true; + this.lbltime.Location = new System.Drawing.Point(188, 22); + this.lbltime.Name = "lbltime"; + this.lbltime.Size = new System.Drawing.Size(42, 13); + this.lbltime.TabIndex = 6; + this.lbltime.Text = "Time: 0"; + // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbltime); this.Controls.Add(this.lblmines); this.Controls.Add(this.buttonH); this.Controls.Add(this.buttonM); @@ -137,5 +150,6 @@ private System.Windows.Forms.Button buttonM; private System.Windows.Forms.Button buttonH; private System.Windows.Forms.Label lblmines; + private System.Windows.Forms.Label lbltime; } } diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index 70c69d7..360ef16 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -19,36 +19,33 @@ namespace ShiftOS.WinForms.Applications { private bool gameplayed = false; private int mineCount = 0; - private int[,] minemap; + private int[,] minemap; //Represents status of tiles. 0-8 = how many mines surrounding. -1 = mine. -2 = flagged mine. -3 to -11 = flagged safe. + private Timer ticking = new Timer(); + private int minetimer; - public ShiftSweeper() - { - InitializeComponent(); - } + public ShiftSweeper() { InitializeComponent(); } public void OnLoad() { buttonE.Visible = true; buttonM.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_medium"); buttonH.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_hard"); + ticking.Interval = 1000; } public void OnSkinLoad() { } public bool OnUnload() { return true; } - public void OnUpgrade() - { - - } + public void OnUpgrade() { } - private void buttonE_Click(object sender, EventArgs e) - { - startGame(0); - } + private void buttonE_Click(object sender, EventArgs e) { startGame(0); } private void startGame(int d) { + lbltime.Text = "Time: 0"; + minetimer = 0; + ticking.Start(); switch (d) { case 0: @@ -57,9 +54,26 @@ namespace ShiftOS.WinForms.Applications minefieldPanel.RowCount = 9; break; + case 1: + mineCount = 40; + minefieldPanel.ColumnCount = 16; + minefieldPanel.RowCount = 16; + break; + + case 2: + mineCount = 99; + minefieldPanel.ColumnCount = 30; + minefieldPanel.RowCount = 16; + break; + default: throw new NullReferenceException(); } + lblmines.Text = "Mines: " + mineCount.ToString(); + buttonE.Enabled = false; + buttonM.Enabled = false; + buttonH.Enabled = false; + gameplayed = true; makegrid(); } @@ -68,6 +82,7 @@ namespace ShiftOS.WinForms.Applications Random rnd1 = new Random(); minemap = new int[minefieldPanel.ColumnCount, minefieldPanel.RowCount]; + // Makes the minefield full of buttons for (int x = 0; x < minefieldPanel.ColumnCount; x++) { for (int y = 0; y < minefieldPanel.RowCount; y++) @@ -76,6 +91,43 @@ namespace ShiftOS.WinForms.Applications minefieldPanel.Controls.Add(makeButton(x, y), x, y); } } + + // Placing the mines + int currminecount = mineCount; + while (currminecount > 0) + { + int mineX = rnd1.Next(minefieldPanel.ColumnCount); + int mineY = rnd1.Next(minefieldPanel.RowCount); + + if (minemap[mineX, mineY] == 0) + { + minemap[mineX, mineY] = -1; + currminecount--; + } + } + + // Setting the numbers + for (int x = 0; x < minefieldPanel.ColumnCount; x++) + { + for (int y = 0; y < minefieldPanel.RowCount; y++) + { + if (minemap[x, y] != -1) + { + int numMines = 0; + for (int xx = -1; xx < 2; xx++) + { + for (int yy = -1; yy < 2; yy++) + { + if (x + xx >= 0 && y + yy >= 0 && x + xx < minefieldPanel.ColumnCount && y + yy < minefieldPanel.RowCount) + { + if (minemap[x + xx, y + yy] == -1) numMines++; + } + } + } + minemap[x, y] = numMines; + } + } + } } private Button makeButton(int col, int row) @@ -85,15 +137,28 @@ namespace ShiftOS.WinForms.Applications bttn.Text = ""; bttn.Name = col.ToString() + " " + row.ToString(); Controls.AddRange(new System.Windows.Forms.Control[] { bttn, }); + bttn.Size = new System.Drawing.Size(minefieldPanel.Width / minefieldPanel.ColumnCount, minefieldPanel.Height / minefieldPanel.RowCount); bttn.Click += new System.EventHandler(bttnOnclick); bttn.MouseDown += new MouseEventHandler(mouseDwn); bttn.MouseUp += new MouseEventHandler(mauseUp); bttn.MouseHover += new EventHandler(mauseHov); bttn.BackgroundImage = Properties.Resources.SweeperTileBlock; + bttn.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bttnOnRightClick); return bttn; } + private void bttnOnRightClick(object sender, MouseEventArgs e) + { + if (!ticking.Enabled) return; + + Button bttnClick = sender as Button; + + if (bttnClick == null) return; + + if (e.Button == MouseButtons.Left | e.Button == MouseButtons.Middle) return; + } + private void mauseHov(object sender, EventArgs e) { pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; @@ -111,7 +176,88 @@ namespace ShiftOS.WinForms.Applications private void bttnOnclick(object sender, EventArgs e) { - + if (!ticking.Enabled) return; + + Button bttnClick = sender as Button; + + if (bttnClick == null) return; //not a button. + + string[] split = bttnClick.Name.Split(new Char[] { ' ' }); + + int x = System.Convert.ToInt32(split[0]); + int y = System.Convert.ToInt32(split[1]); + + + + if (minemap[x, y] == -1) + { + ticking.Enabled = false; + + buttonE.Enabled = true; + buttonM.Enabled = true; + buttonH.Enabled = true; + + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) + { + for (int yy = 0; yy < minefieldPanel.RowCount; yy++) + { + minefieldPanel.GetControlFromPosition(xx, yy).Enabled = false; + if (minemap[xx, yy] == -1) + { + minefieldPanel.GetControlFromPosition(xx, yy).BackgroundImage = Properties.Resources.SweeperTileBomb; + } + + } + } + } + else if (minemap[x, y] < -1) return; + else removeBlank(x, y); + } + + private void removeBlank(int x, int y) + { + if (!minefieldPanel.GetControlFromPosition(x, y).Enabled) return; + else + { + minefieldPanel.GetControlFromPosition(x, y).Enabled = false; + trueform(x, y); + for (int xx = -1; xx < 2; xx++) + { + for (int yy = -1; yy < 2; yy++) + { + if (x + xx >= 0 && y + yy >= 0 && x + xx < minefieldPanel.ColumnCount && y + yy < minefieldPanel.RowCount) + { + if (minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled && minemap[x+xx,y+yy] != -1 && minemap[x + xx, y + yy] != -2) + { + minefieldPanel.GetControlFromPosition(x, y).Enabled = false; + if (minemap[x, y] == 0) + { + removeBlank(x + xx, y + yy); + } + } + + } + } + } + } + } + + private void trueform(int x, int y) + { + Button bttn = (Button)minefieldPanel.GetControlFromPosition(x, y); + if (minemap[x,y] == 0) bttn.BackgroundImage = Properties.Resources.SweeperTile0; + else if (minemap[x, y] == 1) bttn.BackgroundImage = Properties.Resources.SweeperTile1; + else if (minemap[x, y] == 2) bttn.BackgroundImage = Properties.Resources.SweeperTile2; + else if (minemap[x, y] == 3) bttn.BackgroundImage = Properties.Resources.SweeperTile3; + else if (minemap[x, y] == 4) bttn.BackgroundImage = Properties.Resources.SweeperTile4; + else if (minemap[x, y] == 5) bttn.BackgroundImage = Properties.Resources.SweeperTile5; + else if (minemap[x, y] == 6) bttn.BackgroundImage = Properties.Resources.SweeperTile6; + else if (minemap[x, y] == 7) bttn.BackgroundImage = Properties.Resources.SweeperTile7; + else if (minemap[x, y] == 8) bttn.BackgroundImage = Properties.Resources.SweeperTile8; } + + private void buttonM_Click(object sender, EventArgs e) { startGame(1); } + + private void buttonH_Click(object sender, EventArgs e) { startGame(2); } } } diff --git a/ShiftOS.WinForms/Resources/SweeperTile1.png b/ShiftOS.WinForms/Resources/SweeperTile1.png index 06819d0..5fc6871 100644 Binary files a/ShiftOS.WinForms/Resources/SweeperTile1.png and b/ShiftOS.WinForms/Resources/SweeperTile1.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile2.png b/ShiftOS.WinForms/Resources/SweeperTile2.png index eec00e9..22c5f02 100644 Binary files a/ShiftOS.WinForms/Resources/SweeperTile2.png and b/ShiftOS.WinForms/Resources/SweeperTile2.png differ -- cgit v1.2.3