From ae2b1c951d3814b10926926fa8a8a21683a43e5e Mon Sep 17 00:00:00 2001 From: artur-kalimullin <144933634+artur-kalimullin@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:19:01 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirFighter/src/DrawningAirFighter.java | 10 ++++----- .../src/DrawningAirFighterEngine.java | 20 ++++++------------ .../DrawningAirFighter$1.class | Bin 728 -> 728 bytes .../DrawningAirFighter.class | Bin 6974 -> 6974 bytes .../DrawningAirFighterEngine.class | Bin 1530 -> 1392 bytes .../EngineCount.class | Bin 1238 -> 1238 bytes .../EntityAirFighter.class | Bin 1325 -> 1325 bytes 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/ProjectAirFighter/src/DrawningAirFighter.java b/ProjectAirFighter/src/DrawningAirFighter.java index 04e62c5..7556659 100644 --- a/ProjectAirFighter/src/DrawningAirFighter.java +++ b/ProjectAirFighter/src/DrawningAirFighter.java @@ -12,7 +12,7 @@ public class DrawningAirFighter { private Integer _startPosY; private final int _drawingAirFighterWidth = 76; private final int _drawingAirFighterHeight = 80; - public DrawningAirFighterEngine drawningAirFighterEngine; + public DrawningAirFighterEngine _drawningAirFighterEngine; public void Init(int speed, float weight, Color bodyColor, Color additionalColor, boolean pgo, boolean rockets) { entityAirFighter = new EntityAirFighter(); @@ -22,11 +22,11 @@ public class DrawningAirFighter { _pictureWidth = null; _pictureHeight = null; - drawningAirFighterEngine = new DrawningAirFighterEngine(); + _drawningAirFighterEngine = new DrawningAirFighterEngine(); Random random = new Random(); int[] countengine = {2, 4, 6}; - int paddlesCount = countengine[random.nextInt(countengine.length)]; - drawningAirFighterEngine.setEnumNumber(paddlesCount); + int engineCount = countengine[random.nextInt(countengine.length)]; + _drawningAirFighterEngine.setEnumNumber(engineCount); } public void setPosition(int x, int y) { @@ -218,7 +218,7 @@ public class DrawningAirFighter { g.fillRect(_startPosX + 45, _startPosY + 3, 5, 4); } - drawningAirFighterEngine.drawAirFighterEngine(g, entityAirFighter.getAdditionalColor(), _startPosX, _startPosY); + _drawningAirFighterEngine.drawAirFighterEngine(g, entityAirFighter.getAdditionalColor(), _startPosX, _startPosY); } } diff --git a/ProjectAirFighter/src/DrawningAirFighterEngine.java b/ProjectAirFighter/src/DrawningAirFighterEngine.java index 010d7df..255f153 100644 --- a/ProjectAirFighter/src/DrawningAirFighterEngine.java +++ b/ProjectAirFighter/src/DrawningAirFighterEngine.java @@ -1,11 +1,11 @@ import java.awt.*; public class DrawningAirFighterEngine { - private EngineCount engineCount; - public void setEnumNumber(int wheelCount) { + private EngineCount _engineCount; + public void setEnumNumber(int engineCount) { for (EngineCount value : EngineCount.values()) { - if (value.getEnumNumber() == wheelCount) { - engineCount = value; + if (value.getEnumNumber() == engineCount) { + _engineCount = value; return; } } @@ -15,24 +15,18 @@ public class DrawningAirFighterEngine { g2d.setColor(color); g2d.setStroke(new BasicStroke(4)); - if (engineCount.getEnumNumber() == 2){ + if (_engineCount.getEnumNumber() <= 2){ g2d.drawRect((int)startPosX + 30, (int) startPosY + 69, 10, 2 ); g2d.drawRect((int)startPosX + 30, (int) startPosY + 3, 10, 2 ); } - if (engineCount.getEnumNumber() == 4){ - g2d.drawRect((int)startPosX + 30, (int) startPosY + 69, 10, 2 ); + if (_engineCount.getEnumNumber() <= 4){ g2d.drawRect((int)startPosX + 30, (int) startPosY + 62, 10, 2 ); - g2d.drawRect((int)startPosX + 30, (int) startPosY + 3, 10, 2 ); g2d.drawRect((int)startPosX + 30, (int) startPosY + 10, 10, 2 ); } - if (engineCount.getEnumNumber() == 6){ - g2d.drawRect((int)startPosX + 30, (int) startPosY + 69, 10, 2 ); - g2d.drawRect((int)startPosX + 30, (int) startPosY + 62, 10, 2 ); + if (_engineCount.getEnumNumber() <= 6){ g2d.drawRect((int)startPosX + 30, (int) startPosY + 55, 10, 2 ); - g2d.drawRect((int)startPosX + 30, (int) startPosY + 3, 10, 2 ); - g2d.drawRect((int)startPosX + 30, (int) startPosY + 10, 10, 2 ); g2d.drawRect((int)startPosX + 30, (int) startPosY + 17, 10, 2 ); } } diff --git a/out/production/PIbd-14_Calimullin_A.R._AirFighter_Hard/DrawningAirFighter$1.class b/out/production/PIbd-14_Calimullin_A.R._AirFighter_Hard/DrawningAirFighter$1.class index d862b027e8bc079a7b8226d13a24c36284bd789d..9bd108e877c27282d783c4d553008c772649ef6e 100644 GIT binary patch delta 13 Ucmcb?dV_UCI}@YhjZzgu8nMnQ zOQzVoMHX+BVcUpfJIS&%SBj3a3p)wakVvhJ?qxTl?7_uerr9S9lEoZSoZ+66ru~47 zI4GMA$$Qh}CF#<0~ilL%y(3Ai}VT1Wt-HPKg`} zMLDNMwPX!NqKRVB!Wq%SSuxHz@s|?Ci&7<+^U5mhN`jp-B~=cGxuE1yq1d>nlyXU_ z=d#kn6~)C>#&{#;i>sa98WLrub==5SLjqDFOaOYNdo9im=!(V+g~ zwmK{Mk4DYlj%J}r^Wm-*#62yZW-WvJn!T77%}%RUN1N6v+0Fy4kB8bI?b-+(+HX2_ zH@b8yPCbN2dOSUPvScc~dKQoMT%PKM^y_6j(;FGk`x(@yc&^XzLZ9WO;ms=}P%?zq zMifIv48ukWZ;S%o8YPUZGwK*MdKoh&a2Y>&XUs5ex-((=Nm`jS!+38-^3hCW%FN=k MS>!XFtP~LB zZ1emUv;c2{@gd}Y-byG-2_sJSrLYJak$N>_iY%TG!n92t1Y-A6~IM_s;)LvvW-E3iqt+-`kl5N7kCOp{gitrva zId)1#x_l{9&Ydl%$&rFw^5m*wmu$Dw%x)e^=_|>%@-Jf)@`Zi;rbt-WFTyDnNtB2T zN<}_pqLKrmRuow5i!hB@dtV=!x{`sgh|t(zEH+?ey!#Jk~3CqBrqW@8y|3#&dm&7y2{<#!Oxs z^Cd%hZAA0Nh-1*OF=Q0tHV*SH#;E7L(ao?i!ie#MQDce^CQm+^0wk@BnZg-2Me)g$ R%x6r_KNX diff --git a/out/production/PIbd-14_Calimullin_A.R._AirFighter_Hard/DrawningAirFighterEngine.class b/out/production/PIbd-14_Calimullin_A.R._AirFighter_Hard/DrawningAirFighterEngine.class index 15c21b3dca54fb325c092b5ca4cb9240fd7582f4..3c3bd0542cf8188588d9e1ed7572f2516fe76719 100644 GIT binary patch delta 261 zcmXAky-vbl6o#L+U#UQ)^|xT85@L-e{to^G5D`sGI=DIO009?nz`@ah#pK&uU0ftF zY;X?_+<|xCOdLEZ+w&&pIqx~s>~H3EWV-iX<6FbYwtJn&UVG@717jt{Dh?aW5s_w# z6uY>3V%?-;Y)LTCWmUG`+1B5xs9VYx-qAlQ)FZXv2^Z|B?}rb8>iefUvNxYkm=`Z6 zwug()8jG@hi8Gdo3AiIqmjX|$^Fom~LOv<6Csuvd$vy{?q@4;?jD%{OVyOwWI6M;dN(N1?{{afHDBu79 delta 308 zcmXYs%}N4c6o#K~=5x%kV$?CU(n@D?Qwc#3{n#%^F5J0yBe-Z8v?yp1tt1G(8<-1- zAOeF3x`&AFpnba_TXe8?&w1c|dC#Z&oxFKc$@}M)a@^Biw|o4MvhGwi&J<(Jks!on zkvL0Cm^ZtTcqfJfs$>FPR*`AwnjO(HN4jV(bw)YnN>{|3{2Sj4blP`1o*NrbEyTjU zSL)<+-*e5Q4lY_`08c7YjFV-OS*hGzJi*2kC)!D&b9pSE^#!-3p*q8s-BsGcsLo-fpNPEb+ K#1F(;9R31;=rDf( diff --git a/out/production/PIbd-14_Calimullin_A.R._AirFighter_Hard/EngineCount.class b/out/production/PIbd-14_Calimullin_A.R._AirFighter_Hard/EngineCount.class index 3d4663f9d423fe2bfab6a903aeaef00e62de4c6b..7157044781b84dc284c5a6f8644fe7513e877d9b 100644 GIT binary patch delta 27 jcmcb{d5v?!GGwU%qcb7n@-$uF2~7$qmGve+=nPEKNpl2l+|Wl&_`Vo+ibU{GcdV^Cp`VNeC~ K)FxkLi2wj+rV60| delta 55 zcmZ3>wU%qcb7n^I$uF2~7^Nqxve+=nPflWql2l?~Wl(0|Vo+faU{GZcV^Cv|VNhpK LV$hg;l_dfIX^IN9