From 685b97e188eb07530363f48dda4e2eb1d70fcdc9 Mon Sep 17 00:00:00 2001
From: MaxKarme <91691525+MaxKarme@users.noreply.github.com>
Date: Fri, 28 Oct 2022 20:18:49 +0300
Subject: [PATCH] refactoring form and make hard part
---
DrawingAircraft.java | 7 ++
DrawingEngines.java | 30 ++++++++
EnginesCount.java | 5 ++
FormAircraft.form | 161 ++++++++++++++++++++++++-------------------
Resources/down.png | Bin 0 -> 451 bytes
Resources/left.png | Bin 0 -> 367 bytes
Resources/right.png | Bin 0 -> 366 bytes
Resources/up.png | Bin 0 -> 360 bytes
8 files changed, 131 insertions(+), 72 deletions(-)
create mode 100644 DrawingEngines.java
create mode 100644 EnginesCount.java
create mode 100644 Resources/down.png
create mode 100644 Resources/left.png
create mode 100644 Resources/right.png
create mode 100644 Resources/up.png
diff --git a/DrawingAircraft.java b/DrawingAircraft.java
index c7011d0..48b301a 100644
--- a/DrawingAircraft.java
+++ b/DrawingAircraft.java
@@ -1,8 +1,10 @@
import java.awt.*;
+import java.util.Random;
class DrawingAircraft
{
public EntityAircraft AirFighter;
+ public DrawingEngines drawingEngines = new DrawingEngines();
private float _startPosX;
private float _startPosY;
@@ -15,8 +17,11 @@ class DrawingAircraft
public void Init(int speed, float weight, Color bodyColor)
{
+ Random rnd = new Random();
+
AirFighter = new EntityAircraft();
AirFighter.Init(speed, weight, bodyColor);
+ drawingEngines.Init(rnd.nextInt(1, 8), bodyColor);
}
public void SetPosition(int x, int y, int width, int height)
@@ -120,6 +125,8 @@ class DrawingAircraft
g.drawPolygon(wingTop);
g.drawPolygon(wingBottom);
g.drawRect((int)_startPosX, (int)_startPosY + 70, 160, 26);
+
+ drawingEngines.draw(g, (int)_startPosX, (int)_startPosY);
}
public void ChangeBorders(int width, int height)
diff --git a/DrawingEngines.java b/DrawingEngines.java
new file mode 100644
index 0000000..9878094
--- /dev/null
+++ b/DrawingEngines.java
@@ -0,0 +1,30 @@
+import java.awt.*;
+
+public class DrawingEngines {
+ private EnginesCount enginesCount;
+ private Color color;
+
+ public void Init(int count, Color bodyColor) {
+ if(count <= 2) enginesCount = EnginesCount.Two;
+ else if(count >= 6) enginesCount = EnginesCount.Six;
+ else enginesCount = EnginesCount.Four;
+
+ color = bodyColor;
+ }
+
+ public void draw(Graphics2D g, int startPosX, int startPosY) {
+ g.setPaint(color);
+ g.fillOval(startPosX + 90, startPosY + 10, 30, 15);
+ g.fillOval(startPosX + 90, startPosY + 141, 30, 15);
+
+ if(enginesCount == EnginesCount.Two) return;
+
+ g.fillOval(startPosX + 90, startPosY + 30, 30, 15);
+ g.fillOval(startPosX + 90, startPosY + 121, 30, 15);
+
+ if(enginesCount == EnginesCount.Four) return;
+
+ g.fillOval(startPosX + 90, startPosY + 50, 30, 15);
+ g.fillOval(startPosX + 90, startPosY + 101, 30, 15);
+ }
+}
diff --git a/EnginesCount.java b/EnginesCount.java
new file mode 100644
index 0000000..dbea801
--- /dev/null
+++ b/EnginesCount.java
@@ -0,0 +1,5 @@
+public enum EnginesCount {
+ Two,
+ Four,
+ Six
+}
diff --git a/FormAircraft.form b/FormAircraft.form
index fedb5cb..ee165ee 100644
--- a/FormAircraft.form
+++ b/FormAircraft.form
@@ -1,6 +1,7 @@
diff --git a/Resources/down.png b/Resources/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..7500783f52570f15ba7b977f6fa53f97342ce4f0
GIT binary patch
literal 451
zcmV;!0X+VRP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0a!^yK~zXf?UqYU
z!!Qtr$EBPA5Z%+V$bo<}P|+Kd+hiRl5F}(qk0m1
ze$V*Ps7eDJ(4*hhIS98#x57#(==Y9|{TFrovMi0Sv{gr{Z=9ObvlCdot;lP};Cuid
z@1Nvt_^#HVv?zOy*FRs>YKBxragCdneR4PP$H0tzHoO?&<(34F;bPfluFOz&sb!Ce
zXG$FkjDg0tWAbFMUu+Uve-e1CbQ#FwktP`u#GPzOZEr67g+zT0Z5HzdwRl`n17_@k
zkKN5++jM$QJuCLTZGyyRbD0@9#FRY*n<*ilV`)GvK2byzMsOot-&~Ow4~_{=Tz3eP
z=Q+E6oE1euqx?jFbH%Lr^UD)tSw^0pPx#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0R%}zK~zXfwU
zf-nq4Tf|eTd&a@ja}FK%qG%Yl#PQ)0)CbskE@o}5463uco
z(f6m&Hruz9p!F~e%jy@G#3V^^pT;14y*aTYC3pkhn8ZlBKkVR~tE)y*;xC&kC#Biu
zC>A4WckJe*ni7kuw${s0C-$h9qY`V9mhRE4*t1>^6z8NCig)!2C9O?Mh+_Juk+29?
zsuNog#b}q(?5*=RCAP?+*khIw>PM#c{p_~6&|Q#1EzTuEr;QX<2LV(&I%jd*s$QYw
zn%b+x9<`f~x2SgX1Kq3UpvukS+J}rwVv=93=VkQ)P0>7Kj{c=BgeSfHd+%gS;E(_S
N002ovPDHLkV1i%gpo9Pb
literal 0
HcmV?d00001
diff --git a/Resources/right.png b/Resources/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..7851a8e71e9a8a331779bd9c11ec654e9b584a27
GIT binary patch
literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85o30K$!7fntTON1GA@#V~B_M)@i5tnhXS7qmS?!em(x-_D`W+
zZL>u$5)@61`u&!x8;Y2>S6iF>_}T2tv3#@i@xn;|^~a00F6z8)-GAjD
zAK9la=-m7L-Gkc|-@9F_ObT-Y3^#s_eycj6bN*+M@ZVETcp5Hw_9W`WbDC30
z9&TC}tFvugY)omF>)S_1EIqQqJ9Yi^La%CuSiNFg9kQ3{xvg8Mq3gsMt0d!Wv&63^
zUIzh@s)+py)>5p7@?F?hQA
KxvXwQ%2
zsq?3|W^9m2UexgZmOx5k-a~;UD|RlLa-+HLxW&>hAGyxU<_nv=nvfx@{&k-oP*6;o
zY4ug%XU9&YS8Ez_{p!=IwBy~4NAu2y
ziuYcV3VE|lqEnTj9As!U4}?mOmn$f<^L!;Bl3j%`j{4-5zfPgg&ebxsLQ
E0Eq;c<^TWy
literal 0
HcmV?d00001