From 555c10a287f3562dda8b7120c0365bfbbd488692 Mon Sep 17 00:00:00 2001
From: Samuel Quevauvillers <samuel.quevauvillers@gmail.com>
Date: Fri, 25 Mar 2016 08:02:43 +0100
Subject: [PATCH 1/2] - added "Add merchant camp" feature - updated "About"
 window

---
 .../GnomoriaEditor/AboutDialog.xaml           |  6 ++--
 GnomoriaEditor/GnomoriaEditor/MainWindow.xaml | 33 +++++++++++++------
 .../GnomoriaEditor/MainWindow.xaml.cs         | 22 +++++++++++++
 .../GnomoriaEditor/Properties/AssemblyInfo.cs |  4 +--
 tmp/AboutDialog.xaml                          | 13 ++++++++
 5 files changed, 63 insertions(+), 15 deletions(-)
 create mode 100644 tmp/AboutDialog.xaml

diff --git a/GnomoriaEditor/GnomoriaEditor/AboutDialog.xaml b/GnomoriaEditor/GnomoriaEditor/AboutDialog.xaml
index a625297..8d3475b 100644
--- a/GnomoriaEditor/GnomoriaEditor/AboutDialog.xaml
+++ b/GnomoriaEditor/GnomoriaEditor/AboutDialog.xaml
@@ -3,9 +3,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="About" Height="224" Width="308" WindowStartupLocation="CenterOwner" >
     <Grid>
-        <TextBlock HorizontalAlignment="Left" Margin="10,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" FontSize="16">Gnomoria editor v0.2</TextBlock>
-        <TextBlock Margin="10,46,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="80">Based on <Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?topic=4581.0" RequestNavigate="Hyperlink_OnRequestNavigate">Gnomoria Save Game Editor</Hyperlink>, thanks to kinsi and Fluff for their original work. <LineBreak></LineBreak><LineBreak></LineBreak> Updated to work with Gnomoria 0.9.18 by <Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?action=profile;u=3717" RequestNavigate="Hyperlink_OnRequestNavigate">Pasta.</Hyperlink></TextBlock>
-        <TextBlock Margin="10,125,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="28">Icons: <Hyperlink NavigateUri="http://www.fatcow.com/free-icons" RequestNavigate="Hyperlink_OnRequestNavigate">http://www.fatcow.com/free-icons</Hyperlink></TextBlock>
+        <TextBlock HorizontalAlignment="Left" Margin="10,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" FontSize="16">Gnomoria editor v0.3</TextBlock>
+        <TextBlock Margin="10,46,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="80"><Run Text="Based on "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?topic=4581.0" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Gnomoria Save Game Editor"/></Hyperlink><Run Text=", thanks to kinsi and Fluff for their original work."/><LineBreak/><LineBreak/><Run Text="Updated to work with Gnomoria "/><Run Text="1.0 "/><Run Text="by "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?action=profile;u=3717" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Pasta"/></Hyperlink><Run Text=" and "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?action=profile;u=5033" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Chatmetaleux."/></Hyperlink></TextBlock>
+        <TextBlock Margin="10,132,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="28">Icons: <Hyperlink NavigateUri="http://www.fatcow.com/free-icons" RequestNavigate="Hyperlink_OnRequestNavigate">http://www.fatcow.com/free-icons</Hyperlink></TextBlock>
         <Button Content="Close" Margin="0,0,10,10" IsCancel="True" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="75"/>
 
 
diff --git a/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml b/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml
index eb7c4a7..a9fbd6c 100644
--- a/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml
+++ b/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml
@@ -107,15 +107,15 @@
                     <Button x:Name="RevealMapButton" Content="Reveal map" HorizontalAlignment="Left" Margin="10,54,0,0" VerticalAlignment="Top" Width="75" Click="RevealMapButton_Click"/>
                     <Button x:Name="RevealOreButton" Content="Reveal ore" HorizontalAlignment="Left" Margin="90,54,0,0" VerticalAlignment="Top" Width="75" Click="RevealOreButton_Click"/>
                     <Button x:Name="ExpandOreButton" Content="Expand ore" HorizontalAlignment="Left" Margin="170,54,0,0" VerticalAlignment="Top" Width="75" Click="ExpandOreButton_Click"/>
