Skip to content

Add a merchant camp #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chatmetaleux wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a merchant camp #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
555c10a
- added "Add merchant camp" feature
Chatmetaleux Mar 25, 2016
7261927
cleaning
Chatmetaleux Mar 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions GnomoriaEditor/GnomoriaEditor/AboutDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>


Expand Down
33 changes: 23 additions & 10 deletions GnomoriaEditor/GnomoriaEditor/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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">
Expand Down
22 changes: 22 additions & 0 deletions GnomoriaEditor/GnomoriaEditor/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ private bool GameLoaded
AddItemButton.IsEnabled = value;
IrrigateButton.IsEnabled = value;
FixGhostItemsButton.IsEnabled = value;
AddMerchantButton.IsEnabled = value;
gameloaded = value;
}
}
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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);
}

}


Expand Down
4 changes: 2 additions & 2 deletions GnomoriaEditor/GnomoriaEditor/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]