Merge pull request 'Polevoy S.V Lab_work1' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/ChipsEater/PIbd-23_Polevoy_S.V._SelfPropelledArtilleryUnit_Hard/pulls/1

AbstractMap.java

@@ -1,103 +0,0 @@
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.util.Random;
-
-public abstract class AbstractMap {
-    private IDrawingObject _drawingObject = null;
-    protected int[][] _map = null;
-    protected int _width;
-    protected int _height;
-    protected float _size_x;
-    protected float _size_y;
-    protected final Random _random = new Random();
-    protected final int _freeRoad = 0;
-    protected final int _barrier = 1;
-
-    public Image createMap(int width, int height, IDrawingObject drawingObject) {
-        _width = width;
-        _height = height;
-        _drawingObject = drawingObject;
-        do {
-            generateMap();
-        } while (!setObjectOnMap());
-        return drawMapWithObject();
-    }
-
-    public Image moveObject(Direction direction) {
-        _drawingObject.moveObject(direction);
-        if (objectIntersects()) {
-            switch (direction) {
-                case Left -> _drawingObject.moveObject(Direction.Right);
-                case Right -> _drawingObject.moveObject(Direction.Left);
-                case Up -> _drawingObject.moveObject(Direction.Down);
-                case Down -> _drawingObject.moveObject(Direction.Up);
-            }
-        }
-        return drawMapWithObject();
-    }
-
-    private boolean setObjectOnMap() {
-        if (_drawingObject == null || _map == null)
-        {
-            return false;
-        }
-
-        for (int i = 2; i < _map.length; i++)
-        {
-            for (int j = 2; j < _map[i].length; j++)
-            {
-                _drawingObject.setObject((int) (i * _size_x), (int) (j * _size_y), _width, _height);
-                if (!objectIntersects()) return true;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean objectIntersects() {
-        float[] location = _drawingObject.getCurrentPosition();
-        Rectangle self = new Rectangle((int) location[0], (int) location[2], (int) location[1] - (int) location[0], (int) location[3] - (int) location[2]);
-        for (int i = 0; i < _map.length; i++)
-        {
-            for (int j = 0; j < _map[i].length; j++)
-            {
-                if (_map[i][j] == _barrier)
-                {
-                    if (self.intersects(new Rectangle(j * (int) _size_x, i * (int) _size_y, (int) _size_x, (int) _size_y)))
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private Image drawMapWithObject() {
-        Image img = new BufferedImage(_width, _height, BufferedImage.TYPE_INT_ARGB);
-        if (_drawingObject == null || _map == null) {
-            return img;
-        }
-        Graphics2D g = (Graphics2D) img.getGraphics();
-        for (int i = 0; i < _map.length; ++i)
-        {
-            for (int j = 0; j < _map[i].length; ++j)
-            {
-                if (_map[i][j] == _freeRoad)
-                {
-                    drawRoadPart(g, i, j);
-                } else if (_map[i][j] == _barrier)
-                {
-                    drawBarrierPart(g, i, j);
-                }
-            }
-        }
-        _drawingObject.drawingObject(g);
-        return img;
-    }
-
-    protected abstract void generateMap();
-    protected abstract void drawRoadPart(Graphics2D g, int i, int j);
-    protected abstract void drawBarrierPart(Graphics2D g, int i, int j);
-}

Direction.java

@@ -2,6 +2,5 @@ public enum Direction {
     Up,
     Down,
     Left,
-    Right,
-    None
+    Right
 }

DrawingAdvancedArtillery.java

@@ -1,28 +0,0 @@
-import java.awt.*;
-
-public class DrawingAdvancedArtillery extends DrawingArtillery {
-    public DrawingAdvancedArtillery(int speed, float weight, Color bodyColor, int rollersCount, Color dopColor, boolean weapon, boolean salvoBattery) {
-        super(speed, weight, bodyColor, rollersCount, 80, 50);
-        artillery = new EntityAdvancedArtillery(speed, weight, bodyColor, dopColor, weapon, salvoBattery);
-    }
-
-    @Override
-    public void drawTransport(Graphics2D g) {
-        if (!(artillery instanceof EntityAdvancedArtillery advancedArtillery)) {
-            return;
-        }
-
-        g.setColor(advancedArtillery.getDopColor());
-        if (advancedArtillery.getWeapon()) {
-            g.setStroke(new BasicStroke(8));
-            g.drawLine((int) _startPosX + _artilleryWidth / 2, (int) _startPosY + _artilleryHeight / 10, (int) _startPosX + _artilleryWidth, (int) _startPosY);
-        }
-        g.setStroke(new BasicStroke(6));
-        if (advancedArtillery.getSalvoBattery()) {
-            g.drawLine((int) _startPosX + _artilleryWidth / 4, (int) _startPosY + _artilleryHeight / 4, (int) _startPosX + _artilleryWidth / 4 + _artilleryHeight / 4, (int) _startPosY - 5);
-            g.drawLine((int) _startPosX + _artilleryWidth / 4 - _artilleryHeight / 4, (int) _startPosY + _artilleryHeight / 4, (int) _startPosX + _artilleryWidth / 4, (int) _startPosY - 5);
-            g.drawLine((int) _startPosX + _artilleryWidth / 4 - _artilleryHeight / 2, (int) _startPosY + _artilleryHeight / 4, (int) _startPosX + _artilleryWidth / 4 - _artilleryHeight / 4, (int) _startPosY - 5);
-        }
-        super.drawTransport(g);
-    }
-}

DrawingArtillery.java

@@ -1,31 +1,27 @@
 import java.awt.*;
 
 public class DrawingArtillery {
-    protected EntityArtillery artillery;
-    protected IDrawingRollers drawingRollers;
-    protected float _startPosX;
-    protected float _startPosY;
+    private EntityArtillery artillery;
+    private DrawingRollers drawingRollers;
+    private float _startPosX;
+    private float _startPosY;
     private Integer _pictureWidth = null;
     private Integer _pictureHeight = null;
-    protected int _artilleryWidth = 80;
-    protected int _artilleryHeight = 50;
+    private final int _artilleryWidth = 80;
+    private final int _artilleryHeight = 50;
 
     public EntityArtillery getArtillery() {
         return artillery;
     }
 
-    public DrawingArtillery(int speed, float weight, Color bodyColor, int rollersCount) {
-        artillery = new EntityArtillery(speed, weight, bodyColor);
-        drawingRollers = RollersType.random(rollersCount, bodyColor);
+    public void Init(int speed, float weight, Color bodyColor, int rollersCount) {
+        artillery = new EntityArtillery();
+        artillery.Init(speed, weight, bodyColor);
+        drawingRollers = new DrawingRollers();
+        drawingRollers.Init(rollersCount, bodyColor);
     }
 
-    protected DrawingArtillery(int speed, float weight, Color bodyColor, int rollersCount, int artilleryWidth, int artilleryHeight) {
-        this(speed, weight, bodyColor, rollersCount);
-        _artilleryWidth = artilleryWidth;
-        _artilleryHeight = artilleryHeight;
-    }
-
-    public void setPosition(int x, int y, int width, int height) {
+    public void SetPosition(int x, int y, int width, int height) {
         if (x < 0 || x + _artilleryWidth >= width)
         {
             return;
@@ -86,7 +82,7 @@ public class DrawingArtillery {
             return;
         }
         g.setColor(artillery.getBodyColor() != null ? artillery.getBodyColor() : Color.BLACK);
-        g.fillRect((int) (_startPosX + _artilleryWidth / 8 * 2), (int) _startPosY, _artilleryWidth / 8 * 4, _artilleryHeight / 5);
+        g.fillRect((int) (_startPosX + _artilleryWidth / 8 * 2), (int) _startPosY, _artilleryWidth / 8 * 4, _artilleryWidth / 5);
         g.fillRect((int) _startPosX, (int) (_startPosY + _artilleryHeight / 5), _artilleryWidth, _artilleryHeight / 3);
 
 
@@ -114,8 +110,4 @@ public class DrawingArtillery {
             _startPosY = _pictureHeight - _artilleryHeight;
         }
     }
-
-    public float[] getCurrentPosition() {
-        return new float[] { _startPosX, _startPosX + _artilleryWidth - 1, _startPosY, _startPosY + _artilleryHeight -1 };
-    }
 }

DrawingCrossRollers.java

@@ -1,82 +0,0 @@
-import java.awt.*;
-
-public class DrawingCrossRollers implements IDrawingRollers {
-    private RollersCount rollersCount;
-    private Color color;
-
-    public DrawingCrossRollers(int rollersCount, Color bodyColor) {
-        setRollersCount(rollersCount);
-        color = bodyColor;
-    }
-
-    public void setRollersCount(int num) {
-        if (num <= 4) {
-            rollersCount = RollersCount.Four;
-        } else if (num >= 6) {
-            rollersCount = RollersCount.Six;
-        } else {
-            rollersCount = RollersCount.Five;
-        }
-    }
-
-    public void draw(Graphics2D g, int x, int y, int artilleryWidth, int artilleryHeight) {
-        g.setColor(color != null ? color : Color.BLACK);
-        g.fillOval(x + artilleryWidth / 20, y + artilleryHeight * 7 / 15, artilleryWidth * 4 / 20, artilleryHeight * 10 / 32);
-        g.fillOval(x + artilleryWidth * 15 / 20, y + artilleryHeight * 7 / 15, artilleryWidth * 4 / 20, artilleryHeight * 10 / 32);
-        switch (rollersCount) {
-            case Six: {
-                g.fillOval(x + artilleryWidth * 8 / 20, y + artilleryHeight * 10 / 16, artilleryWidth * 2 / 20, artilleryHeight * 6 / 32);
-            }
-            case Five: {
-                g.fillOval(x + artilleryWidth * 10 / 20, y + artilleryHeight * 10 / 16, artilleryWidth * 2 / 20, artilleryHeight * 6 / 32);
-            }
-            case Four: {
-                g.fillOval(x + artilleryWidth * 5 / 20, y + artilleryHeight * 9 / 16, artilleryWidth * 3 / 20, artilleryHeight * 8 / 32);
-                g.fillOval(x + artilleryWidth * 12 / 20, y + artilleryHeight * 9 / 16, artilleryWidth * 3 / 20, artilleryHeight * 8 / 32);
-            }
-        }
-        drawOrnament(g, x, y, artilleryWidth, artilleryHeight);
-    }
-
-    private void drawOrnament(Graphics2D g, int x, int y, int artilleryWidth, int artilleryHeight) {
-        g.setStroke(new BasicStroke(1));
-        g.setColor(Color.BLACK);
-
-
-        g.drawLine(x + artilleryWidth / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 32, x + artilleryWidth * 5 / 20 - 1, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 32);
-        g.drawLine(x + artilleryWidth * 3 / 20, y + artilleryHeight * 7 / 15, x + artilleryWidth * 3 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 10 / 32);
-        g.drawLine(x + artilleryWidth * 2 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 64, x + artilleryWidth * 4 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 15 / 64);
-        g.drawLine(x + artilleryWidth * 4 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 64, x + artilleryWidth * 2 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 15 / 64);
-
-        g.drawLine(x + artilleryWidth * 15 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 32, x + artilleryWidth * 19 / 20 - 1, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 32);
-        g.drawLine(x + artilleryWidth * 17 / 20, y + artilleryHeight * 7 / 15, x + artilleryWidth * 17 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 10 / 32);
-        g.drawLine(x + artilleryWidth * 16 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 64, x + artilleryWidth * 18 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 15 / 64);
-        g.drawLine(x + artilleryWidth * 18 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 64, x + artilleryWidth * 16 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 15 / 64);
-
-        switch(rollersCount) {
-            case Six: {
-                g.drawLine(x + artilleryWidth * 8 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32, x + artilleryWidth * 10 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32);
-                g.drawLine(x + artilleryWidth * 9 / 20, y + artilleryHeight * 10 / 16, x + artilleryWidth * 9 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 6 / 32);
-                g.drawLine(x + artilleryWidth * 8 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 - artilleryHeight * 3 / 64, x + artilleryWidth * 10 / 20 - artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 + artilleryHeight * 3 / 64);
-                g.drawLine(x + artilleryWidth * 9 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 - artilleryHeight * 3 / 64, x + artilleryWidth * 8 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 + artilleryHeight * 3 / 64);
-            }
-            case Five: {
-                g.drawLine(x + artilleryWidth * 10 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32, x + artilleryWidth * 12 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32);
-                g.drawLine(x + artilleryWidth * 11 / 20, y + artilleryHeight * 10 / 16, x + artilleryWidth * 11 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 6 / 32);
-                g.drawLine(x + artilleryWidth * 12 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 - artilleryHeight * 3 / 64, x + artilleryWidth * 12 / 20 - artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 + artilleryHeight * 3 / 64);
-                g.drawLine(x + artilleryWidth * 11 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 - artilleryHeight * 3 / 64, x + artilleryWidth * 10 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 + artilleryHeight * 3 / 64);
-            }
-            case Four: {
-                g.drawLine(x + artilleryWidth * 5 / 20, y + artilleryHeight * 9 / 16 + artilleryHeight * 4 / 32, x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 20, y + artilleryHeight * 9 / 16 + artilleryHeight * 4 / 32);
-                g.drawLine(x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 40, y + artilleryHeight * 9 / 16, x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 40, y + artilleryHeight * 9 / 16 + artilleryHeight * 8 / 32);
-                g.drawLine(x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 2 / 32, x + artilleryWidth * 5 / 20 + artilleryWidth * 9 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 6 / 32);
-                g.drawLine(x + artilleryWidth * 5 / 20 + artilleryWidth * 9 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 2 / 32, x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 6 / 32);
-
-                g.drawLine(x + artilleryWidth * 12 / 20, y + artilleryHeight * 9 / 16 + artilleryHeight * 4 / 32, x + artilleryWidth * 12 / 20 + artilleryWidth * 3 / 20, y + artilleryHeight * 9 / 16 + artilleryHeight * 4 / 32);
-                g.drawLine(x + artilleryWidth * 12 / 20 + artilleryWidth * 3 / 40, y + artilleryHeight * 9 / 16, x + artilleryWidth * 12 / 20 + artilleryWidth * 3 / 40, y + artilleryHeight * 9 / 16 + artilleryHeight * 8 / 32);
-                g.drawLine(x + artilleryWidth * 12 / 20 + artilleryWidth * 3 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 2 / 32, x + artilleryWidth * 12 / 20 + artilleryWidth * 9 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 6 / 32);
-                g.drawLine(x + artilleryWidth * 12 / 20 + artilleryWidth * 9 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 2 / 32, x + artilleryWidth * 12 / 20 + artilleryWidth * 3 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 6 / 32);
-            }
-        }
-    }
-}

DrawingObjectArtillery.java

@@ -1,37 +0,0 @@
-import java.awt.*;
-
-public class DrawingObjectArtillery implements IDrawingObject {
-    private DrawingArtillery _artillery = null;
-
-    public DrawingObjectArtillery(DrawingArtillery artillery) {
-        _artillery = artillery;
-    }
-
-    public float getStep() {
-        if (_artillery != null && _artillery.artillery != null) {
-            return _artillery.artillery.getStep();
-        }
-        return 0;
-    }
-
-    public float[] getCurrentPosition() {
-        if (_artillery != null) {
-            return _artillery.getCurrentPosition();
-        }
-        return new float[] { 0, 0, 0, 0 };
-    }
-
-    public void moveObject(Direction direction) {
-        if (_artillery != null) {
-            _artillery.moveTransport(direction);
-        }
-    }
-
-    public void setObject(int x, int y, int width, int height) {
-        _artillery.setPosition(x, y, width, height);
-    }
-
-    public void drawingObject(Graphics2D g) {
-        _artillery.drawTransport(g);
-    }
-}

DrawingRollers.java

@@ -1,10 +1,10 @@
 import java.awt.*;
 
-public class DrawingRollers implements IDrawingRollers {
+public class DrawingRollers {
     private RollersCount rollersCount;
     private Color color;
 
-    public DrawingRollers(int rollersCount, Color bodyColor) {
+    public void Init(int rollersCount, Color bodyColor) {
         setRollersCount(rollersCount);
         color = bodyColor;
     }

DrawingSquaredRollers.java

@@ -1,107 +0,0 @@
-import java.awt.*;
-
-public class DrawingSquaredRollers implements IDrawingRollers {
-    private RollersCount rollersCount;
-    private Color color;
-
-    public DrawingSquaredRollers(int rollersCount, Color bodyColor) {
-        setRollersCount(rollersCount);
-        color = bodyColor;
-    }
-
-    public void setRollersCount(int num) {
-        if (num <= 4) {
-            rollersCount = RollersCount.Four;
-        } else if (num >= 6) {
-            rollersCount = RollersCount.Six;
-        } else {
-            rollersCount = RollersCount.Five;
-        }
-    }
-
-    public void draw(Graphics2D g, int x, int y, int artilleryWidth, int artilleryHeight) {
-        g.setColor(color != null ? color : Color.BLACK);
-        g.fillOval(x + artilleryWidth / 20, y + artilleryHeight * 7 / 15, artilleryWidth * 4 / 20, artilleryHeight * 10 / 32);
-        g.fillOval(x + artilleryWidth * 15 / 20, y + artilleryHeight * 7 / 15, artilleryWidth * 4 / 20, artilleryHeight * 10 / 32);
-        switch (rollersCount) {
-            case Six: {
-                g.fillOval(x + artilleryWidth * 8 / 20, y + artilleryHeight * 10 / 16, artilleryWidth * 2 / 20, artilleryHeight * 6 / 32);
-            }
-            case Five: {
-                g.fillOval(x + artilleryWidth * 10 / 20, y + artilleryHeight * 10 / 16, artilleryWidth * 2 / 20, artilleryHeight * 6 / 32);
-            }
-            case Four: {
-                g.fillOval(x + artilleryWidth * 5 / 20, y + artilleryHeight * 9 / 16, artilleryWidth * 3 / 20, artilleryHeight * 8 / 32);
-                g.fillOval(x + artilleryWidth * 12 / 20, y + artilleryHeight * 9 / 16, artilleryWidth * 3 / 20, artilleryHeight * 8 / 32);
-            }
-        }
-        drawOrnament(g, x, y, artilleryWidth, artilleryHeight);
-    }
-
-    private void drawOrnament(Graphics2D g, int x, int y, int artilleryWidth, int artilleryHeight) {
-        g.setStroke(new BasicStroke(1));
-        g.setColor(Color.BLACK);
-
-        Polygon bigRollerFirstPattern = new Polygon();
-        bigRollerFirstPattern.addPoint(x + artilleryWidth / 20 + 1, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 32);
-        bigRollerFirstPattern.addPoint(x + artilleryWidth * 3 / 20, y + artilleryHeight * 7 / 15 + 1);
-        bigRollerFirstPattern.addPoint(x + artilleryWidth * 5 / 20 - 1, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 32);
-        bigRollerFirstPattern.addPoint(x + artilleryWidth * 3 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 10 / 32 - 1);
-        g.drawPolygon(bigRollerFirstPattern);
-        bigRollerFirstPattern.translate(artilleryWidth * 14 / 20, 0);
-        g.drawPolygon(bigRollerFirstPattern);
-
-        Polygon bigRollerSecondPattern = new Polygon();
-        bigRollerSecondPattern.addPoint(x + artilleryWidth * 2 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 64);
-        bigRollerSecondPattern.addPoint(x + artilleryWidth * 4 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 5 / 64);
-        bigRollerSecondPattern.addPoint(x + artilleryWidth * 4 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 15 / 64);
-        bigRollerSecondPattern.addPoint(x + artilleryWidth * 2 / 20, y + artilleryHeight * 7 / 15 + artilleryHeight * 15 / 64);
-        g.drawPolygon(bigRollerSecondPattern);
-        bigRollerSecondPattern.translate(artilleryWidth * 14 / 20, 0);
-        g.drawPolygon(bigRollerSecondPattern);
-
-        Polygon smallRollerFirstPattern = new Polygon();
-        smallRollerFirstPattern.addPoint(x + artilleryWidth * 8 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32);
-        smallRollerFirstPattern.addPoint(x + artilleryWidth * 9 / 20, y + artilleryHeight * 10 / 16);
-        smallRollerFirstPattern.addPoint(x + artilleryWidth * 10 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32);
-        smallRollerFirstPattern.addPoint(x + artilleryWidth * 9 / 20, y + artilleryHeight * 10 / 16 + artilleryHeight * 6 / 32);
-
-        Polygon smallRollerSecondPattern = new Polygon();
-        smallRollerSecondPattern.addPoint(x + artilleryWidth * 8 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 - artilleryHeight * 3 / 64);
-        smallRollerSecondPattern.addPoint(x + artilleryWidth * 9 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 - artilleryHeight * 3 / 64);
-        smallRollerSecondPattern.addPoint(x + artilleryWidth * 10 / 20 - artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 + artilleryHeight * 3 / 64);
-        smallRollerSecondPattern.addPoint(x + artilleryWidth * 8 / 20 + artilleryWidth * 2 / 80, y + artilleryHeight * 10 / 16 + artilleryHeight * 3 / 32 + artilleryHeight * 3 / 64);
-
-        switch(rollersCount) {
-            case Six: {
-                g.drawPolygon(smallRollerFirstPattern);
-                g.drawPolygon(smallRollerSecondPattern);
-            }
-            case Five: {
-                smallRollerFirstPattern.translate(artilleryWidth * 2 / 20, 0);
-                smallRollerSecondPattern.translate(artilleryWidth * 2 / 20, 0);
-                g.drawPolygon(smallRollerFirstPattern);
-                g.drawPolygon(smallRollerSecondPattern);
-            }
-            case Four: {
-                Polygon mediumRollerFirstPattern = new Polygon();
-                mediumRollerFirstPattern.addPoint(x + artilleryWidth * 5 / 20, y + artilleryHeight * 9 / 16 + artilleryHeight * 4 / 32);
-                mediumRollerFirstPattern.addPoint(x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 40, y + artilleryHeight * 9 / 16);
-                mediumRollerFirstPattern.addPoint(x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 20, y + artilleryHeight * 9 / 16 + artilleryHeight * 4 / 32);
-                mediumRollerFirstPattern.addPoint(x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 40, y + artilleryHeight * 9 / 16 + artilleryHeight * 8 / 32);
-                g.drawPolygon(mediumRollerFirstPattern);
-                mediumRollerFirstPattern.translate(artilleryWidth * 7 / 20, 0);
-                g.drawPolygon(mediumRollerFirstPattern);
-
-                Polygon mediumRollerSecondPattern = new Polygon();
-                mediumRollerSecondPattern.addPoint(x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 2 / 32);
-                mediumRollerSecondPattern.addPoint(x + artilleryWidth * 5 / 20 + artilleryWidth * 9 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 2 / 32);
-                mediumRollerSecondPattern.addPoint(x + artilleryWidth * 5 / 20 + artilleryWidth * 9 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 6 / 32);
-                mediumRollerSecondPattern.addPoint(x + artilleryWidth * 5 / 20 + artilleryWidth * 3 / 80, y + artilleryHeight * 9 / 16 + artilleryHeight * 6 / 32);
-                g.drawPolygon(mediumRollerSecondPattern);
-                mediumRollerSecondPattern.translate(artilleryWidth * 7 / 20, 0);
-                g.drawPolygon(mediumRollerSecondPattern);
-            }
-        }
-    }
-}

EntityAdvancedArtillery.java

@@ -1,26 +0,0 @@
-import java.awt.*;
-
-public class EntityAdvancedArtillery extends EntityArtillery {
-    private Color dopColor;
-    private boolean weapon;
-    private boolean salvoBattery;
-
-    public EntityAdvancedArtillery(int speed, float weight, Color bodyColor, Color dopColor, boolean weapon, boolean salvoBattery) {
-        super(speed, weight, bodyColor);
-        this.dopColor = dopColor;
-        this.weapon = weapon;
-        this.salvoBattery = salvoBattery;
-    }
-
-    public Color getDopColor() {
-        return dopColor;
-    }
-
-    public boolean getWeapon() {
-        return weapon;
-    }
-
-    public boolean getSalvoBattery() {
-        return salvoBattery;
-    }
-}

EntityArtillery.java

@@ -6,7 +6,7 @@ public class EntityArtillery {
     private float weight;
     private Color bodyColor;
 
-    public EntityArtillery(int speed, float weight, Color bodyColor) {
+    public void Init(int speed, float weight, Color bodyColor) {
         Random rnd = new Random();
         this.speed = speed <= 0 ? rnd.nextInt(50, 150) : speed;
         this.weight = weight <= 0 ? rnd.nextInt(40, 70) : weight;

ForestMap.java

@@ -1,49 +0,0 @@
-import java.awt.*;
-import java.util.Arrays;
-
-public class ForestMap extends AbstractMap {
-    private final Color barrierColor = Color.green;
-    private final Color roadColor = new Color(165, 42, 42, 255);
-
-    @Override
-    protected void drawBarrierPart(Graphics2D g, int i, int j)
-    {
-        g.setColor(barrierColor);
-        g.fillRect(j * (int) _size_x, i * (int) _size_y, (int) _size_x, (int) _size_y);
-    }
-
-    @Override
-    protected void drawRoadPart(Graphics2D g, int i, int j)
-    {
-        g.setColor(roadColor);
-        g.fillRect(j * (int) _size_x, i * (int) _size_y, (int) _size_x, (int) _size_y);
-    }
-
-    @Override
-    protected void generateMap() {
-        _map = new int[50][50];
-        _size_x = (float)_width / _map[0].length;
-        _size_y = (float)_height / _map.length;
-        int counter = 0;
-        for (int[] row : _map) {
-            Arrays.fill(row, _freeRoad);
-        }
-        while (counter < 20)
-        {
-            int x = _random.nextInt(2, 49);
-            int y = _random.nextInt(3, 50);
-            var points = new int[] { _map[y][x], _map[y - 1][x], _map[y - 2][x], _map[y - 2][x - 1], _map[y - 2][x + 1], _map[y - 3][x] };
-            var forComparison = new int[] { _freeRoad, _freeRoad, _freeRoad, _freeRoad, _freeRoad, _freeRoad };
-            if (Arrays.equals(points, forComparison))
-            {
-                _map[y][x] = _barrier;
-                _map[y - 1][x] = _barrier;
-                _map[y - 2][x] = _barrier;
-                _map[y - 2][x - 1] = _barrier;
-                _map[y - 2][x + 1] = _barrier;
-                _map[y - 3][x] = _barrier;
-                counter++;
-            }
-        }
-    }
-}

FormArtillery.form

@@ -53,7 +53,7 @@
           </component>
         </children>
       </grid>
-      <grid id="fa947" binding="pictureBox" layout-manager="GridLayoutManager" row-count="3" column-count="7" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="fa947" binding="pictureBox" layout-manager="GridLayoutManager" row-count="3" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -63,7 +63,7 @@
         <children>
           <hspacer id="f89d0">
             <constraints>
-              <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
           </hspacer>
           <vspacer id="402e3">
@@ -73,12 +73,12 @@
           </vspacer>
           <vspacer id="bbd8c">
             <constraints>
-              <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
           </vspacer>
           <component id="271ef" class="javax.swing.JButton" binding="buttonUp">
             <constraints>
-              <grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false">
+              <grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -93,7 +93,7 @@
           </component>
           <component id="4b967" class="javax.swing.JButton" binding="buttonDown">
             <constraints>
-              <grid row="2" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
+              <grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -107,7 +107,7 @@
           </component>
           <component id="2e663" class="javax.swing.JButton" binding="buttonLeft">
             <constraints>
-              <grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
+              <grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -122,7 +122,7 @@
           </component>
           <component id="c2d76" class="javax.swing.JButton" binding="buttonRight">
             <constraints>
-              <grid row="2" column="6" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
+              <grid row="2" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -137,7 +137,7 @@
           </component>
           <component id="7bc68" class="javax.swing.JButton" binding="createButton">
             <constraints>
-              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <alignmentX value="0.0"/>
@@ -145,14 +145,6 @@
               <text value="Создать"/>
             </properties>
           </component>
-          <component id="27408" class="javax.swing.JButton" binding="createAdvancedButton">
-            <constraints>
-              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Модификация"/>
-            </properties>
-          </component>
         </children>
       </grid>
     </children>

FormArtillery.java

@@ -1,7 +1,5 @@
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.util.Random;
@@ -17,7 +15,6 @@ public class FormArtillery extends JFrame {
     private JButton buttonDown;
     private JButton buttonLeft;
     private JButton buttonRight;
-    private JButton createAdvancedButton;
 
     private DrawingArtillery _artillery;
 
@@ -26,7 +23,8 @@ public class FormArtillery extends JFrame {
         this.setContentPane(artilleryPane);
         createButton.addActionListener(e -> {
             Random rnd = new Random();
-            _artillery = new DrawingArtillery(
+            _artillery = new DrawingArtillery();
+            _artillery.Init(
                     rnd.nextInt(100, 300),
                     rnd.nextInt(1000, 2000),
                     new Color(
@@ -35,7 +33,7 @@ public class FormArtillery extends JFrame {
                             rnd.nextInt(0, 256)),
                     rnd.nextInt(4, 7)
             );
-            _artillery.setPosition(10 + rnd.nextInt(90), 10 + rnd.nextInt(90), pictureBox.getWidth(), pictureBox.getHeight());
+            _artillery.SetPosition(10 + rnd.nextInt(90), 10 + rnd.nextInt(90), pictureBox.getWidth(), pictureBox.getHeight());
             speedLabel.setText(String.format("Скорость: %s", _artillery.getArtillery().getSpeed()));
             weightLabel.setText(String.format("Вес: %s", _artillery.getArtillery().getWeight()));
             colorLabel.setText(String.format("Цвет: %x", _artillery.getArtillery().getBodyColor().getRGB()));
@@ -64,35 +62,12 @@ public class FormArtillery extends JFrame {
             if (_artillery != null) _artillery.moveTransport(Direction.Down);
             repaint();
         });
-        createAdvancedButton.addActionListener(e -> {
-            Random rnd = new Random();
-            _artillery = new DrawingAdvancedArtillery(
-                    rnd.nextInt(100, 300),
-                    rnd.nextInt(1000, 2000),
-                    new Color(
-                            rnd.nextInt(0, 256),
-                            rnd.nextInt(0, 256),
-                            rnd.nextInt(0, 256)),
-                    rnd.nextInt(4, 7),
-                    new Color(
-                            rnd.nextInt(0, 256),
-                            rnd.nextInt(0, 256),
-                            rnd.nextInt(0, 256)),
-                    rnd.nextBoolean(),
-                    rnd.nextBoolean()
-            );
-            _artillery.setPosition(10 + rnd.nextInt(90), 10 + rnd.nextInt(90), pictureBox.getWidth(), pictureBox.getHeight());
-            speedLabel.setText(String.format("Скорость: %s", _artillery.getArtillery().getSpeed()));
-            weightLabel.setText(String.format("Вес: %s", _artillery.getArtillery().getWeight()));
-            colorLabel.setText(String.format("Цвет: %x", _artillery.getArtillery().getBodyColor().getRGB()));
-            repaint();
-        });
     }
 
     @Override
     public void paint(Graphics g) {
         super.paint(g);
-        Graphics2D g2d = (Graphics2D) pictureBox.getGraphics();
+        Graphics2D g2d = (Graphics2D) artilleryPane.getGraphics();
         if (_artillery != null) {
             _artillery.drawTransport(g2d);
         }

FormMap.form

@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormMap">
-  <grid id="27dc6" binding="artilleryPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="630" height="420"/>
-    </constraints>
-    <properties>
-      <minimumSize width="80" height="50"/>
-      <preferredSize width="640" height="480"/>
-    </properties>
-    <border type="none"/>
-    <children>
-      <grid id="57516" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="dcb7f" class="javax.swing.JLabel" binding="speedLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="998a6" class="javax.swing.JLabel" binding="weightLabel">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="cffd1" class="javax.swing.JLabel" binding="colorLabel">
-            <constraints>
-              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-      <grid id="52641" binding="pictureBox" layout-manager="GridLayoutManager" row-count="4" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="6937b" class="javax.swing.JButton" binding="buttonUp">
-            <constraints>
-              <grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <borderPainted value="true"/>
-              <contentAreaFilled value="false"/>
-              <icon value="Resources/ArrowUp.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <hspacer id="48a84">
-            <constraints>
-              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </hspacer>
-          <vspacer id="f9d1a">
-            <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </vspacer>
-          <component id="e761a" class="javax.swing.JButton" binding="buttonDown">
-            <constraints>
-              <grid row="3" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <contentAreaFilled value="false"/>
-              <icon value="Resources/ArrowDown.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="b99d6" class="javax.swing.JButton" binding="buttonLeft">
-            <constraints>
-              <grid row="3" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <contentAreaFilled value="false"/>
-              <icon value="Resources/ArrowLeft.png"/>
-              <label value=""/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="7f134" class="javax.swing.JButton" binding="buttonRight">
-            <constraints>
-              <grid row="3" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <contentAreaFilled value="false"/>
-              <icon value="Resources/ArrowRight.png"/>
-              <label value=""/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="fc5b2" class="javax.swing.JButton" binding="createButton">
-            <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <alignmentX value="0.0"/>
-              <margin top="0" left="0" bottom="0" right="0"/>
-              <text value="Создать"/>
-            </properties>
-          </component>
-          <component id="65e99" class="javax.swing.JButton" binding="createAdvancedButton">
-            <constraints>
-              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Модификация"/>
-            </properties>
-          </component>
-          <component id="80160" class="javax.swing.JComboBox" binding="comboBoxSelectorMap">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <model>
-                <item value="Простая карта"/>
-                <item value="Лесная карта"/>
-              </model>
-            </properties>
-          </component>
-        </children>
-      </grid>
-    </children>
-  </grid>
-</form>

FormMap.java

@@ -1,110 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.Random;
-
-public class FormMap extends JFrame {
-    private JPanel artilleryPane;
-    private JLabel speedLabel;
-    private JLabel weightLabel;
-    private JLabel colorLabel;
-    private JPanel pictureBox;
-    private JButton buttonUp;
-    private JButton buttonDown;
-    private JButton buttonLeft;
-    private JButton buttonRight;
-    private JButton createButton;
-    private JButton createAdvancedButton;
-    private JComboBox comboBoxSelectorMap;
-
-    private AbstractMap _abstractMap;
-    private Image bufferedImage;
-
-    public FormMap() {
-        this.setTitle("Artillery");
-        this.setContentPane(artilleryPane);
-
-        _abstractMap = new SimpleMap();
-
-        createButton.addActionListener(e -> {
-            Random rnd = new Random();
-            var artillery = new DrawingArtillery(
-                    rnd.nextInt(100, 300),
-                    rnd.nextInt(1000, 2000),
-                    new Color(rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)),
-                    rnd.nextInt(4, 6 + 1)
-            );
-            setData(artillery);
-        });
-        buttonLeft.setForeground(new Color(0, 0, 0, 0));
-        buttonRight.setForeground(new Color(0, 0, 0, 0));
-        buttonUp.setForeground(new Color(0, 0, 0, 0));
-        buttonDown.setForeground(new Color(0, 0, 0, 0));
-        buttonLeft.addActionListener(e -> {
-            if (_abstractMap != null) {
-                bufferedImage = _abstractMap.moveObject(Direction.Left);
-                repaint();
-            }
-        });
-        buttonRight.addActionListener(e -> {
-            if (_abstractMap != null) {
-                bufferedImage = _abstractMap.moveObject(Direction.Right);
-                repaint();
-            }
-        });
-        buttonUp.addActionListener(e -> {
-            if (_abstractMap != null) {
-                bufferedImage = _abstractMap.moveObject(Direction.Up);
-                repaint();
-            }
-        });
-        buttonDown.addActionListener(e -> {
-            if (_abstractMap != null) {
-                bufferedImage = _abstractMap.moveObject(Direction.Down);
-                repaint();
-            }
-        });
-        createAdvancedButton.addActionListener(e -> {
-            Random rnd = new Random();
-            var artillery = new DrawingAdvancedArtillery(
-                    rnd.nextInt(100, 300),
-                    rnd.nextInt(1000, 2000),
-                    new Color(rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)),
-                    rnd.nextInt(4, 6 + 1),
-                    new Color(rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)),
-                    rnd.nextBoolean(),
-                    rnd.nextBoolean()
-            );
-            setData(artillery);
-        });
-        comboBoxSelectorMap.addItemListener(e -> {
-            if (e.getStateChange() == ItemEvent.SELECTED) {
-                switch (e.getItem().toString()) {
-                    case "Простая карта" -> _abstractMap = new SimpleMap();
-                    case "Лесная карта" -> _abstractMap = new ForestMap();
-                }
-            }
-        });
-    }
-
-    private void setData(DrawingArtillery artillery) {
-        Random rnd = new Random();
-        artillery.setPosition(rnd.nextInt(10, 100), rnd.nextInt(10, 100), pictureBox.getWidth(), pictureBox.getHeight());
-        speedLabel.setText(String.format("Скорость: %d", artillery.artillery.getSpeed()));
-        weightLabel.setText(String.format("Вес: %f", artillery.artillery.getWeight()));
-        colorLabel.setText(String.format("Цвет: %x", artillery.getArtillery().getBodyColor().getRGB()));
-        bufferedImage = _abstractMap.createMap(pictureBox.getWidth(), pictureBox.getHeight(), new DrawingObjectArtillery(artillery));
-        repaint();
-    }
-
-    @Override
-    public void paint(Graphics g) {
-        super.paint(g);
-
-        if (bufferedImage != null) {
-            pictureBox.paintComponents(bufferedImage.getGraphics());
-            pictureBox.getGraphics().drawImage(bufferedImage, 0, 0, null);
-        }
-    }
-}

IDrawingObject.java

@@ -1,9 +0,0 @@
-import java.awt.*;
-
-public interface IDrawingObject {
-    float getStep();
-    void setObject(int x, int y, int width, int height);
-    void moveObject(Direction direction);
-    void drawingObject(Graphics2D g);
-    float[] getCurrentPosition();
-}

IDrawingRollers.java

@@ -1,6 +0,0 @@
-import java.awt.*;
-
-public interface IDrawingRollers {
-    void setRollersCount(int num);
-    void draw(Graphics2D g, int x, int y, int artilleryWidth, int artilleryHeight);
-}

Program.java

@@ -2,7 +2,7 @@ import javax.swing.*;
 
 public class Program {
     public static void main(String[] args) {
-        FormMap form = new FormMap();
+        FormArtillery form = new FormArtillery();
         form.setSize(640, 480);
         form.setVisible(true);
         form.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);

RollersType.java

@@ -1,17 +0,0 @@
-import java.awt.*;
-import java.util.Random;
-
-public enum RollersType {
-    Standard,
-    Squared,
-    Cross;
-
-    public static IDrawingRollers random(int rollersCount, Color bodyColor) {
-        return switch (new Random().nextInt(RollersType.values().length)) {
-            case 0 -> new DrawingRollers(rollersCount, bodyColor);
-            case 1 -> new DrawingSquaredRollers(rollersCount, bodyColor);
-            case 2 -> new DrawingCrossRollers(rollersCount, bodyColor);
-            default -> null;
-        };
-    }
-}

SimpleMap.java

@@ -1,40 +0,0 @@
-import java.awt.*;
-import java.util.Arrays;
-
-public class SimpleMap extends AbstractMap {
-    private final Color barrierColor = Color.black;
-    private final Color roadColor = Color.gray;
-
-    @Override
-    protected void drawBarrierPart(Graphics2D g, int i, int j) {
-        g.setColor(barrierColor);
-        g.fillRect(j * (int) _size_x, i * (int) _size_y, (int) _size_x, (int) _size_y);
-    }
-
-    @Override
-    protected void drawRoadPart(Graphics2D g, int i, int j) {
-        g.setColor(roadColor);
-        g.fillRect(j * (int) _size_x, i * (int) _size_y, (int) _size_x, (int) _size_y);
-    }
-
-    @Override
-    protected void generateMap() {
-        _map = new int[100][100];
-        _size_x = (float)_width / _map[0].length;
-        _size_y = (float)_height / _map.length;
-        int counter = 0;
-        for (int[] row : _map) {
-            Arrays.fill(row, _freeRoad);
-        }
-        while (counter < 50)
-        {
-            int x = _random.nextInt(0, 100);
-            int y = _random.nextInt(0, 100);
-            if (_map[y][x] == _freeRoad)
-            {
-                _map[y][x] = _barrier;
-                counter++;
-            }
-        }
-    }
-}