From f4524f86242d45ab06b2bbe3bf8b5dbf9671533c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Sat, 22 Oct 2022 16:15:59 +0400 Subject: [PATCH] Rename --- Material/KeyDown.jpg | Bin 0 -> 808 bytes Material/KeyDown.png | Bin 0 -> 1433 bytes Material/KeyLeft.png | Bin 0 -> 1265 bytes Material/KeyRight.png | Bin 0 -> 1310 bytes Material/KeyUp.png | Bin 0 -> 1278 bytes src/DrawingField.java | 12 ++++++------ src/FormGasolineTanker.java | 2 +- src/FormMap.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Material/KeyDown.jpg create mode 100644 Material/KeyDown.png create mode 100644 Material/KeyLeft.png create mode 100644 Material/KeyRight.png create mode 100644 Material/KeyUp.png diff --git a/Material/KeyDown.jpg b/Material/KeyDown.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f0945dd2f020cd9a1df6d9a5b5c96e702fbddc48 GIT binary patch literal 808 zcmex=kBn zaw38vawLQQ2N(o77|a>Wm>HEAm;@P_1sVSz0ePK~g&E;^klUG9See;5*nqMo0t}4I zOe~CC%$!iqF)}bQv#_!WDjEv03yT;z1_mV-PBfi#P(szjtf+Cy!izv%BEUdJ10YdB zOwn5mJV3jd1epaH>=|CYj>*Z@j*+eY+E4jD$DKOOx~}W8v%vFJ3Devy&OG8)W<0F7Ubw&D;m6D!Qdgf@>Kqce zq0DmOMxySdjN9iz&#-OwdmH!O=L_=&25a$E(h7d^ChENtnzmiAd)M-_He{*P#Sbs) z{jYj+u(kRZ9@=KzroAnxYnR&T(rvCPA)CczW?g?eFFDC=r|@>+O?Or=TvTkP!N&5S zaZ^BpQ;5RyE$5{(W*nc>?G~N4blWm{`7Z%2e4-@}O3$APZjH5zE&en`k?G5+ddZ(& YR;l(qzeN-oFDtw$wBIDqBLDv;03kT=o&W#< literal 0 HcmV?d00001 diff --git a/Material/KeyDown.png b/Material/KeyDown.png new file mode 100644 index 0000000000000000000000000000000000000000..ff09b70c28c9988dac153284fd98a56020d7069e GIT binary patch literal 1433 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 UC`*H+82|tP07*qoM6N<$g5dIoJpcdz literal 0 HcmV?d00001 diff --git a/Material/KeyUp.png b/Material/KeyUp.png new file mode 100644 index 0000000000000000000000000000000000000000..0e4bf6ffa0263f78b54fa34ba68c98c19ef64090 GIT binary patch literal 1278 zcmVu0sj2jo~ zRd69$DB?mv1Ys_yAR;J1xPw^=BIrVV#=N^8vk2))+H~x`={O|#K`km>b*fH%b?VeP z74q`(qB-ZN1xjgEoe)y9o!9SSeg6#Z{+Ub$)T3?7<6E&-180mm6~8v+7w-Oz$_s+_ zW$Y_gvDu)c#1kQ;jTv*>70`UY6BJ(Kl^JqFYu(0-5kjD~{=erD3JCp=+4f}&2yRnB zZ7l5eZriG4%4rj5#1_K0Vy%Xnfmj$e#VCVR(y3=M8JMPtj*bo#i^V|lz5G?(K7o7q zfKm#KGe{|+ltM0-!`$2)E-o&hwf+(ZUpsVe5R5U{whhiX48y?w{yuhgb`Xt5F+M(y zuC6ZFw%v@O9W;$Gr4$%rxVgE(^71lfXJ>JIe2kxe|AY{t>8w$pw8!feH$H368Hd&y zT50U=?&9I$0a8l*^~az1vGN1Ax3@411B|i{vVoFKRhAFqQ&Lqt6$=}-uwhviu98<+ zTU*2E=qQ8`0Dx>Zi@m))NFgDWY#MV-QOq<=q|<3^ZEc~iug^IJZ7DD`G=!Cv75w_= z7b1}eq?DnJTe-uU=Eu&@&#|$wf&Tt}Xsw}?axU8g0|VIH+(a&yLuG0rOw_copioMc zY>RVn&hh;GjMdduOiWBTTd*v93#!Sg~EsSwrwMu&0=I^1dEG{xVyUx zowb^Z1@&uMYgm?rL?VHBJdWPpUI-z;7=vk=wFjmYQc5t!u)VzvLWom$`zbHKrM0fw z5#@SlSt=S;o(mgrficDZeVb55DN`Kg6^r#Q)Gv%1mLcA-$f%*+g~ zuCCDC-TmRa`v4(?fKuw%Wlv8J5{U#(PEIgAJq@LluW`NRnM$R?QA`Md`}=#OQYl0t zkq_U!CQ2y_Kox~$Sq@8-Qr|XK55Dq>ZUk-b zj=S73ROL4GlREG-e%ofLz7=aV_&Piq&HH)fCH&%dV#Ky(>|3!`gRk6u(A@cFHuV)L z?zUy@Td`IHH%${#%DQ$G)DO9BsL_8V`01~;b}r*mO7QphcXUQOOB3=?pwUb6R~#0V zv0SlO1kdO5uq>NBO~#ODRKNK{wpSANF6I%1Twr o<>gd#GZFSF=_S7`R|tWB0pFkf#1au;M1& literal 0 HcmV?d00001 diff --git a/src/DrawingField.java b/src/DrawingField.java index f92125f..9aef989 100644 --- a/src/DrawingField.java +++ b/src/DrawingField.java @@ -25,13 +25,13 @@ public class DrawingField extends JPanel{ private void SetData() { Random rand=new Random(); _gasolineTanker.SetPosition(rand.nextInt(100)+10,rand.nextInt(100)+10,getWidth(),getHeight()); - Field.SpeedLabel.setText("Скорость: "+_gasolineTanker.getGasolineTanker().getSpeed()); - Field.WeightLabel.setText("Вес: "+_gasolineTanker.getGasolineTanker().getWeight()); - Field.BodyColorLabel.setText("Цвет: "+Integer.toHexString(_gasolineTanker.getGasolineTanker().getBodyColor().getRGB()).substring(2)); + Field.SpeedLabel.setText("Speed: "+_gasolineTanker.getGasolineTanker().getSpeed()); + Field.WeightLabel.setText("Weight: "+_gasolineTanker.getGasolineTanker().getWeight()); + Field.BodyColorLabel.setText("Color: "+Integer.toHexString(_gasolineTanker.getGasolineTanker().getBodyColor().getRGB()).substring(2)); } public void CreateButtonAction(){ Random rand=new Random(); - Color color1 = JColorChooser.showDialog(Field, "Выберите цвет тела корабля", null); + Color color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)); if(color1==null) color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)); _gasolineTanker=new DrawingGasolineTanker(rand.nextInt(50)+10,rand.nextInt(3000)+20000,color1,rand.nextInt(3)); @@ -39,8 +39,8 @@ public class DrawingField extends JPanel{ } public void CreateModifButtonAction(){ Random rand=new Random(); - Color color1=JColorChooser.showDialog(Field, "Выберите цвет тела корабля",null); - Color color2=JColorChooser.showDialog(Field, "Выборите цвет модификаций корабля",null); + Color color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)); + Color color2=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)); if(color1==null) color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)); if (color2==null) diff --git a/src/FormGasolineTanker.java b/src/FormGasolineTanker.java index 22aa3a9..079ba06 100644 --- a/src/FormGasolineTanker.java +++ b/src/FormGasolineTanker.java @@ -19,7 +19,7 @@ public class FormGasolineTanker extends JFrame{ private JPanel PictureBox; public FormGasolineTanker(){ - super("Военный корабль"); + super("Gasoline Tanker"); setContentPane(PictureBox); setSize(1000,700); Width = getWidth(); diff --git a/src/FormMap.java b/src/FormMap.java index e58f7c9..accc5f3 100644 --- a/src/FormMap.java +++ b/src/FormMap.java @@ -30,7 +30,7 @@ public class FormMap extends JFrame { ImageIcon spriteRight =new ImageIcon((new ImageIcon("Material\\KeyRight.png")). getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH)); public FormMap(){ - super("Военный корабль"); + super("Gasoline tanker"); setContentPane(PictureBox); setSize(1000,700); Width = getWidth();