norbipeti/Torpedo
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

git-tfs-id: [https://sznp.visualstudio.com/DefaultCollection/]$/Torpedo;C16

Browse source
This commit is contained in:
Dávid 2016-03-20 18:23:45 +00:00 committed by NorbiPeti
parent 8eaab232b5
commit 79b71820e8
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Torpedo/Torpedo/Game.cs
View file

@ -66,7 +66,7 @@ namespace Torpedo
} }
} }
public static void NextTurn() public static void NextTurn(bool hit)
{ {
if (State == GameState.Prepare) if (State == GameState.Prepare)
{ {
@ -122,6 +122,8 @@ namespace Torpedo
} }
if (Type == GameType.Singleplayer) if (Type == GameType.Singleplayer)
{ {
if (hit)
return;
GameForm.Instance.SetPanelsEnabled(false); GameForm.Instance.SetPanelsEnabled(false);
Player.SwapPlayers(); Player.SwapPlayers();
if (Player.CurrentOwn == Player.Player2) if (Player.CurrentOwn == Player.Player2)
@ -131,6 +133,8 @@ namespace Torpedo
} }
else if (Type == GameType.Multiplayer) else if (Type == GameType.Multiplayer)
{ {
if (hit)
return;
Timer t = new Timer(); Timer t = new Timer();
t.Interval = 2000; t.Interval = 2000;
int c = 0; int c = 0;

12
Torpedo/Torpedo/GameForm.Designer.cs generated
View file

@ -44,7 +44,7 @@
// //
// ownPanel // ownPanel
// //
this.ownPanel.BackColor = System.Drawing.Color.DeepSkyBlue; this.ownPanel.BackColor = System.Drawing.Color.Lime;
this.ownPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ownPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ownPanel.Location = new System.Drawing.Point(12, 27); this.ownPanel.Location = new System.Drawing.Point(12, 27);
this.ownPanel.Name = "ownPanel"; this.ownPanel.Name = "ownPanel";
@ -75,13 +75,13 @@
// többjátékosToolStripMenuItem // többjátékosToolStripMenuItem
// //
this.többjátékosToolStripMenuItem.Name = "többjátékosToolStripMenuItem"; this.többjátékosToolStripMenuItem.Name = "többjátékosToolStripMenuItem";
this.többjátékosToolStripMenuItem.Size = new System.Drawing.Size(84, 20); this.többjátékosToolStripMenuItem.Size = new System.Drawing.Size(83, 20);
this.többjátékosToolStripMenuItem.Text = "Többjátékos"; this.többjátékosToolStripMenuItem.Text = "Többjátékos";
this.többjátékosToolStripMenuItem.Click += new System.EventHandler(this.GameTypeMenuClick); this.többjátékosToolStripMenuItem.Click += new System.EventHandler(this.GameTypeMenuClick);
// //
// enemyPanel // enemyPanel
// //
this.enemyPanel.BackColor = System.Drawing.Color.DeepSkyBlue; this.enemyPanel.BackColor = System.Drawing.Color.Lime;
this.enemyPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.enemyPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.enemyPanel.Location = new System.Drawing.Point(405, 27); this.enemyPanel.Location = new System.Drawing.Point(405, 27);
this.enemyPanel.Name = "enemyPanel"; this.enemyPanel.Name = "enemyPanel";
@ -115,7 +115,7 @@
this.moveRightButton.Name = "moveRightButton"; this.moveRightButton.Name = "moveRightButton";
this.moveRightButton.Size = new System.Drawing.Size(75, 75); this.moveRightButton.Size = new System.Drawing.Size(75, 75);
this.moveRightButton.TabIndex = 4; this.moveRightButton.TabIndex = 4;
this.moveRightButton.Text = "Jobbra"; this.moveRightButton.Text = "Jobb";
this.moveRightButton.UseVisualStyleBackColor = true; this.moveRightButton.UseVisualStyleBackColor = true;
this.moveRightButton.Click += new System.EventHandler(this.MoveShip); this.moveRightButton.Click += new System.EventHandler(this.MoveShip);
// //
@ -135,7 +135,7 @@
this.moveLeftButton.Name = "moveLeftButton"; this.moveLeftButton.Name = "moveLeftButton";
this.moveLeftButton.Size = new System.Drawing.Size(75, 75); this.moveLeftButton.Size = new System.Drawing.Size(75, 75);
this.moveLeftButton.TabIndex = 6; this.moveLeftButton.TabIndex = 6;
this.moveLeftButton.Text = "Le"; this.moveLeftButton.Text = "Bal";
this.moveLeftButton.UseVisualStyleBackColor = true; this.moveLeftButton.UseVisualStyleBackColor = true;
this.moveLeftButton.Click += new System.EventHandler(this.MoveShip); this.moveLeftButton.Click += new System.EventHandler(this.MoveShip);
// //
@ -169,7 +169,7 @@
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "GameForm"; this.Name = "GameForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Torpedó"; this.Text = "Csorpedóóó";
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);

4
Torpedo/Torpedo/GameForm.cs
View file

@ -108,7 +108,7 @@ namespace Torpedo
{ {
shipSizeLabel.Text = ""; shipSizeLabel.Text = "";
lastship = null; lastship = null;
Game.NextTurn(); Game.NextTurn(false);
} }
} }
@ -153,7 +153,7 @@ namespace Torpedo
ship.DamagedParts[clickedfield.Y - ship.Y] = true; ship.DamagedParts[clickedfield.Y - ship.Y] = true;
} }
GameRenderer.Enemy.RenderGameField(); GameRenderer.Enemy.RenderGameField();
Game.NextTurn(); Game.NextTurn(ship != null);
} }
private void Game_GameStateChange(object sender, GameStateChangeEventArgs e) private void Game_GameStateChange(object sender, GameStateChangeEventArgs e)

2
Torpedo/Torpedo/OwnGameRenderer.cs
View file

@ -21,7 +21,7 @@ namespace Torpedo
{ FieldTypeOwn.OwnShip, Color.LightGray }, { FieldTypeOwn.OwnShip, Color.LightGray },
{ FieldTypeOwn.OwnShipDamaged, Color.DarkRed }, { FieldTypeOwn.OwnShipDamaged, Color.DarkRed },
{ FieldTypeOwn.OwnShipDestroyed, Color.Black }, { FieldTypeOwn.OwnShipDestroyed, Color.Black },
{ FieldTypeOwn.Missed, Color.LightBlue } { FieldTypeOwn.Missed, Color.LightBlue },
}); });
public void UpdateField(int x, int y, FieldTypeOwn fieldtype) public void UpdateField(int x, int y, FieldTypeOwn fieldtype)