Compare commits

..

No commits in common. '9b644359061151911bcbd97bcd0b937fe9c461cd' and '9ef2a57235544edee3356c9691d2687fa4ac3239' have entirely different histories.

@ -18,12 +18,10 @@
<e p="Path.xaml.cs" t="Include" />
</e>
<e p="Extensions" t="Include">
<e p="Direction.cs" t="Include" />
<e p="MathExtensions.cs" t="Include" />
<e p="Modes.cs" t="Include" />
<e p="MouseExtensions.cs" t="Include" />
<e p="ReadJSON.cs" t="Include" />
<e p="SeaskipperCosts.cs" t="Include" />
</e>
<e p="main-map.png" t="Include" />
<e p="MainWindow.xaml" t="Include" />
@ -36,7 +34,6 @@
<e p="Controls" t="Include">
<e p="EditorCanvas.g.cs" t="Include" />
<e p="Node.g.cs" t="Include" />
<e p="Path.g.cs" t="Include" />
</e>
<e p="GeneratedInternalTypeHelper.g.cs" t="Include" />
<e p="MainWindow.g.cs" t="Include" />

@ -28,9 +28,11 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="8d840f1a-4000-4390-ab3f-2383ed6434d5" name="Default Changelist" comment="Updated Paths with a direction enum, and added seaskipper costs enum">
<list default="true" id="8d840f1a-4000-4390-ab3f-2383ed6434d5" name="Default Changelist" comment="Added custom Node control">
<change afterPath="$PROJECT_DIR$/Controls/Path.xaml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Extensions/Modes.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.NodeEditor/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Controls/Node.xaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Controls/Node.xaml.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/NodeEditor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/NodeEditor.csproj" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@ -46,26 +48,18 @@
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="mock://C:/Users/Liam/NodeEditor/Controls/Path.xaml.cs" root0="SKIP_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Controls/Node.xaml.cs" />
<option value="$PROJECT_DIR$/Controls/Path.xaml" />
<option value="$PROJECT_DIR$/Extensions/Modes.cs" />
<option value="$PROJECT_DIR$/Extensions/SeaskipperCosts.cs" />
<option value="$PROJECT_DIR$/Extensions/Direction.cs" />
<option value="$PROJECT_DIR$/Controls/Path.xaml.cs" />
<option value="$PROJECT_DIR$/Controls/Node.xaml.cs" />
<option value="$PROJECT_DIR$/NodeEditor.csproj" />
</list>
</option>
</component>
<component name="ProjectId" id="1ltZq4ji537vQS7B5Q2SkaWibqc" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
@ -82,8 +76,6 @@
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="ReSpellerSettingsId" />
<property name="vue.rearranger.settings.migration" value="true" />
</component>
<component name="RunManager">
@ -116,7 +108,7 @@
<updated>1608418540783</updated>
<workItem from="1608418548513" duration="1911000" />
<workItem from="1608578473230" duration="1904000" />
<workItem from="1608581445298" duration="4238000" />
<workItem from="1608581445298" duration="934000" />
</task>
<task id="LOCAL-00001" summary="Added custom Node control">
<created>1608580007149</created>
@ -125,21 +117,7 @@
<option name="project" value="LOCAL" />
<updated>1608580007149</updated>
</task>
<task id="LOCAL-00002" summary="Added Paths custom control and Modes enum.">
<created>1608582666680</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1608582666680</updated>
</task>
<task id="LOCAL-00003" summary="Updated Paths with a direction enum, and added seaskipper costs enum">
<created>1608584795551</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1608584795551</updated>
</task>
<option name="localTasksCounter" value="4" />
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -189,22 +167,12 @@
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
<MESSAGE value="Added custom Node control" />
<MESSAGE value="Added Paths custom control and Modes enum." />
<MESSAGE value="Updated Paths with a direction enum, and added seaskipper costs enum" />
<option name="LAST_COMMIT_MESSAGE" value="Updated Paths with a direction enum, and added seaskipper costs enum" />
<option name="LAST_COMMIT_MESSAGE" value="Added custom Node control" />
</component>
<component name="WindowStateProjectService">
<state x="0" y="228" key="SettingsEditor" timestamp="1608583242732">
<screen x="0" y="0" width="1920" height="1160" />
</state>
<state x="0" y="228" key="SettingsEditor/0.0.1920.1160@0.0.1920.1160" timestamp="1608583242732" />
<state x="92" y="92" width="1736" height="976" key="VCS.FileHistoryDialog" timestamp="1608585366848">
<screen x="0" y="0" width="1920" height="1160" />
</state>
<state x="92" y="92" width="1736" height="976" key="VCS.FileHistoryDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1608585366848" />
<state x="552" y="313" key="Vcs.Push.Dialog.v2" timestamp="1608582676704">
<state x="552" y="313" key="Vcs.Push.Dialog.v2" timestamp="1608580058123">
<screen x="0" y="0" width="1920" height="1160" />
</state>
<state x="552" y="313" key="Vcs.Push.Dialog.v2/0.0.1920.1160@0.0.1920.1160" timestamp="1608582676704" />
<state x="552" y="313" key="Vcs.Push.Dialog.v2/0.0.1920.1160@0.0.1920.1160" timestamp="1608580058123" />
</component>
</project>