-                    <GroupBox Header="Create items" HorizontalAlignment="Left" Margin="10,81,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.033,-4.906" Height="198" Width="235">
-                        <Grid Margin="0,0,0,0">
-                            <Label Content="Material" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
-                            <ComboBox x:Name="MaterialList" HorizontalAlignment="Left" Margin="68,45,0,0" VerticalAlignment="Top" Width="120" DisplayMemberPath="Name" SelectionChanged="MaterialList_SelectionChanged"/>
-                            <Label Content="Item" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top"/>
-                            <ComboBox x:Name="ItemList" HorizontalAlignment="Left" Margin="68,76,0,0" VerticalAlignment="Top" Width="120" DisplayMemberPath="Name"/>
-                            <Label Content="Amount" HorizontalAlignment="Left" Margin="10,103,0,0" VerticalAlignment="Top"/>
-                            <TextBox x:Name="ItemAmount" HorizontalAlignment="Left" Height="23" Margin="68,106,0,0" TextWrapping="Wrap" Text="5" VerticalAlignment="Top" Width="40"/>
-                            <Button x:Name="AddItemButton" Content="Add item(s)" HorizontalAlignment="Left" Margin="113,143,0,0" VerticalAlignment="Top" Width="75" Click="AddItemButton_Click"/>
+                    <GroupBox Header="Create items" HorizontalAlignment="Left" Margin="10,81,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.033,-4.906" Height="116" Width="235">
+                        <Grid>
+                            <Label Content="Material" HorizontalAlignment="Left" Margin="19,5,0,0" VerticalAlignment="Top"/>
+                            <ComboBox x:Name="MaterialList" HorizontalAlignment="Left" Margin="77,9,0,0" VerticalAlignment="Top" Width="136" DisplayMemberPath="Name" SelectionChanged="MaterialList_SelectionChanged"/>
+                            <Label Content="Item" HorizontalAlignment="Left" Margin="19,36,0,0" VerticalAlignment="Top"/>
+                            <ComboBox x:Name="ItemList" HorizontalAlignment="Left" Margin="77,40,0,0" VerticalAlignment="Top" Width="136" DisplayMemberPath="Name"/>
+                            <Label Content="Amount" HorizontalAlignment="Left" Margin="19,67,0,0" VerticalAlignment="Top"/>
+                            <TextBox x:Name="ItemAmount" HorizontalAlignment="Left" Height="23" Margin="77,70,0,0" TextWrapping="Wrap" Text="5" VerticalAlignment="Top" Width="40"/>
+                            <Button x:Name="AddItemButton" Content="Add item(s)" HorizontalAlignment="Left" Margin="138,69,0,0" VerticalAlignment="Top" Width="75" Click="AddItemButton_Click"/>
                         </Grid>
                     </GroupBox>
                     <Button x:Name="IrrigateButton" Content="Irrigate underground farms" HorizontalAlignment="Left" Margin="305,54,0,0" VerticalAlignment="Top" Width="157" Click="IrrigateButton_Click"/>
@@ -147,7 +147,20 @@
                     <ScrollViewer Margin="13,312,10,10">
                         <TextBlock x:Name="StatusBlock" Margin="0,0,0,0" TextWrapping="Wrap" HorizontalAlignment="Left" Width="auto"/>
                     </ScrollViewer>
