Skip to content
This repository has been archived by the owner on Jan 9, 2019. It is now read-only.

Commit

Permalink
Merge spec and glyph with Data.Talent namespace versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@roncli
roncli committed Apr 21, 2014
1 parent 5091394 commit 7b62f66
Show file tree
Hide file tree
Showing 24 changed files with 59 additions and 199 deletions.
1 change: 1 addition & 0 deletions LibWowAPI/Challenge/Schema/member.vb
View file
Expand Up @@ -5,6 +5,7 @@

Imports System.Runtime.Serialization
Imports roncliProductions.LibWowAPI.Character.Schema
Imports roncliProductions.LibWowAPI.Data.Talents.Schema

Namespace roncliProductions.LibWowAPI.Challenge.Schema

Expand Down
1 change: 1 addition & 0 deletions LibWowAPI/Challenge/clsChallengeRealm.vb
View file
Expand Up @@ -12,6 +12,7 @@ Imports System.Runtime.Serialization
Imports System.Runtime.Serialization.Json
Imports System.Text.Encoding
Imports roncliProductions.LibWowAPI.Character
Imports roncliProductions.LibWowAPI.Data.Talents
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Extensions
Imports roncliProductions.LibWowAPI.Guild
Expand Down
1 change: 1 addition & 0 deletions LibWowAPI/Challenge/clsChallengeRegion.vb
View file
Expand Up @@ -12,6 +12,7 @@ Imports System.Runtime.Serialization
Imports System.Runtime.Serialization.Json
Imports System.Text.Encoding
Imports roncliProductions.LibWowAPI.Character
Imports roncliProductions.LibWowAPI.Data.Talents
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Extensions
Imports roncliProductions.LibWowAPI.Guild
Expand Down
1 change: 1 addition & 0 deletions LibWowAPI/Challenge/clsMember.vb
View file
Expand Up @@ -7,6 +7,7 @@ Imports System
Imports System.Collections.ObjectModel
Imports roncliProductions.LibWowAPI.Character
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Data.Talents

Namespace roncliProductions.LibWowAPI.Challenge

Expand Down
1 change: 1 addition & 0 deletions LibWowAPI/Character/Schema/characterBasicInfo.vb
View file
Expand Up @@ -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.Data.Talents.Schema

Namespace roncliProductions.LibWowAPI.Character.Schema

Expand Down
19 changes: 0 additions & 19 deletions LibWowAPI/Character/Schema/glyph.vb
View file

This file was deleted.

1 change: 1 addition & 0 deletions LibWowAPI/Character/Schema/glyphs.vb
View file
Expand Up @@ -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.Data.Talents.Schema

Namespace roncliProductions.LibWowAPI.Character.Schema

Expand Down
1 change: 1 addition & 0 deletions LibWowAPI/Character/Schema/hunterPet.vb
View file
Expand Up @@ -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.Data.Talents.Schema

Namespace roncliProductions.LibWowAPI.Character.Schema

Expand Down
21 changes: 0 additions & 21 deletions LibWowAPI/Character/Schema/spec.vb
View file

This file was deleted.

1 change: 1 addition & 0 deletions LibWowAPI/Character/Schema/talentSpec.vb
View file
Expand Up @@ -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.Data.Talents.Schema

Namespace roncliProductions.LibWowAPI.Character.Schema

Expand Down
1 change: 1 addition & 0 deletions LibWowAPI/Character/clsCharacterBasicInfo.vb
View file
Expand Up @@ -8,6 +8,7 @@ Imports roncliProductions.LibWowAPI.Data.CharacterClasses
Imports roncliProductions.LibWowAPI.Data.CharacterRaces
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Guild
Imports roncliProductions.LibWowAPI.Data.Talents

Namespace roncliProductions.LibWowAPI.Character

Expand Down
37 changes: 21 additions & 16 deletions LibWowAPI/Character/clsCharacterProfile.vb
View file
Expand Up @@ -18,6 +18,7 @@ Imports roncliProductions.LibWowAPI.Extensions
Imports roncliProductions.LibWowAPI.Guild
Imports roncliProductions.LibWowAPI.Item
Imports roncliProductions.LibWowAPI.ItemSet
Imports roncliProductions.LibWowAPI.Data.Talents

Namespace roncliProductions.LibWowAPI.Character

