Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Refactoring for basic guild information and emblems.

  • Loading branch information...
roncli committed Apr 11, 2014
1 parent 970752f commit 400f37c557a380791e6fc25bf5de0b915437119c
Showing with 87 additions and 354 deletions.
  1. +4 −4 LibWowAPI/Achievement/clsAchievement.vb
  2. +1 −1 LibWowAPI/Achievement/clsAchievementLookup.vb
  3. +0 −20 LibWowAPI/Challenge/Schema/emblem.vb
  4. +2 −1 LibWowAPI/Challenge/Schema/group.vb
  5. +3 −2 LibWowAPI/Challenge/clsChallengeRealm.vb
  6. +3 −2 LibWowAPI/Challenge/clsChallengeRegion.vb
  7. +1 −1 LibWowAPI/Challenge/clsCharacter.vb
  8. +0 −66 LibWowAPI/Challenge/clsEmblem.vb
  9. +6 −5 LibWowAPI/Challenge/clsGroup.vb
  10. +2 −1 LibWowAPI/Character/Schema/character.vb
  11. +0 −20 LibWowAPI/Character/Schema/emblem.vb
  12. +0 −22 LibWowAPI/Character/Schema/guild.vb
  13. +6 −5 LibWowAPI/Character/clsCharacter.vb
  14. +2 −1 LibWowAPI/Character/clsCharacterProfile.vb
  15. +0 −66 LibWowAPI/Character/clsEmblem.vb
  16. +0 −82 LibWowAPI/Character/clsGuild.vb
  17. +2 −2 LibWowAPI/Data/CharacterAchievements/clsCharacterAchievements.vb
  18. +1 −1 LibWowAPI/Data/CharacterRaces/clsCharacterRaces.vb
  19. +7 −7 LibWowAPI/Data/CharacterRaces/clsRace.vb
  20. +2 −2 LibWowAPI/Data/GuildAchievements/clsGuildAchievements.vb
  21. +2 −2 LibWowAPI/{Challenge/Schema/guild.vb → Guild/Schema/guildBasicInfo.vb}
  22. +1 −1 LibWowAPI/Guild/clsCharacter.vb
  23. +7 −7 LibWowAPI/Guild/clsGuild.vb
  24. +2 −2 LibWowAPI/{Challenge/clsGuild.vb → Guild/clsGuildBasicInfo.vb}
  25. +1 −1 LibWowAPI/Guild/clsGuildProfile.vb
  26. +1 −1 LibWowAPI/PvP/clsArenaLadder.vb
  27. +1 −1 LibWowAPI/PvP/clsArenaTeam.vb
  28. +1 −1 LibWowAPI/PvP/clsCharacter.vb
  29. +7 −7 LibWowAPI/PvP/clsTeam.vb
  30. +6 −6 LibWowAPI/Realm/clsPvpZone.vb
  31. +2 −2 LibWowAPI/Realm/clsRealmStatus.vb
  32. +2 −2 LibWowAPI/modEnums.vb
  33. +6 −6 LibWowAPI/modExtensions.vb
  34. +4 −4 LibWowAPIDemo/modMain.vb
  35. +2 −0 README.markdown
@@ -101,10 +101,10 @@ Namespace roncliProductions.LibWowAPI.Achievement
''' </summary>
''' <value>This property gets or sets the Faction field.</value>
''' <returns>Returns the faction that the achievement is specific to.</returns>
''' <remarks>This represents the faction that the achievement is specific to. If the achievement is not specific to any given faction, this returns <see cref="Side.Neutral" />.</remarks>
Public Property Faction As Side
''' <remarks>This represents the faction that the achievement is specific to. If the achievement is not specific to any given faction, this returns <see cref="Faction.Neutral" />.</remarks>
Public Property Faction As Faction

Friend Sub New(intID As Integer, strTitle As String, intPoints As Integer, strDescription As String, strReward As String, riRewardItems As Collection(Of RewardItem), strIcon As String, cCriteria As Collection(Of Criteria), blnAccountWide As Boolean, sFaction As Side)
Friend Sub New(intID As Integer, strTitle As String, intPoints As Integer, strDescription As String, strReward As String, riRewardItems As Collection(Of RewardItem), strIcon As String, cCriteria As Collection(Of Criteria), blnAccountWide As Boolean, fFaction As Faction)
ID = intID
Title = strTitle
Points = intPoints
@@ -114,7 +114,7 @@ Namespace roncliProductions.LibWowAPI.Achievement
Icon = strIcon
colCriteria = cCriteria
AccountWide = blnAccountWide
Faction = sFaction
Faction = fFaction
End Sub

End Class
@@ -144,7 +144,7 @@ Namespace roncliProductions.LibWowAPI.Achievement
).ToCollection()
),
alAchievement.accountWide,
CType(alAchievement.factionId, Side)
CType(alAchievement.factionId, Faction)
)
End Sub

This file was deleted.

@@ -4,6 +4,7 @@
' This source code is released under the GNU Lesser General Public License (LGPL) Version 3.0.

Imports System.Runtime.Serialization
Imports roncliProductions.LibWowAPI.Guild.Schema

Namespace roncliProductions.LibWowAPI.Challenge.Schema

@@ -16,7 +17,7 @@ Namespace roncliProductions.LibWowAPI.Challenge.Schema
<DataMember()> Public Property faction As String
<DataMember()> Public Property isRecurring As Boolean
<DataMember()> Public Property members As member()
<DataMember()> Public Property guild As guild
<DataMember()> Public Property guild As guildBasicInfo

End Class

@@ -13,6 +13,7 @@ Imports System.Runtime.Serialization.Json
Imports System.Text.Encoding
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Extensions
Imports roncliProductions.LibWowAPI.Guild

Namespace roncliProductions.LibWowAPI.Challenge

@@ -126,7 +127,7 @@ Namespace roncliProductions.LibWowAPI.Challenge
New TimeSpan(0, 0, 0, 0, g.time.time),
DateTime.Parse(g.date, CultureInfo.InvariantCulture),
g.medal,
g.faction.GetSide(),
g.faction.GetFaction(),
g.isRecurring,
(
From m In g.members
@@ -167,7 +168,7 @@ Namespace roncliProductions.LibWowAPI.Challenge
)
).ToCollection(),
If(
g.guild Is Nothing, Nothing, New Guild(
g.guild Is Nothing, Nothing, New GuildBasicInfo(
g.guild.name,
g.guild.realm,
g.guild.battlegroup,
@@ -13,6 +13,7 @@ Imports System.Runtime.Serialization.Json
Imports System.Text.Encoding
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Extensions
Imports roncliProductions.LibWowAPI.Guild

Namespace roncliProductions.LibWowAPI.Challenge

@@ -122,7 +123,7 @@ Namespace roncliProductions.LibWowAPI.Challenge
New TimeSpan(0, 0, 0, 0, g.time.time),
DateTime.Parse(g.date, CultureInfo.InvariantCulture),
g.medal,
g.faction.GetSide(),
g.faction.GetFaction(),
g.isRecurring,
(
From m In g.members
@@ -163,7 +164,7 @@ Namespace roncliProductions.LibWowAPI.Challenge
)
).ToCollection(),
If(
g.guild Is Nothing, Nothing, New Guild(
g.guild Is Nothing, Nothing, New GuildBasicInfo(
g.guild.name,
g.guild.realm,
g.guild.battlegroup,
@@ -52,7 +52,7 @@ Namespace roncliProductions.LibWowAPI.Challenge
''' </summary>
''' <value>This property gets or sets the Race field.</value>
''' <returns>Returns the character's race.</returns>
''' <remarks>The character's race is represented by a <see cref="Data.CharacterRaces.Race" /> object. See the <see cref="Data.CharacterRaces.Race.Name" /> property to get the name of the race, and the <see cref="Data.CharacterRaces.Race.Side" /> property to get the character's faction.</remarks>
''' <remarks>The character's race is represented by a <see cref="Data.CharacterRaces.Race" /> object. See the <see cref="Data.CharacterRaces.Race.Name" /> property to get the name of the race, and the <see cref="Data.CharacterRaces.Race.Faction" /> property to get the character's faction.</remarks>
Public Property Race As Race

''' <summary>

This file was deleted.

@@ -6,6 +6,7 @@
Imports System
Imports System.Collections.ObjectModel
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Guild

Namespace roncliProductions.LibWowAPI.Challenge

@@ -53,7 +54,7 @@ Namespace roncliProductions.LibWowAPI.Challenge
''' <value>This property gets or sets the Faction field.</value>
''' <returns>Returns the faction the group belongs to.</returns>
''' <remarks>This represents the faction the group belongs to.</remarks>
Public Property Faction As Side
Public Property Faction As Faction

''' <summary>
''' Determines whether any of the members of this group have a higher ranking for this map.
@@ -82,17 +83,17 @@ Namespace roncliProductions.LibWowAPI.Challenge
''' <value>This property gets or sets the Guild field.</value>
''' <returns>Returns the guild the members in the group are from.</returns>
''' <remarks>This represents the guild the members in the group are from.</remarks>
Public Property Guild As Guild
Public Property Guild As GuildBasicInfo

Public Sub New(intRanking As Integer, tsTime As TimeSpan, dtDate As DateTime, strMedal As String, sFaction As Side, blnIsRecurring As Boolean, mMembers As Collection(Of Member), gGuild As Guild)
Public Sub New(intRanking As Integer, tsTime As TimeSpan, dtDate As DateTime, strMedal As String, fFaction As Faction, blnIsRecurring As Boolean, mMembers As Collection(Of Member), gbiGuild As GuildBasicInfo)
Ranking = intRanking
Time = tsTime
[Date] = dtDate
Medal = strMedal
Faction = sFaction
Faction = fFaction
IsRecurring = blnIsRecurring
colMembers = mMembers
Guild = gGuild
Guild = gbiGuild
End Sub

End Class
@@ -4,6 +4,7 @@
' This source code is released under the GNU Lesser General Public License (LGPL) Version 3.0.

Imports System.Runtime.Serialization
Imports roncliProductions.LibWowAPI.Guild.Schema

Namespace roncliProductions.LibWowAPI.Character.Schema

@@ -20,7 +21,7 @@ Namespace roncliProductions.LibWowAPI.Character.Schema
<DataMember()> Public Property achievementPoints As Integer
<DataMember()> Public Property thumbnail As String
<DataMember()> Public Property calcClass As String
<DataMember()> Public Property guild As guild
<DataMember()> Public Property guild As guildBasicInfo
<DataMember()> Public Property items As items
<DataMember()> Public Property stats As stats
<DataMember()> Public Property professions As professions

This file was deleted.

This file was deleted.

@@ -7,6 +7,7 @@ Imports System.Collections.ObjectModel
Imports roncliProductions.LibWowAPI.Data.CharacterClasses
Imports roncliProductions.LibWowAPI.Data.CharacterRaces
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Guild

Namespace roncliProductions.LibWowAPI.Character

@@ -61,7 +62,7 @@ Namespace roncliProductions.LibWowAPI.Character
''' </summary>
''' <value>This property gets or sets the Race field.</value>
''' <returns>Returns the character's race.</returns>
''' <remarks>The character's race is represented by a <see cref="Data.CharacterRaces.Race" /> object. See the <see cref="Data.CharacterRaces.Race.Name" /> property to get the name of the race, and the <see cref="Data.CharacterRaces.Race.Side" /> property to get the character's faction.</remarks>
''' <remarks>The character's race is represented by a <see cref="Data.CharacterRaces.Race" /> object. See the <see cref="Data.CharacterRaces.Race.Name" /> property to get the name of the race, and the <see cref="Data.CharacterRaces.Race.Faction" /> property to get the character's faction.</remarks>
Public Property Race As Race

''' <summary>
@@ -109,8 +110,8 @@ Namespace roncliProductions.LibWowAPI.Character
''' </summary>
''' <value>This property gets or sets the Guild field.</value>
''' <returns>Returns the character's guild.</returns>
''' <remarks>If the <see cref="CharacterProfileOptions.Guild" /> property of the <see cref="CharacterProfile.Options" /> property is set to true, a <see cref="Guild" /> class will be available, containing information about the character's guild.</remarks>
Public Property Guild As Guild
''' <remarks>If the <see cref="CharacterProfileOptions.Guild" /> property of the <see cref="CharacterProfile.Options" /> property is set to true, a <see cref="GuildBasicInfo" /> class will be available, containing information about the character's guild.</remarks>
Public Property Guild As GuildBasicInfo

''' <summary>
''' The character's equipped items.
@@ -262,7 +263,7 @@ Namespace roncliProductions.LibWowAPI.Character
End Get
End Property

Friend Sub New(dtLastModified As Date, strName As String, strRealm As String, strBattlegroup As String, cClass As [Class], rRace As Race, gGender As Gender, intLevel As Integer, intAchievementPoints As Integer, strThumbnail As String, strCalcClass As String, gGuild As Guild, iItems As Items, sStats As Stats, pProfessions As Professions, rReputation As Collection(Of Reputation), tTitles As Collection(Of Title), aAchievements As Achievements, pHunterPets As Collection(Of HunterPet), tTalents As Collection(Of TalentSpec), aAppearance As Appearance, mMounts As Mounts, pProgression As Progression, pPvP As PvP, intQuests As Collection(Of Integer), fiFeed As Collection(Of FeedItem))
Friend Sub New(dtLastModified As Date, strName As String, strRealm As String, strBattlegroup As String, cClass As [Class], rRace As Race, gGender As Gender, intLevel As Integer, intAchievementPoints As Integer, strThumbnail As String, strCalcClass As String, gbiGuild As GuildBasicInfo, iItems As Items, sStats As Stats, pProfessions As Professions, rReputation As Collection(Of Reputation), tTitles As Collection(Of Title), aAchievements As Achievements, pHunterPets As Collection(Of HunterPet), tTalents As Collection(Of TalentSpec), aAppearance As Appearance, mMounts As Mounts, pProgression As Progression, pPvP As PvP, intQuests As Collection(Of Integer), fiFeed As Collection(Of FeedItem))
LastModified = dtLastModified
Name = strName
Realm = strRealm
@@ -274,7 +275,7 @@ Namespace roncliProductions.LibWowAPI.Character
AchievementPoints = intAchievementPoints
Thumbnail = strThumbnail
CalcClass = strCalcClass
Guild = gGuild
Guild = gbiGuild
Items = iItems
Stats = sStats
Professions = pProfessions
@@ -14,6 +14,7 @@ Imports System.Runtime.Serialization.Json
Imports System.Text.Encoding
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Extensions
Imports roncliProductions.LibWowAPI.Guild

Namespace roncliProductions.LibWowAPI.Character

@@ -127,7 +128,7 @@ Namespace roncliProductions.LibWowAPI.Character
cpCharacter.thumbnail,
cpCharacter.calcClass,
If(cpCharacter.guild Is Nothing, Nothing,
New Guild(
New GuildBasicInfo(
cpCharacter.guild.name,
cpCharacter.guild.realm,
cpCharacter.guild.battlegroup,

0 comments on commit 400f37c

Please sign in to comment.
You can’t perform that action at this time.