@ -10,6 +10,8 @@ namespace NodeEditor.Controls
public partial class Node : UserControl
{
public static List<Node> Nodes { get; } = new List<Node>();
// ReSharper disable once UnusedAutoPropertyAccessor.Global
public string Desc { get; set; }
public Node()

@ -14,8 +14,6 @@ namespace NodeEditor.Controls
public Modes Mode { get; set; }
public int Cost { get; set; }
public Direction Direction { get; set; }
public Path()
{
Difficulty = new[] {1, 1, 1, 1, 1};
@ -23,7 +21,6 @@ namespace NodeEditor.Controls
LvlRequired = 0;
Mode = Modes.Walk;
Cost = 0;
Direction = Direction.Both;
Paths.Add(this);
InitializeComponent();
}
@ -34,7 +31,6 @@ namespace NodeEditor.Controls
LvlRequired = 0;
Mode = Modes.Walk;
Cost = 0;
Direction = Direction.Both;
Paths.Add(this);
InitializeComponent();
}
@ -45,7 +41,6 @@ namespace NodeEditor.Controls
LvlRequired = 0;
Mode = mode;
Cost = 0;
Direction = Direction.Both;
Paths.Add(this);
InitializeComponent();
}
@ -56,7 +51,6 @@ namespace NodeEditor.Controls
LvlRequired = 0;
Mode = mode;
Cost = cost;
Direction = Direction.Both;
Paths.Add(this);
InitializeComponent();
}
@ -67,7 +61,6 @@ namespace NodeEditor.Controls
LvlRequired = lvlRequired;
Mode = mode;
Cost = cost;
Direction = Direction.Both;
Paths.Add(this);
InitializeComponent();
}
@ -78,18 +71,6 @@ namespace NodeEditor.Controls
LvlRequired = lvlRequired;
Mode = mode;
Cost = cost;
Direction = Direction.Both;
Paths.Add(this);
InitializeComponent();
}
public Path(int distance, Modes mode, int cost, int lvlRequired, int[] difficulty, Direction direction)
{
Difficulty = difficulty;
Distance = distance;
LvlRequired = lvlRequired;
Mode = mode;
Cost = cost;
Direction = direction;
Paths.Add(this);
InitializeComponent();
}

@ -1,9 +0,0 @@
namespace NodeEditor.Extensions
{
public enum Direction
{
Both,
TowardsA,
TowardsB
}
}

@ -1,71 +0,0 @@
namespace NodeEditor.Extensions
{
public enum SeaskipperCosts
{
NemractSelchar = 12,
NemractLlevigar = 42,
NemractRoosterIsland = 4,
NemractHalfMoonIsland = 8,
NemractMageIsland = 8,
NemractNodgujIsland = 14,
NemractZhightIsland = 16,
NemractDurumIsles = 4,
NemractBearZoo = 4,
SelcharLlevigar = 24,
SelcharNodgujIsland = 8,
SelcharSkiensIsland = 10,
SelcharVolcanicIsles = 18,
SelcharMaroPeaks = 12,
SelcharPirateCove = 16,
SelcharDeadIsland = 16,
SelcharGallionsGraveyard = 16,
LlevigarVolcanicIsles = 16,
LlevigarMaroPeaks = 18,
LlevigarPirateCove = 20,
LlevigarDeadIsland = 24,
LlevigarJofashDocks = 32,
LlevigarGallionsGraveyard = 16,
RoosterIslandNemract = 8,
RoosterIslandSelchar = 10,
RoosterIslandLlevigar = 38,
HalfMoonIslandNemract = 10,
HalfMoonIslandSelchar = 14,
HalfMoonIslandLlevigar = 40,
MageIslandNemract = 10,
MageIslandSelchar = 10,
MageIslandLlevigar = 40,
NodgujIslandNemract = 22,
NodgujIslandSelchar = 12,
NodgujIslandLlevigar = 32,
ZhightIslandNemract = 16,
ZhightIslandSelchar = 12,
ZhightIslandLlevigar = 30,
SkiensIslandNemract = 26,
SkiensIslandSelchar = 12,
SkiensIslandLlevigar = 30,
VolcanicIslesNemract = 34,
VolcanicIslesSelchar = 26,
VolcanicIslesLlevigar = 26,
MaroPeaksNemract = 28,
MaroPeaksSelchar = 20,
MaroPeaksLlevigar = 28,
PirateCoveNemract = 28,
PirateCoveSelchar = 14,
PirateCoveLlevigar = 28,
DeadIslandNemract = 32,
DeadIslandSelchar = 22,
DeadIslandLlevigar = 32,
JofashDocksNemract = 38,
JofashDocksSelchar = 26,
JofashDocksLlevigar = 38,
GallionsGraveyardNemract = 24,
GallionsGraveyardSelchar = 14,
GallionsGraveyardLlevigar = 28,
DurumIslesNemract = 8,
DurumIslesSelchar = 10,
DurumIslesLlevigar = 38,
BearZooNemract = 8,
BearZooSelchar = 10,
BearZooLlevigar = 38
}
}

@ -9,7 +9,6 @@
<RootNamespace>NodeEditor</RootNamespace>
<AssemblyName>NodeEditor</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<RuntimeIdentifiers>win</RuntimeIdentifiers>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
@ -54,7 +53,6 @@
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="Windows.Foundation.UniversalApiContract" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@ -73,7 +71,6 @@
<Compile Include="Controls\Path.xaml.cs">
<DependentUpon>Path.xaml</DependentUpon>
</Compile>
<Compile Include="Extensions\Direction.cs" />
<Compile Include="Extensions\MathExtensions.cs" />
<Compile Include="Extensions\Modes.cs" />
<Compile Include="Extensions\MouseExtensions.cs" />
@ -95,7 +92,6 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Extensions\SeaskipperCosts.cs" />
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
@ -131,7 +127,6 @@
<Resource Include="main-map.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
<PackageReference Include="ModernWpfUI.MahApps">
<Version>0.9.2</Version>
</PackageReference>

Loading…
Cancel
Save