YourDax/PIbd-23_Tikhonenkov_A.E_AntiAircraftGun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Алексей Тихоненков 2023-10-15 22:58:40 +04:00
parent d5b447bf0f
commit 6e4ffe95d8
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/AdvancedDrawingAntiAirCraftGun.cs
View File

@ -16,12 +16,12 @@ namespace AntiAircraftGun.DrawingObjects
public AdvancedDrawingAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool rocket,bool radar, int width, int height) : public AdvancedDrawingAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool rocket,bool radar, int width, int height) :
base(speed, weight, bodyColor, additionalColor, width, height) base(speed, weight, bodyColor, additionalColor, width, height)
{ {
AntiAirСraftGun = new EntityAdvancedAntiAircraftGun(speed, weight, bodyColor, additionalColor, dopColor, rocket,radar); AntiAirСraftGun = new EntityAdvancedAntiAirCraftGun(speed, weight, bodyColor, additionalColor, dopColor, rocket,radar);
} }
public override void DrawTransport(Graphics g) public override void DrawTransport(Graphics g)
{ {
if (AntiAirСraftGun is not EntityAdvancedAntiAircraftGun advancedGun) if (AntiAirСraftGun is not EntityAdvancedAntiAirCraftGun advancedGun)
{ {
return; return;
} }

4
AntiAirCraftGun/AntiAirCraftGun/Enitites/EntityAdvancedAntiAircraftGun.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace AntiAircraftGun.Enitites namespace AntiAircraftGun.Enitites
{ {
public class EntityAdvancedAntiAircraftGun : EntityAntiAirCraftGun public class EntityAdvancedAntiAirCraftGun : EntityAntiAirCraftGun
{ {
public Color DopColor { get; private set; } public Color DopColor { get; private set; }
@ -17,7 +17,7 @@ namespace AntiAircraftGun.Enitites
public EntityAdvancedAntiAircraftGun(int speed, double weight, Color bodyColor, Color additionalColor,Color dopColor, bool rocket, bool radar) public EntityAdvancedAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor,Color dopColor, bool rocket, bool radar)
: base(speed, weight, bodyColor, additionalColor) : base(speed, weight, bodyColor, additionalColor)
{ {
DopColor = dopColor; DopColor = dopColor;

16
AntiAirCraftGun/AntiAirCraftGun/MovementStrategy/DrawingObjectAntiAirCraftGun.cs
View File

@ -9,28 +9,28 @@ namespace AntiAircraftGun.MovementStrategy
{ {
public class DrawingObjectAntiAirCraftGun : IMoveableObject public class DrawingObjectAntiAirCraftGun : IMoveableObject
{ {
private readonly BaseDrawingAntiAirCraftGun? _drawningCar = null; private readonly BaseDrawingAntiAirCraftGun? _drawningAntiAirCraftGun = null;
public DrawingObjectAntiAirCraftGun(BaseDrawingAntiAirCraftGun drawningCar) public DrawingObjectAntiAirCraftGun(BaseDrawingAntiAirCraftGun drawningCar)
{ {
_drawningCar = drawningCar; _drawningAntiAirCraftGun = drawningCar;
} }
public ObjectParameters? GetObjectPosition public ObjectParameters? GetObjectPosition
{ {
get get
{ {
if (_drawningCar == null || _drawningCar.AntiAirСraftGun == if (_drawningAntiAirCraftGun == null || _drawningAntiAirCraftGun.AntiAirСraftGun ==
null) null)
{ {
return null; return null;
} }
return new ObjectParameters(_drawningCar.GetPosX, return new ObjectParameters(_drawningAntiAirCraftGun.GetPosX,
_drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight); _drawningAntiAirCraftGun.GetPosY, _drawningAntiAirCraftGun.GetWidth, _drawningAntiAirCraftGun.GetHeight);
} }
} }
public int GetStep => (int)(_drawningCar?.AntiAirСraftGun?.Step ?? 0); public int GetStep => (int)(_drawningAntiAirCraftGun?.AntiAirСraftGun?.Step ?? 0);
public bool CheckCanMove(DirectionType direction) => public bool CheckCanMove(DirectionType direction) =>
_drawningCar?.CanMove(direction) ?? false; _drawningAntiAirCraftGun?.CanMove(direction) ?? false;
public void MoveObject(DirectionType direction) => public void MoveObject(DirectionType direction) =>
_drawningCar?.MoveTransport(direction); _drawningAntiAirCraftGun?.MoveTransport(direction);
} }
} }