-                    <Button x:Name="FixGhostItemsButton" Content="Fix unusable ghost items" HorizontalAlignment="Left" Margin="13,284,0,0" VerticalAlignment="Top" Width="152" ToolTip="Try to fix the problem where items stored in a deconstructed crate are bugged and unusable\r\nThe crate must be deconstructed from its stockpile first. If not possible you have to remove the stockpile." Click="FixGhostItems_Click"/>
+                    <Button x:Name="FixGhostItemsButton" Content="Fix unusable ghost items" HorizontalAlignment="Left" Margin="252,285,0,0" VerticalAlignment="Top" Width="152" ToolTip="Try to fix the problem where items stored in a deconstructed crate are bugged and unusable\r\nThe crate must be deconstructed from its stockpile first. If not possible you have to remove the stockpile." Click="FixGhostItems_Click"/>
+                    <GroupBox x:Name="groupBox" Header="Add a Merchant Camp" HorizontalAlignment="Left" Height="105" Margin="10,202,0,0" VerticalAlignment="Top" Width="235">
+                        <Button x:Name="AddMerchantButton" Content="Add" HorizontalAlignment="Left" Margin="166,59,0,0" VerticalAlignment="Top" Width="45" ToolTip="" Click="add_faction" RenderTransformOrigin="-0.178,0.619"/>
+                    </GroupBox>
+                    <ComboBox x:Name="cobCamp" HorizontalAlignment="Left" Height="22" Margin="81,221,0,0" VerticalAlignment="Top" Width="146">
+                        <ComboBoxItem Content="General merchant"/>
+                        <ComboBoxItem Content="Mining colony"/>
+                        <ComboBoxItem Content="Lumber camp"/>
+                        <ComboBoxItem Content="Agricultural"/>
+                    </ComboBox>
+                    <Label x:Name="label" Content="Camp" HorizontalAlignment="Left" Margin="21,218,0,0" VerticalAlignment="Top"/>
+                    <Label x:Name="label1" Content="Dist. (days)" HorizontalAlignment="Left" Margin="22,247,0,0" VerticalAlignment="Top"/>
+                    <Slider x:Name="slider" HorizontalAlignment="Left" Margin="114,250,0,0" VerticalAlignment="Top" Width="113" SelectionEnd="6" SelectionStart="1" Value="3" Maximum="6" Minimum="1" AutoToolTipPlacement="TopLeft"/>
+                    <Label x:Name="lDistCamp" Content="3" HorizontalAlignment="Left" Margin="86,248,0,0" VerticalAlignment="Top"/>
                 </Grid>
             </TabItem>
             <TabItem x:Name="GnomesTab" Header="Gnomes" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="57">
diff --git a/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml.cs b/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml.cs
index 861341d..e209351 100644
--- a/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml.cs
+++ b/GnomoriaEditor/GnomoriaEditor/MainWindow.xaml.cs
@@ -44,6 +44,7 @@ private bool GameLoaded
                 AddItemButton.IsEnabled = value;
                 IrrigateButton.IsEnabled = value;
                 FixGhostItemsButton.IsEnabled = value;
+                AddMerchantButton.IsEnabled = value;
                 gameloaded = value;
             }
         }
@@ -78,6 +79,8 @@ public MainWindow()
             ItemList.SelectedIndex = 145;
             MaterialList.SelectedIndex = 59;
             //QualityList.SelectedIndex = 5;
+            cobCamp.SelectedIndex = 0;
+            slider.ValueChanged += new RoutedPropertyChangedEventHandler<double>(slider_camp_changed);
         }
 
         private static void InitializeGnomoria()
@@ -728,6 +731,25 @@ private void FixGhostItems_Click(object sender, RoutedEventArgs e)
             }
             AddStatusText(string.Format("Done. {0} piles/container fixed.", cnt));
         }
+
+        private void slider_camp_changed(object sender, EventArgs e)
+        {
+            lDistCamp.Content = Math.Round(slider.Value,1).ToString();
+        }
+
+        private void add_faction(object sender, EventArgs e)
+        {
+            if (cobCamp.SelectedIndex == -1) return;
+
+            string[] defs = { "MerchantCityState","MiningColony", "LumberCamp", "AgriculturalSettlement" };
+            FactionDef def = GnomanEmpire.Instance.GameDefs.FactionDefs[defs[cobCamp.SelectedIndex]];
+            Faction f = new Faction(def,null , (float)slider.Value);
+
+            AddStatusText(cobCamp.Text + " " + f.Name + " added." );
+
+            GnomanEmpire.Instance.World.AIDirector.AddFaction(f);
+        }
+
     }
 
 
