Skip to content

Commit 2044247

Browse files
author
showpicep
committed
added some features
1 parent b78fbf6 commit 2044247

28 files changed

+661
-17
lines changed

‎ShipBattle.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30907.101
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShipBattle", "ShipBattle\ShipBattle.csproj", "{4E291926-F2FD-4318-8CDC-41E59081293C}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{4E291926-F2FD-4318-8CDC-41E59081293C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{4E291926-F2FD-4318-8CDC-41E59081293C}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{4E291926-F2FD-4318-8CDC-41E59081293C}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{4E291926-F2FD-4318-8CDC-41E59081293C}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {94E7971C-C9C8-45EA-9BCB-2ECC939448AD}
24+
EndGlobalSection
25+
EndGlobal

‎ShipBattle/.vs/ShipBattle/v16/.suo‎

66 KB
Binary file not shown.

‎ShipBattle/App.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
5+
</startup>
6+
</configuration>

‎ShipBattle/Form1.Designer.cs‎

Lines changed: 49 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ShipBattle renamed to ShipBattle/Form1.cs

Lines changed: 63 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.ComponentModel;
44
using System.Data;
@@ -47,6 +47,7 @@ public void CreateMaps()
4747
{
4848
this.Width = mapSize * 2 * cellSize + 100;
4949
this.Height = (mapSize + 3) * cellSize + 100;
50+
5051
for (int i = 0; i < mapSize; i++)
5152
{
5253
for (int j = 0; j < mapSize; j++)
@@ -98,8 +99,8 @@ public void CreateMaps()
9899
{
99100
enemyButtons[i, j] = button;
100101
}
101-
this.Controls.Add(button);
102-
}
102+
this.Controls.Add(button);
103+
}
103104
}
104105

105106
Label map1 = new Label();
@@ -142,7 +143,6 @@ public void CreateMaps()
142143
public void Start(object sender, EventArgs e)
143144
{
144145
isPlaying = true;
145-
146146
}
147147

148148

@@ -152,7 +152,7 @@ private bool check(List<Point> l)
152152

153153
foreach (Point p in l)
154154
{
155-
isChecked = isChecked && !( myMap[p.Y, p.X] == 1 || myMap[p.Y, p.X] == -1);
155+
isChecked = isChecked && !(myMap[p.Y, p.X] == 1 || myMap[p.Y, p.X] == -1);
156156
}
157157

158158
return isChecked;
@@ -166,9 +166,9 @@ private void addShip(List<Point> l)
166166
myButtons[p.Y, p.X].BackColor = Color.Red;
167167
}
168168

169-
for (int i = 0; i < mapSize-1; i++)
169+
for (int i = 0; i < mapSize; i++)
170170
{
171-
for (int j = 0; j < mapSize-1; j++)
171+
for (int j = 0; j < mapSize; j++)
172172
{
173173
if (myMap[i, j] == 1)
174174
{
@@ -180,20 +180,21 @@ private void addShip(List<Point> l)
180180

181181
private void fillFields(int i, int j)
182182
{
183-
184-
for (int k = i - 1; k <= i+1 ; k++)
183+
184+
for (int k = i - 1; k <= i + 1; k++)
185185
{
186-
for (int c = j - 1; c <= j+1 ; c++)
186+
for (int c = j - 1; c <= j + 1; c++)
187187
if (!cantFill(k, c))
188188
{
189189
myMap[k, c] = -1;
190+
//myButtons[k, c].BackColor = Color.Blue;
190191
}
191192
}
192193
}
193194

194-
private bool cantFill(int i, int j)
195+
private bool cantFill(int i, int j)
195196
{
196-
return (myMap[i, j] == 1 || i > mapSize || j > mapSize );
197+
return !(i < mapSize && j < mapSize && myMap[i, j] != 1);
197198
}
198199

199200
private void showError_1()
@@ -205,19 +206,43 @@ private void showError_2()
205206
{
206207
MessageBox.Show("ЧИТАЙ ПРАВИЛААА2");
207208
}
209+
210+
private void showError_3()
211+
{
212+
MessageBox.Show("ЧИТАЙ ПРАВИЛААА3");
213+
}
214+
215+
private void showError_4()
216+
{
217+
MessageBox.Show("ЧИТАЙ ПРАВИЛААА4");
218+
}
219+
private void showError_5()
220+
{
221+
MessageBox.Show("ЧИТАЙ ПРАВИЛААА5");
222+
}
208223
private void readFields(int positionInCheckedListBoxOne, Button pressedButton, bool isHorizontal)
209224
{
225+
bool flag;
226+
227+
if (isHorizontal)
228+
{
229+
flag = pressedButton.Location.X / cellSize + positionInCheckedListBoxOne <= mapSize;
230+
}
231+
else
232+
{
233+
flag = pressedButton.Location.Y / cellSize + positionInCheckedListBoxOne <= mapSize;
234+
}
235+
210236
if (countShips[positionInCheckedListBoxOne] > 0)
211237
{
212-
if (pressedButton.Location.Y / cellSize + positionInCheckedListBoxOne <= mapSize)
238+
if (flag)
213239
{
214240
List<Point> l = new List<Point>();
215241
int k = 0;
216242
int kx = 0;
217243
int ky = 0;
218244
while (k < positionInCheckedListBoxOne)
219245
{
220-
221246
int x = pressedButton.Location.X / cellSize + kx; // Горизонталь
222247
int y = pressedButton.Location.Y / cellSize + ky; // Вертикаль
223248
l.Add(new Point(x, y));
@@ -235,6 +260,7 @@ private void readFields(int positionInCheckedListBoxOne, Button pressedButton, b
235260

236261
if (check(l))
237262
{
263+
238264
addShip(l);
239265
countShips[positionInCheckedListBoxOne]--;
240266
}
@@ -259,8 +285,28 @@ public void ConfigureShips(object sender, EventArgs e)
259285
string positionInCheckedListBoxTwo = Convert.ToString(checkedListBox2.SelectedItem);
260286
Button pressedButton = sender as Button;
261287

262-
readFields(positionInCheckedListBoxOne, pressedButton, positionInCheckedListBoxTwo == "Горизонтально");
263-
288+
if (positionInCheckedListBoxOne == 0 || positionInCheckedListBoxTwo == "")
289+
{
290+
if (positionInCheckedListBoxOne == 0 && positionInCheckedListBoxTwo == "")
291+
{
292+
showError_5();
293+
}
294+
295+
else if (positionInCheckedListBoxOne == 0)
296+
{
297+
showError_3();
298+
}
299+
300+
else if (positionInCheckedListBoxTwo == "")
301+
{
302+
showError_4();
303+
}
304+
}
305+
else
306+
{
307+
readFields(positionInCheckedListBoxOne, pressedButton, positionInCheckedListBoxTwo == "Горизонтально");
308+
}
309+
264310
}
265311
}
266-
}
312+
}

‎ShipBattle/Form1.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎ShipBattle/Player.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace ShipBattle
8+
{
9+
class Player
10+
{
11+
}
12+
}

0 commit comments

Comments
 (0)