rinat/PIbd-13_Valiullin_R.A._WarmlyShip_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lab6' of https://git.is.ulstu.ru/rinat/PIbd-13_Valiullin_R.A._WarmlyShip_Simple into lab6

Browse Source
This commit is contained in:
pnevmoslon1 2024-05-21 02:57:07 +04:00
commit 7d7fbff67f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WarmlyShip/WarmlyShip/Entities/EntityWarmlyShip.cs
View File

@ -50,14 +50,14 @@ public class EntityWarmlyShip : EntityShip
} }
public override string[] GetStringRepresentation() public override string[] GetStringRepresentation()
{ {
return new[] { nameof(EntityShip), Speed.ToString(), Weight.ToString(), BodyColor.Name, return new[] { nameof(EntityWarmlyShip), Speed.ToString(), Weight.ToString(), BodyColor.Name,
SeckondColor.Name, FuelHole.ToString(), Pipes.ToString() }; SeckondColor.Name, FuelHole.ToString(), Pipes.ToString() };
} }
public static EntityShip? CreateEntityWarmlyShip(string[] strs) public static EntityShip? CreateEntityWarmlyShip(string[] strs)
{ {
if (strs.Length != 7 || strs[0] != nameof(EntityShip)) if (strs.Length != 7 || strs[0] != nameof(EntityWarmlyShip))
{ {
return null; return null;
} }

6
WarmlyShip/WarmlyShip/FormShipCollection.Designer.cs generated
View File

@ -68,7 +68,7 @@
groupBoxTools.Dock = DockStyle.Right; groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(961, 24); groupBoxTools.Location = new Point(961, 24);
groupBoxTools.Name = "groupBoxTools"; groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(187, 497); groupBoxTools.Size = new Size(187, 554);
groupBoxTools.TabIndex = 0; groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false; groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты"; groupBoxTools.Text = "Инструменты";
@ -245,7 +245,7 @@
pictureBox.Dock = DockStyle.Fill; pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 24); pictureBox.Location = new Point(0, 24);
pictureBox.Name = "pictureBox"; pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(961, 497); pictureBox.Size = new Size(961, 554);
pictureBox.TabIndex = 3; pictureBox.TabIndex = 3;
pictureBox.TabStop = false; pictureBox.TabStop = false;
// //
@ -294,7 +294,7 @@
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1148, 521); ClientSize = new Size(1148, 578);
Controls.Add(pictureBox); Controls.Add(pictureBox);
Controls.Add(groupBoxTools); Controls.Add(groupBoxTools);
Controls.Add(menuStrip); Controls.Add(menuStrip);