From 7d4bdd1dfad7da71dd598547762109881e3f8f66 Mon Sep 17 00:00:00 2001 From: Bartosz Chyzy Date: Tue, 14 May 2019 22:49:31 +0200 Subject: [PATCH] =?UTF-8?q?Uzupe=C5=82nienie=20o=20randomowe=20smieci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MapEditor/MapEditor/App.config | 4 +- .../Helpers/ColorToFieldTypeConverter.cs | 2 +- .../MapEditor/MapEditor/Program.cs | 59 ++++++++++++++++++- 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/Trunk/Helper Programs/MapEditor/MapEditor/App.config b/Trunk/Helper Programs/MapEditor/MapEditor/App.config index 9133650..cf7021d 100644 --- a/Trunk/Helper Programs/MapEditor/MapEditor/App.config +++ b/Trunk/Helper Programs/MapEditor/MapEditor/App.config @@ -1,8 +1,8 @@  - - + + diff --git a/Trunk/Helper Programs/MapEditor/MapEditor/Helpers/ColorToFieldTypeConverter.cs b/Trunk/Helper Programs/MapEditor/MapEditor/Helpers/ColorToFieldTypeConverter.cs index 7a880a6..a951ee1 100644 --- a/Trunk/Helper Programs/MapEditor/MapEditor/Helpers/ColorToFieldTypeConverter.cs +++ b/Trunk/Helper Programs/MapEditor/MapEditor/Helpers/ColorToFieldTypeConverter.cs @@ -22,7 +22,7 @@ namespace MapEditor.Helpers return FieldType.House; if (color == Color.FromArgb(255,255,0)) - return FieldType.House; + return FieldType.Dump; throw new NotImplementedException($"Conversion form {color.ToKnownColor()} has not been implemented."); diff --git a/Trunk/Helper Programs/MapEditor/MapEditor/Program.cs b/Trunk/Helper Programs/MapEditor/MapEditor/Program.cs index 58262a0..49be9c8 100644 --- a/Trunk/Helper Programs/MapEditor/MapEditor/Program.cs +++ b/Trunk/Helper Programs/MapEditor/MapEditor/Program.cs @@ -29,7 +29,7 @@ namespace MapEditor private static IEnumerable GetFieldInfos(Bitmap bitmap) { var width = bitmap.Width; - var height = bitmap.Height; + var height = bitmap.Height; for (int x = 0; x < width; x++) { @@ -44,6 +44,7 @@ namespace MapEditor } private static bool GenerateXML(IEnumerable fieldInfos) { + var random = new Random(); try { using (var xmlWriter = XmlWriter.Create(Config.OutputFilePath)) @@ -64,6 +65,62 @@ namespace MapEditor xmlWriter.WriteElementString("Y",fieldInfo.Y.ToString()); xmlWriter.WriteEndElement(); + + if (fieldInfo.FieldType == FieldType.House) + { + xmlWriter.WriteStartElement("TrashCans"); + var hasAnyDumps = false; + if (random.Next(0, 10) > 4) + { + xmlWriter.WriteStartElement("Can"); + xmlWriter.WriteElementString("GarbageType", "Paper"); + xmlWriter.WriteElementString("Volume", random.Next(0, 100).ToString()); + xmlWriter.WriteEndElement(); + + hasAnyDumps = true; + } + + if (random.Next(0, 10) > 4) + { + xmlWriter.WriteStartElement("Can"); + xmlWriter.WriteElementString("GarbageType", "Glass"); + xmlWriter.WriteElementString("Volume", random.Next(0, 100).ToString()); + xmlWriter.WriteEndElement(); + + hasAnyDumps = true; + } + + if (random.Next(0, 10) > 4) + { + xmlWriter.WriteStartElement("Can"); + xmlWriter.WriteElementString("GarbageType", "Organic"); + xmlWriter.WriteElementString("Volume", random.Next(0, 100).ToString()); + xmlWriter.WriteEndElement(); + + hasAnyDumps = true; + } + + if (random.Next(0, 10) > 4) + { + xmlWriter.WriteStartElement("Can"); + xmlWriter.WriteElementString("GarbageType", "PlasticMetal"); + xmlWriter.WriteElementString("Volume", random.Next(0, 100).ToString()); + xmlWriter.WriteEndElement(); + + hasAnyDumps = true; + } + + if (!hasAnyDumps) + { + xmlWriter.WriteStartElement("Can"); + xmlWriter.WriteElementString("GarbageType", "PlasticMetal"); + xmlWriter.WriteElementString("Volume", random.Next(0, 40).ToString()); + xmlWriter.WriteEndElement(); + } + + xmlWriter.WriteEndElement(); + } + xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement();