Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@SamHurne
SamHurne committed Jul 9, 2016
2 parents 98b6c08 + 4bcbc40 commit f901121
Show file tree
Hide file tree
Showing 46 changed files with 1,892 additions and 1,355 deletions.
129 changes: 33 additions & 96 deletions GW2PAO.API/Data/DungeonsTable.cs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion GW2PAO.API/Data/Entities/WvWObjective.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace GW2PAO.API.Data.Entities
{
public class WvWObjective
{
public int ID { get; set; }
public WvWObjectiveId ID { get; set; }
public ObjectiveType Type { get; set; }
public WvWMap Map { get; set; }
public string MatchId { get; set; }
Expand Down
97 changes: 97 additions & 0 deletions GW2PAO.API/Data/Entities/WvWObjectiveId.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
namespace GW2PAO.API.Data.Entities
{
using System;
using System.Xml;
using System.Xml.Schema;
using System.Xml.Serialization;
using GW2PAO.API.Data.Enums;

/// <summary>
/// World-vs-World Objective Unique Identifier, which is a combination of ID and Map
/// </summary>
public class WvWObjectiveId : IXmlSerializable
{
/// <summary>
/// The numerical objective ID
/// </summary>
public int ObjectiveId { get; private set; }

/// <summary>
/// The map the objective is located on
/// </summary>
public WvWMap Map { get; private set; }

/// <summary>
/// Default constructor
/// </summary>
public WvWObjectiveId() { }

/// <summary>
/// Parameterised constructor
/// </summary>
public WvWObjectiveId(int objectiveId, WvWMap map)
{
this.ObjectiveId = objectiveId;
this.Map = map;
}

public static bool operator == (WvWObjectiveId obj1, WvWObjectiveId obj2)
{
return obj1.Equals(obj2);
}

public static bool operator != (WvWObjectiveId obj1, WvWObjectiveId obj2)
{
return !obj1.Equals(obj2);
}

public override bool Equals(object obj)
{
if (obj == null || this.GetType() != obj.GetType())
{
return false;
}

var other = (WvWObjectiveId)obj;

return this.ObjectiveId == other.ObjectiveId &&
this.Map == other.Map;
}

public override int GetHashCode()
{
int code = this.ObjectiveId + (int)this.Map;
return code.GetHashCode();
}

public override string ToString()
{
return this.Map + "-" + this.ObjectiveId + "-";
}

#region IXmlSerializable
public XmlSchema GetSchema()
{
return null;
}

public void ReadXml(XmlReader reader)
{
int parsedId = -1;
if (int.TryParse(reader.GetAttribute("ObjectiveId"), out parsedId))
this.ObjectiveId = parsedId;

WvWMap parsedMap = WvWMap.Unknown;
if (Enum.TryParse(reader.GetAttribute("Map"), out parsedMap))
this.Map = parsedMap;

}

public void WriteXml(XmlWriter writer)
{
writer.WriteAttributeString("ObjectiveId", this.ObjectiveId.ToString());
writer.WriteAttributeString("Map", this.Map.ToString());
}
#endregion
}
}
98 changes: 0 additions & 98 deletions GW2PAO.API/Data/Enums/WvWObjectiveID.cs
View file

This file was deleted.

92 changes: 92 additions & 0 deletions GW2PAO.API/Data/WvWObjectiveIDs.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@

namespace GW2PAO.API.Data.Enums
{
using GW2PAO.API.Data.Entities;

public static class WvWObjectiveIds
{
// Eternal Battlegrounds:
public static readonly WvWObjectiveId EB_Keep_Overlook = new WvWObjectiveId(1, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Keep_Valley = new WvWObjectiveId(2, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Keep_Lowlands = new WvWObjectiveId(3, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Camp_Golanta = new WvWObjectiveId(4, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Camp_Pangloss = new WvWObjectiveId(5, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Camp_Speldan = new WvWObjectiveId(6, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Camp_Danelon = new WvWObjectiveId(7, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Camp_Umberglade = new WvWObjectiveId(8, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Castle_Stonemist = new WvWObjectiveId(9, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Camp_Rogues = new WvWObjectiveId(10, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Aldons = new WvWObjectiveId(11, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Wildcreek = new WvWObjectiveId(12, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Jerrifers = new WvWObjectiveId(13, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Klovan = new WvWObjectiveId(14, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Langor = new WvWObjectiveId(15, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Quentin = new WvWObjectiveId(16, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Mendons = new WvWObjectiveId(17, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Anzalias = new WvWObjectiveId(18, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Ogrewatch = new WvWObjectiveId(19, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Veloka = new WvWObjectiveId(20, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Durios = new WvWObjectiveId(21, WvWMap.EternalBattlegrounds);
public static readonly WvWObjectiveId EB_Tower_Bravost = new WvWObjectiveId(22, WvWMap.EternalBattlegrounds);

// Blue Borderlands:
public static readonly WvWObjectiveId BB_Keep_Hills = new WvWObjectiveId(32, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Keep_Bay = new WvWObjectiveId(33, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Camp_Orchard = new WvWObjectiveId(34, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Tower_Redbriar = new WvWObjectiveId(35, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Tower_Greenlake = new WvWObjectiveId(36, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Keep_Garrison = new WvWObjectiveId(37, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Tower_Dawns = new WvWObjectiveId(38, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Camp_Spiritholme = new WvWObjectiveId(39, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Tower_Woodhaven = new WvWObjectiveId(40, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Camp_Greenwater = new WvWObjectiveId(50, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Camp_Godslore = new WvWObjectiveId(51, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Camp_Stargrove = new WvWObjectiveId(52, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Camp_Redvale = new WvWObjectiveId(53, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Temple = new WvWObjectiveId(62, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Hollow = new WvWObjectiveId(63, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Estate = new WvWObjectiveId(64, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Orchard = new WvWObjectiveId(65, WvWMap.BlueBorderlands);
public static readonly WvWObjectiveId BB_Carvers = new WvWObjectiveId(66, WvWMap.BlueBorderlands);

// Red Borderlands:
public static readonly WvWObjectiveId RB_Keep_Hills = new WvWObjectiveId(32, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Keep_Bay = new WvWObjectiveId(33, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Camp_Orchard = new WvWObjectiveId(34, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Tower_Greenbriar = new WvWObjectiveId(35, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Tower_Bluelake = new WvWObjectiveId(36, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Keep_Garrison = new WvWObjectiveId(37, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Tower_Longview = new WvWObjectiveId(38, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Camp_Godsword = new WvWObjectiveId(39, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Tower_Cliffside = new WvWObjectiveId(40, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Camp_Bluewater = new WvWObjectiveId(50, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Camp_Astralholme = new WvWObjectiveId(51, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Camp_Arahs = new WvWObjectiveId(52, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Camp_Greenvale = new WvWObjectiveId(53, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Temple = new WvWObjectiveId(62, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Hollow = new WvWObjectiveId(63, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Estate = new WvWObjectiveId(64, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Orchard = new WvWObjectiveId(65, WvWMap.RedBorderlands);
public static readonly WvWObjectiveId RB_Carvers = new WvWObjectiveId(66, WvWMap.RedBorderlands);

// Green Borderlands:
public static readonly WvWObjectiveId GB_Keep_Hills = new WvWObjectiveId(32, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Keep_Bay = new WvWObjectiveId(33, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Camp_Orchard = new WvWObjectiveId(34, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Tower_Bluebriar = new WvWObjectiveId(35, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Tower_Redlake = new WvWObjectiveId(36, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Keep_Garrison = new WvWObjectiveId(37, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Tower_Sunnyhill = new WvWObjectiveId(38, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Camp_Faithleap = new WvWObjectiveId(39, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Tower_Cragtop = new WvWObjectiveId(40, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Camp_Redwater = new WvWObjectiveId(50, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Camp_Foghaven = new WvWObjectiveId(51, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Camp_Titanpaw = new WvWObjectiveId(52, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Camp_Bluevale = new WvWObjectiveId(53, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Temple = new WvWObjectiveId(62, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Hollow = new WvWObjectiveId(63, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Estate = new WvWObjectiveId(64, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Orchard = new WvWObjectiveId(65, WvWMap.GreenBorderlands);
public static readonly WvWObjectiveId GB_Carvers = new WvWObjectiveId(66, WvWMap.GreenBorderlands);
}
}
Loading

0 comments on commit f901121

Please sign in to comment.