Expand Down Expand Up @@ -966,22 +967,26 @@ Namespace roncliProductions.LibWowAPI.Character
)
).ToCollection(),
New Glyphs(
(From g In t.glyphs.major
Select New Glyph(
g.glyph,
g.item,
g.name,
g.icon
)
).ToCollection(),
(From g In t.glyphs.minor
Select New Glyph(
g.glyph,
g.item,
g.name,
g.icon
)
).ToCollection()
(
From g In t.glyphs.major
Select New Glyph(
g.glyph,
g.item,
g.name,
g.icon,
GlyphType.Major
)
).ToCollection(),
(
From g In t.glyphs.minor
Select New Glyph(
g.glyph,
g.item,
g.name,
g.icon,
GlyphType.Minor
)
).ToCollection()
),
If(
t.spec Is Nothing, Nothing, New Spec(
Expand Down
55 changes: 0 additions & 55 deletions LibWowAPI/Character/clsGlyph.vb
View file

This file was deleted.

1 change: 1 addition & 0 deletions LibWowAPI/Character/clsGlyphs.vb
View file
Expand Up @@ -4,6 +4,7 @@
' This source code is released under the GNU Lesser General Public License (LGPL) Version 3.0.

Imports System.Collections.ObjectModel
Imports roncliProductions.LibWowAPI.Data.Talents

Namespace roncliProductions.LibWowAPI.Character

Expand Down
2 changes: 2 additions & 0 deletions LibWowAPI/Character/clsHunterPet.vb
View file
Expand Up @@ -3,6 +3,8 @@
'
' This source code is released under the GNU Lesser General Public License (LGPL) Version 3.0.

Imports roncliProductions.LibWowAPI.Data.Talents

Namespace roncliProductions.LibWowAPI.Character

''' <summary>
Expand Down
73 changes: 0 additions & 73 deletions LibWowAPI/Character/clsSpec.vb
View file

This file was deleted.

1 change: 1 addition & 0 deletions LibWowAPI/Character/clsTalentSpec.vb
View file
Expand Up @@ -4,6 +4,7 @@
' This source code is released under the GNU Lesser General Public License (LGPL) Version 3.0.

Imports System.Collections.ObjectModel
Imports roncliProductions.LibWowAPI.Data.Talents

Namespace roncliProductions.LibWowAPI.Character

Expand Down
3 changes: 2 additions & 1 deletion LibWowAPI/Data/Talents/clsClassTalents.vb
View file
Expand Up @@ -11,6 +11,7 @@ Imports System.Linq
Imports System.Runtime.Serialization
Imports System.Runtime.Serialization.Json
Imports System.Text.Encoding
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Extensions

Namespace roncliProductions.LibWowAPI.Data.Talents
Expand Down Expand Up @@ -134,7 +135,7 @@ Namespace roncliProductions.LibWowAPI.Data.Talents
g.item,
g.name,
g.icon,
g.typeId
CType(g.typeId, GlyphType)
)
).ToCollection(),
(
Expand Down
16 changes: 9 additions & 7 deletions LibWowAPI/Data/Talents/clsGlyph.vb
View file
Expand Up @@ -3,6 +3,8 @@
'
' This source code is released under the GNU Lesser General Public License (LGPL) Version 3.0.

Imports roncliProductions.LibWowAPI.Enums

Namespace roncliProductions.LibWowAPI.Data.Talents

''' <summary>
Expand Down Expand Up @@ -44,19 +46,19 @@ Namespace roncliProductions.LibWowAPI.Data.Talents
Public Property Icon As String

''' <summary>
''' The ID number of the glyph type.
''' The type of the glyph.
''' </summary>
''' <value>This property gets or sets the TypeID field.</value>
''' <returns>Returns the ID number of the glyph type.</returns>
''' <remarks>This will return 0 if the glyph is a major glyph, or a 1 if the glyph is a minor glyph.</remarks>
Public Property TypeID As Integer
''' <value>This property gets or sets the GlyphType field.</value>
''' <returns>Returns the type of glyph.</returns>
''' <remarks>This is a <see cref="GlyphType" /> enumeration that describes the type of glyph</remarks>
Public Property GlyphType As GlyphType

Friend Sub New(intGlyph As Integer, intItem As Integer, strName As String, strIcon As String, intTypeID As Integer)
Friend Sub New(intGlyph As Integer, intItem As Integer, strName As String, strIcon As String, gtGlyphType As GlyphType)
Glyph = intGlyph
Item = intItem
Name = strName
Icon = strIcon
TypeID = intTypeID
GlyphType = gtGlyphType
End Sub

End Class
Expand Down
1 change: 1 addition & 0 deletions LibWowAPI/Guild/clsGuildProfile.vb
View file
Expand Up @@ -15,6 +15,7 @@ Imports System.Text.Encoding
Imports roncliProductions.LibWowAPI.Achievement
Imports roncliProductions.LibWowAPI.Challenge
Imports roncliProductions.LibWowAPI.Character
Imports roncliProductions.LibWowAPI.Data.Talents
Imports roncliProductions.LibWowAPI.Enums
Imports roncliProductions.LibWowAPI.Extensions
Imports roncliProductions.LibWowAPI.Item
Expand Down

0 comments on commit 7b62f66

Please sign in to comment.