Skip to content

Expedition 1.0 #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
beemerwt wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Expedition 1.0 #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
5b44134
Updated combat
Aug 11, 2017
474fb58
Expedition profile
Aug 11, 2017
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
22 changes: 12 additions & 10 deletions Albion/Merlin/API/Game/Spells.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SpellCategory = gz.SpellCategory;
using SpellTarget = gz.SpellTarget;

using UnityEngine;

Expand Down Expand Up @@ -50,7 +52,7 @@ public string Name
}
}

public gz.SpellCategory Category
public SpellCategory Category
{
get
{
Expand All @@ -59,11 +61,11 @@ public gz.SpellCategory Category
if (configuration != null)
return configuration.Category;

return gz.SpellCategory.None;
return SpellCategory.None;
}
}

public gz.SpellTarget Target
public SpellTarget Target
{
get
{
Expand All @@ -72,7 +74,7 @@ public gz.SpellTarget Target
if (configuration != null)
return configuration.Target;

return gz.SpellTarget.None;
return SpellTarget.None;
}
}

Expand Down Expand Up @@ -134,25 +136,25 @@ public string Name
}
}

public gz.SpellCategory Category
public SpellCategory Category
{
get
{
if (_internalConfiguration != null)
return _internalConfiguration.d4;

return gz.SpellCategory.None;
return SpellCategory.None;
}
}

public gz.SpellTarget Target
public SpellTarget Target
{
get
{
if (_internalConfiguration != null)
return _internalConfiguration.d1;

return gz.SpellTarget.None;
return SpellTarget.None;
}
}

Expand Down Expand Up @@ -190,12 +192,12 @@ public static IEnumerable<Spell> Slot(this IEnumerable<Spell> spells, SpellSlotI
return spells.Where<Spell>(spell => spell.SpellSlot == spellSlot);
}

public static IEnumerable<Spell> Category(this IEnumerable<Spell> spells, gz.SpellCategory category)
public static IEnumerable<Spell> Category(this IEnumerable<Spell> spells, SpellCategory category)
{
return spells.Where<Spell>(spell => spell.Category == category);
}

public static IEnumerable<Spell> Target(this IEnumerable<Spell> spells, gz.SpellTarget target)
public static IEnumerable<Spell> Target(this IEnumerable<Spell> spells, SpellTarget target)
{
return spells.Where<Spell>(spell => spell.Target == target);
}
Expand Down
22 changes: 12 additions & 10 deletions Albion/Merlin/API/Game/Spells.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SpellCategory = gz.SpellCategory;
using SpellTarget = gz.SpellTarget;

using UnityEngine;

Expand Down Expand Up @@ -51,7 +53,7 @@ namespace Merlin.API
}
}

public gz.SpellCategory Category
public SpellCategory Category
{
get
{
Expand All @@ -60,11 +62,11 @@ namespace Merlin.API
if (configuration != null)
return configuration.Category;

return gz.SpellCategory.None;
return SpellCategory.None;
}
}

public gz.SpellTarget Target
public SpellTarget Target
{
get
{
Expand All @@ -73,7 +75,7 @@ namespace Merlin.API
if (configuration != null)
return configuration.Target;

return gz.SpellTarget.None;
return SpellTarget.None;
}
}

Expand Down Expand Up @@ -135,25 +137,25 @@ namespace Merlin.API
}
}

public gz.SpellCategory Category
public SpellCategory Category
{
get
{
if (_internalConfiguration != null)
return _internalConfiguration.d4;

return gz.SpellCategory.None;
return SpellCategory.None;
}
}

public gz.SpellTarget Target
public SpellTarget Target
{
get
{
if (_internalConfiguration != null)
return _internalConfiguration.d1;

return gz.SpellTarget.None;
return SpellTarget.None;
}
}

Expand Down Expand Up @@ -191,12 +193,12 @@ namespace Merlin.API
return spells.Where<Spell>(spell => spell.SpellSlot == spellSlot);
}

public static IEnumerable<Spell> Category(this IEnumerable<Spell> spells, gz.SpellCategory category)
public static IEnumerable<Spell> Category(this IEnumerable<Spell> spells, SpellCategory category)
{
return spells.Where<Spell>(spell => spell.Category == category);
}

public static IEnumerable<Spell> Target(this IEnumerable<Spell> spells, gz.SpellTarget target)
public static IEnumerable<Spell> Target(this IEnumerable<Spell> spells, SpellTarget target)
{
return spells.Where<Spell>(spell => spell.Target == target);
}
Expand Down
13 changes: 12 additions & 1 deletion Albion/Merlin/Merlin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,17 @@
<Compile Include="Pathing\Worldmap\WorldmapPathfinder.cs" />
<Compile Include="Profile.cs" />
<Compile Include="Profiles\Combat.cs" />
<Compile Include="Profiles\Expedition\Expedition.Combat.cs" />
<Compile Include="Profiles\Expedition\Expedition.cs" />
<Compile Include="Profiles\Expedition\Expedition.Navigation.cs" />
<Compile Include="Profiles\Expedition\Expedition.Restart.cs" />
<Compile Include="Profiles\Expedition\ExpeditionPathingRequest.cs" />
<Compile Include="Profiles\Expedition\Mob.cs" />
<Compile Include="Profiles\Expedition\Mobs\HereticArcherMob.cs" />
<Compile Include="Profiles\Expedition\Mobs\HereticMageMob.cs" />
<Compile Include="Profiles\Expedition\Mobs\HereticMinibossMob.cs" />
<Compile Include="Profiles\Expedition\Mobs\HereticTankMob.cs" />
<Compile Include="Profiles\Expedition\Mobs\OverseerMob.cs" />
<Compile Include="Profiles\Gatherer\Blacklisted.cs" />
<Compile Include="Profiles\Gatherer\Gatherer.Bank.cs" />
<Compile Include="Profiles\Gatherer\Gatherer.Combat.cs" />
Expand Down Expand Up @@ -246,4 +257,4 @@
</Target>
<Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
<Import Project="..\packages\Fody.2.1.2\build\netstandard1.0\Fody.targets" Condition="Exists('..\packages\Fody.2.1.2\build\netstandard1.0\Fody.targets')" />
</Project>
</Project>
Loading