From e8ba3c4d51665601eb3c6c3c3fa15aa46e6028bb Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 17 Dec 2023 19:20:21 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81=D0=BE=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D1=86=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExtensionDrawingPlane.java | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/ProjectStormtrooper/ExtensionDrawingPlane.java b/ProjectStormtrooper/ExtensionDrawingPlane.java index 1d7d081..5896ed1 100644 --- a/ProjectStormtrooper/ExtensionDrawingPlane.java +++ b/ProjectStormtrooper/ExtensionDrawingPlane.java @@ -4,42 +4,52 @@ import java.awt.*; public class ExtensionDrawingPlane { public static DrawingPlane CreateDrawingPlane(String info, String separatorForObject, int width, int height) { + // todo Добавить сохранение значеиня допкласса String[] strs = info.split(separatorForObject); - if (strs.length == 3) - { + if (strs.length == 5) { return new DrawingPlane( Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), - Color.getColor(strs[2]), + new Color( + Integer.parseInt(strs[2]), + Integer.parseInt(strs[3]), + Integer.parseInt(strs[4]) + ), width, height ); } - if (strs.length == 6) - { + if (strs.length == 10) { return new DrawingStormtrooper( Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), - Color.getColor(strs[2]), - Color.getColor(strs[3]), - Boolean.parseBoolean(strs[4]), - Boolean.parseBoolean(strs[5]), + new Color( + Integer.parseInt(strs[2]), + Integer.parseInt(strs[3]), + Integer.parseInt(strs[4]) + ), + new Color( + Integer.parseInt(strs[5]), + Integer.parseInt(strs[6]), + Integer.parseInt(strs[7]) + ), + Boolean.parseBoolean(strs[8]), + Boolean.parseBoolean(strs[9]), width, height ); } return null; } - public static String GetDataForSave(DrawingPlane drawingPlane, String separatorForObject) - { + + public static String GetDataForSave(DrawingPlane drawingPlane, String separatorForObject) { + // todo Добавить загрузку значеиня допкласса var plane = drawingPlane.EntityPlane; - if (plane == null) - { + if (plane == null) { return ""; } - String str = plane.Speed + separatorForObject + plane.Weight + separatorForObject + plane.BodyColor.toString(); - if (!(plane instanceof EntityStormtrooper stormtrooper)) - { + String str = plane.Speed + separatorForObject + plane.Weight + separatorForObject + plane.BodyColor.getRed() + separatorForObject + plane.BodyColor.getGreen() + separatorForObject + plane.BodyColor.getBlue(); + if (!(plane instanceof EntityStormtrooper stormtrooper)) { return str; } - return str + separatorForObject + stormtrooper.AdditionalColor + separatorForObject + stormtrooper.Bombs + separatorForObject + stormtrooper.Rockets; + return str + separatorForObject + stormtrooper.AdditionalColor.getRed() + separatorForObject + stormtrooper.AdditionalColor.getGreen() + separatorForObject + stormtrooper.AdditionalColor.getBlue() + separatorForObject + stormtrooper.Bombs + separatorForObject + stormtrooper.Rockets; } }