diff --git a/GnomoriaEditor/GnomoriaEditor/Properties/AssemblyInfo.cs b/GnomoriaEditor/GnomoriaEditor/Properties/AssemblyInfo.cs
index a8d4c9e..9b87984 100644
--- a/GnomoriaEditor/GnomoriaEditor/Properties/AssemblyInfo.cs
+++ b/GnomoriaEditor/GnomoriaEditor/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.3.0")]
+[assembly: AssemblyFileVersion("0.0.3.0")]
diff --git a/tmp/AboutDialog.xaml b/tmp/AboutDialog.xaml
new file mode 100644
index 0000000..8d3475b
--- /dev/null
+++ b/tmp/AboutDialog.xaml
@@ -0,0 +1,13 @@
+<Window x:Class="GnomoriaEditor.AboutDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="About" Height="224" Width="308" WindowStartupLocation="CenterOwner" >
+    <Grid>
+        <TextBlock HorizontalAlignment="Left" Margin="10,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" FontSize="16">Gnomoria editor v0.3</TextBlock>
+        <TextBlock Margin="10,46,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="80"><Run Text="Based on "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?topic=4581.0" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Gnomoria Save Game Editor"/></Hyperlink><Run Text=", thanks to kinsi and Fluff for their original work."/><LineBreak/><LineBreak/><Run Text="Updated to work with Gnomoria "/><Run Text="1.0 "/><Run Text="by "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?action=profile;u=3717" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Pasta"/></Hyperlink><Run Text=" and "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?action=profile;u=5033" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Chatmetaleux."/></Hyperlink></TextBlock>
+        <TextBlock Margin="10,132,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="28">Icons: <Hyperlink NavigateUri="http://www.fatcow.com/free-icons" RequestNavigate="Hyperlink_OnRequestNavigate">http://www.fatcow.com/free-icons</Hyperlink></TextBlock>
+        <Button Content="Close" Margin="0,0,10,10" IsCancel="True" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="75"/>
+
+
+    </Grid>
+</Window>

From 7261927c213fb941d2a4af0d46af13d2e4c2f00a Mon Sep 17 00:00:00 2001
From: Samuel Quevauvillers <samuel.quevauvillers@gmail.com>
Date: Fri, 25 Mar 2016 08:04:57 +0100
Subject: [PATCH 2/2] cleaning

---
 tmp/AboutDialog.xaml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 tmp/AboutDialog.xaml

diff --git a/tmp/AboutDialog.xaml b/tmp/AboutDialog.xaml
deleted file mode 100644
index 8d3475b..0000000
--- a/tmp/AboutDialog.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Window x:Class="GnomoriaEditor.AboutDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="About" Height="224" Width="308" WindowStartupLocation="CenterOwner" >
-    <Grid>
-        <TextBlock HorizontalAlignment="Left" Margin="10,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" FontSize="16">Gnomoria editor v0.3</TextBlock>
-        <TextBlock Margin="10,46,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="80"><Run Text="Based on "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?topic=4581.0" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Gnomoria Save Game Editor"/></Hyperlink><Run Text=", thanks to kinsi and Fluff for their original work."/><LineBreak/><LineBreak/><Run Text="Updated to work with Gnomoria "/><Run Text="1.0 "/><Run Text="by "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?action=profile;u=3717" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Pasta"/></Hyperlink><Run Text=" and "/><Hyperlink NavigateUri="http://forums.gnomoria.com/index.php?action=profile;u=5033" RequestNavigate="Hyperlink_OnRequestNavigate"><Run Text="Chatmetaleux."/></Hyperlink></TextBlock>
-        <TextBlock Margin="10,132,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="28">Icons: <Hyperlink NavigateUri="http://www.fatcow.com/free-icons" RequestNavigate="Hyperlink_OnRequestNavigate">http://www.fatcow.com/free-icons</Hyperlink></TextBlock>
-        <Button Content="Close" Margin="0,0,10,10" IsCancel="True" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="75"/>
-
-
-    </Grid>
-</Window>