diff --git a/Material/KeyDown.jpg b/Material/KeyDown.jpg new file mode 100644 index 0000000..f0945dd Binary files /dev/null and b/Material/KeyDown.jpg differ diff --git a/Material/KeyDown.png b/Material/KeyDown.png new file mode 100644 index 0000000..ff09b70 Binary files /dev/null and b/Material/KeyDown.png differ diff --git a/Material/KeyLeft.png b/Material/KeyLeft.png new file mode 100644 index 0000000..b64110a Binary files /dev/null and b/Material/KeyLeft.png differ diff --git a/Material/KeyRight.png b/Material/KeyRight.png new file mode 100644 index 0000000..478e541 Binary files /dev/null and b/Material/KeyRight.png differ diff --git a/Material/KeyUp.png b/Material/KeyUp.png new file mode 100644 index 0000000..0e4bf6f Binary files /dev/null and b/Material/KeyUp.png differ 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();