Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 37 additions & 1 deletion WaypointCreatorGen2/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="WaypointCreatorGen2.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<applicationSettings>
<WaypointCreatorGen2.Properties.Settings>
<setting name="host" serializeAs="String">
<value>127.0.0.1</value>
</setting>
<setting name="port" serializeAs="String">
<value>3306</value>
</setting>
<setting name="database" serializeAs="String">
<value>world</value>
</setting>
<setting name="username" serializeAs="String">
<value>trinity</value>
</setting>
<setting name="password" serializeAs="String">
<value>trinity</value>
</setting>
</WaypointCreatorGen2.Properties.Settings>
</applicationSettings>
</configuration>
66 changes: 54 additions & 12 deletions WaypointCreatorGen2/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 20 additions & 6 deletions WaypointCreatorGen2/Properties/Settings.settings
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WaypointCreatorGen2.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="host" Type="System.String" Scope="Application">
<Value Profile="(Default)">127.0.0.1</Value>
</Setting>
<Setting Name="port" Type="System.String" Scope="Application">
<Value Profile="(Default)">3306</Value>
</Setting>
<Setting Name="database" Type="System.String" Scope="Application">
<Value Profile="(Default)">world</Value>
</Setting>
<Setting Name="username" Type="System.String" Scope="Application">
<Value Profile="(Default)">trinity</Value>
</Setting>
<Setting Name="password" Type="System.String" Scope="Application">
<Value Profile="(Default)">trinity</Value>
</Setting>
</Settings>
</SettingsFile>
1 change: 1 addition & 0 deletions WaypointCreatorGen2/WaypointCreator.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 39 additions & 4 deletions WaypointCreatorGen2/WaypointCreator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using MySqlConnector;

namespace WaypointCreatorGen2
{
Expand All @@ -22,6 +23,17 @@ public partial class WaypointCreator : Form

private const int SEQUENCE_TO_CHECK_FOR_DUPLICATES = 3;

private string GetConnectionString()
{
var host = Properties.Settings.Default.host;
var port = Properties.Settings.Default.port;
var database = Properties.Settings.Default.database;
var username = Properties.Settings.Default.username;
var password = Properties.Settings.Default.password;

return $"server={host};user={username};database={database};port={port};password={password};";
}

public WaypointCreator()
{
InitializeComponent();
Expand Down Expand Up @@ -213,22 +225,45 @@ private void ListEntries(UInt32 creatureId)
{
foreach (var waypointsByEntry in WaypointDatabyCreatureEntry)
{
CreatureNamesByEntry.TryGetValue(waypointsByEntry.Key, out var name);
var name = GetCreatureName(waypointsByEntry.Key);
foreach (var waypointsByGuid in waypointsByEntry.Value)
EditorListBox.Items.Add($"{waypointsByEntry.Key} - {name} ({waypointsByGuid.Key})");
}

}
else
{
if (WaypointDatabyCreatureEntry.ContainsKey(creatureId))
{
CreatureNamesByEntry.TryGetValue(creatureId, out var name);
var name = GetCreatureName(creatureId);
foreach (var waypointsByGuid in WaypointDatabyCreatureEntry[creatureId])
EditorListBox.Items.Add($"{creatureId} - {name} ({waypointsByGuid.Key.ToString()})");
}
}
}

private string GetCreatureName(UInt32 entry)
{
string name = string.Empty;
string query = "SELECT `name` FROM `creature_template` WHERE `entry` = @entry";

using (MySqlConnection conn = new MySqlConnection(GetConnectionString()))
{
conn.Open();
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@entry", entry);

using (MySqlDataReader reader = cmd.ExecuteReader())
{
if (reader.Read())
{
name = reader["name"].ToString();
}
}
}
}

return name;
}

private void ShowWaypointDataForCreature(UInt32 creatureId, UInt64 lowGUID)
Expand Down Expand Up @@ -422,7 +457,7 @@ private void GenerateSQLStripMenuItem_Click(object sender, EventArgs e)
{
// Generates the SQL output.
// waypoint_data
CreatureNamesByEntry.TryGetValue(_selectedCreatureId, out string name);
string name = GetCreatureName(_selectedCreatureId);
var velocity = "NULL";

SQLOutputTextBox.AppendText("SET @MOVERGUID := @CGUID+xxxxxxxx;\r\n");
Expand Down
27 changes: 27 additions & 0 deletions WaypointCreatorGen2/WaypointCreatorGen2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,34 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
<HintPath>..\packages\MySqlConnector.2.3.7\lib\net471\MySqlConnector.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down Expand Up @@ -63,6 +89,7 @@
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
11 changes: 11 additions & 0 deletions WaypointCreatorGen2/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.1" targetFramework="net472" />
<package id="MySqlConnector" version="2.3.7" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Diagnostics.DiagnosticSource" version="7.0.2" targetFramework="net472" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
</packages>