diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index aa0bbea2e..49de82f48 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -25,10 +25,6 @@ ''' ''' Returns the move of a Pokémon with a specified ID. ''' - ''' - ''' - ''' - ''' Private Function GetPokemonMoveFromID(ByVal Pokemon As Pokemon, ByVal MoveID As Integer) As Attack For Each a As Attack In Pokemon.Attacks If a.ID = MoveID Then @@ -41,8 +37,6 @@ ''' ''' If the battle is a remote battle, then start this function once client input is received. ''' - ''' - ''' Public Sub StartMultiTurnAction(ByVal BattleScreen As BattleScreen) 'Recharge: If BattleScreen.FieldEffects.OwnRecharge > 0 Then @@ -1942,9 +1936,6 @@ endthisround: ''' Faints a Pokémon. ''' ''' true: faints own, false: faints opp - ''' - ''' - ''' Public Sub FaintPokemon(ByVal own As Boolean, ByVal BattleScreen As BattleScreen, ByVal message As String) Dim p As Pokemon = BattleScreen.OwnPokemon If own = False Then @@ -3710,7 +3701,6 @@ endthisround: ''' If the code comes from the own player or not. ''' Battlescreen reference ''' If the call should get added the PVP list or the own queue. - ''' Public Sub ChangeCameraAngel(ByVal direction As Integer, ByVal own As Boolean, ByVal BattleScreen As BattleScreen, Optional ByVal AddPVP As Boolean = False) Dim q As CameraQueryObject = Nothing @@ -3757,9 +3747,8 @@ endthisround: ''' ''' Ends a round (or a complete round) ''' - ''' Battlescreen LOL + ''' Battlescreen ''' 0=complete;1=own;2=opp - ''' Public Sub EndRound(ByVal BattleScreen As BattleScreen, ByVal type As Integer) With BattleScreen Select Case type diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb index 5b8aa4d65..89748c21b 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb @@ -225,10 +225,6 @@ ''' ''' Outcome: 0=true/>1=false:1=sleeptalk/snore 2=other move 3=start sleep 4=X wont obey 5=X wont obey 6=X turned away 7=X is loafing around 8=X pretended to not notice ''' - ''' - ''' - ''' - ''' Public Shared Function ObedienceCheck(ByVal UsedAttack As Attack, BattleScreen As BattleScreen) As Integer Dim p As Pokemon = BattleScreen.OwnPokemon @@ -1782,8 +1778,6 @@ ''' Calculates the usable multiplier from a stat reduction/raise. ''' ''' The relative stat reduction/raise of the stat. - ''' - ''' Public Shared Function GetMultiplierFromStat(ByVal StatValue As Integer) As Single Select Case StatValue Case -6 diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb index cf8a3ea6d..422871186 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb @@ -1463,7 +1463,6 @@ nextIndex: ''' ''' Use this to download the sprites for the players. ''' - ''' Private Sub DownloadOnlineSprites() If Core.Player.IsGamejoltSave = True Then Dim t As New Threading.Thread(AddressOf DownloadSprites) diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/FieldEffects.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/FieldEffects.vb index 58047ed8d..baeaab20a 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/FieldEffects.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/FieldEffects.vb @@ -284,8 +284,6 @@ ''' Which Pokémon? ''' The BattleScreen reference. ''' 0: Supression abilities, 1: GastroAcid, 2: both - ''' - ''' Public Function CanUseAbility(ByVal own As Boolean, ByVal BattleScreen As BattleScreen, Optional ByVal CheckType As Integer = 0) As Boolean If CheckType = 0 Or CheckType = 2 Then Dim p As Pokemon = BattleScreen.OppPokemon diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb index 6502fbc21..0abec3fbe 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/PokemonProfile.vb @@ -3,7 +3,6 @@ ''' ''' Represents a Pokémon in battle. ''' - ''' Public Class PokemonProfile ''' @@ -11,7 +10,6 @@ ''' ''' The Position on the battle field. ''' The reference to the Pokémon in the party. - ''' Public Sub New(ByVal Target As PokemonTarget, ByVal Pokemon As Pokemon) Me._fieldPosition = Target Me._pokemon = Pokemon @@ -23,9 +21,6 @@ ''' ''' The Pokémon reference class instance that is associated with this profile. ''' - ''' - ''' - ''' Public ReadOnly Property Pokémon As Pokemon Get Return Me._pokemon @@ -35,9 +30,6 @@ ''' ''' The position of this Pokémon on the field. ''' - ''' - ''' - ''' Public ReadOnly Property FieldPosition As PokemonTarget Get Return Me._fieldPosition @@ -59,450 +51,363 @@ ''' ''' The amount of damage this Pokémon took in the last attack. ''' - ''' Public LastDamageTaken As Integer = 0 ''' ''' The counter that indicates how many turns this Pokémon has been in battle. ''' - ''' Public TurnsInBattle As Integer = 0 ''' ''' If this Pokémon directly damaged an opponent last turn. ''' - ''' Public DealtDamageThisTurn As Boolean = False ''' ''' List of used moves (IDs) ''' - ''' Public UsedMoves As New List(Of Integer) ''' ''' An item this Pokémon possibly lost in battle. ''' - ''' Public LostItem As Item = Nothing ''' ''' If this Pokémon Mega Evolved in this battle. ''' - ''' Public MegaEvolved As Boolean = False ''' ''' The last move this Pokémon used. ''' - ''' Public LastMove As Attack = Nothing ''' ''' The turn number this Pokémon last used a move. ''' - ''' Public LastTurnMoved As Integer = 0 ''' ''' Trigger, if the Pokémon wants to switch out but another one used Pursuit on it. ''' - ''' Public Pursuit As Boolean = False ''' ''' The turns until the Pokémon wakes up. ''' - ''' Public SleepTurns As Integer = 0 ''' ''' Round counter for toxic. ''' - ''' Public ToxicRound As Integer = 0 ''' ''' Rounds until Yawn affects the Pokémon. ''' - ''' Public Yawn As Integer = 0 ''' ''' Turns until confusion runs out. ''' - ''' Public ConfusionTurns As Integer = 0 ''' ''' The Truant ability counter. When this is 1, the Pokémon won't move this round. ''' - ''' Public TruantRound As Integer = 0 ' ''' ''' Turns True if Imprison was used on this Pokémon. ''' - ''' Public Imprisoned As Boolean = False ''' ''' Taunt move counter, if true, Pokémon cannot use status moves. ''' - ''' Public Taunted As Integer = 0 ''' ''' If the Pokémon is affected by Embargo. ''' - ''' Public Embargo As Integer = 0 ''' ''' Rounds until Encore wears off. ''' - ''' Public Encore As Integer = 0 ''' ''' The move reference that the encored Pokémon has to use. ''' - ''' Public EncoreMove As Attack = Nothing ''' ''' Rounds until Torment wears off. ''' - ''' Public Torment As Integer = 0 ''' ''' The move that the Pokémon is forced to use. ''' - ''' Public TormentMoveID As Integer = -1 ''' ''' The move chosen for Choice Items. ''' - ''' Public ChoiceMove As Attack = Nothing ''' ''' Turns true when the Pokémon is affected by Gastro Acid. ''' - ''' Public GastroAcid As Integer = 0 ''' ''' The counter for the rage move. ''' - ''' Public Rage As Integer = 0 ''' ''' Checks if Defense Curl was used. ''' - ''' Public DefenseCurl As Integer = 0 ''' ''' Charge move counter. ''' - ''' Public Charge As Integer = 0 ''' ''' Indicates if minimize got used. ''' - ''' Public Minimize As Integer = 0 ''' ''' Counter for Bide ''' - ''' Public Bide As Integer = 0 ''' ''' Stores all the damage that the Pokémon will deal with Bide. ''' - ''' Public BideDamage As Integer = 0 ''' ''' Doubles effect probability for four turns. ''' - ''' Public WaterPledge As Integer = 0 ''' ''' The counter for the Uproar move. ''' - ''' Public Uproar As Integer = 0 ''' ''' The Outrage move counter. ''' - ''' Public Outrage As Integer = 0 ''' ''' The Thrash move counter. ''' - ''' Public Thrash As Integer = 0 ''' ''' The Petal Dance move counter. ''' - ''' Public PetalDance As Integer = 0 ''' ''' Rollout move counter ''' - ''' Public Rollout As Integer = 0 ''' ''' Iceball move counter ''' - ''' Public IceBall As Integer = 0 ''' ''' Recharge counter for moves like Hyperbeam. ''' - ''' Public Recharge As Integer = 0 ''' ''' Razor Wind move counter. ''' - ''' Public RazorWind As Integer = 0 ''' ''' Skull bash Move counter. ''' - ''' Public SkullBash As Integer = 0 ''' ''' Sky Attack move counter. ''' - ''' Public SkyAttack As Integer = 0 ''' ''' Solar beam move counter. ''' - ''' Public SolarBeam As Integer = 0 ''' ''' Ice Burn move counter. ''' - ''' Public IceBurn As Integer = 0 ''' ''' Freeze Shock move counter. ''' - ''' Public FreezeShock As Integer = 0 ''' ''' Fly move counter. ''' - ''' Public Fly As Integer = 0 ''' ''' Dig move counter. ''' - ''' Public Dig As Integer = 0 ''' ''' Bounce move counter. ''' - ''' Public Bounce As Integer = 0 ''' ''' Dive move counter. ''' - ''' Public Dive As Integer = 0 ''' ''' Shadow Force move counter. ''' - ''' Public ShadowForce As Integer = 0 ''' ''' Sky Drop move counter. ''' - ''' Public SkyDrop As Integer = 0 ''' ''' Turns this Pokémon is trapped in Wrap. ''' - ''' Public Wrap As Integer = 0 ''' ''' Turns this Pokémon is trapped in Whirlpool. ''' - ''' Public Whirlpool As Integer = 0 ''' ''' Turns this Pokémon is trapped in Bind. ''' - ''' Public Bind As Integer = 0 ''' ''' Turns this Pokémon is trapped in Clamp. ''' - ''' Public Clamp As Integer = 0 ''' ''' Turns this Pokémon is trapped in FireSpin. ''' - ''' Public FireSpin As Integer = 0 ''' ''' Turns this Pokémon is trapped in MagmaStorm. ''' - ''' Public MagmaStorm As Integer = 0 ''' ''' Turns this Pokémon is trapped in SandTomb. ''' - ''' Public SandTomb As Integer = 0 ''' ''' Focus Energy move counter. ''' - ''' Public FocusEnergy As Integer = 0 ''' ''' Lucky Chant move counter. ''' - ''' Public LuckyChant As Integer = 0 ''' ''' Counter for the Lock On and Mind Reader move. ''' - ''' Public LockedOn As Integer = 0 ''' ''' Counter for the Fury Cutter move. ''' - ''' Public FuryCutter As Integer = 0 ''' ''' Counter for the Stockpile move. ''' - ''' Public StockPile As Integer = 0 ''' ''' Magic Coat move counter. ''' - ''' Public MagicCoat As Integer = 0 ''' ''' Roost counter, set to flying type. ''' - ''' Public Roost As Integer = 0 ''' ''' Destiny Bond move counter. ''' - ''' Public DestinyBond As Integer = 0 ''' ''' Endure move counter. ''' - ''' Public Endure As Integer = 0 ''' ''' Protect move counter ''' - ''' Public Protect As Integer = 0 ''' ''' Detect move counter ''' - ''' Public Detect As Integer = 0 ''' ''' Indicates how much HP the substitute has left. ''' - ''' Public Substitute As Integer = 0 ''' ''' Counts the consecutive uses of Protect like moves. ''' - ''' Public ProtectMoveCounter As Integer = 0 ''' ''' King's Shield move counter. ''' - ''' Public KingsShield As Integer = 0 ''' ''' Ingrain move counter. ''' - ''' Public Ingrain As Integer = 0 ''' ''' Counter for the Magnet Rise move. ''' - ''' Public MagnetRise As Integer = 0 ''' ''' Counter for the Aqua Ring move. ''' - ''' Public AquaRing As Integer = 0 ''' ''' If the Pokémon is affected by Nightmare. ''' - ''' Public Nightmare As Integer = 0 ''' ''' If the Pokémon is affected by Curse. ''' - ''' Public Cursed As Integer = 0 ''' ''' Turns until Perish Song faints Pokémon. ''' - ''' Public PerishSong As Integer = 0 ''' ''' Counter for moves like Spider Web. ''' - ''' Public Trapped As Integer = 0 ''' ''' Counter for the Foresight move. ''' - ''' Public Foresight As Integer = 0 ''' ''' Counter for the Odor Sleught move. ''' - ''' Public OdorSleught As Integer = 0 ''' ''' Counter for the Miracle Eye move. ''' - ''' Public MiracleEye As Integer = 0 ''' ''' Halves this Pokémon's speed for four turns. ''' - ''' Public GrassPledge As Integer = 0 ''' ''' Deals damage of 1/8 HP at the end of turn for four turns. ''' - ''' Public FirePledge As Integer = 0 ''' ''' If Leech Seed got used on this Pokémon ''' - ''' Public LeechSeed As Integer = 0 ''' ''' The target the leech seed HP gets sent to. ''' - ''' Public LeechSeedTarget As PokemonTarget = Nothing ''' ''' Counter for the Metronome item. ''' - ''' Public MetronomeItemCount As Integer = 0 ''' ''' Raises critical Hit ratio, Lansat Berry trigger ''' - ''' Public LansatBerry As Integer = 0 ''' ''' Raises attack speed when Custap berry got eaten. ''' - ''' Public CustapBerry As Integer = 0 #End Region @@ -511,7 +416,6 @@ ''' Resets the fields to their default values when a new Pokémon gets switched in. ''' ''' If the Pokémon got switched in using Baton Pass. - ''' Public Sub ResetFields(ByVal BatonPassed As Boolean) Me.SleepTurns = 0 Me.TruantRound = 0 @@ -592,13 +496,11 @@ ''' ''' Represents a position on the battle field by targeting the Pokémon. ''' - ''' Public Class PokemonTarget ''' ''' The positions on the battle field a Pokémon can get targeted on. ''' - ''' Public Enum Targets OwnLeft OwnCenter @@ -614,7 +516,6 @@ ''' Creates a new instance of a Pokémon Target. ''' ''' The Target type of this Pokémon Target. - ''' Public Sub New(ByVal t As Targets) Me._target = t End Sub @@ -623,7 +524,6 @@ ''' Creates a new instance of a Pokémon Target. ''' ''' The Target type of this Pokémon Target. - ''' Public Sub New(ByVal s As String) Select Case s.ToLower() Case "ownleft" @@ -644,9 +544,6 @@ ''' ''' The target of this PokémonTarget. ''' - ''' - ''' - ''' Public ReadOnly Property Target() As Targets Get Return Me._target @@ -664,9 +561,6 @@ ''' ''' Creates a target set to Own Left. ''' - ''' - ''' - ''' Public Shared ReadOnly Property OwnLeft() As PokemonTarget Get Return New PokemonTarget(Targets.OwnLeft) @@ -676,9 +570,6 @@ ''' ''' Creates a target set to Own Center. ''' - ''' - ''' - ''' Public Shared ReadOnly Property OwnCenter() As PokemonTarget Get Return New PokemonTarget(Targets.OwnCenter) @@ -688,9 +579,6 @@ ''' ''' Creates a target set to Own Right. ''' - ''' - ''' - ''' Public Shared ReadOnly Property OwnRight() As PokemonTarget Get Return New PokemonTarget(Targets.OwnRight) @@ -700,9 +588,6 @@ ''' ''' Creates a target set to Opp Left. ''' - ''' - ''' - ''' Public Shared ReadOnly Property OppLeft() As PokemonTarget Get Return New PokemonTarget(Targets.OppLeft) @@ -712,9 +597,6 @@ ''' ''' Creates a target set to Opp Center. ''' - ''' - ''' - ''' Public Shared ReadOnly Property OppCenter() As PokemonTarget Get Return New PokemonTarget(Targets.OppCenter) @@ -724,9 +606,6 @@ ''' ''' Creates a target set to Opp Right. ''' - ''' - ''' - ''' Public Shared ReadOnly Property OppRight() As PokemonTarget Get Return New PokemonTarget(Targets.OppRight) @@ -736,7 +615,6 @@ ''' ''' Reverses the sides of the target (Own => Opp; Opp => Own) ''' - ''' Public Sub Reverse() Select Case Me._target Case Targets.OwnLeft @@ -757,8 +635,6 @@ ''' ''' Returns a string that represents the target. ''' - ''' - ''' Public Overrides Function ToString() As String Return Me._target.ToString() End Function @@ -866,8 +742,6 @@ ''' ''' The reference to the BattleScreen. ''' The list of Pokémon targets. - ''' - ''' Public Shared Function GetValidPokemonTargets(ByVal BattleScreen As BattleScreen, ByVal l As List(Of PokemonTarget)) As List(Of PokemonTarget) Dim returnList As New List(Of PokemonTarget) @@ -883,9 +757,6 @@ ''' ''' If the Pokémon target is on the own side of the field. ''' - ''' - ''' - ''' Public ReadOnly Property IsOwn() As Boolean Get Select Case Me._target diff --git a/2.5DHero/2.5DHero/Core/Core.vb b/2.5DHero/2.5DHero/Core/Core.vb index 32381a8fa..fabddb1ab 100644 --- a/2.5DHero/2.5DHero/Core/Core.vb +++ b/2.5DHero/2.5DHero/Core/Core.vb @@ -204,7 +204,6 @@ ''' ''' Intended for rendering 3D models on top of sprites. ''' - ''' Private Sub Render() CurrentScreen.Render() End Sub diff --git a/2.5DHero/2.5DHero/Core/CoreSpriteBatch.vb b/2.5DHero/2.5DHero/Core/CoreSpriteBatch.vb index 2ef0c8656..3caef6474 100644 --- a/2.5DHero/2.5DHero/Core/CoreSpriteBatch.vb +++ b/2.5DHero/2.5DHero/Core/CoreSpriteBatch.vb @@ -1,4 +1,4 @@ -''' +''' ''' A wrapper class for the default SpriteBatch class which extends certain functions of the original class to allow easy screen sizing. ''' Public Class CoreSpriteBatch @@ -38,7 +38,6 @@ Public Class CoreSpriteBatch ''' ''' If the SpriteBatch is running. ''' - ''' Public ReadOnly Property Running() As Boolean Get Return Me._running @@ -306,7 +305,6 @@ Public Class CoreSpriteBatch ''' ''' The scale of the interface depending on the window size. ''' - ''' Public ReadOnly Property InterfaceScale() As Double Get If Core.windowSize.Height < Core.CurrentScreen.GetScreenScaleMinimum().Height Or Core.windowSize.Width < Core.CurrentScreen.GetScreenScaleMinimum().Width Then @@ -406,4 +404,4 @@ Public Class CoreSpriteBatch #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Core/GameController.vb b/2.5DHero/2.5DHero/Core/GameController.vb index 3c96ac78a..635d3ee00 100644 --- a/2.5DHero/2.5DHero/Core/GameController.vb +++ b/2.5DHero/2.5DHero/Core/GameController.vb @@ -3,7 +3,6 @@ Imports System.Windows.Forms ''' ''' Controls the game's main workflow. ''' -''' Public Class GameController Inherits Microsoft.Xna.Framework.Game @@ -11,43 +10,36 @@ Public Class GameController ''' ''' The current version of the game. ''' - ''' Public Const GAMEVERSION As String = "0.53.3" ''' ''' The number of released iterations of the game. ''' - ''' Public Const RELEASEVERSION As String = "90" ''' ''' The development stage the game is in. ''' - ''' Public Const GAMEDEVELOPMENTSTAGE As String = "Indev" ''' ''' The name of the game. ''' - ''' Public Const GAMENAME As String = "Pokémon 3D" ''' ''' The name of the developer that appears on the title screen. ''' - ''' Public Const DEVELOPER_NAME As String = "P3D Team" ''' ''' If the Debug Mode is active. ''' - ''' Public Const IS_DEBUG_ACTIVE As Boolean = False ''' ''' If the game should set the GameJolt online version to the current online version. ''' - ''' Public Const UPDATEONLINEVERSION As Boolean = False Public Graphics As GraphicsDeviceManager @@ -135,10 +127,10 @@ Public Class GameController End Sub Private Shared GameHacked As Boolean = False 'Temp value that stores if a hacking file was detected at game start. + ''' ''' If the player hacked any instance of Pokémon3D at some point. ''' - ''' Public Shared ReadOnly Property Hacker() As Boolean Get Return GameHacked @@ -148,7 +140,6 @@ Public Class GameController ''' ''' The path to the game folder. ''' - ''' Public Shared ReadOnly Property GamePath() As String Get Return My.Application.Info.DirectoryPath diff --git a/2.5DHero/2.5DHero/Debug/DebugDisplay.vb b/2.5DHero/2.5DHero/Debug/DebugDisplay.vb index 6ba539ea1..ef51b52bc 100644 --- a/2.5DHero/2.5DHero/Debug/DebugDisplay.vb +++ b/2.5DHero/2.5DHero/Debug/DebugDisplay.vb @@ -3,7 +3,6 @@ ''' ''' Renders the debug information. ''' - ''' Public Shared Sub Draw() If Core.CurrentScreen.CanDrawDebug = True Then Dim isDebugString As String = "" @@ -56,9 +55,6 @@ ''' ''' The amount of vertices rendered in the last frame. ''' - ''' - ''' - ''' Public Shared Property DrawnVertices() As Integer Get Return _drawnVertices @@ -71,9 +67,6 @@ ''' ''' The maximum amount of vertices that are present in the current scene. ''' - ''' - ''' - ''' Public Shared Property MaxVertices() As Integer Get Return _maxVertices @@ -86,9 +79,6 @@ ''' ''' The distance of the vertex to the camera, that is the furthest away from the camera. ''' - ''' - ''' - ''' Public Shared Property MaxDistance() As Integer Get Return _maxDistance diff --git a/2.5DHero/2.5DHero/Debug/DotNetVersion.vb b/2.5DHero/2.5DHero/Debug/DotNetVersion.vb index 8d1a781d3..0737361ae 100644 --- a/2.5DHero/2.5DHero/Debug/DotNetVersion.vb +++ b/2.5DHero/2.5DHero/Debug/DotNetVersion.vb @@ -1,14 +1,11 @@ ''' ''' A class to supply .Net installation information. ''' -''' Public Class DotNetVersion ''' ''' Returns .Net installation information. ''' - ''' - ''' Public Shared Function GetInstalled() As String Dim output As String = "" diff --git a/2.5DHero/2.5DHero/Debug/ObjectDump.vb b/2.5DHero/2.5DHero/Debug/ObjectDump.vb index d5a989c10..b8a392d09 100644 --- a/2.5DHero/2.5DHero/Debug/ObjectDump.vb +++ b/2.5DHero/2.5DHero/Debug/ObjectDump.vb @@ -1,4 +1,4 @@ -''' +''' ''' A class to access the dump of variables of an object. ''' Public Class ObjectDump @@ -21,7 +21,6 @@ Public Class ObjectDump ''' ''' Creates a new instance of the ObjectDump class and performs a dump on the passed object. ''' - ''' Public Sub New(ByVal obj As Object) CreateDump(obj) End Sub @@ -135,4 +134,4 @@ Public Class ObjectDump Return "List<" & listType.GetGenericArguments()(0).Name & ">[]" End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Entites/Entity.vb b/2.5DHero/2.5DHero/Entites/Entity.vb index 7388856e6..ce9e6ff00 100644 --- a/2.5DHero/2.5DHero/Entites/Entity.vb +++ b/2.5DHero/2.5DHero/Entites/Entity.vb @@ -477,8 +477,6 @@ ''' ''' Returns the offset from the 0,0,0 center of the position of the entity. ''' - ''' - ''' Private Function GetCenter() As Vector3 If CreatedWorld = False Or CreateWorldEveryFrame = True Then Dim v As Vector3 = Vector3.Zero '(Me.ViewBox.Min - Me.Position) + (Me.ViewBox.Max - Me.Position) diff --git a/2.5DHero/2.5DHero/Entites/Other/NetworkPlayer.vb b/2.5DHero/2.5DHero/Entites/Other/NetworkPlayer.vb index 228454fa3..24b74784c 100644 --- a/2.5DHero/2.5DHero/Entites/Other/NetworkPlayer.vb +++ b/2.5DHero/2.5DHero/Entites/Other/NetworkPlayer.vb @@ -10,7 +10,6 @@ ''' ''' The Network ID of the player ''' - ''' Public NetworkID As Integer = 0 Public faceRotation As Integer diff --git a/2.5DHero/2.5DHero/Entites/Other/OverworldPokemon.vb b/2.5DHero/2.5DHero/Entites/Other/OverworldPokemon.vb index 34d80f4d2..481d242a9 100644 --- a/2.5DHero/2.5DHero/Entites/Other/OverworldPokemon.vb +++ b/2.5DHero/2.5DHero/Entites/Other/OverworldPokemon.vb @@ -1,4 +1,4 @@ -Public Class OverworldPokemon +Public Class OverworldPokemon Inherits Entity @@ -116,7 +116,6 @@ ''' ''' If the OverworldPokémon should be rendered. ''' - ''' Public Function IsVisible() As Boolean If CBool(GameModeManager.GetGameRuleValue("ShowFollowPokemon", "1")) = True Then If Screen.Level.ShowOverworldPokemon = True Then @@ -270,4 +269,4 @@ Me.ChangeTexture() End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Exceptions/InvalidEntityTypeException.vb b/2.5DHero/2.5DHero/Exceptions/InvalidEntityTypeException.vb index dd7896e79..36f794171 100644 --- a/2.5DHero/2.5DHero/Exceptions/InvalidEntityTypeException.vb +++ b/2.5DHero/2.5DHero/Exceptions/InvalidEntityTypeException.vb @@ -3,7 +3,6 @@ ''' ''' An exception to be thrown when an entity conversion encounters a type error. ''' - ''' Public Class InvalidEntityTypeException Inherits Exception diff --git a/2.5DHero/2.5DHero/Global Interfaces/ICopyAble.vb b/2.5DHero/2.5DHero/Global Interfaces/ICopyAble.vb index 7e221a9f7..d886bd06e 100644 --- a/2.5DHero/2.5DHero/Global Interfaces/ICopyAble.vb +++ b/2.5DHero/2.5DHero/Global Interfaces/ICopyAble.vb @@ -1,14 +1,11 @@ ''' ''' An interface for classes to implement that can create a copied instance member. ''' -''' Public Interface ICopyAble ''' ''' Returns a new instance of the class in use. ''' - ''' - ''' Function Copy() As Object End Interface \ No newline at end of file diff --git a/2.5DHero/2.5DHero/HelperClasses/Animation.vb b/2.5DHero/2.5DHero/HelperClasses/Animation.vb index 0c1ba7a17..4fef05fbd 100644 --- a/2.5DHero/2.5DHero/HelperClasses/Animation.vb +++ b/2.5DHero/2.5DHero/HelperClasses/Animation.vb @@ -1,8 +1,6 @@ ''' ''' A class which can display an animation. -''' Version: 1.0.0.0 (12.06.2012) ''' -''' Public Class Animation Inherits BasicObject @@ -161,7 +159,6 @@ Public Class Animation ''' ''' Starts the animation. ''' - ''' Public Sub Start() _Running = PlayMode.Playing End Sub @@ -169,7 +166,6 @@ Public Class Animation ''' ''' Stopps the animation and returns to start. ''' - ''' Public Sub Stopp() _Running = PlayMode.Stopped CurrentRow = StartRow @@ -179,7 +175,6 @@ Public Class Animation ''' ''' Returns to start and starts the animation afterwards. ''' - ''' Public Sub Restart() _Running = PlayMode.Playing CurrentRow = StartRow @@ -189,7 +184,6 @@ Public Class Animation ''' ''' Pauses the animation. ''' - ''' Public Sub Pause() _Running = PlayMode.Paused End Sub diff --git a/2.5DHero/2.5DHero/HelperClasses/BasicObject.vb b/2.5DHero/2.5DHero/HelperClasses/BasicObject.vb index dac90d873..0b009dd6b 100644 --- a/2.5DHero/2.5DHero/HelperClasses/BasicObject.vb +++ b/2.5DHero/2.5DHero/HelperClasses/BasicObject.vb @@ -1,8 +1,6 @@ ''' ''' This is the BasicObject class for each Graphics-Component. -''' Version: 1.0.0.2 (17.07.2012) ''' -''' Public MustInherit Class BasicObject #Region "Fields" @@ -17,13 +15,11 @@ Public MustInherit Class BasicObject ''' ''' Use the random-function to create randomized values. ''' - ''' Public Random As New System.Random() ''' ''' You can store a value in the Tag. ''' - ''' Public Tag As New Object #End Region @@ -33,9 +29,6 @@ Public MustInherit Class BasicObject ''' ''' The visual texture of the object. ''' - ''' - ''' - ''' Public Property Texture As Texture2D Get Return _Texture @@ -48,9 +41,6 @@ Public MustInherit Class BasicObject ''' ''' Height of the object. ''' - ''' - ''' - ''' Public Property Height As Integer Get Return _Height @@ -63,9 +53,6 @@ Public MustInherit Class BasicObject ''' ''' Width of the object. ''' - ''' - ''' - ''' Public Property Width As Integer Get Return _Width @@ -78,9 +65,6 @@ Public MustInherit Class BasicObject ''' ''' The position if the object in the window in pixels ''' - ''' - ''' - ''' Public Property Position As Vector2 Get Return _Position @@ -93,9 +77,6 @@ Public MustInherit Class BasicObject ''' ''' A visible parameter which can be used to toggle object's visibility. ''' - ''' - ''' - ''' Public Property Visible As Boolean Get Return _Visible @@ -108,9 +89,6 @@ Public MustInherit Class BasicObject ''' ''' Shows that you can dispose this object in the next Unload-Method. ''' - ''' - ''' - ''' Public Property DisposeReady As Boolean Get Return _DisposeReady @@ -123,9 +101,6 @@ Public MustInherit Class BasicObject ''' ''' Returns a rectangle created by position, width and height of this object. ''' - ''' - ''' - ''' Public Property Rectangle As Rectangle Get Return New Rectangle(CInt(Position.X), CInt(Position.Y), Width, Height) @@ -140,9 +115,6 @@ Public MustInherit Class BasicObject ''' ''' The size of this object (width and height) ''' - ''' - ''' - ''' Public Property Size As Size Get Return New Size(Me.Width, Me.Height) @@ -162,7 +134,6 @@ Public MustInherit Class BasicObject ''' The width of this object (x-axis) ''' The height of this object (y-axis) ''' The position of this object. - ''' Public Sub New(ByVal Texture As Texture2D, ByVal Width As Integer, ByVal Height As Integer, ByVal Position As Vector2) Me._Texture = Texture Me._Width = Width @@ -173,7 +144,6 @@ Public MustInherit Class BasicObject ''' ''' Makes the object invisible and ready for disposing. ''' - ''' Public Sub Remove() DisposeReady = True Visible = False diff --git a/2.5DHero/2.5DHero/HelperClasses/GameMessage.vb b/2.5DHero/2.5DHero/HelperClasses/GameMessage.vb index 10ab547cf..63dd00775 100644 --- a/2.5DHero/2.5DHero/HelperClasses/GameMessage.vb +++ b/2.5DHero/2.5DHero/HelperClasses/GameMessage.vb @@ -1,8 +1,6 @@ ''' ''' This class can show a message ingame. -''' Version: 1.0.0.1 (22.06.2012) ''' -''' Public Class GameMessage Inherits BasicObject @@ -37,9 +35,6 @@ Public Class GameMessage ''' ''' The duretion in milliseconds this message will be displayed. ''' - ''' - ''' - ''' Public Property Duration As Single Get Return _Duration @@ -52,9 +47,6 @@ Public Class GameMessage ''' ''' The backgroundcolor the texture will be colored with. ''' - ''' - ''' - ''' Public Property BackgroundColor As Color Get Return _BackgroundColor @@ -67,9 +59,6 @@ Public Class GameMessage ''' ''' The rectangle from the texture to be drawn. ''' - ''' - ''' - ''' Public Property TextureRectangle As Rectangle Get Return _TextureRectangle @@ -82,9 +71,6 @@ Public Class GameMessage ''' ''' Shows the message in fullscreen (overides size and dock) ''' - ''' - ''' - ''' Public Property Fullscreen As Boolean Get Return _Fullscreen @@ -97,9 +83,6 @@ Public Class GameMessage ''' ''' Docks the message at a side of the window (overides size) ''' - ''' - ''' - ''' Public Property Dock As DockStyles Get Return _Dock @@ -112,9 +95,6 @@ Public Class GameMessage ''' ''' The text that will be displayed. ''' - ''' - ''' - ''' Public Property Text As String Get Return _Text @@ -127,9 +107,6 @@ Public Class GameMessage ''' ''' The position the text is drawn (relative to message-position) ''' - ''' - ''' - ''' Public Property TextPosition As Vector2 Get Return _TextPosition @@ -151,9 +128,6 @@ Public Class GameMessage ''' ''' The color for the text. ''' - ''' - ''' - ''' Public Property TextColor As Color Get Return _TextColor @@ -166,9 +140,6 @@ Public Class GameMessage ''' ''' If this value is true, the duretion has no effect on the visibility of this message. ''' - ''' - ''' - ''' Public Property ShowAlways As Boolean Get Return _showAlways @@ -206,7 +177,6 @@ Public Class GameMessage ''' The actual text to be displayed. ''' The spritefont, the text will be drawn with. ''' The color the text will be drawn in. - ''' Public Sub SetupText(ByVal Text As String, ByVal SpriteFont As SpriteFont, ByVal TextColor As Color) Me._Text = Text Me._spriteFont = SpriteFont @@ -216,7 +186,6 @@ Public Class GameMessage ''' ''' Updates the message (required!) ''' - ''' Public Sub Update() If _showAlways = False Then If _Duration > CSng(0) Then @@ -256,7 +225,6 @@ Public Class GameMessage ''' ''' Draw the message. ''' - ''' Public Sub Draw() If Visible = True Then If _Fullscreen = True Then @@ -281,9 +249,6 @@ Public Class GameMessage ''' ''' Actual drawing stuff. ''' - ''' - ''' - ''' Private Sub DrawMe(ByVal drawSize As Size, ByVal drawPosition As Vector2) Core.SpriteBatch.DrawInterface(Me.Texture, New Rectangle(CInt(drawPosition.X), CInt(drawPosition.Y), drawSize.Width, drawSize.Height), TextureRectangle, New Color(_BackgroundColor.R, _BackgroundColor.G, _BackgroundColor.B, Me._alpha)) Core.SpriteBatch.DrawInterfaceString(_spriteFont, Me._Text, LinkVector2(Me.Position, Me._TextPosition, 1), New Color(Me._TextColor.R, Me._TextColor.G, Me._TextColor.B, Me._alpha)) @@ -298,7 +263,6 @@ Public Class GameMessage ''' ''' The time span the message will appear on the screen. ''' The graphics device the message will be drawn on. - ''' Public Sub ShowMessage(ByVal Duration As Single, ByVal graphics As GraphicsDevice) Me._Duration = Duration Me.Visible = True diff --git a/2.5DHero/2.5DHero/HelperClasses/TimeHelpers.vb b/2.5DHero/2.5DHero/HelperClasses/TimeHelpers.vb index 6f46c9e83..c25405427 100644 --- a/2.5DHero/2.5DHero/HelperClasses/TimeHelpers.vb +++ b/2.5DHero/2.5DHero/HelperClasses/TimeHelpers.vb @@ -1,10 +1,9 @@ -Public Class TimeHelpers +Public Class TimeHelpers ''' ''' Converts an amount of seconds to a TimeSpan. ''' ''' The seconds to convert. - ''' Public Shared Function ConvertSecondToTime(ByVal Seconds As Integer) As TimeSpan Dim minutes As Integer = 0 Dim hours As Integer = 0 @@ -26,7 +25,6 @@ ''' ''' Returns the amount of time the player has played. ''' - ''' Public Shared Function GetCurrentPlayTime() As TimeSpan Dim PTime As TimeSpan = Core.Player.PlayTime @@ -41,7 +39,6 @@ ''' ''' The DateTime to display. ''' To show the seconds or not. - ''' Public Shared Function GetDisplayTime(ByVal DateTime As Date, ByVal ShowSeconds As Boolean) As String Return GetDisplayTime(New TimeSpan(DateTime.Hour, DateTime.Minute, DateTime.Second), ShowSeconds) End Function @@ -51,7 +48,6 @@ ''' ''' The TimeSpan to display. ''' To show the seconds or not. - ''' Public Shared Function GetDisplayTime(ByVal Time As TimeSpan, ByVal ShowSeconds As Boolean) As String Dim days As Integer = Time.Days Dim hour As Integer = Time.Hours @@ -79,4 +75,4 @@ Return t End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Input/KeyBindings.vb b/2.5DHero/2.5DHero/Input/KeyBindings.vb index 54647146e..7336575a3 100644 --- a/2.5DHero/2.5DHero/Input/KeyBindings.vb +++ b/2.5DHero/2.5DHero/Input/KeyBindings.vb @@ -1,4 +1,4 @@ -Public Class KeyBindings +Public Class KeyBindings Public Shared ForwardMoveKey As Keys = Keys.W Public Shared LeftMoveKey As Keys = Keys.A @@ -106,7 +106,6 @@ ''' Converts the name of a key to the actual Key class. ''' ''' The key name to convert. - ''' ''' The default is Keys.None. Public Shared Function GetKey(ByVal keyStr As String) As Keys For Each k As Keys In [Enum].GetValues(GetType(Keys)) @@ -122,7 +121,6 @@ ''' Returns the name of a key. ''' ''' The key to get the name for. - ''' ''' Returns String.Empty by default. Public Shared Function GetKeyName(ByVal key As Keys) As String Return key.ToString() @@ -230,8 +228,6 @@ ''' ''' Creates the default keyboard.dat file. ''' - ''' - ''' Public Shared Sub CreateKeySave(ByVal force As Boolean) If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then If IO.File.Exists(GameController.GamePath & "\Save\Keyboard.dat") = False Or force = True Then @@ -268,7 +264,6 @@ ''' ''' Saves the current keyboard configuration to the keyboard.dat file. ''' - ''' Public Shared Sub SaveKeys() If IO.Directory.Exists(GameController.GamePath & "\Save") = True Then Dim s As String = "[ForwardMove]=" & GetKeyName(ForwardMoveKey) & vbNewLine & @@ -314,8 +309,6 @@ ''' The maximum length of the text. -1 means infinite length. ''' Checks if the Shift variant of a key gets considered. ''' Checks if the Alt variant of a key gets considered. - ''' - ''' Public Shared Function GetInput(ByVal WhiteKeys() As Keys, ByVal BlackKeys() As Keys, Optional ByRef Text As String = "", Optional ByVal MaxLength As Integer = -1, Optional ByVal TriggerShift As Boolean = True, Optional ByVal TriggerAlt As Boolean = True) As String Dim Keys() As Keys = KeyBoardHandler.GetPressedKeys() For Each Key As Keys In Keys @@ -382,8 +375,6 @@ ''' The key whitelist. ''' The key blacklist. ''' The key to be checked. - ''' - ''' Private Shared Function KeyBlocked(ByVal WhiteKeys() As Keys, ByVal BlackKeys() As Keys, ByVal Key As Keys) As Boolean Dim MapWhite As Boolean = WhiteKeys.Length > 0 Dim MapBlack As Boolean = BlackKeys.Length > 0 @@ -405,8 +396,6 @@ ''' The maximum length of the text. -1 means infinite length. ''' Checks if the Shift variant of a key gets considered. ''' Checks if the Alt variant of a key gets considered. - ''' - ''' Public Shared Function GetInput(Optional ByRef Text As String = "", Optional ByVal MaxLength As Integer = -1, Optional ByVal TriggerShift As Boolean = True, Optional ByVal TriggerAlt As Boolean = True) As String Return GetInput({}, {Keys.Enter, Keys.Up, Keys.Down, Keys.Left, Keys.Right, Keys.Tab, Keys.Delete, Keys.Home, Keys.End, Keys.Escape}, @@ -423,8 +412,6 @@ ''' The maximum length of the text. -1 means infinite length. ''' Checks if the Shift variant of a key gets considered. ''' Checks if the Alt variant of a key gets considered. - ''' - ''' Public Shared Function GetNameInput(Optional ByRef Text As String = "", Optional ByVal MaxLength As Integer = -1, Optional ByVal TriggerShift As Boolean = True, Optional ByVal TriggerAlt As Boolean = True) As String Return GetInput({Keys.NumPad0, Keys.NumPad1, Keys.NumPad2, Keys.NumPad3, Keys.NumPad4, Keys.NumPad5, Keys.NumPad6, Keys.NumPad7, Keys.NumPad8, Keys.NumPad9, Keys.Space, Keys.D1, Keys.D2, Keys.D3, Keys.D4, Keys.D5, Keys.D6, Keys.D7, Keys.D8, Keys.D9, Keys.D0, Keys.Back, Keys.A, Keys.B, Keys.C, Keys.D, Keys.E, Keys.F, Keys.G, Keys.H, Keys.I, Keys.J, Keys.K, Keys.L, Keys.M, Keys.N, Keys.O, Keys.P, Keys.Q, Keys.R, Keys.S, Keys.T, Keys.U, Keys.V, Keys.W, Keys.X, Keys.Y, Keys.Z}, {}, @@ -434,4 +421,4 @@ TriggerAlt) End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Input/KeyCharConverter.vb b/2.5DHero/2.5DHero/Input/KeyCharConverter.vb index 2e17d1f92..b3e223cc8 100644 --- a/2.5DHero/2.5DHero/Input/KeyCharConverter.vb +++ b/2.5DHero/2.5DHero/Input/KeyCharConverter.vb @@ -1,4 +1,4 @@ -''' +''' ''' This class serves the only purpose to convert a key form the Keys enumeration to an actual Char that the key represents on the currently loaded keyboard layout. ''' Public Class KeyCharConverter @@ -1100,7 +1100,6 @@ Public Class KeyCharConverter ''' Returns chars representing the keys pressed on a keyboard. ''' ''' The key. Returns nothing when no keypress was detected. - ''' Public Shared Function GetCharFromKey(key As Keys) As Char? Return GetCharFromKey(CType(key, Windows.Forms.Keys)) End Function @@ -1109,7 +1108,6 @@ Public Class KeyCharConverter ''' Returns chars representing the keys pressed on a keyboard. ''' ''' The key. Returns nothing when no keypress was detected. - ''' Public Shared Function GetCharFromKey(key As Windows.Forms.Keys) As Char? Dim ch As Char? = Nothing @@ -1134,4 +1132,4 @@ Public Class KeyCharConverter Return ch End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Input/KeyboardInput.vb b/2.5DHero/2.5DHero/Input/KeyboardInput.vb index 1399734ad..60703604f 100644 --- a/2.5DHero/2.5DHero/Input/KeyboardInput.vb +++ b/2.5DHero/2.5DHero/Input/KeyboardInput.vb @@ -1,4 +1,4 @@ -''' +''' ''' Handles text input from the keyboard. ''' Public Class KeyboardInput @@ -444,7 +444,6 @@ Public Class KeyboardInput ''' ''' Returns the selected text. ''' - ''' Public ReadOnly Property SelectedText() As String Get If Me._selectionLength <= 0 Then @@ -530,4 +529,4 @@ Public Class KeyboardInput #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Modules/Extensions.vb b/2.5DHero/2.5DHero/Modules/Extensions.vb index 894f5905a..7c16d042c 100644 --- a/2.5DHero/2.5DHero/Modules/Extensions.vb +++ b/2.5DHero/2.5DHero/Modules/Extensions.vb @@ -1,4 +1,4 @@ -Imports System.Runtime.CompilerServices +Imports System.Runtime.CompilerServices Module Extensions @@ -531,8 +531,6 @@ Module Extensions ''' ''' Inverts the Color. ''' - ''' - ''' Public Function Invert(ByVal c As Color) As Color Return New Color(255 - c.R, 255 - c.G, 255 - c.B, c.A) @@ -551,8 +549,6 @@ Module Extensions ''' ''' Converts a System.Drawing.Color into a Xna.Framework.Color. ''' - ''' - ''' Public Function ToXNA(ByVal c As Drawing.Color) As Color Return New Color(c.R, c.G, c.B, c.A) @@ -561,11 +557,9 @@ Module Extensions ''' ''' Converts a Xna.Framework.Color into a System.Drawing.Color. ''' - ''' - ''' Public Function ToDrawing(ByVal c As Color) As Drawing.Color Return Drawing.Color.FromArgb(c.R, c.G, c.B, c.A) End Function -End Module \ No newline at end of file +End Module diff --git a/2.5DHero/2.5DHero/Network/Chat.vb b/2.5DHero/2.5DHero/Network/Chat.vb index 25749bc91..10b80c71b 100644 --- a/2.5DHero/2.5DHero/Network/Chat.vb +++ b/2.5DHero/2.5DHero/Network/Chat.vb @@ -130,8 +130,6 @@ ''' ''' Writes the message into the chat and returns True, if the message was a command. Only sends non-command messages to servers. ''' - ''' - ''' Public Shared Sub WriteLine(ByVal chatMessage As ChatMessage) Logger.Log(Logger.LogTypes.Entry, "Chat.vb: " & chatMessage.Message) diff --git a/2.5DHero/2.5DHero/Network/ChatScreen.vb b/2.5DHero/2.5DHero/Network/ChatScreen.vb index 918235b86..3b106ab19 100644 --- a/2.5DHero/2.5DHero/Network/ChatScreen.vb +++ b/2.5DHero/2.5DHero/Network/ChatScreen.vb @@ -1,4 +1,4 @@ -Public Class ChatScreen +Public Class ChatScreen Inherits Screen @@ -895,7 +895,6 @@ ''' ''' Return sub for the Delegate controller input request screen. ''' - ''' Public Sub GetControllerInput(ByVal input As String) Me.currentText = input End Sub @@ -903,7 +902,6 @@ ''' ''' Inserts a new message to the NewMessages query. ''' - ''' Public Shared Sub InsertNewMessage(ByVal chatMessage As Chat.ChatMessage) Select Case chatMessage.MessageType Case Chat.ChatMessage.MessageTypes.CommandMessage @@ -929,7 +927,6 @@ ''' ''' Enters a new PM chat. ''' - ''' Private Sub EnterPMChat(ByVal newPMChatName As String) If PMChats.Keys.Contains(newPMChatName) = False Then PMChats.Add(newPMChatName, False) @@ -941,7 +938,6 @@ ''' ''' Called when the client receives a PM message from the server. ''' - ''' Public Shared Sub ReceivedPMMessage(ByVal chatMessage As Chat.ChatMessage) If PMChats.Keys.Contains(chatMessage.Sender) = False Then PMChats.Add(chatMessage.Sender, True) @@ -986,4 +982,4 @@ End If End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Network/GameJolt/API.vb b/2.5DHero/2.5DHero/Network/GameJolt/API.vb index d5fff48e1..74795eeee 100644 --- a/2.5DHero/2.5DHero/Network/GameJolt/API.vb +++ b/2.5DHero/2.5DHero/Network/GameJolt/API.vb @@ -22,7 +22,6 @@ ''' Handles received data. ''' ''' The data to work with. - ''' Public Shared Function HandleData(ByVal data As String) As List(Of JoltValue) 'Old system: If data.Contains("data:""" & vbNewLine) = True Then diff --git a/2.5DHero/2.5DHero/Network/GameJolt/LogInScreen.vb b/2.5DHero/2.5DHero/Network/GameJolt/LogInScreen.vb index 2351c5c3c..1facf2415 100644 --- a/2.5DHero/2.5DHero/Network/GameJolt/LogInScreen.vb +++ b/2.5DHero/2.5DHero/Network/GameJolt/LogInScreen.vb @@ -448,8 +448,6 @@ Namespace GameJolt ''' ''' This gets called from all GameJolt screens. If the player is no longer connected to GameJolt, it opens up the login screen. ''' - ''' - ''' Public Shared Sub KickFromOnlineScreen(ByVal SetToScreen As Screen) If Core.Player.IsGameJoltSave = True AndAlso GameJolt.API.LoggedIn = False Then Core.SetScreen(New GameJolt.LogInScreen(SetToScreen)) diff --git a/2.5DHero/2.5DHero/Network/Profiles/Emblem.vb b/2.5DHero/2.5DHero/Network/Profiles/Emblem.vb index 000f14971..76e090f7a 100644 --- a/2.5DHero/2.5DHero/Network/Profiles/Emblem.vb +++ b/2.5DHero/2.5DHero/Network/Profiles/Emblem.vb @@ -3,7 +3,6 @@ ''' ''' A class to handle emblem rendering and management. ''' - ''' Public Class Emblem #Region "Enumrations" @@ -11,7 +10,6 @@ ''' ''' The names of male trainer types. ''' - ''' Public Enum MaleEmblemSpriteType Preschooler = 0 SchoolKid = 1 @@ -38,7 +36,6 @@ ''' ''' The names of female trainer types. ''' - ''' Public Enum FemaleEmblemSpriteType Preschooler = 0 SchoolKid = 1 @@ -65,7 +62,6 @@ ''' ''' The sprites of male trainers. ''' - ''' Public Enum MaleEmblemSprites NN40 = 0 NN42 = 1 @@ -92,7 +88,6 @@ ''' ''' The sprites of female trainers. ''' - ''' Public Enum FemaleEmblemSprites NN41 = 0 NN43 = 1 @@ -129,7 +124,6 @@ ''' The position on the screen. ''' The scale of the emblem. ''' An alternative sprite to draw. - ''' Public Shared Sub Draw(ByVal Name As String, ByVal ID As String, ByVal Points As Integer, ByVal Gender As String, ByVal EmblemBackground As String, ByVal Position As Vector2, ByVal Scale As Single, ByVal SpriteTexture As Texture2D) Draw(Name, ID, Points, Gender, EmblemBackground, Position, Scale, SpriteTexture, Nothing) End Sub @@ -146,7 +140,6 @@ ''' The scale of the emblem. ''' An alternative sprite to draw. ''' A list of 0-6 Pokémon to render below the player information. - ''' Public Shared Sub Draw(ByVal Name As String, ByVal ID As String, ByVal Points As Integer, ByVal Gender As String, ByVal EmblemBackground As String, ByVal Position As Vector2, ByVal Scale As Single, ByVal SpriteTexture As Texture2D, ByVal PokemonList As List(Of Pokemon)) 'Generate OT: Dim OT As String = ID diff --git a/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb b/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb index 42a437109..6cae88874 100644 --- a/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb +++ b/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb @@ -1,4 +1,4 @@ -Namespace GameJolt +Namespace GameJolt Public Class GamejoltSave @@ -45,7 +45,6 @@ ''' ''' Apricorn data ''' - ''' Public ReadOnly Property Apricorns() As String Get Return Me._apricorns @@ -55,7 +54,6 @@ ''' ''' Berry data ''' - ''' Public ReadOnly Property Berries() As String Get Return Me._berries @@ -65,7 +63,6 @@ ''' ''' Box data ''' - ''' Public ReadOnly Property Box() As String Get Return Me._box @@ -75,7 +72,6 @@ ''' ''' Daycare data ''' - ''' Public ReadOnly Property Daycare() As String Get Return Me._daycare @@ -85,7 +81,6 @@ ''' ''' ItemData data ''' - ''' Public ReadOnly Property ItemData() As String Get Return Me._itemData @@ -95,7 +90,6 @@ ''' ''' Item data ''' - ''' Public ReadOnly Property Items() As String Get Return Me._items @@ -105,7 +99,6 @@ ''' ''' NPC data ''' - ''' Public ReadOnly Property NPC() As String Get Return Me._NPC @@ -115,7 +108,6 @@ ''' ''' Option data ''' - ''' Public ReadOnly Property Options() As String Get Return Me._options @@ -125,7 +117,6 @@ ''' ''' Party data ''' - ''' Public ReadOnly Property Party() As String Get Return Me._party @@ -135,7 +126,6 @@ ''' ''' Player data ''' - ''' Public ReadOnly Property Player() As String Get Return Me._player @@ -145,7 +135,6 @@ ''' ''' Pokedex data ''' - ''' Public ReadOnly Property Pokedex() As String Get Return Me._pokedex @@ -155,7 +144,6 @@ ''' ''' Register data ''' - ''' Public ReadOnly Property Register() As String Get Return Me._register @@ -165,7 +153,6 @@ ''' ''' HallOfFame data ''' - ''' Public ReadOnly Property HallOfFame() As String Get Return Me._hallOfFame @@ -175,7 +162,6 @@ ''' ''' SecretBase data ''' - ''' Public ReadOnly Property SecretBase() As String Get Return Me._secretBase @@ -185,7 +171,6 @@ ''' ''' RoamingPokemon data ''' - ''' Public ReadOnly Property RoamingPokemon() As String Get Return Me._roamingPokemon @@ -195,7 +180,6 @@ ''' ''' Statistics data ''' - ''' Public ReadOnly Property Statistics() As String Get Return Me._statistics @@ -266,7 +250,6 @@ ''' ''' Indicates if the download finished. ''' - ''' Public ReadOnly Property DownloadFinished() As Boolean Get Return DownloadProgress() = TotalDownloadItems() @@ -276,7 +259,6 @@ ''' ''' Returns the amount of downloaded items. ''' - ''' Public ReadOnly Property DownloadProgress() As Integer Get Dim c As Integer = 0 @@ -295,7 +277,6 @@ ''' ''' The total files to download from the server. ''' - ''' Public ReadOnly Property TotalDownloadItems() As Integer Get Return SAVEFILECOUNT + EXTRADATADOWNLOADCOUNT @@ -305,7 +286,6 @@ ''' ''' If the download of this save failed at some point. ''' - ''' Public ReadOnly Property DownloadFailed() As Boolean Get Return Me._downloadFailed @@ -1036,4 +1016,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Network/Servers/Package.vb b/2.5DHero/2.5DHero/Network/Servers/Package.vb index 9d9892e33..afeb2108d 100644 --- a/2.5DHero/2.5DHero/Network/Servers/Package.vb +++ b/2.5DHero/2.5DHero/Network/Servers/Package.vb @@ -24,7 +24,6 @@ ''' ''' Not used anymore, use GameData instead. ''' - ''' PlayData = 1 PrivateMessage = 2 @@ -81,9 +80,6 @@ ''' ''' The PackageType of this Package. ''' - ''' - ''' - ''' Public ReadOnly Property PackageType() As PackageTypes Get Return CType(Me._packageType, PackageTypes) @@ -93,9 +89,6 @@ ''' ''' The Origin ID of this Package. ''' - ''' - ''' - ''' Public ReadOnly Property Origin() As Integer Get Return Me._origin @@ -105,9 +98,6 @@ ''' ''' The DataItems of this Package. ''' - ''' - ''' - ''' Public ReadOnly Property DataItems() As List(Of String) Get Return Me._dataItems @@ -117,9 +107,6 @@ ''' ''' Returns if the data used to create this Package was valid. ''' - ''' - ''' - ''' Public ReadOnly Property IsValid() As Boolean Get Return Me._isValid @@ -129,9 +116,6 @@ ''' ''' The protocol version of this package. ''' - ''' - ''' - ''' Public ReadOnly Property ProtocolVersion() As String Get Return Me._protocolVersion @@ -141,9 +125,6 @@ ''' ''' The protocol type (TCP or UDP) this package is using when sending data. ''' - ''' - ''' - ''' Public Property ProtocolType() As ProtocolTypes Get Return Me._protocolType @@ -161,7 +142,6 @@ ''' Creates a new instance of the Package class. ''' ''' The raw Package data as bytes. - ''' Public Sub New(ByVal ByteArray As Byte()) Me.New(System.Text.Encoding.ASCII.GetString(ByteArray)) End Sub @@ -170,7 +150,6 @@ ''' Creates a new instance of the Package class. ''' ''' The raw Package data. - ''' Public Sub New(ByVal FullData As String) Try If FullData.Contains("|") = False Then @@ -254,7 +233,6 @@ ''' The Origin computer ID of the new Package. ''' The ProtocolType this package is going to use. ''' An array of DataItems the Package contains. - ''' Public Sub New(ByVal PackageType As PackageTypes, ByVal Origin As Integer, ByVal ProtocolType As ProtocolTypes, ByVal DataItems As List(Of String)) Me._protocolVersion = ServersManager.PROTOCOLVERSION Me._packageType = PackageType @@ -269,7 +247,6 @@ ''' The PackageType of the new Package. ''' The Origin computer ID of the new Package. ''' The ProtocolType this package is going to use. - ''' Public Sub New(ByVal PackageType As PackageTypes, ByVal Origin As Integer, ByVal ProtocolType As ProtocolTypes) Me._protocolVersion = ServersManager.PROTOCOLVERSION Me._packageType = PackageType @@ -282,7 +259,6 @@ ''' ''' The PackageType of the new Package. ''' The ProtocolType this package is going to use. - ''' Public Sub New(ByVal PackageType As PackageTypes, ByVal ProtocolType As ProtocolTypes) Me._protocolVersion = ServersManager.PROTOCOLVERSION Me._packageType = PackageType @@ -297,7 +273,6 @@ ''' The Origin computer ID of the new Package. ''' The ProtocolType this package is going to use. ''' The single Data Item to create the package with. - ''' Public Sub New(ByVal Packagetype As PackageTypes, ByVal Origin As Integer, ByVal ProtocolType As ProtocolTypes, ByVal DataItem As String) Me.New(Packagetype, Origin, ProtocolType, {DataItem}.ToList()) End Sub @@ -309,8 +284,6 @@ ''' ''' Returns the raw Package data from the members of this instance. ''' - ''' - ''' Public Overrides Function ToString() As String Dim outputStr As String = Me._protocolVersion & "|" & CInt(Me._packageType).ToString() & "|" & Me._origin.ToString() & "|" & Me._dataItems.Count @@ -330,7 +303,6 @@ ''' ''' Gives this package to the PackageHandler. ''' - ''' Public Sub Handle() PackageHandler.HandlePackage(Me) End Sub @@ -338,8 +310,6 @@ ''' ''' Returns a byte array of the data of this package. ''' - ''' - ''' Public Function GetByteArray() As Byte() Return System.Text.Encoding.ASCII.GetBytes(Me.ToString()) End Function diff --git a/2.5DHero/2.5DHero/Network/Servers/PlayerCollection.vb b/2.5DHero/2.5DHero/Network/Servers/PlayerCollection.vb index d81935259..f767d9bc9 100644 --- a/2.5DHero/2.5DHero/Network/Servers/PlayerCollection.vb +++ b/2.5DHero/2.5DHero/Network/Servers/PlayerCollection.vb @@ -1,18 +1,15 @@ -Namespace Servers +Namespace Servers ''' ''' Contains all connected players. ''' - ''' Inherits from List(of ) Public Class PlayerCollection - Inherits System.Collections.Generic.List(Of Player) + Inherits List(Of Player) ''' ''' Removes all players from the collection that have the specified name. ''' - ''' - ''' Public Sub RemoveByName(ByVal Name As String) For i = 0 To Me.Count - 1 If i <= Me.Count - 1 Then @@ -127,4 +124,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Network/Servers/PlayerManager.vb b/2.5DHero/2.5DHero/Network/Servers/PlayerManager.vb index 25497fa59..ac427af89 100644 --- a/2.5DHero/2.5DHero/Network/Servers/PlayerManager.vb +++ b/2.5DHero/2.5DHero/Network/Servers/PlayerManager.vb @@ -5,7 +5,6 @@ Namespace Servers ''' ''' Manages all local player related operations. ''' - ''' Public Class PlayerManager Private _receivedWorldData As Boolean = False 'If this client received the server's world data. diff --git a/2.5DHero/2.5DHero/Network/Servers/ServerConnection.vb b/2.5DHero/2.5DHero/Network/Servers/ServerConnection.vb index fd7f03b91..53ca6eec3 100644 --- a/2.5DHero/2.5DHero/Network/Servers/ServerConnection.vb +++ b/2.5DHero/2.5DHero/Network/Servers/ServerConnection.vb @@ -7,7 +7,6 @@ Namespace Servers ''' ''' Manages all Servers connection related operations. ''' - ''' Public Class ServerConnection Private _client As TcpClient @@ -23,9 +22,6 @@ Namespace Servers ''' ''' Returns the current connection status. ''' - ''' - ''' - ''' Public ReadOnly Property Connected() As Boolean Get If _client Is Nothing Then @@ -39,7 +35,6 @@ Namespace Servers ''' Connects to a server. ''' ''' The server to connect to. - ''' Public Sub Connect(ByVal Server As Server) Dim t As New Threading.Thread(AddressOf InternalConnect) t.IsBackground = True @@ -95,7 +90,6 @@ Namespace Servers ''' ''' Aborts the threads and closes any open streams. ''' - ''' Public Sub Abort() Logger.Debug("ServerConnection.vb: Aborting threads and streams...") Me._ConnectionOpen = False @@ -130,7 +124,6 @@ Namespace Servers ''' ''' Disconnects the player from the server and opens the main menu. ''' - ''' Public Sub Disconnect() Me.Disconnect("", "") End Sub @@ -140,7 +133,6 @@ Namespace Servers ''' ''' The header to display on the ConnectScreen. ''' The Message to display on the ConnectScreen. - ''' Public Sub Disconnect(ByVal Header As String, ByVal Message As String) If Me._ConnectionOpen = True Then Logger.Debug("Disconnect; Header: " & Header & "; Message: " & Message) @@ -161,7 +153,6 @@ Namespace Servers ''' ''' Start the ping thread. ''' - ''' Public Sub StartPing() Me.StopPing() Me.LastPingTime = Date.Now @@ -178,7 +169,6 @@ Namespace Servers ''' ''' Stopping the ping thread. ''' - ''' Public Sub StopPing() Try Me.PingTimer.Stop() @@ -188,7 +178,6 @@ Namespace Servers ''' ''' Sends a ping package to the connected server. ''' - ''' Private Sub InternalPing() Try If DateDiff(DateInterval.Second, Me.LastPingTime, Date.Now) >= 10 Then @@ -236,8 +225,6 @@ Namespace Servers ''' ''' Send a package object to the server. ''' - ''' - ''' Public Sub SendPackage(ByVal Package As Package) If _ConnectionOpen = True And Me._client.Connected = True Then Threading.ThreadPool.QueueUserWorkItem(New Threading.WaitCallback(AddressOf InternalSendPackage), Package) @@ -270,7 +257,6 @@ Namespace Servers ''' ''' Start the listen thread that receives packages from the server. ''' - ''' Private Sub StartListen() If Not Me._receiveThread Is Nothing AndAlso Me._receiveThread.IsAlive = True Then Try @@ -285,7 +271,6 @@ Namespace Servers ''' ''' Listen to the server (TCP). ''' - ''' Private Sub InternalListen() While Me._client.Connected Try @@ -311,7 +296,6 @@ Namespace Servers ''' ''' Stops listening to the TCP and UDP ports. ''' - ''' Private Sub StopListen() Try If Not Me._receiveThread Is Nothing Then diff --git a/2.5DHero/2.5DHero/Network/Servers/ServersManager.vb b/2.5DHero/2.5DHero/Network/Servers/ServersManager.vb index 919a1bd72..e4a84f788 100644 --- a/2.5DHero/2.5DHero/Network/Servers/ServersManager.vb +++ b/2.5DHero/2.5DHero/Network/Servers/ServersManager.vb @@ -74,7 +74,6 @@ Namespace Servers ''' ''' Updates the ServersManager and sends the player data package if needed. ''' - ''' Public Sub Update() If JoinServerScreen.Online = True And ConnectScreen.Connected = True Then If Me._PlayerManager.HasNewPlayerData() = True Then diff --git a/2.5DHero/2.5DHero/Network/UrlEncoder.vb b/2.5DHero/2.5DHero/Network/UrlEncoder.vb index f878b804a..6e7a9f009 100644 --- a/2.5DHero/2.5DHero/Network/UrlEncoder.vb +++ b/2.5DHero/2.5DHero/Network/UrlEncoder.vb @@ -1,4 +1,4 @@ -Imports System.Text +Imports System.Text ''' ''' Because the 4.0 client .net Framework does not contain the System.Web assembly, we need to implement the only function we @@ -11,7 +11,6 @@ Public Class UrlEncoder ''' Returns the URL encoded string of an URL that properly escapes special characters. ''' ''' The string to encode. - ''' Public Shared Function Encode(ByVal str As String) As String If str Is Nothing Then Return Nothing @@ -104,4 +103,4 @@ Public Class UrlEncoder ' ^ The array of safe characters, apart from alphanumeric. End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Overworld/OverworldCamera.vb b/2.5DHero/2.5DHero/Overworld/OverworldCamera.vb index 7e4415211..33d7fead1 100644 --- a/2.5DHero/2.5DHero/Overworld/OverworldCamera.vb +++ b/2.5DHero/2.5DHero/Overworld/OverworldCamera.vb @@ -1,4 +1,4 @@ -Public Class OverworldCamera +Public Class OverworldCamera Inherits Camera @@ -36,7 +36,6 @@ ''' ''' Usually true, but if the player walks against an entitity that forces him to move up, set this to false so that the visual/audio feedback of walking against something don't appear. ''' - ''' Public Property DidWalkAgainst() As Boolean Get Return _didWalkAgainst @@ -132,7 +131,6 @@ ''' ''' If the camera is pointing straight north, east, south or west. ''' - ''' Public Function IsPointingToNormalDirection() As Boolean Return (Yaw = 0F Or Yaw = MathHelper.Pi * 0.5F Or Yaw = MathHelper.Pi Or Yaw = MathHelper.Pi * 1.5F) End Function @@ -1007,4 +1005,4 @@ #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb b/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb index 15497b935..7a987b064 100644 --- a/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb +++ b/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb @@ -1,7 +1,6 @@ ''' ''' The screen to display the default Overworld gameplay. ''' -''' Inherits Screen. Public Class OverworldScreen Inherits Screen @@ -19,7 +18,6 @@ Public Class OverworldScreen ''' ''' The delay until the XBOX buttons get shown since the player last pressed a button. ''' - ''' Private ShowControlsDelay As Single = 4.0F #End Region @@ -29,9 +27,6 @@ Public Class OverworldScreen ''' ''' Array of Title objects to be rendered on the screen. ''' - ''' - ''' - ''' Public ReadOnly Property Titles() As List(Of Title) Get Return Me._titles @@ -41,9 +36,6 @@ Public Class OverworldScreen ''' ''' The ActionScript instance that controls the scripts. ''' - ''' - ''' - ''' Public ReadOnly Property ActionScript() As ActionScript Get Return Me._actionScript @@ -53,9 +45,6 @@ Public Class OverworldScreen ''' ''' Checks if the player encountered a trainer. ''' - ''' - ''' - ''' Public Property TrainerEncountered() As Boolean Get Return Me._trainerEncountered @@ -68,9 +57,6 @@ Public Class OverworldScreen ''' ''' Fade progress value for the black screen fade. ''' - ''' - ''' - ''' Public Shared Property FadeValue() As Integer Get Return _fadeValue @@ -83,8 +69,6 @@ Public Class OverworldScreen ''' ''' The Fishing Rod that should be rendered on the screen. ''' - ''' - ''' ''' -1 = No Rod, 0 = Old Rod, 1 = Good Rod, 2 = Super Rod Public Shared Property DrawRodID() As Integer Get @@ -100,7 +84,6 @@ Public Class OverworldScreen ''' ''' Returns information about the Overworld Screen. ''' - ''' ''' Implements the GetScreenStatus method. Public Overrides Function GetScreenStatus() As String Dim s As String = "IsSurfing=" & Level.Surfing.ToString() & vbNewLine & @@ -115,7 +98,6 @@ Public Class OverworldScreen ''' ''' Creates a new instance of the OverworldScreen. ''' - ''' Public Sub New() 'Set default information: Me.Identification = Identifications.OverworldScreen @@ -158,7 +140,6 @@ Public Class OverworldScreen ''' ''' Updates the OverworldScreen. ''' - ''' Public Overrides Sub Update() 'If the MapScript has a value loaded from the MapScript map tag and there is no script running, start that script: If LevelLoader.MapScript <> "" And ActionScript.IsReady = True Then @@ -275,7 +256,6 @@ Public Class OverworldScreen ''' ''' Updates the delay of the XBOX button render. ''' - ''' Private Sub UpdateShowControlDelay() If Me.ShowControlsDelay > 0.0F Then 'If any Gamepad is connected, countdown the delay. @@ -296,7 +276,6 @@ Public Class OverworldScreen ''' Handles PVP and Trade requests incoming from other players via Servers and prompts the accept screens. ''' ''' True, if no requests are in the queue, False otherwise. - ''' Private Function HandleServerRequests() As Boolean If GameJolt.PokegearScreen.BattleRequestData <> -1 Then 'A Servers ID from another player is set here. If Core.ServersManager.PlayerCollection.HasPlayer(GameJolt.PokegearScreen.BattleRequestData) = True Then 'If the player still exists on the server. @@ -423,7 +402,6 @@ Public Class OverworldScreen ''' ''' Update all title objects in the _titles array. ''' - ''' Private Sub UpdateTitles() For Each t As Title In Me._titles t.Update() @@ -437,7 +415,6 @@ Public Class OverworldScreen ''' ''' A class to display text on the OverworldScreen. ''' - ''' Public Class Title Private _text As String = "Sample Text" @@ -450,8 +427,6 @@ Public Class OverworldScreen ''' ''' The text to be displayed on the screen. ''' - ''' - ''' ''' The default is "Sample Text". Public Property Text() As String Get @@ -465,8 +440,6 @@ Public Class OverworldScreen ''' ''' The color of the text on the screen. ''' - ''' - ''' ''' The default is White (255,255,255). No transparency is suppoorted. Public Property TextColor() As Color Get @@ -480,8 +453,6 @@ Public Class OverworldScreen ''' ''' The scale of the text. ''' - ''' - ''' ''' The default is x10. Public Property Scale() As Single Get @@ -495,8 +466,6 @@ Public Class OverworldScreen ''' ''' The position of the text on the screen. ''' - ''' - ''' ''' The default is 0,0 - This position gets ignored when IsCentered is set to True. Public Property Position() As Vector2 Get @@ -510,8 +479,6 @@ Public Class OverworldScreen ''' ''' This determines if the text is always centered on the screen. ''' - ''' - ''' ''' The default is True. If this is set to True, the Position Property is getting ignored. Public Property IsCentered() As Boolean Get @@ -525,8 +492,6 @@ Public Class OverworldScreen ''' ''' The delay in ticksx10 until the text fades from the screen. ''' - ''' - ''' ''' The default is 20. Public Property Delay() As Single Get @@ -540,7 +505,6 @@ Public Class OverworldScreen ''' ''' Creates a new instance of the Title class and assigns the default values to all properties. ''' - ''' Public Sub New() '//Empty constructor. End Sub @@ -554,7 +518,6 @@ Public Class OverworldScreen ''' The scale of the text. ''' The position of the text on the screen. ''' If the text should always get centered on the screen. - ''' Public Sub New(ByVal Text As String, ByVal Delay As Single, ByVal TextColor As Color, ByVal Scale As Single, ByVal Position As Vector2, ByVal IsCentered As Boolean) Me._text = Text Me._delay = Delay @@ -567,7 +530,6 @@ Public Class OverworldScreen ''' ''' Renders the text on the screen. ''' - ''' Public Sub Draw() Dim p As Vector2 = Vector2.Zero @@ -590,7 +552,6 @@ Public Class OverworldScreen ''' ''' Updates the Title object. ''' - ''' Public Sub Update() If Me._delay > 0.0F Then Me._delay -= 0.1F @@ -603,9 +564,6 @@ Public Class OverworldScreen ''' ''' Returns, if the title object faded from the screen. ''' - ''' - ''' - ''' Public ReadOnly Property IsReady() As Boolean Get Return Me._delay = 0.0F diff --git a/2.5DHero/2.5DHero/Overworld/OverworldStorage.vb b/2.5DHero/2.5DHero/Overworld/OverworldStorage.vb index e8aabd535..48ccd03fc 100644 --- a/2.5DHero/2.5DHero/Overworld/OverworldStorage.vb +++ b/2.5DHero/2.5DHero/Overworld/OverworldStorage.vb @@ -1,7 +1,6 @@ -''' +''' ''' Provides variables to store an overworld instance. ''' -''' Public Class OverworldStorage Public OverworldScreen As Screen @@ -13,7 +12,6 @@ Public Class OverworldStorage ''' ''' Uses the currently active Overworld screen and active level/camera/effect/skydome instances. ''' - ''' Public Sub SetToCurrentEnvironment() Dim s As Screen = Core.CurrentScreen While s.Identification <> Screen.Identifications.OverworldScreen And Not s.PreScreen Is Nothing @@ -26,4 +24,4 @@ Public Class OverworldStorage Me.SkyDome = Screen.SkyDome End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Overworld/RouteSign.vb b/2.5DHero/2.5DHero/Overworld/RouteSign.vb index 2c2a92a98..ee3dc1c17 100644 --- a/2.5DHero/2.5DHero/Overworld/RouteSign.vb +++ b/2.5DHero/2.5DHero/Overworld/RouteSign.vb @@ -1,7 +1,6 @@ ''' ''' The sign displaying the current location in the world. ''' -''' Public Class RouteSign Private _positionY As Single = -60 @@ -12,8 +11,6 @@ Public Class RouteSign ''' ''' Sets the values of the RouteSign and displays it on the screen. ''' - ''' - ''' Public Sub Setup(ByVal newText As String) 'Only if the text is different from last time the RouteSign showed up, display the RouteSign. If newText.ToLower() <> Me._text.ToLower() Then @@ -26,7 +23,6 @@ Public Class RouteSign ''' ''' Hides the RouteSign. ''' - ''' Public Sub Hide() Me._show = False End Sub @@ -34,7 +30,6 @@ Public Class RouteSign ''' ''' Update the RouteSign. ''' - ''' Public Sub Update() If Me._delay > 0.0F Then If Me._positionY < 5.0F Then @@ -57,7 +52,6 @@ Public Class RouteSign ''' ''' Renders the RouteSign. ''' - ''' Public Sub Draw() If Me._show = True Then Dim placeString As String = Localization.GetString("Places_" & Me._text, Me._text) diff --git a/2.5DHero/2.5DHero/Player/PlayerInventory.vb b/2.5DHero/2.5DHero/Player/PlayerInventory.vb index f51f81b2f..a697062dd 100644 --- a/2.5DHero/2.5DHero/Player/PlayerInventory.vb +++ b/2.5DHero/2.5DHero/Player/PlayerInventory.vb @@ -1,7 +1,6 @@ ''' ''' Represents the player's inventory. ''' -''' Public Class PlayerInventory Inherits List(Of ItemContainer) @@ -42,9 +41,6 @@ Public Class PlayerInventory ''' ''' Returns a character that represents the item's pocket icon. ''' - ''' - ''' - ''' Public Function GetItemPocketChar(ByVal Item As Item) As String Select Case Item.ItemType Case Item.ItemTypes.Standard @@ -73,7 +69,6 @@ Public Class PlayerInventory ''' ''' The ID of the item. ''' Amount of items to add. - ''' Public Sub AddItem(ByVal ID As Integer, ByVal Amount As Integer) Dim newItem As Item = net.Pokemon3D.Game.Item.GetItemByID(ID) @@ -92,7 +87,6 @@ Public Class PlayerInventory ''' ''' The ID of the item to remove. ''' The amount of items to remove. - ''' Public Sub RemoveItem(ByVal ID As Integer, ByVal Amount As Integer) If Amount > 0 Then For Each c As ItemContainer In Me @@ -112,7 +106,6 @@ Public Class PlayerInventory ''' Removes all items of an ID from the inventory. ''' ''' The ID of the item. - ''' Public Sub RemoveItem(ByVal ID As Integer) Dim Amount As Integer = Me.GetItemAmount(ID) If Amount > 0 Then @@ -124,8 +117,6 @@ Public Class PlayerInventory ''' Returns the count of the item in the inventory. ''' ''' The ID of the item to be counted. - ''' - ''' Public Function GetItemAmount(ByVal ID As Integer) As Integer For Each c As ItemContainer In Me If c.ItemID = ID Then @@ -139,9 +130,6 @@ Public Class PlayerInventory ''' ''' If the player has the Running Shoes in their inventory. ''' - ''' - ''' - ''' Public ReadOnly Property HasRunningShoes() As Boolean Get If Core.Player.SandBoxMode = True Or GameController.IS_DEBUG_ACTIVE = True Then @@ -161,8 +149,6 @@ Public Class PlayerInventory ''' ''' The Item to store in the inventory. ''' The amount. - ''' - ''' Public Function GetMessageReceive(ByVal Item As Item, ByVal Amount As Integer) As String Dim Message As String = "" If Amount = 1 Then diff --git a/2.5DHero/2.5DHero/Player/SaveGameHelpers.vb b/2.5DHero/2.5DHero/Player/SaveGameHelpers.vb index 0b8a3f2fb..468b87209 100644 --- a/2.5DHero/2.5DHero/Player/SaveGameHelpers.vb +++ b/2.5DHero/2.5DHero/Player/SaveGameHelpers.vb @@ -1,4 +1,4 @@ -''' +''' ''' A class that helps with saving the game. ''' Public Class SaveGameHelpers @@ -12,7 +12,6 @@ Public Class SaveGameHelpers ''' ''' If the game encountered any errors while uploading data. ''' - ''' Public Shared ReadOnly Property EncounteredErrors() As Boolean Get Return _failedSaveParts > 0 @@ -22,7 +21,6 @@ Public Class SaveGameHelpers ''' ''' If the download check has already started. ''' - ''' Public Shared ReadOnly Property StartedDownloadCheck() As Boolean Get Return _startedDownloadCheck @@ -32,7 +30,6 @@ Public Class SaveGameHelpers ''' ''' Increments the value that counts the upload parts and starts the download check if the upload is finished. ''' - ''' Public Shared Sub AddGameJoltSaveCounter(ByVal result As String) _savingProgress += 1 @@ -51,7 +48,6 @@ Public Class SaveGameHelpers ''' ''' Increments the counter once the data files have been uploaded and starts the download check if the upload is finished. ''' - ''' Public Shared Sub CompleteGameJoltSave(ByVal result As String) _savingProgress += GameJolt.GamejoltSave.SAVEFILECOUNT @@ -70,7 +66,6 @@ Public Class SaveGameHelpers ''' ''' If saving the GameJolt save to the GameJolt server is finished (with checks). ''' - ''' Public Shared ReadOnly Property GameJoltSaveDone() As Boolean Get If _tempGJSave Is Nothing Then @@ -147,7 +142,6 @@ Public Class SaveGameHelpers ''' This makes "PlayTime" the only part of the entire save that could get corrupted and passed on undetected (I believe this is impossible to even happen). ''' ''' The player data. - ''' Private Shared Function GetTimeFixedPlayerData(ByVal input As String) As String Dim inputArr As String() = input.Split({vbNewLine}, StringSplitOptions.None) Dim output As String = "" @@ -166,4 +160,4 @@ Public Class SaveGameHelpers Return output End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb index ebfdb08e5..d7f0c5694 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb @@ -3,7 +3,6 @@ ''' ''' Represents a Pokémon's move. ''' - ''' Public Class Attack Implements ICopyAble @@ -29,7 +28,6 @@ ''' ''' The target for an attack. ''' - ''' Public Enum Targets OneAdjacentTarget 'One adjacent target, excluding itself. OneAdjacentFoe 'One adjacent foe. @@ -242,8 +240,6 @@ ''' Returns a new instance of AttackV2 based on the input ID. ''' ''' The ID of the Move to return. - ''' - ''' Public Shared Function GetAttackByID(ByVal ID As Integer) As Attack Dim returnMove As Attack @@ -1535,7 +1531,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub PreAttack(ByVal Own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING HERE End Sub @@ -1545,7 +1540,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function MoveFailBeforeAttack(ByVal Own As Boolean, ByVal BattleScreen As BattleScreen) As Boolean 'DO NOTHING HERE Return False @@ -1556,7 +1550,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function GetBasePower(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Integer Return Me.Power End Function @@ -1566,7 +1559,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function GetDamage(ByVal Critical As Boolean, ByVal Own As Boolean, ByVal targetPokemon As Boolean, ByVal BattleScreen As BattleScreen) As Integer Return BattleCalculation.CalculateDamage(Me, Critical, Own, targetPokemon, BattleScreen) End Function @@ -1576,7 +1568,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function GetTimesToAttack(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Integer Return Me.TimesToAttack End Function @@ -1586,7 +1577,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub MoveHits(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) If Me.IsGameModeMove = True Then AttackSpecialFunctions.ExecuteAttackFunction(Me, own, BattleScreen) @@ -1604,7 +1594,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub MoveMisses(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING HERE End Sub @@ -1614,7 +1603,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub MoveProtectedDetected(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING HERE End Sub @@ -1624,7 +1612,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub MoveHasNoEffect(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING HERE End Sub @@ -1634,7 +1621,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function GetAttackType(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Element Dim p As Pokemon = BattleScreen.OwnPokemon If own = False Then @@ -1665,7 +1651,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function GetAccuracy(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Integer Return Me.Accuracy End Function @@ -1675,7 +1660,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function DeductPP(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Boolean Return True End Function @@ -1685,7 +1669,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Function GetUseAccEvasion(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Boolean Return Me.UseAccEvasion End Function @@ -1695,7 +1678,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub MoveSelected(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING End Sub @@ -1705,7 +1687,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub BeforeDealingDamage(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING End Sub @@ -1715,7 +1696,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub AbsorbedBySubstitute(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING End Sub @@ -1725,7 +1705,6 @@ ''' ''' If the own Pokémon used the move. ''' Reference to the BattleScreen. - ''' Public Overridable Sub MoveFailsSoundproof(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) 'DO NOTHING End Sub @@ -1734,7 +1713,6 @@ ''' Returns the attack stat of a Pokémon (Physical or Special). ''' ''' The Pokémon that used the move. - ''' Public Overridable Function GetUseAttackStat(ByVal p As Pokemon) As Integer If Me.Category = Categories.Physical Then Return p.Attack @@ -1747,7 +1725,6 @@ ''' Returns the defense stat of a Pokémon (Physical or Special). ''' ''' The Pokémon that used the move. - ''' Public Overridable Function GetUseDefenseStat(ByVal p As Pokemon) As Integer If Me.Category = Categories.Physical Then Return p.Defense @@ -1760,7 +1737,6 @@ ''' If the AI is allowed to use this move. ''' ''' Reference to the BattleScreen. - ''' Public Function AIUseMove(ByVal BattleScreen As BattleScreen) As Boolean Return True End Function @@ -1792,8 +1768,6 @@ ''' ''' Returns a copy of this move. ''' - ''' - ''' Public Function Copy() As Object Implements ICopyAble.Copy Dim m As Attack @@ -1816,8 +1790,6 @@ ''' Builds an instance of AttackV2 with PP and MaxPP set. ''' ''' Data in the format "ID,MaxPP,CurrentPP" - ''' - ''' Public Shared Function ConvertStringToAttack(ByVal InputData As String) As Attack If InputData <> "" Then Dim Data() As String = InputData.Split(CChar(",")) @@ -1837,8 +1809,6 @@ ''' ''' Raises the PP of the move by one stage. ''' - ''' - ''' Public Function RaisePP() As Boolean Select Case Me.OriginalPP Case 5 @@ -1907,8 +1877,6 @@ ''' ''' Returns the texture representing the category of this move. ''' - ''' - ''' Public Function GetDamageCategoryImage() As Texture2D Dim r As New Rectangle(0, 0, 0, 0) @@ -1927,8 +1895,6 @@ ''' ''' Returns a saveable string. ''' - ''' - ''' Public Overrides Function ToString() As String Return Me.OriginalID.ToString() & "," & Me.MaxPP.ToString() & "," & Me.CurrentPP.ToString() End Function diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/AttackSpecialFunctions.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/AttackSpecialFunctions.vb index 5000bbff6..69a474fce 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/AttackSpecialFunctions.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/AttackSpecialFunctions.vb @@ -3,7 +3,6 @@ ''' ''' A class to execute GameMode attack functions. ''' - ''' Public Class AttackSpecialFunctions ''' @@ -12,7 +11,6 @@ ''' The move containing the attack function. ''' Own toggle. ''' Reference to the BattleScreen. - ''' Public Shared Sub ExecuteAttackFunction(ByVal Move As Attack, ByVal own As Boolean, ByVal BattleScreen As BattleScreen) Dim functions() As String = Move.GameModeFunction.Split(CChar(",")) diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/GameModeAttackLoader.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/GameModeAttackLoader.vb index f77525e4e..1cdb95b73 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/GameModeAttackLoader.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/GameModeAttackLoader.vb @@ -3,7 +3,6 @@ ''' ''' Provides an interface to load additional GameMode moves. ''' - ''' Public Class GameModeAttackLoader 'The default relative path to load moves from (Content folder). @@ -34,7 +33,6 @@ ''' Loads a move from a file. ''' ''' The file to load the move from. - ''' Private Shared Sub LoadMove(ByVal file As String) Dim move As New Attack() 'Load the default Pound move. move.IsGameModeMove = True @@ -201,7 +199,6 @@ ''' ''' The ID of the custom move. ''' Returns a move or nothing. - ''' Public Shared Function GetAttackByID(ByVal ID As Integer) As Attack For Each m As Attack In LoadedMoves If m.ID = ID Then diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb b/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb index 1df5dd5dd..b56b7fba2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Berry.vb @@ -89,8 +89,6 @@ ''' Returns if a Pokémon likes this berry based on its flavour. ''' ''' The Pokémon to test this berry for. - ''' - ''' Public Function PokemonLikes(ByVal p As Pokemon) As Boolean Select Case p.Nature Case Pokemon.Natures.Lonely diff --git a/2.5DHero/2.5DHero/Pokemon/Items/FileItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/FileItem.vb index 7cc314b01..5342f9bdc 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/FileItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/FileItem.vb @@ -3,7 +3,6 @@ ''' ''' This class enables content creators to create own items with own images, functions and stats. ''' - ''' Public Class FileItem Inherits Item @@ -14,9 +13,6 @@ ''' ''' Returns the item of the FileItem class. ''' - ''' - ''' - ''' Public ReadOnly Property Item() As Item Get Return Me @@ -26,9 +22,6 @@ ''' ''' Returns if the FileItem is generated in a valid state. ''' - ''' - ''' - ''' Public ReadOnly Property IsValid() As Boolean Get Return Me._isValid @@ -38,9 +31,6 @@ ''' ''' This is the script binding that represents the script that gets executed once the item gets used. ''' - ''' - ''' - ''' Public Property ScriptBinding() As String Get Return Me._scriptBinding @@ -53,7 +43,6 @@ ''' ''' Iniztializes a new FileItem class. ''' - ''' Public Sub New(ByVal data As String) data = data.Remove(0, 1) data = data.Remove(data.Length - 1, 1) diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Item.vb b/2.5DHero/2.5DHero/Pokemon/Items/Item.vb index 3e759d3cf..84b22d4ca 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Item.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Item.vb @@ -1,7 +1,6 @@ -''' +''' ''' An item the player stores in their inventory. ''' -''' Public Class Item ''Implement the interface to allow the copy of an item instance. @@ -10,47 +9,38 @@ Public Class Item ''' ''' The type of item. This is also the bag they get sorted into. ''' - ''' Public Enum ItemTypes ''' ''' The default item category for misc. items. ''' - ''' Standard ''' ''' Medicine items that restore Pokémon. ''' - ''' Medicine ''' ''' Plants, like berries and apricorns. ''' - ''' Plants ''' ''' All Poké Balls. ''' - ''' Pokéballs ''' ''' TMs and HMs. ''' - ''' Machines ''' ''' Keyitems of the game. ''' - ''' KeyItems ''' ''' Mail items. ''' - ''' Mail ''' ''' Items to be used in battle. ''' - ''' BattleItems End Enum @@ -94,9 +84,6 @@ Public Class Item ''' ''' The singular item name. ''' - ''' - ''' - ''' Public ReadOnly Property Name() As String Get Return Me._name @@ -106,9 +93,6 @@ Public Class Item ''' ''' The ID of the item. ''' - ''' - ''' - ''' Public ReadOnly Property ID() As Integer Get Return Me._id @@ -118,9 +102,6 @@ Public Class Item ''' ''' The plural name of the item. ''' - ''' - ''' - ''' Public ReadOnly Property PluralName() As String Get Return Me._pluralName @@ -130,9 +111,6 @@ Public Class Item ''' ''' The price of this item if the player purchases it in exchange for PokéDollars. This halves when selling an item to the store. ''' - ''' - ''' - ''' Public ReadOnly Property PokéDollarPrice() As Integer Get Return Me._pokeDollarPrice @@ -142,9 +120,6 @@ Public Class Item ''' ''' The price of this item if the player purchases it exchange for BattlePoints. ''' - ''' - ''' - ''' Public ReadOnly Property BattlePointsPrice() As Integer Get Return Me._battlePointsPrice @@ -154,9 +129,6 @@ Public Class Item ''' ''' The type of this item. This also controls in which bag this item gets sorted. ''' - ''' - ''' - ''' Public ReadOnly Property ItemType() As ItemTypes Get Return Me._itemType @@ -166,9 +138,6 @@ Public Class Item ''' ''' The default catch multiplier if the item gets used as a Pokéball. ''' - ''' - ''' - ''' Public ReadOnly Property CatchMultiplier() As Single Get Return Me._catchMultiplier @@ -178,9 +147,6 @@ Public Class Item ''' ''' The maximum amount of this item type (per ID) that can be stored in the bag. ''' - ''' - ''' - ''' Public ReadOnly Property MaxStack() As Integer Get Return Me._maxStack @@ -190,9 +156,6 @@ Public Class Item ''' ''' A value that can be used to sort items in the bag after. Lower values make items appear closer to the top. ''' - ''' - ''' - ''' Public ReadOnly Property SortValue() As Integer Get Return Me._sortValue @@ -202,9 +165,6 @@ Public Class Item ''' ''' The texture of this item. ''' - ''' - ''' - ''' Public ReadOnly Property Texture() As Texture2D Get Return Me._texture @@ -214,9 +174,6 @@ Public Class Item ''' ''' The bag description of this item. ''' - ''' - ''' - ''' Public ReadOnly Property Description() As String Get Return Me._description @@ -226,9 +183,6 @@ Public Class Item ''' ''' The additional data that is stored with this item. ''' - ''' - ''' - ''' Public Property AdditionalData() As String Get Return Me._additionalData @@ -241,9 +195,6 @@ Public Class Item ''' ''' The damage the Fling move does when this item is attached to a Pokémon. ''' - ''' - ''' - ''' Public ReadOnly Property FlingDamage() As Integer Get Return Me._flingDamage @@ -253,9 +204,6 @@ Public Class Item ''' ''' If this item can be traded in for money. ''' - ''' - ''' - ''' Public ReadOnly Property CanBeTraded() As Boolean Get Return Me._canBeTraded @@ -265,9 +213,6 @@ Public Class Item ''' ''' If this item can be given to a Pokémon. ''' - ''' - ''' - ''' Public ReadOnly Property CanBeHold() As Boolean Get Return Me._canBeHold @@ -277,9 +222,6 @@ Public Class Item ''' ''' If this item can be used from the bag. ''' - ''' - ''' - ''' Public ReadOnly Property CanBeUsed() As Boolean Get Return Me._canBeUsed @@ -289,9 +231,6 @@ Public Class Item ''' ''' If this item can be used in battle. ''' - ''' - ''' - ''' Public ReadOnly Property CanBeUsedInBattle() As Boolean Get Return Me._canBeUsedInBattle @@ -301,9 +240,6 @@ Public Class Item ''' ''' If this item can be tossed in the bag. ''' - ''' - ''' - ''' Public ReadOnly Property CanBeTossed() As Boolean Get Return Me._canBeTossed @@ -313,9 +249,6 @@ Public Class Item ''' ''' If this item requires the player to select a Pokémon to use the item on in battle. ''' - ''' - ''' - ''' Public ReadOnly Property BattleSelectPokemon() As Boolean Get Return Me._requiresPokemonSelectInBattle @@ -325,9 +258,6 @@ Public Class Item ''' ''' If this item is a Pokéball item. ''' - ''' - ''' - ''' Public ReadOnly Property IsBall() As Boolean Get Return Me._isBall @@ -337,9 +267,6 @@ Public Class Item ''' ''' If this item is a Berry item. ''' - ''' - ''' - ''' Public ReadOnly Property IsBerry() As Boolean Get Return Me._isBerry @@ -349,9 +276,6 @@ Public Class Item ''' ''' If this item is a Healing item. ''' - ''' - ''' - ''' Public ReadOnly Property IsHealingItem() As Boolean Get Return Me._isHealingItem @@ -361,9 +285,6 @@ Public Class Item ''' ''' If this item is a Mail item. ''' - ''' - ''' - ''' Public ReadOnly Property IsMail() As Boolean Get Return Me._isMail @@ -373,9 +294,6 @@ Public Class Item ''' ''' If this item is a Mega Stone. ''' - ''' - ''' - ''' Public ReadOnly Property IsMegaStone() As Boolean Get Return Me._isMegaStone @@ -385,9 +303,6 @@ Public Class Item ''' ''' If this item is a Plate. ''' - ''' - ''' - ''' Public ReadOnly Property IsPlate() As Boolean Get Return Me._isPlate @@ -397,7 +312,6 @@ Public Class Item ''' ''' The color for player dialogues. ''' - ''' Public Shared ReadOnly Property PlayerDialogueColor() As Color Get Return New Color(0, 128, 227) @@ -417,7 +331,6 @@ Public Class Item ''' The SortValue of this Item. ''' The TextureRectangle from the "Items\ItemSheet" texture. ''' The description of this Item. - ''' Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) Me.Initialize(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) End Sub @@ -425,7 +338,6 @@ Public Class Item ''' ''' Creates a new instance of the Item class without setting any properties. ''' - ''' Public Sub New() 'Empty Constructor// End Sub @@ -441,7 +353,6 @@ Public Class Item ''' The SortValue of this Item. ''' The TextureRectangle from the "Items\ItemSheet" texture. ''' The description of this Item. - ''' Protected Sub Initialize(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) Me._name = Name Me._pluralName = Name & "s" 'Default plural name with "s" at the end. @@ -463,7 +374,6 @@ Public Class Item ''' ''' The item gets used from the bag. ''' - ''' Public Overridable Sub Use() Logger.Debug("PLACEHOLDER FOR ITEM USE") End Sub @@ -472,8 +382,6 @@ Public Class Item ''' A method that gets used when the item is applied to a Pokémon. Returns True if the action was successful. ''' ''' The Index of the Pokémon in party. - ''' - ''' Public Overridable Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean If PokeIndex < 0 Or PokeIndex > 5 Then Throw New ArgumentOutOfRangeException("PokeIndex", PokeIndex, "The index for a Pokémon in a player's party can only be between 0 and 5.") @@ -486,8 +394,6 @@ Public Class Item ''' ''' Tries to remove a single item of this item type from the player's bag and returns a message which changes depending on if the item that got removed was the last one of its kind. ''' - ''' - ''' Public Function RemoveItem() As String Core.Player.Inventory.RemoveItem(Me.ID, 1) If Core.Player.Inventory.GetItemAmount(Me.ID) = 0 Then @@ -500,8 +406,6 @@ Public Class Item ''' Returns an item instance based on the passed in ID. ''' ''' The desired item's ID. - ''' - ''' Public Shared Function GetItemByID(ByVal ID As Integer) As Item 'Check if the ID is available in the FileItem list. 'Free Slots: @@ -1657,7 +1561,6 @@ Public Class Item ''' Returns an item based on its name. ''' ''' The name of the item. - ''' ''' This method is not as performant on initial use as the GetItemByID method. Public Shared Function GetItemByName(ByVal name As String) As Item 'Check if the name is available in the FileItem list. @@ -1692,10 +1595,8 @@ Public Class Item ''' ''' Creates a new instance of the Item instance based on its ID. ''' - ''' - ''' Public Function Copy() As Object Implements ICopyAble.Copy Return Item.GetItemByID(Me.ID) End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb index 6b5b0c132..1478bfe47 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MailItem.vb @@ -1,9 +1,8 @@ -Namespace Items +Namespace Items ''' ''' The basic item that represents a Mail Item. ''' - ''' Public Class MailItem Inherits Item @@ -27,7 +26,6 @@ ''' The ID of the Item. ''' The TextureRectangle of the Item. ''' The Description of the Item. - ''' Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ID As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) MyBase.New(Name, Price, ItemTypes.Mail, ID, 1.0F, 0, TextureRectangle, Description) @@ -74,4 +72,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb index 152de4bc4..89602f97f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/Medicine/ShinyCandy.vb @@ -1,9 +1,8 @@ -Namespace Items.Medicine +Namespace Items.Medicine ''' ''' Not in the game... ''' - ''' Public Class ShinyCandy Inherits Item @@ -35,4 +34,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb index 2d9ea486a..c9e56f877 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb @@ -1,9 +1,8 @@ -Namespace Items +Namespace Items ''' ''' Represents a Medicine Item. ''' - ''' Public Class MedicineItem Inherits Item @@ -19,7 +18,6 @@ ''' The SortValue of this Item. ''' The TextureRectangle from the "Items\ItemSheet" texture. ''' The description of this Item. - ''' Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) End Sub @@ -29,8 +27,6 @@ ''' ''' The index of the Pokémon in the player's party. ''' The HP that should be healed. - ''' - ''' Public Function HealPokemon(ByVal PokeIndex As Integer, ByVal HP As Integer) As Boolean If PokeIndex < 0 Or PokeIndex > 5 Then Throw New ArgumentOutOfRangeException("PokeIndex", PokeIndex, "The index for a Pokémon in a player's party can only be between 0 and 5.") @@ -77,8 +73,6 @@ ''' Tries to cure a Pokémon from Poison. ''' ''' The index of a Pokémon in the player's party. - ''' - ''' Public Function CurePoison(ByVal PokeIndex As Integer) As Boolean If PokeIndex < 0 Or PokeIndex > 5 Then Throw New ArgumentOutOfRangeException("PokeIndex", PokeIndex, "The index for a Pokémon in a player's party can only be between 0 and 5.") @@ -116,8 +110,6 @@ ''' Tries to wake a Pokémon up from Sleep. ''' ''' The index of a Pokémon in the player's party. - ''' - ''' Public Function WakeUp(ByVal PokeIndex As Integer) As Boolean If PokeIndex < 0 Or PokeIndex > 5 Then Throw New ArgumentOutOfRangeException("PokeIndex", PokeIndex, "The index for a Pokémon in a player's party can only be between 0 and 5.") @@ -155,8 +147,6 @@ ''' Tries to heal a Pokémon from Burn. ''' ''' The index of a Pokémon in the player's party. - ''' - ''' Public Function HealBurn(ByVal PokeIndex As Integer) As Boolean If PokeIndex < 0 Or PokeIndex > 5 Then Throw New ArgumentOutOfRangeException("PokeIndex", PokeIndex, "The index for a Pokémon in a player's party can only be between 0 and 5.") @@ -194,8 +184,6 @@ ''' Tries to heal a Pokémon from Ice. ''' ''' The index of a Pokémon in the player's party. - ''' - ''' Public Function HealIce(ByVal PokeIndex As Integer) As Boolean If PokeIndex < 0 Or PokeIndex > 5 Then Throw New ArgumentOutOfRangeException("PokeIndex", PokeIndex, "The index for a Pokémon in a player's party can only be between 0 and 5.") @@ -235,8 +223,6 @@ ''' Tries to heal a Pokémon from Paralysis. ''' ''' The index of a Pokémon in the player's party. - ''' - ''' Public Function HealParalyze(ByVal PokeIndex As Integer) As Boolean If PokeIndex < 0 Or PokeIndex > 5 Then Throw New ArgumentOutOfRangeException("PokeIndex", PokeIndex, "The index for a Pokémon in a player's party can only be between 0 and 5.") @@ -274,4 +260,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb index 9355a20d8..a3fd03a21 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStone.vb @@ -1,9 +1,8 @@ -Namespace Items +Namespace Items ''' ''' The base class for all Mega Stone items. ''' - ''' Public Class MegaStone Inherits Item @@ -33,4 +32,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb index a96779e8b..8cd63c5a1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Abomasnow. ''' - ''' Public Class Abomasite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb index e30250fcb..374cae014 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Absol. ''' - ''' Public Class Absolite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb index ef74bb401..f8e64ee4a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Aerodactyl. ''' - ''' Public Class Aerodactylite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb index 904aa9b3e..fb583ef95 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Aggron. ''' - ''' Public Class Aggronite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb index b4e42968d..b86aa736c 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Alakazam. ''' - ''' Public Class Alakazite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb index 8ce09cf67..feec76713 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Altaria. ''' - ''' Public Class Altarianite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb index b069ae89b..e5a58503f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Ampharos. ''' - ''' Public Class Ampharosite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb index 14e4988fe..1ab86d8a4 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Audino. ''' - ''' Public Class Audinite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb index a57660db2..1dc3d735e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Banette. ''' - ''' Public Class Banettite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb index 536d12ef9..4f2c0d907 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Beedrill. ''' - ''' Public Class Beedrillite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb index 7f27fdca6..4e837a6eb 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Blastoise. ''' - ''' Public Class Blastoisinite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb index 5f5d381db..45e4e92f7 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Blaziken. ''' - ''' Public Class Blazikenite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb index 93951a8de..eef39ad90 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Camerupt. ''' - ''' Public Class Cameruptite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb index cda096ef3..a8219163f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' A Mega Stone for Charizard. ''' - ''' Public Class CharizarditeX Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb index ee1579de0..16b6f1ab1 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' A Mega Stone for Charizard. ''' - ''' Public Class CharizarditeY Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb index d896f518b..1ed08dcc3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Diancie. ''' - ''' Public Class Diancite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb index f3276e4e1..5cf0079e5 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Gallade. ''' - ''' Public Class Galladite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb index da521471d..e8d30fe6b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Garchompite. ''' - ''' Public Class Garchompite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb index faaf655f3..e6ca3843e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Gardevoir. ''' - ''' Public Class Gardevoirite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb index a80234f5b..ca8fd2d3f 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Gengar. ''' - ''' Public Class Gengarite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb index 6c361814c..774e0d465 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Glalie. ''' - ''' Public Class Glalitite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb index d117f43fb..e01acc9cd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Gyarados. ''' - ''' Public Class Gyaradosite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb index 8940182e0..59e3de166 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Heracross. ''' - ''' Public Class Heracronite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb index b8a1db531..d1c2e5c95 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Houndoomin. ''' - ''' Public Class Houndoominite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb index 698adf902..952155801 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Kangaskhan. ''' - ''' Public Class Kangaskhanite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb index b22383187..6aa7205aa 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Latias. ''' - ''' Public Class Latiasite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb index 5258cf039..44c80cb6a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Latios. ''' - ''' Public Class Latiosite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb index 5033acda5..68fbc1625 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Lopunnite. ''' - ''' Public Class Lopunnite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb index 4f45193c4..21e88c293 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Lucario. ''' - ''' Public Class Lucarionite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb index 885d2a6f4..d03ea7a87 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Manectric. ''' - ''' Public Class Manectite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb index ac4481486..3cbba1f85 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Mawile. ''' - ''' Public Class Mawilite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb index 3529f0cb0..cfd7df488 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Medicham. ''' - ''' Public Class Medichamite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb index b8a4a48fc..a594a2168 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Metagross. ''' - ''' Public Class Metagrossite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb index 7e57d56c2..10d972384 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' A Mega Stone for Mewtwo. ''' - ''' Public Class MewtwoniteX Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb index 46cb0f5f6..8df4f1abf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' A Mega Stone for Mewtwo. ''' - ''' Public Class MewtwoniteY Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb index a8a854621..3c92a46da 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Pidgeot. ''' - ''' Public Class Pidgeotite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb index 72539a1f8..9ffde58b8 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Pinsir. ''' - ''' Public Class Pinsirite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb index 3027b7e4a..9045526ef 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Sableye. ''' - ''' Public Class Sablenite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb index fec9210e0..159121016 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Salamence. ''' - ''' Public Class Salamencite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb index 0a38b8d41..1e3ef70b3 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Sceptile. ''' - ''' Public Class Sceptilite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb index 2ffa044f5..e8ee5b328 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Scizor. ''' - ''' Public Class Scizorite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb index 213076b13..b319ef8a2 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Sharpedo. ''' - ''' Public Class Sharpedonite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb index b80d4c1da..5d85e2334 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Slowbro. ''' - ''' Public Class Slowbronite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb index c41638b58..9df899bdf 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Steelix. ''' - ''' Public Class Steelixite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb index bafe88b5e..e8e856354 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Swampert. ''' - ''' Public Class Swampertite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb index 4de1e10cb..74ee477fe 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Tyranitar. ''' - ''' Public Class Tyranitarite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb index 303073596..e5856486a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb @@ -1,9 +1,8 @@ -Namespace Items.MegaStones +Namespace Items.MegaStones ''' ''' The Mega Stone for Venusaur. ''' - ''' Public Class Venusaurite Inherits MegaStone @@ -14,4 +13,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb index 44e7a83c6..197b9d22d 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/PlateItem.vb @@ -1,9 +1,8 @@ -Namespace Items +Namespace Items ''' ''' The base item for all Arceus plates. ''' - ''' Public Class PlateItem Inherits Item @@ -38,4 +37,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb index 87f78cc2c..e45753b54 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/StoneItem.vb @@ -1,4 +1,4 @@ -Namespace Items +Namespace Items Public Class StoneItem @@ -15,7 +15,6 @@ ''' The SortValue of this Item. ''' The TextureRectangle from the "Items\ItemSheet" texture. ''' The description of this Item. - ''' Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) @@ -56,4 +55,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb index d939aadf3..14bdfc244 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/VitaminItem.vb @@ -1,9 +1,8 @@ -Namespace Items +Namespace Items ''' ''' Represents a Vitamin Item. ''' - ''' Public Class VitaminItem Inherits Item @@ -19,7 +18,6 @@ ''' The SortValue of this Item. ''' The TextureRectangle from the "Items\ItemSheet" texture. ''' The description of this Item. - ''' Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) End Sub @@ -29,8 +27,6 @@ ''' ''' An integer representing the stat that should be upped by the Vitamin. ''' The Pokémon that the Vitamin should be used on. - ''' - ''' Protected Function CanUseVitamin(ByVal stat As Integer, ByVal p As Pokemon) As Boolean If stat < 100 Then Dim allStats As Integer = p.EVAttack + p.EVDefense + p.EVSpAttack + p.EVSpDefense + p.EVHP + p.EVSpeed @@ -44,4 +40,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb b/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb index 9360f2ea7..7fa772145 100644 --- a/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb +++ b/2.5DHero/2.5DHero/Pokemon/Items/WingItem.vb @@ -1,9 +1,8 @@ -Namespace Items +Namespace Items ''' ''' Represents a Wing Item. ''' - ''' Public Class WingItem Inherits Item @@ -19,7 +18,6 @@ ''' The SortValue of this Item. ''' The TextureRectangle from the "Items\ItemSheet" texture. ''' The description of this Item. - ''' Public Sub New(ByVal Name As String, ByVal Price As Integer, ByVal ItemType As ItemTypes, ByVal ID As Integer, ByVal CatchMultiplier As Single, ByVal SortValue As Integer, ByVal TextureRectangle As Rectangle, ByVal Description As String) MyBase.New(Name, Price, ItemType, ID, CatchMultiplier, SortValue, TextureRectangle, Description) @@ -40,8 +38,6 @@ ''' ''' An integer representing the stat that should be upped by the Wing. ''' The Pokémon that the Wing should be used on. - ''' - ''' Protected Function CanUseWing(ByVal stat As Integer, ByVal p As Pokemon) As Boolean If stat < 255 Then Dim allStats As Integer = p.EVAttack + p.EVDefense + p.EVSpAttack + p.EVSpDefense + p.EVHP + p.EVSpeed @@ -55,4 +51,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/Element.vb b/2.5DHero/2.5DHero/Pokemon/Monster/Element.vb index b3d0d97b7..265fb1c46 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/Element.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/Element.vb @@ -1,4 +1,4 @@ -''' +''' ''' Represents the Element of a Pokémon or move type. ''' Public Class Element @@ -34,7 +34,6 @@ Public Class Element ''' ''' The Type of this Element. ''' - ''' Public Property Type As Types Get Return Me._type @@ -155,7 +154,6 @@ Public Class Element ''' ''' The attacking element. ''' The defending element. - ''' Public Shared Function GetElementMultiplier(ByVal AttackElement As Element, ByVal DefenseElement As Element) As Single Dim a As Element = AttackElement Dim d As Element = DefenseElement @@ -876,7 +874,6 @@ Public Class Element ''' ''' Returns the rectangle from the texture "GUI\Menus\Types" that represents the Type of this Element. ''' - ''' Public Function GetElementImage() As Rectangle Dim r As New Rectangle(0, 0, 0, 0) @@ -983,4 +980,4 @@ Public Class Element Return Element1._type <> Element2._type End Operator -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb b/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb index 1b56b687a..34723554a 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb @@ -1,4 +1,4 @@ -Public Class EvolutionCondition +Public Class EvolutionCondition Public Enum ConditionTypes Level @@ -98,8 +98,6 @@ ''' The Pokémon to get the evolution from. ''' The trigger that triggered the evolution. ''' An argument (for example Item ID) - ''' - ''' Public Shared Function EvolutionNumber(ByVal p As Pokemon, ByVal trigger As EvolutionTrigger, ByVal arg As String) As Integer If trigger = EvolutionTrigger.LevelUp Or trigger = EvolutionTrigger.Trading Then If Not p.Item Is Nothing Then @@ -226,4 +224,4 @@ Return 0 End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb b/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb index 832ac5ef3..b0669c3dd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb @@ -1,4 +1,4 @@ -''' +''' ''' Represents a Pokémon. ''' Public Class Pokemon @@ -6,7 +6,6 @@ Public Class Pokemon ''' ''' Defines which Pokémon in the default GameMode are considered "legendary". ''' - ''' Public Shared ReadOnly Legendaries() As Integer = {144, 145, 146, 150, 151, 243, 244, 245, 249, 250, 251, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 716, 717, 718, 719, 720, 721} #Region "Events" @@ -20,7 +19,6 @@ Public Class Pokemon ''' ''' The different experience types a Pokémon can have. ''' - ''' Public Enum ExperienceTypes Fast MediumFast @@ -31,7 +29,6 @@ Public Class Pokemon ''' ''' EggGroups a Pokémon can have to define its breeding compatibility. ''' - ''' Public Enum EggGroups Monster Water1 @@ -55,7 +52,6 @@ Public Class Pokemon ''' ''' Genders of a Pokémon. ''' - ''' Public Enum Genders Male Female @@ -65,7 +61,6 @@ Public Class Pokemon ''' ''' The status problems a Pokémon can have. ''' - ''' Public Enum StatusProblems None Burn @@ -80,7 +75,6 @@ Public Class Pokemon ''' ''' The volatile status a Pokémon can have. ''' - ''' Public Enum VolatileStatus Confusion Flinch @@ -91,7 +85,6 @@ Public Class Pokemon ''' ''' Different natures of a Pokémon. ''' - ''' Public Enum Natures Hardy Lonely @@ -123,7 +116,6 @@ Public Class Pokemon ''' ''' Ways to change the Friendship value of a Pokémon. ''' - ''' Public Enum FriendShipCauses Walking LevelUp @@ -144,9 +136,6 @@ Public Class Pokemon ''' ''' Returns the name to reference to the animation/model of this Pokémon. ''' - ''' - ''' - ''' Public ReadOnly Property AnimationName() As String Get Return PokemonForms.GetAnimationName(Me) @@ -588,9 +577,6 @@ Public Class Pokemon ''' ''' The HP of this Pokémon. ''' - ''' - ''' - ''' Public Property HP() As Integer Get Return Me._HP @@ -604,9 +590,6 @@ Public Class Pokemon ''' ''' The maximal HP of this Pokémon. ''' - ''' - ''' - ''' Public Property MaxHP() As Integer Get Return Me._maxHP @@ -620,9 +603,6 @@ Public Class Pokemon ''' ''' The Attack of this Pokémon. ''' - ''' - ''' - ''' Public Property Attack() As Integer Get Return Me._attack @@ -636,9 +616,6 @@ Public Class Pokemon ''' ''' The Defense of this Pokémon. ''' - ''' - ''' - ''' Public Property Defense() As Integer Get Return Me._defense @@ -652,9 +629,6 @@ Public Class Pokemon ''' ''' The Special Attack of this Pokémon. ''' - ''' - ''' - ''' Public Property SpAttack() As Integer Get Return Me._SpAttack @@ -668,9 +642,6 @@ Public Class Pokemon ''' ''' The Special Defense of this Pokémon. ''' - ''' - ''' - ''' Public Property SpDefense() As Integer Get Return Me._SpDefense @@ -684,9 +655,6 @@ Public Class Pokemon ''' ''' The Speed of this Pokémon. ''' - ''' - ''' - ''' Public Property Speed() As Integer Get Return Me._speed @@ -711,9 +679,6 @@ Public Class Pokemon ''' ''' The HP EV this Pokémon got. ''' - ''' - ''' - ''' Public Property EVHP() As Integer Get Return Me._EVHP @@ -728,9 +693,6 @@ Public Class Pokemon ''' ''' The Attack EV this Pokémon got. ''' - ''' - ''' - ''' Public Property EVAttack() As Integer Get Return Me._EVAttack @@ -745,9 +707,6 @@ Public Class Pokemon ''' ''' The Defense EV this Pokémon got. ''' - ''' - ''' - ''' Public Property EVDefense() As Integer Get Return Me._EVDefense @@ -762,9 +721,6 @@ Public Class Pokemon ''' ''' The Special Attack EV this Pokémon got. ''' - ''' - ''' - ''' Public Property EVSpAttack() As Integer Get Return Me._EVSpAttack @@ -779,9 +735,6 @@ Public Class Pokemon ''' ''' The Special Defense EV this Pokémon got. ''' - ''' - ''' - ''' Public Property EVSpDefense() As Integer Get Return Me._EVSpDefense @@ -796,9 +749,6 @@ Public Class Pokemon ''' ''' The Speed EV this Pokémon got. ''' - ''' - ''' - ''' Public Property EVSpeed() As Integer Get Return Me._EVSpeed @@ -824,9 +774,6 @@ Public Class Pokemon ''' ''' The HP IV this Pokémon got. ''' - ''' - ''' - ''' Public Property IVHP() As Integer Get Return Me._IVHP @@ -840,9 +787,6 @@ Public Class Pokemon ''' ''' The Attack IV this Pokémon got. ''' - ''' - ''' - ''' Public Property IVAttack() As Integer Get Return Me._IVAttack @@ -856,9 +800,6 @@ Public Class Pokemon ''' ''' The Defense IV this Pokémon got. ''' - ''' - ''' - ''' Public Property IVDefense() As Integer Get Return Me._IVDefense @@ -872,9 +813,6 @@ Public Class Pokemon ''' ''' The Special Attack IV this Pokémon got. ''' - ''' - ''' - ''' Public Property IVSpAttack() As Integer Get Return Me._IVSpAttack @@ -888,9 +826,6 @@ Public Class Pokemon ''' ''' The Special Defense IV this Pokémon got. ''' - ''' - ''' - ''' Public Property IVSpDefense() As Integer Get Return Me._IVSpDefense @@ -904,9 +839,6 @@ Public Class Pokemon ''' ''' The Speed IV this Pokémon got. ''' - ''' - ''' - ''' Public Property IVSpeed() As Integer Get Return Me._IVSpeed @@ -961,8 +893,6 @@ Public Class Pokemon ''' Returns if this Pokémon is affected by a Volatile Status effect. ''' ''' The Volatile Status effect to test for. - ''' - ''' Public Function HasVolatileStatus(ByVal VolatileStatus As VolatileStatus) As Boolean Return Me._volatiles.Contains(VolatileStatus) End Function @@ -971,7 +901,6 @@ Public Class Pokemon ''' Affects this Pokémon with a Volatile Status. ''' ''' The Volatile Status to affect this Pokémon with. - ''' Public Sub AddVolatileStatus(ByVal VolatileStatus As VolatileStatus) If Me._volatiles.Contains(VolatileStatus) = False Then Me._volatiles.Add(VolatileStatus) @@ -982,7 +911,6 @@ Public Class Pokemon ''' Removes a Volatile Status effect this Pokémon is affected by. ''' ''' The Volatile Status effect to remove. - ''' Public Sub RemoveVolatileStatus(ByVal VolatileStatus As VolatileStatus) If Me._volatiles.Contains(VolatileStatus) = True Then Me._volatiles.Remove(VolatileStatus) @@ -992,7 +920,6 @@ Public Class Pokemon ''' ''' Clears all Volatile Status effects affecting this Pokémon. ''' - ''' Public Sub ClearAllVolatiles() Me._volatiles.Clear() End Sub @@ -1018,7 +945,6 @@ Public Class Pokemon ''' ''' Resets the temp storages of the Pokémon. ''' - ''' Public Sub ResetTemp() _volatiles.Clear() @@ -1110,9 +1036,6 @@ Public Class Pokemon ''' ''' The Pokémon's original primary type. ''' - ''' - ''' - ''' Public Property OriginalType1() As Element Get Return Me._originalType1 @@ -1127,9 +1050,6 @@ Public Class Pokemon ''' ''' The Pokémon's original secondary type. ''' - ''' - ''' - ''' Public Property OriginalType2() As Element Get Return Me._originalType2 @@ -1144,9 +1064,6 @@ Public Class Pokemon ''' ''' The Pokémon's original national Pokédex number. ''' - ''' - ''' - ''' Public Property OriginalNumber() As Integer Get Return Me._originalNumber @@ -1161,9 +1078,6 @@ Public Class Pokemon ''' ''' The Pokémon's original shiny state. ''' - ''' - ''' - ''' Public Property OriginalShiny() As Integer Get Return Me._originalShiny @@ -1178,9 +1092,6 @@ Public Class Pokemon ''' ''' The Pokémon's original stats. ''' - ''' - ''' - ''' Public Property OriginalStats() As Integer() Get Return Me._originalStats @@ -1195,9 +1106,6 @@ Public Class Pokemon ''' ''' The Pokémon's original ability. ''' - ''' - ''' - ''' Public Property OriginalAbility() As Ability Get Return Me._originalAbility @@ -1212,9 +1120,6 @@ Public Class Pokemon ''' ''' The Pokémon's original hold item. ''' - ''' - ''' - ''' Public Property OriginalItem() As Item Get Return Me._originalItem @@ -1229,9 +1134,6 @@ Public Class Pokemon ''' ''' The Pokémon's original moveset. ''' - ''' - ''' - ''' Public Property OriginalMoves() As List(Of BattleSystem.Attack) Get Return Me._originalMoves @@ -1246,9 +1148,6 @@ Public Class Pokemon ''' ''' If this Pokémon has been using the Transform move (or any other move/ability that causes similar effects). ''' - ''' - ''' - ''' Public Property IsTransformed() As Boolean Get Return Me._isTransformed @@ -1279,7 +1178,6 @@ Public Class Pokemon ''' ''' Empties the cached textures. ''' - ''' Private Sub ClearTextures() Textures.Clear() Textures.AddRange({Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing}) @@ -1291,7 +1189,6 @@ Public Class Pokemon ''' ''' Creates a new instance of the Pokémon class. ''' - ''' Private Sub New() MyBase.New() Me.ClearTextures() @@ -1301,8 +1198,6 @@ Public Class Pokemon ''' Returns a new Pokémon class instance. ''' ''' The number of the Pokémon in the national Pokédex. - ''' - ''' Public Shared Function GetPokemonByID(ByVal Number As Integer) As Pokemon Return GetPokemonByID(Number, "") End Function @@ -1316,9 +1211,6 @@ Public Class Pokemon ''' ''' Checks if a requested Pokémon data file exists. ''' - ''' - ''' - ''' Public Shared Function PokemonDataExists(ByVal Number As Integer) As Boolean Return System.IO.File.Exists(GameModeManager.GetPokemonDataFilePath(Number.ToString() & ".dat")) End Function @@ -1327,8 +1219,6 @@ Public Class Pokemon ''' Returns a new Pokémon class instance defined by data. ''' ''' The data that defines the Pokémon. - ''' - ''' Public Shared Function GetPokemonByData(ByVal InputData As String) As Pokemon Dim Tags As New Dictionary(Of String, String) Dim Data() As String = InputData.Split(CChar("}")) @@ -1365,7 +1255,6 @@ Public Class Pokemon ''' ''' Loads definition data from the data files and empties the temp textures. ''' - ''' Public Sub ReloadDefinitions() Me.LoadDefinitions(Me.Number, Me.AdditionalData) Me.ClearTextures() @@ -1376,7 +1265,6 @@ Public Class Pokemon ''' ''' The number of the Pokémon in the national Pokédex. ''' The additional data. - ''' Public Sub LoadDefinitions(ByVal Number As Integer, ByVal AdditionalData As String) Dim path As String = PokemonForms.GetPokemonDataFile(Number, AdditionalData) Security.FileValidation.CheckFileValid(path, False, "Pokemon.vb") @@ -1597,7 +1485,6 @@ Public Class Pokemon ''' Applies data to the Pokémon. ''' ''' The input data. - ''' Public Sub LoadData(ByVal InputData As String) Dim loadedHP As Boolean = False @@ -1734,8 +1621,6 @@ Public Class Pokemon ''' ''' Returns the save data from the Pokémon. ''' - ''' - ''' Public Function GetSaveData() As String Dim SaveGender As Integer = 0 If Me.Gender = Genders.Female Then @@ -1849,7 +1734,6 @@ Public Class Pokemon ''' ''' The level to set the Pokémon's level to. ''' If the parameters like Nature and Ability should be set. Otherwise, it just loads the attacks and sets the level. - ''' Public Sub Generate(ByVal newLevel As Integer, ByVal SetParameters As Boolean) Me.Level = 0 @@ -2027,8 +1911,6 @@ Public Class Pokemon ''' Converts an EggGroup ID string to the EggGroup enum item. ''' ''' The ID string. - ''' - ''' Public Shared Function ConvertIDToEggGroup(ByVal ID As String) As EggGroups Select Case ID.ToLower() Case "monster" @@ -2074,8 +1956,6 @@ Public Class Pokemon ''' Converts a Nature ID to a Nature enum item. ''' ''' The nature ID. - ''' - ''' Public Shared Function ConvertIDToNature(ByVal ID As Integer) As Natures Select Case ID Case 0 @@ -2138,7 +2018,6 @@ Public Class Pokemon ''' ''' Generates a new individual value for this Pokémon. ''' - ''' Private Sub GenerateIndividualValue() Dim chars As String = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" @@ -2153,7 +2032,6 @@ Public Class Pokemon ''' ''' Returns the Display Name of this Pokémon. ''' - ''' ''' Returns "Egg" when the Pokémon is in an egg. Returns the properly translated name if it exists. Returns the nickname if set. Public Function GetDisplayName() As String If Me.EggSteps > 0 Then @@ -2174,8 +2052,6 @@ Public Class Pokemon ''' ''' Returns the properly translated name of a Pokémon if defined in the language files. ''' - ''' - ''' Public Function GetName() As String If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then Return Localization.GetString("pokemon_name_" & Me.Name) @@ -2187,9 +2063,6 @@ Public Class Pokemon ''' ''' Returns the English name of the Pokémon. ''' - ''' - ''' - ''' Public Property OriginalName As String Get Return Me.Name @@ -2206,7 +2079,6 @@ Public Class Pokemon ''' ''' The amount of EXP. ''' If the Pokémon should learn an attack if it could learn one at level up. - ''' Public Sub GetExperience(ByVal Exp As Integer, ByVal LearnRandomAttack As Boolean) Me.Experience += Exp While Me.Experience >= NeedExperience(Me.Level + 1) @@ -2219,7 +2091,6 @@ Public Class Pokemon ''' Rasies the Pokémon's level by one. ''' ''' If one attack of the Pokémon should be replaced by an attack potentially learned on the new level. - ''' Public Sub LevelUp(ByVal LearnRandomAttack As Boolean) Me.Level += 1 @@ -2241,7 +2112,6 @@ Public Class Pokemon ''' ''' Recalculates all stats for this Pokémon using its current EVs, IVs and level. ''' - ''' Public Sub CalculateStats() Me.MaxHP = CalcStatus(Me.Level, True, Me.BaseHP, Me.EVHP, Me.IVHP, "HP") Me.Attack = CalcStatus(Me.Level, False, Me.BaseAttack, Me.EVAttack, Me.IVAttack, "Attack") @@ -2260,8 +2130,6 @@ Public Class Pokemon ''' The EV stat of the Pokémon. ''' The IV stat of the Pokémon. ''' The name of the stat. - ''' - ''' Private Function CalcStatus(ByVal calcLevel As Integer, ByVal DoHP As Boolean, ByVal baseStat As Integer, ByVal EVStat As Integer, ByVal IVStat As Integer, ByVal StatName As String) As Integer If DoHP = True Then If Me.Number = 292 Then @@ -2278,7 +2146,6 @@ Public Class Pokemon ''' Replaces a random move of the Pokémon by one that it learns on a given level. ''' ''' The level the Pokémon learns the desired move on. - ''' Public Sub LearnAttack(ByVal learnLevel As Integer) If AttackLearns.ContainsKey(learnLevel) = True Then Dim a As BattleSystem.Attack = AttackLearns(learnLevel) @@ -2301,8 +2168,6 @@ Public Class Pokemon ''' Returns the EXP needed for the given level. ''' ''' The level this function should return the exp amount for. - ''' - ''' Public Function NeedExperience(ByVal EXPLevel As Integer) As Integer Dim n As Integer = EXPLevel Dim i As Integer = 0 @@ -2330,8 +2195,6 @@ Public Class Pokemon ''' ''' Returns the cummulative PP count of all moves. ''' - ''' - ''' Public Function CountPP() As Integer Dim AllPP As Integer = 0 For Each Attack As BattleSystem.Attack In Attacks @@ -2343,7 +2206,6 @@ Public Class Pokemon ''' ''' Fully heals this Pokémon. ''' - ''' Public Sub FullRestore() Me.Status = StatusProblems.None Me.Heal(Me.MaxHP) @@ -2359,7 +2221,6 @@ Public Class Pokemon ''' Heals the Pokémon. ''' ''' The amount of HP to heal the Pokémon by. - ''' Public Sub Heal(ByVal HealHP As Integer) Me.HP = (Me.HP + HealHP).Clamp(0, Me.MaxHP) End Sub @@ -2368,7 +2229,6 @@ Public Class Pokemon ''' Changes the Friendship value of this Pokémon. ''' ''' The cause as to why the Friendship value should change. - ''' Public Sub ChangeFriendShip(ByVal cause As FriendShipCauses) Dim add As Integer = 0 @@ -2465,8 +2325,6 @@ Public Class Pokemon ''' 8=normal overworld ''' 9=shiny overworld ''' 10=normal,front,animation - ''' - ''' Private Function GetTexture(ByVal index As Integer) As Texture2D If Textures(index) Is Nothing Then Select Case index @@ -2509,8 +2367,6 @@ Public Class Pokemon ''' ''' Returns the Overworld texture of this Pokémon. ''' - ''' - ''' Public Function GetOverworldTexture() As Texture2D If Me.IsShiny = False Then Return Me.GetTexture(8) @@ -2523,8 +2379,6 @@ Public Class Pokemon ''' Returns the Menu Texture of this Pokémon. ''' ''' If the texture returned can represent the Pokémon in its egg. - ''' - ''' Public Function GetMenuTexture(ByVal CanGetEgg As Boolean) As Texture2D If Me.EggSteps > 0 And CanGetEgg = True Then Return GetTexture(5) @@ -2536,8 +2390,6 @@ Public Class Pokemon ''' ''' Returns the Menu Texture of this Pokémon. ''' - ''' - ''' Public Function GetMenuTexture() As Texture2D Return GetMenuTexture(True) End Function @@ -2546,8 +2398,6 @@ Public Class Pokemon ''' Returns the display texture of this Pokémon. ''' ''' If this Pokémon should be viewed from the front. - ''' - ''' Public Function GetTexture(ByVal FrontView As Boolean) As Texture2D If FrontView = True Then If Me.IsEgg() = True Then @@ -2575,8 +2425,6 @@ Public Class Pokemon ''' ''' Returns properties to display models on a 2D GUI. Data structure: scale sng,posX sng,posY sng,posZ sng,roll sng ''' - ''' - ''' Public Function GetModelProperties() As Tuple(Of Single, Single, Single, Single, Single) Dim scale As Single = CSng(0.6 / Me.PokedexEntry.Height) Dim x As Single = 0.0F @@ -2710,8 +2558,6 @@ Public Class Pokemon ''' ''' The trigger of the evolution. ''' An argument that specifies the evolution. - ''' - ''' Public Function CanEvolve(ByVal trigger As EvolutionCondition.EvolutionTrigger, ByVal argument As String) As Boolean Dim n As Integer = EvolutionCondition.EvolutionNumber(Me, trigger, argument) If n = 0 Then @@ -2725,8 +2571,6 @@ Public Class Pokemon ''' ''' The trigger of the evolution. ''' An argument that specifies the evolution. - ''' - ''' Public Function GetEvolutionID(ByVal trigger As EvolutionCondition.EvolutionTrigger, ByVal argument As String) As Integer Return EvolutionCondition.EvolutionNumber(Me, trigger, argument) End Function @@ -2736,7 +2580,6 @@ Public Class Pokemon ''' ''' The Pokéball this Pokémon got captured in. ''' The capture method. - ''' Public Sub SetCatchInfos(ByVal Ball As Item, ByVal Method As String) Me.CatchLocation = Screen.Level.MapName Me.CatchTrainerName = Core.Player.Name @@ -2750,8 +2593,6 @@ Public Class Pokemon ''' Checks if the Pokémon is of a certain type. ''' ''' The type to check. - ''' - ''' Public Function IsType(ByVal CheckType As Element.Types) As Boolean If Type1.Type = CheckType Or Type2.Type = CheckType Then Return True @@ -2762,7 +2603,6 @@ Public Class Pokemon ''' ''' Plays the cry of this Pokémon. ''' - ''' Public Sub PlayCry() Dim Pitch As Single = 0.0F Dim percent As Integer = 100 @@ -2787,8 +2627,6 @@ Public Class Pokemon ''' Checks if this Pokémon knows a certain move. ''' ''' The move to check for. - ''' - ''' Public Function KnowsMove(ByVal Move As BattleSystem.Attack) As Boolean For Each a As BattleSystem.Attack In Me.Attacks If a.ID = Move.ID Then @@ -2802,8 +2640,6 @@ Public Class Pokemon ''' ''' Checks if this Pokémon is inside an Egg. ''' - ''' - ''' Public Function IsEgg() As Boolean If Me.EggSteps > 0 Then Return True @@ -2815,7 +2651,6 @@ Public Class Pokemon ''' Adds Effort values (EV) to this Pokémon after defeated another Pokémon, if possible. ''' ''' The defeated Pokémon. - ''' Public Sub GainEffort(ByVal DefeatedPokemon As Pokemon) Dim allEV As Integer = EVHP + EVAttack + EVDefense + EVSpeed + EVSpAttack + EVSpDefense If allEV < 510 Then @@ -2868,8 +2703,6 @@ Public Class Pokemon ''' ''' Returns if this Pokémon knows an HM move. ''' - ''' - ''' Public Function HasHMMove() As Boolean For Each m As BattleSystem.Attack In Me.Attacks If m.IsHMMove = True Then @@ -2882,8 +2715,6 @@ Public Class Pokemon ''' ''' Returns if this Pokémon is fully evolved. ''' - ''' - ''' Public Function IsFullyEvolved() As Boolean Return Me.EvolutionConditions.Count = 0 End Function @@ -2891,9 +2722,6 @@ Public Class Pokemon ''' ''' Checks if this Pokémon has a Hidden Ability assigend to it. ''' - ''' - ''' - ''' Public ReadOnly Property HasHiddenAbility() As Boolean Get Return Not Me.HiddenAbility Is Nothing @@ -2903,9 +2731,6 @@ Public Class Pokemon ''' ''' Checks if the Pokémon has its Hidden Ability set as its current ability. ''' - ''' - ''' - ''' Public ReadOnly Property IsUsingHiddenAbility() As Boolean Get If HasHiddenAbility() = True Then @@ -2919,4 +2744,4 @@ Public Class Pokemon Return GetSaveData() End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/Resource/PokemonForms.vb b/2.5DHero/2.5DHero/Pokemon/Monster/Resource/PokemonForms.vb index 59ff5e83f..7c69845be 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/Resource/PokemonForms.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/Resource/PokemonForms.vb @@ -1,4 +1,4 @@ -Public Class PokemonForms +Public Class PokemonForms Private Shared _pokemonList As New List(Of PokemonForm) @@ -15,9 +15,6 @@ ''' ''' Returns the initial Additional Data, if it needs to be set at generation time of the Pokémon. ''' - ''' - ''' - ''' Public Shared Function GetInitialAdditionalData(ByVal P As Pokemon) As String For Each listP In _pokemonList If listP.IsNumber(P.Number) = True Then @@ -31,9 +28,6 @@ ''' ''' Returns the Animation Name of the Pokémon, the path to its Sprite/Model files. ''' - ''' - ''' - ''' Public Shared Function GetAnimationName(ByVal P As Pokemon) As String For Each listP In _pokemonList If listP.IsNumber(P.Number) = True Then @@ -47,9 +41,6 @@ ''' ''' Returns the grid coordinates of the Pokémon's menu sprite. ''' - ''' - ''' - ''' Public Shared Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2 For Each listP In _pokemonList If listP.IsNumber(P.Number) = True Then @@ -71,9 +62,6 @@ ''' ''' Returns the size of the Pokémon's menu sprite. ''' - ''' - ''' - ''' Public Shared Function GetMenuImageSize(ByVal P As Pokemon) As Size For Each listP In _pokemonList If listP.IsNumber(P.Number) = True Then @@ -87,9 +75,6 @@ ''' ''' Returns the addition to the Pokémon's overworld sprite name. ''' - ''' - ''' - ''' Public Shared Function GetOverworldAddition(ByVal P As Pokemon) As String For Each listP In _pokemonList If listP.IsNumber(P.Number) = True Then @@ -103,9 +88,6 @@ ''' ''' Returns the path to the Pokémon's overworld sprite. ''' - ''' - ''' - ''' Public Shared Function GetOverworldSpriteName(ByVal P As Pokemon) As String Dim path As String = "Pokemon\Overworld\Normal\" If P.IsShiny = True Then @@ -120,8 +102,6 @@ ''' ''' The number of the Pokémon. ''' The additional data of the Pokémon. - ''' - ''' Public Shared Function GetPokemonDataFile(ByVal Number As Integer, ByVal AdditionalData As String) As String Dim FileName As String = GameModeManager.GetPokemonDataFilePath(Number.ToString() & ".dat") @@ -1058,4 +1038,4 @@ #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/RoamingPokemon.vb b/2.5DHero/2.5DHero/Pokemon/Monster/RoamingPokemon.vb index df8446a86..c1851893b 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/RoamingPokemon.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/RoamingPokemon.vb @@ -1,4 +1,4 @@ -Public Class RoamingPokemon +Public Class RoamingPokemon Public WorldID As Integer = -1 Public LevelFile As String = "" @@ -69,8 +69,6 @@ ''' Removes the Pokemon from the list of roaming Pokemon. The Pokemon has to hold the data as Tag. ''' ''' The Pokemon containing the Tag. - ''' - ''' Public Shared Function RemoveRoamingPokemon(ByVal p As RoamingPokemon) As String Dim compareData As String = p.CompareData() @@ -107,4 +105,4 @@ Return newData End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/Shedinja.vb b/2.5DHero/2.5DHero/Pokemon/Monster/Shedinja.vb index 432769e81..8eba690cd 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/Shedinja.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/Shedinja.vb @@ -1,10 +1,8 @@ -Public Class Shedinja +Public Class Shedinja ''' ''' Generates a new Shedinja based on the Nincada that evolved into Ninjask. ''' - ''' - ''' Public Shared Function GenerateNew(ByVal Ninjask As Pokemon) As Pokemon Dim p As Pokemon = Pokemon.GetPokemonByID(292) p.Generate(20, True) @@ -44,10 +42,6 @@ ''' ''' Checks if the Pokémon that just evolved can additionally spawn a Shedinja. ''' - ''' - ''' - ''' - ''' Public Shared Function CanEvolveInto(ByVal EvolvedPokemon As Pokemon, ByVal Trigger As EvolutionCondition.EvolutionTrigger) As Boolean If EvolvedPokemon.Number = 291 And Trigger = EvolutionCondition.EvolutionTrigger.LevelUp Then If Core.Player.Pokemons.Count < 6 Then @@ -59,4 +53,4 @@ Return False End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Pokemon/Wild/Spawner.vb b/2.5DHero/2.5DHero/Pokemon/Wild/Spawner.vb index cfba3cc82..58258d1b6 100644 --- a/2.5DHero/2.5DHero/Pokemon/Wild/Spawner.vb +++ b/2.5DHero/2.5DHero/Pokemon/Wild/Spawner.vb @@ -1,9 +1,8 @@ -Public Class Spawner +Public Class Spawner ''' ''' Methods to encounter a wild Pokémon. ''' - ''' Public Enum EncounterMethods As Integer Land = 0 Headbutt = 1 @@ -20,8 +19,6 @@ ''' ''' The levelfile that contains this Pokémon ''' The encounter method. - ''' - ''' Public Shared Function GetPokemon(ByVal LevelFile As String, ByVal Method As EncounterMethods, Optional ByVal CanEncounterRoaming As Boolean = True, Optional ByVal InputPokeFile As String = "") As Pokemon If CanEncounterRoaming = True Then Dim roamingPokemon As RoamingPokemon = CheckForRoaming(LevelFile, Method) @@ -188,4 +185,4 @@ Return Nothing End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/FontContainer.vb b/2.5DHero/2.5DHero/Resources/FontContainer.vb index 373eacef5..16c85ac08 100644 --- a/2.5DHero/2.5DHero/Resources/FontContainer.vb +++ b/2.5DHero/2.5DHero/Resources/FontContainer.vb @@ -1,7 +1,6 @@ -''' +''' ''' Class that contains a SpriteFont with its corresponding name. ''' -''' Public Class FontContainer Private _spriteFont As SpriteFont @@ -12,7 +11,6 @@ Public Class FontContainer ''' ''' The name of the Font. ''' The SpriteFont. - ''' Public Sub New(ByVal FontName As String, ByVal Font As SpriteFont) Me._fontName = FontName Me._spriteFont = Font @@ -28,9 +26,6 @@ Public Class FontContainer ''' ''' Returns the name of the Font. ''' - ''' - ''' - ''' Public ReadOnly Property FontName() As String Get Return Me._fontName @@ -40,13 +35,10 @@ Public Class FontContainer ''' ''' The SpriteFont. ''' - ''' - ''' - ''' Public ReadOnly Property SpriteFont() As SpriteFont Get Return Me._spriteFont End Get End Property -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/FontManager.vb b/2.5DHero/2.5DHero/Resources/FontManager.vb index 9c62ed4c1..ad526706b 100644 --- a/2.5DHero/2.5DHero/Resources/FontManager.vb +++ b/2.5DHero/2.5DHero/Resources/FontManager.vb @@ -1,4 +1,4 @@ -Public Class FontManager +Public Class FontManager Private Shared FontList As New Dictionary(Of String, FontContainer) @@ -56,8 +56,6 @@ ''' Looks to see if a font is loaded. Code that uses this should generally check for a return of nothing, indicating the font does not exist. ''' ''' The name of the font. - ''' - ''' Public Shared Function GetFont(ByVal fontName As String) As SpriteFont If FontList.ContainsKey(fontname.ToLower()) = True Then Return FontList(fontname.ToLower()).SpriteFont @@ -69,8 +67,6 @@ ''' Looks to see if a FontContainer is loaded. Code that uses this should generally check for a return of nothing, indicating the font does not exist. ''' ''' The name of the font. - ''' - ''' Public Shared Function GetFontContainer(ByVal fontName As String) As FontContainer If FontList.ContainsKey(fontName.ToLower()) = True Then Return FontList(fontName.ToLower()) @@ -120,4 +116,4 @@ End Get End Property -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/GameModeManager.vb b/2.5DHero/2.5DHero/Resources/GameModeManager.vb index aac58b4aa..76131786e 100644 --- a/2.5DHero/2.5DHero/Resources/GameModeManager.vb +++ b/2.5DHero/2.5DHero/Resources/GameModeManager.vb @@ -1,4 +1,4 @@ -Public Class GameModeManager +Public Class GameModeManager Private Shared GameModeList As New List(Of GameMode) Private Shared GameModePointer As Integer = 0 @@ -7,7 +7,6 @@ ''' ''' Loads (or reloads) the list of GameModes. The pointer also gets reset. ''' - ''' Public Shared Sub LoadGameModes() GameModeList.Clear() GameModePointer = 0 @@ -37,7 +36,6 @@ ''' ''' Creates the GameModes directory. ''' - ''' Public Shared Sub CreateGameModesFolder() If System.IO.Directory.Exists(GameController.GamePath & "\GameModes") = False Then System.IO.Directory.CreateDirectory(GameController.GamePath & "\GameModes") @@ -48,7 +46,6 @@ ''' Sets the GameModePointer to a new item. ''' ''' The directory resembeling the new GameMode. - ''' Public Shared Sub SetGameModePointer(ByVal GameModeDirectoryName As String) For i = 0 To GameModeList.Count - 1 Dim GameMode As GameMode = GameModeList(i) @@ -64,9 +61,6 @@ ''' ''' Returns the amount of loaded GameModes. ''' - ''' - ''' - ''' Public Shared ReadOnly Property GameModeCount() As Integer Get Return GameModeList.Count @@ -76,9 +70,6 @@ ''' ''' Checks if a GameMode exists. ''' - ''' - ''' - ''' Public Shared Function GameModeExists(ByVal GameModePath As String) As Boolean For Each GameMode As GameMode In GameModeList If GameMode.DirectoryName = GameModePath Then @@ -93,7 +84,6 @@ ''' Adds a GameMode to the list. ''' ''' The path of the GameMode directory. - ''' Private Shared Sub AddGameMode(ByVal Path As String) Dim newGameMode As New GameMode(Path & "\GameMode.dat") If newGameMode.IsValid = True Then @@ -104,7 +94,6 @@ ''' ''' Creates the default Kolben GameMode. ''' - ''' Public Shared Sub CreateKolbenMode() Dim doCreateKolbenMode As Boolean = False If System.IO.Directory.Exists(GameController.GamePath & "\GameModes\Kolben") = True Then @@ -131,9 +120,6 @@ ''' ''' Returns the currently active GameMode. ''' - ''' - ''' - ''' Public Shared ReadOnly Property ActiveGameMode() As GameMode Get If GameModeList.Count - 1 >= GameModePointer Then @@ -146,8 +132,6 @@ ''' ''' Returns the GameRules of the currently active GameMode. ''' - ''' - ''' Public Shared Function GetGameRules() As List(Of GameMode.GameRule) Return ActiveGameMode.GameRules End Function @@ -156,8 +140,6 @@ ''' Returns the Value of a chosen GameRule from the currently active GameMode. ''' ''' The RuleName to search for. - ''' - ''' Public Shared Function GetGameRuleValue(ByVal RuleName As String, ByVal DefaultValue As String) As String start: Dim rules As List(Of GameMode.GameRule) = GetGameRules() @@ -177,8 +159,6 @@ start: ''' Returns the correct map path to load a map from. ''' ''' The levelfile containing the map. - ''' - ''' Public Shared Function GetMapPath(ByVal levelFile As String) As String If ActiveGameMode.IsDefaultGamemode = True Then Return GameController.GamePath & GameMode.DefaultMapPath & levelFile @@ -199,8 +179,6 @@ start: ''' Returns the correct script file path to load a script from. ''' ''' The file that contains the script information. - ''' - ''' Public Shared Function GetScriptPath(ByVal scriptFile As String) As String If ActiveGameMode.IsDefaultGamemode = True Then Return GameController.GamePath & GameMode.DefaultScriptPath & scriptFile @@ -221,8 +199,6 @@ start: ''' Returns the correct poke file path to load a Wild Pokémon Definition from. ''' ''' The file that contains the Wild Pokémon Definitions. - ''' - ''' Public Shared Function GetPokeFilePath(ByVal pokeFile As String) As String If ActiveGameMode.IsDefaultGamemode = True Then Return GameController.GamePath & GameMode.DefaultPokeFilePath & pokeFile @@ -243,8 +219,6 @@ start: ''' Returns the correct Pokémon data file path to load a Pokémon from. ''' ''' The file which contains the Pokémon information. - ''' - ''' Public Shared Function GetPokemonDataFilePath(ByVal PokemonDataFile As String) As String If ActiveGameMode.IsDefaultGamemode = True Then Return GameController.GamePath & GameMode.DefaultPokemonDataPath & PokemonDataFile @@ -273,8 +247,6 @@ start: ''' Returns the correct Content file path to load content from. ''' ''' The stub file path to the Content file. - ''' - ''' Public Shared Function GetContentFilePath(ByVal ContentFile As String) As String If ActiveGameMode.IsDefaultGamemode = True Then Return GameController.GamePath & GameMode.DefaultContentPath & ContentFile @@ -290,7 +262,6 @@ start: ''' ''' Loads the FileItems for the loaded player file. ''' - ''' Public Shared Sub LoadFileItems() If Not Core.Player Is Nothing Then Core.Player.FileItems.Clear() @@ -317,8 +288,6 @@ start: ''' Checks if a map file exists either in the active GameMode or the default GameMode. ''' ''' The map file to look for. - ''' - ''' Public Shared Function MapFileExists(ByVal levelFile As String) As Boolean Dim path As String = GameController.GamePath & ActiveGameMode.MapPath & levelFile Dim defaultPath As String = GameController.GamePath & GameMode.DefaultMapPath & levelFile @@ -333,8 +302,6 @@ start: ''' Checks if a Content file exists either in the active GameMode or the default GameMode. ''' ''' The Content file to look for. - ''' - ''' Public Shared Function ContentFileExists(ByVal contentFile As String) As Boolean Dim path As String = GameController.GamePath & ActiveGameMode.ContentPath & contentFile Dim defaultPath As String = GameController.GamePath & GameMode.DefaultContentPath & contentFile @@ -357,9 +324,6 @@ Public Class GameMode ''' ''' Is this GameMode loaded correctly? ''' - ''' - ''' - ''' Public ReadOnly Property IsValid() As Boolean Get If _loaded = True Then @@ -381,9 +345,6 @@ Public Class GameMode ''' ''' The name of the directory this GameMode is placed in. Not the full path. ''' - ''' - ''' - ''' Public ReadOnly Property DirectoryName() As String Get If _usedFileName <> "" Then @@ -399,9 +360,6 @@ Public Class GameMode ''' ''' The name of the directory this GameMode is placed in. ''' - ''' - ''' - ''' Public ReadOnly Property Path() As String Get If _usedFileName <> "" Then @@ -417,7 +375,6 @@ Public Class GameMode ''' Create a new GameMode. ''' ''' The file the gamemode should load from. - ''' Public Sub New(ByVal FileName As String) Load(FileName) End Sub @@ -443,7 +400,6 @@ Public Class GameMode ''' The skin colors for the new GameMode. Must be the same amount as SkinFiles and SkinNames. ''' The skin files for the new GameMode. Must be the same amount as SkinColors and SkinNames. ''' The skin names for the new GameMode. Must be the same amount as SkinFiles and SkinColors. - ''' Public Sub New(ByVal Name As String, ByVal Description As String, ByVal Version As String, ByVal Author As String, ByVal MapPath As String, ByVal ScriptPath As String, ByVal PokeFilePath As String, ByVal PokemonDataPath As String, ByVal ContentPath As String, ByVal LocalizationsPath As String, ByVal GameRules As List(Of GameRule), ByVal StartMap As String, ByVal StartPosition As Vector3, ByVal StartRotation As Single, ByVal StartLocationName As String, ByVal StartDialogue As String, ByVal StartColor As Color, ByVal PokemonAppear As String, ByVal IntroMusic As String, ByVal SkinColors As List(Of Color), ByVal SkinFiles As List(Of String), ByVal SkinNames As List(Of String)) Me._name = Name @@ -476,8 +432,6 @@ Public Class GameMode ''' ''' This loads the GameMode. ''' - ''' - ''' Private Sub Load(ByVal FileName As String) If System.IO.File.Exists(FileName) = True Then Dim Data() As String = System.IO.File.ReadAllLines(FileName) @@ -596,7 +550,6 @@ Public Class GameMode ''' ''' Reload the GameMode from an already used file. ''' - ''' Public Sub Reload() Load(Me._usedFileName) End Sub @@ -605,7 +558,6 @@ Public Class GameMode ''' Reload the GameMode. ''' ''' Use this file to reload the GameMode from. - ''' Public Sub Reload(ByVal FileName As String) Load(FileName) End Sub @@ -613,8 +565,6 @@ Public Class GameMode ''' ''' Returns the default Kolben Game Mode. ''' - ''' - ''' Public Shared Function GetKolbenGameMode() As GameMode Dim SkinColors As List(Of Color) = {New Color(248, 176, 32), New Color(248, 216, 88), New Color(56, 88, 200), New Color(216, 96, 112), New Color(56, 88, 152), New Color(239, 90, 156)}.ToList() Dim SkinFiles As List(Of String) = {"Ethan", "Lyra", "Nate", "Rosa", "Hilbert", "Hilda"}.ToList() @@ -644,7 +594,6 @@ Public Class GameMode ''' Export this GameMode to a file. ''' ''' The file this GameMode should get exported to. - ''' Public Sub SaveToFile(ByVal File As String) Dim s As String = "Name|" & Me._name & vbNewLine & "Description|" & Me._description & vbNewLine & @@ -756,9 +705,6 @@ Public Class GameMode ''' ''' The name of this GameMode. ''' - ''' - ''' - ''' Public Property Name() As String Get Return Me._name @@ -771,9 +717,6 @@ Public Class GameMode ''' ''' The Description of the GameMode. This may contain multiple lines. ''' - ''' - ''' - ''' Public Property Description() As String Get Return Me._description @@ -786,9 +729,6 @@ Public Class GameMode ''' ''' The version of the GameMode. Warning: This doesn't have to be a number! ''' - ''' - ''' - ''' Public Property Version() As String Get Return Me._version @@ -801,9 +741,6 @@ Public Class GameMode ''' ''' The author of the GameMode. ''' - ''' - ''' - ''' Public Property Author() As String Get Return Me._author @@ -816,9 +753,6 @@ Public Class GameMode ''' ''' The MapPath used from this GameMode to load maps from. ''' - ''' - ''' - ''' Public Property MapPath() As String Get Return Me._mapPath.Replace("$Mode", "\GameModes\" & Me.DirectoryName) @@ -831,9 +765,6 @@ Public Class GameMode ''' ''' The ScriptPath from this GameMode to load scripts from. ''' - ''' - ''' - ''' Public Property ScriptPath() As String Get Return Me._scriptPath.Replace("$Mode", "\GameModes\" & Me.DirectoryName) @@ -846,9 +777,6 @@ Public Class GameMode ''' ''' The .poke file directory from this GameMode. ''' - ''' - ''' - ''' Public Property PokeFilePath() As String Get Return Me._pokeFilePath.Replace("$Mode", "\GameModes\" & Me.DirectoryName) @@ -861,9 +789,6 @@ Public Class GameMode ''' ''' The Pokemon-Datapath to load Pokemon data from. ''' - ''' - ''' - ''' Public Property PokemonDataPath() As String Get Return Me._pokemonDataPath.Replace("$Mode", "\GameModes\" & Me.DirectoryName) @@ -876,9 +801,6 @@ Public Class GameMode ''' ''' The content path to load images, sounds and music from. ''' - ''' - ''' - ''' Public Property ContentPath() As String Get Return Me._contentPath.Replace("$Mode", "\GameModes\" & Me.DirectoryName) @@ -891,9 +813,6 @@ Public Class GameMode ''' ''' The localizations path to load additional tokens from. Tokens that are already existing get overritten. ''' - ''' - ''' - ''' Public Property LocalizationsPath() As String Get Return Me._localizationsPath.Replace("$Mode", "\GameModes\" & Me.DirectoryName) @@ -906,9 +825,6 @@ Public Class GameMode ''' ''' The GameRules that apply to this GameMode. ''' - ''' - ''' - ''' Public Property GameRules() As List(Of GameRule) Get Return Me._gameRules @@ -938,9 +854,6 @@ Public Class GameMode ''' ''' The start map for this GameMode. ''' - ''' - ''' - ''' Public Property StartMap() As String Get Return Me._startMap @@ -953,9 +866,6 @@ Public Class GameMode ''' ''' The start position for this GameMode. ''' - ''' - ''' - ''' Public Property StartPosition() As Vector3 Get Return Me._startPosition @@ -968,9 +878,6 @@ Public Class GameMode ''' ''' The start rotation for this GameMode. ''' - ''' - ''' - ''' Public Property StartRotation() As Single Get Return Me._startRotation @@ -983,9 +890,6 @@ Public Class GameMode ''' ''' The start location name for this GameMode. ''' - ''' - ''' - ''' Public Property StartLocationName() As String Get Return Me._startLocationName @@ -998,9 +902,6 @@ Public Class GameMode ''' ''' The dialogue said in the intro of the game. Split in 3 different texts: intro dialogue, after Pokémon jumped out, after name + character choose. ''' - ''' - ''' - ''' Public Property StartDialogue() As String Get Return Me._startDialogue @@ -1013,9 +914,6 @@ Public Class GameMode ''' ''' The default background color in the intro sequence. ''' - ''' - ''' - ''' Public Property StartColor() As Color Get Return Me._startColor @@ -1028,9 +926,6 @@ Public Class GameMode ''' ''' The Pokémon that appear on the new game screen for this GameMode. ''' - ''' - ''' - ''' Public Property PokemonAppear() As String Get Return Me._pokemonAppear @@ -1056,9 +951,6 @@ Public Class GameMode ''' ''' The Pokémon range that will appear on the new game screen for this GameMode. ''' - ''' - ''' - ''' Public ReadOnly Property PokemonRange() As Integer() Get Return Me._pokemonRange @@ -1068,9 +960,6 @@ Public Class GameMode ''' ''' The intro music that plays on the new game screen for this GameMode. ''' - ''' - ''' - ''' Public Property IntroMusic() As String Get Return Me._introMusic @@ -1083,9 +972,6 @@ Public Class GameMode ''' ''' The skin colors for this GameMode. Must be the same amount as SkinFiles and SkinNames. ''' - ''' - ''' - ''' Public Property SkinColors() As List(Of Color) Get Return Me._skinColors @@ -1098,9 +984,6 @@ Public Class GameMode ''' ''' The skin files for this GameMode. Must be the same amount as SkinNames and SkinColors. ''' - ''' - ''' - ''' Public Property SkinFiles() As List(Of String) Get Return Me._skinFiles @@ -1113,9 +996,6 @@ Public Class GameMode ''' ''' The skin names for this GameMode. Must be the same amount as SkinFiles and SkinColors. ''' - ''' - ''' - ''' Public Property SkinNames() As List(Of String) Get Return Me._skinNames @@ -1137,7 +1017,6 @@ Public Class GameMode ''' ''' The name of the game rule. ''' The value of the game rule. - ''' Public Sub New(ByVal Name As String, ByVal Value As String) Me._ruleName = Name Me._ruleValue = Value @@ -1146,9 +1025,6 @@ Public Class GameMode ''' ''' The name of this GameRule. ''' - ''' - ''' - ''' Public Property RuleName() As String Get Return _ruleName @@ -1161,9 +1037,6 @@ Public Class GameMode ''' ''' The Value of this GameRule. ''' - ''' - ''' - ''' Public Property RuleValue() As String Get Return Me._ruleValue @@ -1175,4 +1048,4 @@ Public Class GameMode End Class -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/ModelManager.vb b/2.5DHero/2.5DHero/Resources/ModelManager.vb index 5c6e82413..5ada2148f 100644 --- a/2.5DHero/2.5DHero/Resources/ModelManager.vb +++ b/2.5DHero/2.5DHero/Resources/ModelManager.vb @@ -1,4 +1,4 @@ -Public Class ModelManager +Public Class ModelManager Shared ModelList As New Dictionary(Of String, Model) @@ -21,7 +21,6 @@ ''' And because there's no other way to properly do this, we access its Protected method MemberwiseClone (inherited from Object) via reflection. ''' ''' The model to copy. - ''' Private Shared Function CreateShallowCopy(ByVal m As Model) As Model Dim memberWiseCloneMethod As Reflection.MethodInfo = m.GetType().GetMethod("MemberwiseClone", Reflection.BindingFlags.NonPublic Or 'I AM SO SORRY!!! Reflection.BindingFlags.Instance Or @@ -85,4 +84,4 @@ Return renderTarget End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/TextureManager.vb b/2.5DHero/2.5DHero/Resources/TextureManager.vb index 10985dca3..1fbe07ca0 100644 --- a/2.5DHero/2.5DHero/Resources/TextureManager.vb +++ b/2.5DHero/2.5DHero/Resources/TextureManager.vb @@ -1,4 +1,4 @@ -Public Class TextureManager +Public Class TextureManager Public Shared DefaultTexture As Texture2D @@ -12,8 +12,6 @@ ''' Returns a texture. ''' ''' The name of the texture. - ''' - ''' Public Shared Function GetTexture(ByVal Name As String) As Texture2D Dim cContent As ContentManager = ContentPackManager.GetContentManager(Name, ".xnb,.png") @@ -73,8 +71,6 @@ ''' The name of the texture. ''' The rectangle to get the texture from. ''' The texturepath to load a texture from. - ''' - ''' Public Shared Function GetTexture(ByVal Name As String, ByVal r As Rectangle, ByVal TexturePath As String) As Texture2D Dim tSource As TextureSource = ContentPackManager.GetTextureReplacement(TexturePath & Name, r) @@ -128,8 +124,6 @@ ''' ''' The name of the texture. ''' The rectangle to get from the texture. - ''' - ''' Public Shared Function GetTexture(ByVal Name As String, ByVal r As Rectangle) As Texture2D Return GetTexture(Name, r, "Textures\") End Function @@ -168,4 +162,4 @@ Return False End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb b/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb index 78fd4a672..1d35182c7 100644 --- a/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb +++ b/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb @@ -1,4 +1,4 @@ -Public Class StorageSystemScreen +Public Class StorageSystemScreen Inherits Screen @@ -1510,9 +1510,6 @@ ''' ''' Adds a pokemon to the next free spot and returns the index of that box ''' - ''' - ''' - ''' Public Shared Function DepositPokemon(ByVal p As Pokemon, Optional ByVal BoxIndex As Integer = -1) As Integer p.FullRestore() @@ -2571,4 +2568,4 @@ Public Class StorageSystemFilterScreen #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Screens/Pokemon/NameObjectScreen.vb b/2.5DHero/2.5DHero/Screens/Pokemon/NameObjectScreen.vb index 87d367c4f..68c4b276d 100644 --- a/2.5DHero/2.5DHero/Screens/Pokemon/NameObjectScreen.vb +++ b/2.5DHero/2.5DHero/Screens/Pokemon/NameObjectScreen.vb @@ -1,4 +1,4 @@ -''' +''' ''' A class to name Pokémon and other objects (namely the rival). ''' ''' Inherits from screen. @@ -22,7 +22,6 @@ Public Class NameObjectScreen ''' Handles the NameAccept event which fires if the object gets renamed. ''' ''' The new name of the object - ''' Public Delegate Sub DNameAcceptEventHandler(ByVal Name As String) Private _acceptName As DNameAcceptEventHandler @@ -32,7 +31,6 @@ Public Class NameObjectScreen ''' ''' The currently active screen. ''' The Pokémon reference to rename. - ''' Public Sub New(ByVal CurrentScreen As Screen, ByVal Pokemon As Pokemon) 'Set default values: Me.Identification = Identifications.NameObjectScreen @@ -232,7 +230,6 @@ Public Class NameObjectScreen ''' This function replaces characters in the string with nothing if the characters aren't allowed in the name. ''' ''' The name string. - ''' ''' Only numbers and alphabetic characters are allowed (0-9, a-z, A-Z) Private Function ReplaceInvalidChars(ByVal text As String) As String 'Creating the char array. @@ -287,4 +284,4 @@ Public Class NameObjectScreen Me._currentText = input End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Screens/Screen.vb b/2.5DHero/2.5DHero/Screens/Screen.vb index 029dea113..461b22e71 100644 --- a/2.5DHero/2.5DHero/Screens/Screen.vb +++ b/2.5DHero/2.5DHero/Screens/Screen.vb @@ -1,13 +1,11 @@ -''' +''' ''' The base class for all screens in the game. ''' -''' Public MustInherit Class Screen ''' ''' The ID for a screen. ''' - ''' Public Enum Identifications MainMenuScreen OverworldScreen @@ -103,9 +101,6 @@ Public MustInherit Class Screen ''' ''' A global camera instance, that carries over screen instances. ''' - ''' - ''' - ''' Public Shared Property Camera() As Camera Get Return _globalCamera @@ -118,9 +113,6 @@ Public MustInherit Class Screen ''' ''' A global level instance, that carries over screen instances. ''' - ''' - ''' - ''' Public Shared Property Level() As Level Get Return _globalLevel @@ -133,9 +125,6 @@ Public MustInherit Class Screen ''' ''' A global BasicEffect instance, that carries over screen instances. ''' - ''' - ''' - ''' Public Shared Property Effect() As BasicEffect Get Return _globalBasicEffect @@ -148,9 +137,6 @@ Public MustInherit Class Screen ''' ''' A global SkyDome instance, that carries over screen instances. ''' - ''' - ''' - ''' Public Shared Property SkyDome() As SkyDome Get Return _globalSkyDome @@ -163,9 +149,6 @@ Public MustInherit Class Screen ''' ''' A global TextBox instance, that carries over screen instances. ''' - ''' - ''' - ''' Public Shared Property TextBox() As TextBox Get Return _globalTextBox @@ -178,9 +161,6 @@ Public MustInherit Class Screen ''' ''' A global ChooseBox instance, that carries over screen instances. ''' - ''' - ''' - ''' Public Shared Property ChooseBox() As ChooseBox Get Return _globalChooseBox @@ -193,9 +173,6 @@ Public MustInherit Class Screen ''' ''' A global PokemonImageView instance, that carries over screen instances. ''' - ''' - ''' - ''' Public Shared Property PokemonImageView() As PokemonImageView Get Return _globalPokemonImageView @@ -223,9 +200,6 @@ Public MustInherit Class Screen ''' ''' A value to store the screen that underlies the current screen in. ''' - ''' - ''' - ''' Public Property PreScreen() As Screen Get Return Me._preScreen @@ -238,9 +212,6 @@ Public MustInherit Class Screen ''' ''' The ID of the screen. ''' - ''' - ''' - ''' Public Property Identification() As Identifications Get Return Me._identification @@ -253,8 +224,6 @@ Public MustInherit Class Screen ''' ''' Wether the mouse is visible on the screen. ''' - ''' - ''' ''' The default value is "False". Public Property MouseVisible() As Boolean Get @@ -268,8 +237,6 @@ Public MustInherit Class Screen ''' ''' Wether the game can be paused when pressing Escape. ''' - ''' - ''' ''' The default value is "True". Public Property CanBePaused() As Boolean Get @@ -283,8 +250,6 @@ Public MustInherit Class Screen ''' ''' Wether the game can be muted by pressing M (default). ''' - ''' - ''' ''' The default value is "True". Public Property CanMuteMusic() As Boolean Get @@ -298,8 +263,6 @@ Public MustInherit Class Screen ''' ''' Wether the ChatScreen can be opened by pressing T (default). ''' - ''' - ''' ''' The default value is "True". Public Property CanChat() As Boolean Get @@ -313,8 +276,6 @@ Public MustInherit Class Screen ''' ''' Wether a screenshot can be taken by pressing F2 (default). ''' - ''' - ''' ''' The default value is "True". Public Property CanTakeScreenshot() As Boolean Get @@ -328,8 +289,6 @@ Public MustInherit Class Screen ''' ''' Wether the debug information can be drawn on the screen. ''' - ''' - ''' ''' The default value is "True". Public Property CanDrawDebug() As Boolean Get @@ -343,8 +302,6 @@ Public MustInherit Class Screen ''' ''' Wether the game can switch its fullscreen state by pressing F11 (default). ''' - ''' - ''' ''' The default value is "True". Public Property CanGoFullscreen() As Boolean Get @@ -371,7 +328,6 @@ Public MustInherit Class Screen ''' Sets if the F2 button (default) can take a screenshot. ''' Sets if the debug information can be drawn on this screen. ''' Sets if the F11 button (default) can sets the game to fullscreen (or back). - ''' Private Sub Setup(ByVal Identification As Identifications, ByVal MouseVisible As Boolean, ByVal CanBePaused As Boolean, ByVal CanMuteMusic As Boolean, ByVal CanChat As Boolean, ByVal CanTakeScreenshot As Boolean, ByVal CanDrawDebug As Boolean, ByVal CanGoFullscreen As Boolean) Me.Identification = Identification Me.MouseVisible = MouseVisible @@ -394,7 +350,6 @@ Public MustInherit Class Screen ''' ''' The base render function of the screen. Used to render models above sprites. ''' - ''' Public Overridable Overloads Sub Render() End Sub @@ -426,8 +381,6 @@ Public MustInherit Class Screen ''' ''' Returns if this screen instance is the currently active screen (set in the global Basic.CurrentScreen). ''' - ''' - ''' Public Function IsCurrentScreen() As Boolean If Core.CurrentScreen.Identification = Me.Identification Then 'If the screen stored in the CurrentScreen field has the same ID as this screen, return true. Return True @@ -455,7 +408,6 @@ Public MustInherit Class Screen ''' ''' An event that is getting raised when the Escape button is getting pressed. The PauseScreen is getting brought up if the CanBePaused field is set to true. ''' - ''' Public Overridable Sub EscapePressed() 'If the game can be paused on this screen, open the PauseScreen. If Core.CurrentScreen.CanBePaused = True Then @@ -493,7 +445,6 @@ Public MustInherit Class Screen ''' ''' The button types and descriptions. ''' The position to draw the buttons. - ''' Friend Sub DrawGamePadControls(ByVal Descriptions As Dictionary(Of Microsoft.Xna.Framework.Input.Buttons, String), ByVal Position As Vector2) 'Only if a Gamepad is connected and the screen is active, render the buttons: If GamePad.GetState(PlayerIndex.One).IsConnected = True And Core.GameOptions.GamePadEnabled = True And Me.IsCurrentScreen() = True Then @@ -553,8 +504,6 @@ Public MustInherit Class Screen ''' ''' Returns the screen status of the current screen. Override this function to return a screen state. ''' - ''' - ''' Public Overridable Function GetScreenStatus() As String '// Return the generic "not implemented" message: Return "Screen state not implemented for screen class: " & Me.Identification.ToString() @@ -563,11 +512,10 @@ Public MustInherit Class Screen ''' ''' Returns the minimum size for the screen size to display a large interface before switching to the small size. ''' - ''' ''' The default size is 800x620 pixels. Public Overridable Function GetScreenScaleMinimum() As Size '// Default size: 800x620 pixels. Return New Size(800, 620) End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Screens/TradeScreen.vb b/2.5DHero/2.5DHero/Screens/TradeScreen.vb index 966404f71..68082989b 100644 --- a/2.5DHero/2.5DHero/Screens/TradeScreen.vb +++ b/2.5DHero/2.5DHero/Screens/TradeScreen.vb @@ -1,4 +1,4 @@ -Public Class TradeScreen +Public Class TradeScreen Inherits Screen @@ -80,7 +80,6 @@ ''' ''' Contains definitions for an item that can be traded in a store. ''' - ''' Public Structure TradeItem ''' @@ -89,7 +88,6 @@ ''' The ID of the Item. ''' The Price of the Item. Leave -1 for automatic Price. ''' The Amount of the Item available in the store. Leave -1 for infinite. - ''' Public Sub New(ByVal ItemID As Integer, ByVal Amount As Integer, ByVal Price As Integer, ByVal Currency As Currencies) Me.ItemID = ItemID Me.Amount = Amount @@ -114,8 +112,6 @@ ''' ''' Returns the Item that is associated with this TradeItem instance. ''' - ''' - ''' Public Function GetItem() As Item Return Item.GetItemByID(Me.ItemID) End Function @@ -140,7 +136,6 @@ ''' ''' The screen that is the current active screen. ''' The string defining what the store sells. Format: {ItemID|Amount|Price} - ''' Public Sub New(ByVal currentScreen As Screen, ByVal storeString As String, ByVal canBuy As Boolean, ByVal canSell As Boolean, ByVal currencyIndicator As String) Me.PreScreen = currentScreen @@ -186,7 +181,6 @@ ''' Sets the currency from the currency indicator string. ''' ''' The currency indicator. - ''' Private Sub SetCurrency(ByVal currencyIndicator As String) Select Case currencyIndicator.ToLower() Case "p", "pokedollar", "pokédollar", "poke", "poké", "poke dollar", "poké dollar", "money" @@ -253,7 +247,6 @@ ''' ''' Updates the main screen. ''' - ''' Private Sub UpdateMain() Me.Title = "Store" @@ -306,7 +299,6 @@ ''' ''' Event when clicking on the Buy button. ''' - ''' Private Sub ButtonMainBuy() Me.MenuState = MenuStates.BuyItemsCategory Me.Cursor = 0 @@ -317,7 +309,6 @@ ''' ''' Event when clicking on the Sell button. ''' - ''' Private Sub ButtonMainSell() Me.MenuState = MenuStates.SellItemsCategory Me.Cursor = 0 @@ -328,7 +319,6 @@ ''' ''' Event when clicking on the Exit button. ''' - ''' Private Sub ButtonMainExit() Core.SetScreen(New TransitionScreen(Core.CurrentScreen, Me.PreScreen, Color.White, False)) End Sub @@ -336,7 +326,6 @@ ''' ''' Draw the main screen. ''' - ''' Private Sub DrawMain() Dim y As Integer = 100 For Each b As String In mainMenuButtons @@ -350,7 +339,6 @@ ''' ''' Draw the cursor on the main screen. ''' - ''' Private Sub DrawMainCursor() Dim cPosition As Vector2 = New Vector2(380, 100 + Me.Cursor * 96 - 42) @@ -1202,7 +1190,6 @@ ''' The width of the button in 64px steps. 5 is default. ''' The text to be displayed on the button. ''' The offset on the text on the button. 16 is default. - ''' Private Sub DrawButton(ByVal Position As Vector2, ByVal Width As Integer, ByVal Text As String, ByVal TextOffset As Integer, Optional ByVal Image As Texture2D = Nothing) Core.SpriteBatch.Draw(Me.texture, New Rectangle(CInt(Position.X), CInt(Position.Y), 64, 64), New Rectangle(16, 16, 16, 16), Color.White) Core.SpriteBatch.Draw(Me.texture, New Rectangle(CInt(Position.X) + 64, CInt(Position.Y), 64 * Width, 64), New Rectangle(32, 16, 16, 16), Color.White) @@ -1296,4 +1283,4 @@ End Select End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Screens/WindowScreen.vb b/2.5DHero/2.5DHero/Screens/WindowScreen.vb index 2ed58c856..8a68c4d33 100644 --- a/2.5DHero/2.5DHero/Screens/WindowScreen.vb +++ b/2.5DHero/2.5DHero/Screens/WindowScreen.vb @@ -1,7 +1,6 @@ -''' +''' ''' A generic class for a screen with a window GUI. ''' -''' Public MustInherit Class WindowScreen Inherits Screen @@ -47,7 +46,6 @@ Public MustInherit Class WindowScreen ''' ''' Draws the gradients and window. ''' - ''' Public Overrides Sub Draw() 'Gradients: If _drawingGradient = True Then @@ -131,7 +129,6 @@ Public MustInherit Class WindowScreen ''' ''' Updates the fade in of the gradients. ''' - ''' Public Overrides Sub Update() If Me._drawingGradient = False And IsDrawingGradients = False Then Me._drawingGradient = True @@ -226,4 +223,4 @@ Public MustInherit Class WindowScreen End If End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Security/HashSecureBase.vb b/2.5DHero/2.5DHero/Security/HashSecureBase.vb index 5f738b922..7fdfc638b 100644 --- a/2.5DHero/2.5DHero/Security/HashSecureBase.vb +++ b/2.5DHero/2.5DHero/Security/HashSecureBase.vb @@ -1,4 +1,4 @@ -Imports System.Reflection +Imports System.Reflection Namespace Security @@ -44,7 +44,6 @@ Namespace Security ''' ''' The exception that gets thrown when the system detects mismatching hash values. ''' - ''' Private Class MismatchingHashValuesException Inherits Exception @@ -59,4 +58,4 @@ Namespace Security End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb b/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb index b2ad36920..c5590b88b 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb @@ -1,4 +1,4 @@ -Public Class ActionScript +Public Class ActionScript Public Scripts As New List(Of Script) @@ -21,8 +21,6 @@ ''' ''' Returns the current ScriptLevel based on the script index. ''' - ''' - ''' Public Shared Function CSL() As ScriptLevel Return ScriptLevels(ScriptLevelIndex) End Function @@ -100,7 +98,6 @@ nextScript: ''' ''' The input string ''' Type of information; 0: Script path, 1: Text, 2: Direct input - ''' Public Sub StartScript(ByVal Input As String, ByVal InputType As Integer, Optional ByVal CheckDelay As Boolean = True, Optional ByVal ResetInsight As Boolean = True) ScriptLevelIndex += 1 @@ -557,8 +554,6 @@ nextScript: ''' Returns the Value and Type of a Register with value. {Value,Type} ''' ''' The name of the register. - ''' - ''' Public Shared Function GetRegisterValue(ByVal Name As String) As Object() Dim registers() As String = Core.Player.RegisterData.Split(CChar(",")) For Each line As String In registers @@ -581,4 +576,4 @@ nextScript: #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/ActionScript/ScriptConversion.vb b/2.5DHero/2.5DHero/World/ActionScript/ScriptConversion.vb index d504603a2..ddf7881c9 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/ScriptConversion.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/ScriptConversion.vb @@ -1,4 +1,4 @@ -''' +''' ''' Used to convert strings into various types. ''' Public Class ScriptConversion @@ -11,8 +11,6 @@ Public Class ScriptConversion ''' ''' Converts an expression into a . ''' - ''' - ''' Public Shared Function ToDouble(ByVal expression As Object) As Double Dim input As String = expression.ToString() Dim retError As Boolean = False @@ -36,8 +34,6 @@ Public Class ScriptConversion ''' ''' If the input can be evaluated into a number. ''' - ''' - ''' Public Shared Function IsArithmeticExpression(ByVal expression As Object) As Boolean Dim retError As Boolean = False Dim postfix As String = ToPostfix(expression.ToString(), retError) @@ -53,7 +49,6 @@ Public Class ScriptConversion ''' Evaluates a math expression in the postfix notation. Example: 2 3 + ''' ''' The postfix string. - ''' Private Shared Function EvaluatePostfix(ByVal input As String, Optional ByRef hasError As Boolean = False) As Double Dim stack As New List(Of Double) Dim tokens As List(Of Char) = input.ToCharArray().ToList() @@ -129,7 +124,6 @@ Public Class ScriptConversion ''' Converts an infix notation to postfix notation. ''' ''' The infix notation. Example: 2+3 - ''' Private Shared Function ToPostfix(ByVal input As String, Optional ByRef hasError As Boolean = False) As String If input.Trim().StartsWith("-") Then input = "0" & input @@ -211,7 +205,6 @@ Public Class ScriptConversion ''' If the token is a number or part of one. ''' ''' The token. - ''' Private Shared Function IsNumber(ByVal token As Char) As Boolean Return "0123456789.,".ToCharArray().Contains(token) End Function @@ -220,7 +213,6 @@ Public Class ScriptConversion ''' If the token is an operator. ''' ''' The token. - ''' Private Shared Function IsOperator(ByVal token As Char) As Boolean Return "+-*/^%".ToCharArray().Contains(token) End Function @@ -229,7 +221,6 @@ Public Class ScriptConversion ''' Returns the precedence for an operator. ''' ''' The operator. - ''' Private Shared Function GetPrecedence(ByVal [Operator] As Char) As Integer Select Case [Operator] Case "+"c, "-"c @@ -247,7 +238,6 @@ Public Class ScriptConversion ''' Returns if an operator has a Left or Right Associativity. ''' ''' The operator - ''' Private Shared Function GetAssociativity(ByVal [Operator] As Char) As Associativity Select Case [Operator] Case "^"c @@ -260,9 +250,6 @@ Public Class ScriptConversion ''' ''' Tries to convert a single number into a . ''' - ''' - ''' - ''' Private Shared Function InternalToDouble(ByVal expression As String, Optional ByRef hasError As Boolean = False) As Double expression = expression.Replace(".", My.Application.Culture.NumberFormat.NumberDecimalSeparator) @@ -284,7 +271,6 @@ Public Class ScriptConversion ''' Converts an expression into an . ''' ''' The expression to convert. - ''' Public Shared Function ToInteger(ByVal expression As Object) As Integer Return CInt(Math.Round(ToDouble(expression))) End Function @@ -293,7 +279,6 @@ Public Class ScriptConversion ''' Converts an expression to a . ''' ''' The expression to convert. - ''' Public Shared Function ToSingle(ByVal expression As Object) As Single Return CSng(ToDouble(expression)) End Function @@ -302,7 +287,6 @@ Public Class ScriptConversion ''' Converts an expression into a . ''' ''' The expression to convert. - ''' Public Shared Function ToBoolean(ByVal expression As Object) As Boolean Select Case expression.ToString().ToLower() Case "true", "1" @@ -316,11 +300,10 @@ Public Class ScriptConversion ''' Performs a check if an expression is a valid . ''' ''' The expression to perform the check on. - ''' Public Shared Function IsBoolean(ByVal expression As Object) As Boolean Dim s As String = expression.ToString() Dim validBools() As String = {"0", "1", "true", "false"} Return validBools.Contains(s.ToLower()) End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/ActionScript/ScriptStorage.vb b/2.5DHero/2.5DHero/World/ActionScript/ScriptStorage.vb index da487eae8..5d7ab0ce4 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/ScriptStorage.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/ScriptStorage.vb @@ -1,4 +1,4 @@ -''' +''' ''' Storage space for scripts. ''' Used with @storage and the storage construct. ''' @@ -17,7 +17,6 @@ Public Class ScriptStorage ''' ''' The type of the storage content. ''' The name of the storage content. - ''' Public Shared Function GetObject(ByVal type As String, ByVal name As String) As Object Select Case type.ToLower() Case "pokemon" @@ -123,7 +122,6 @@ Public Class ScriptStorage ''' Counts the content entries. ''' ''' The type of the content entires to count or empty for all entires. - ''' Public Shared Function Count(ByVal type As String) As Integer If type = "" Then Return Pokemons.Count + Strings.Count + Integers.Count + Booleans.Count + Items.Count @@ -161,4 +159,4 @@ Public Class ScriptStorage Return ScriptConversion.ToDouble(expression) End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommander.vb b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommander.vb index 614904f17..4293bf3d2 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommander.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommander.vb @@ -1,4 +1,4 @@ -Namespace ScriptVersion2 +Namespace ScriptVersion2 Partial Class ScriptCommander @@ -13,7 +13,6 @@ ''' ''' If the script finished executing. If false, the script will get executed next frame. ''' - ''' Private Shared Property IsReady As Boolean Get Return ScriptV2.IsReady @@ -26,7 +25,6 @@ ''' ''' A value to indicate if the script has been started last frame. Not automatically set. Sometimes needed for when a script runs longer than one frame. ''' - ''' Private Shared Property Started As Boolean Get Return ScriptV2.started @@ -39,7 +37,6 @@ ''' ''' If the ScriptController can execute the next script in the same frame once this finishes. ''' - ''' Private Shared Property CanContinue() As Boolean Get Return ScriptV2.CanContinue @@ -149,8 +146,6 @@ ''' ''' Generates a script line that gets inserted infront of the current script to turn the player into the correct orientation. ''' - ''' - ''' Private Shared Function InsertSpin(ByVal inputString As String) As Boolean If ActionScript.TempSpin = True Then If ActionScript.TempInputDirection > -1 Then @@ -203,4 +198,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptComparer.vb b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptComparer.vb index 69f45c84c..bae7dc5d9 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptComparer.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptComparer.vb @@ -1,4 +1,4 @@ -Namespace ScriptVersion2 +Namespace ScriptVersion2 Partial Class ScriptComparer @@ -33,7 +33,6 @@ ''' Evaluates a script comparison between two expressions. ''' ''' The string containing the expression to compare. - ''' Public Shared Function EvaluateScriptComparison(ByVal inputString As String) As Boolean Return EvaluateScriptComparison(inputString, False) End Function @@ -43,7 +42,6 @@ ''' ''' The string containing the expression to compare. ''' If the case of the strings should be evaluated. - ''' Public Shared Function EvaluateScriptComparison(ByVal inputString As String, ByVal caseSensitive As Boolean) As Boolean Dim comparer As String = "=" @@ -157,7 +155,6 @@ ''' The complete construct. Example: <mainclass.subclass(argument)>. ''' If a <not> is put directly in front of the construct, the result will be negated. ''' - ''' Public Shared Function EvaluateConstruct(ByVal construct As Object) As Object If TryCast(construct, String) <> Nothing Then If CStr(construct) = "" Then @@ -240,7 +237,6 @@ ''' Returns a SubClass and Argument as Pair. ''' ''' The string to deconstruct. Example: command(argument) - ''' Public Shared Function GetSubClassArgumentPair(ByVal inputString As String) As PairValue Dim p As New PairValue @@ -266,7 +262,6 @@ ''' ''' The main class of the contruct. ''' The sub class of the construct. - ''' Private Shared Function GetConstructReturnValue(ByVal mainClass As String, ByVal subClass As String) As Object Select Case mainClass.ToLower() Case "pokemon" @@ -317,7 +312,6 @@ ''' Returns a string for a boolean. ''' ''' The boolean to convert. - ''' Public Shared Function ReturnBoolean(ByVal bool As Boolean) As String If bool = True Then Return "true" @@ -347,4 +341,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptLibrary.vb b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptLibrary.vb index 2a08a4167..2ca7fee02 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptLibrary.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptLibrary.vb @@ -1,4 +1,4 @@ -Namespace ScriptVersion2 +Namespace ScriptVersion2 Public Class ScriptLibrary @@ -9,7 +9,6 @@ ''' ''' Call this at the initialize phase of the game. Fills the library with the script content. ''' - ''' Public Shared Sub InitializeLibrary() Dim sw As New Stopwatch() sw.Start() @@ -961,9 +960,6 @@ ''' ''' The data type needed for this argument. ''' - ''' - ''' - ''' Public ReadOnly Property ArgumentType() As ArgumentTypes Get Return Me._type @@ -973,9 +969,6 @@ ''' ''' The name of this argument. ''' - ''' - ''' - ''' Public ReadOnly Property Name() As String Get Return Me._name @@ -985,9 +978,6 @@ ''' ''' Specifies if this argument is optional for the command or construct. ''' - ''' - ''' - ''' Public ReadOnly Property IsOptional() As Boolean Get Return Me._isOptional @@ -997,9 +987,6 @@ ''' ''' Returns the default value for the argument if it is optional. ''' - ''' - ''' - ''' Public ReadOnly Property DefaultValue() As String Get Return Me._defaultValue @@ -1032,8 +1019,6 @@ ''' Gets the help content for a script command or construct. ''' ''' class.subclass - ''' - ''' Public Shared Function GetHelpContent(ByVal inputCommand As String, ByVal pageSize As Integer) As String If inputCommand.ToLower().StartsWith("constructs") Then Dim list As New List(Of String) @@ -1175,4 +1160,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/World/Badge.vb b/2.5DHero/2.5DHero/World/Badge.vb index 53e9c0fd9..8ac48f91b 100644 --- a/2.5DHero/2.5DHero/World/Badge.vb +++ b/2.5DHero/2.5DHero/World/Badge.vb @@ -1,7 +1,6 @@ -''' +''' ''' This class handles all actions regarding badge loading and displaying. ''' -''' Public Class Badge Public Enum HMMoves @@ -22,7 +21,6 @@ Public Class Badge ''' ''' This describes one badge loaded by a GameMode with ID, Name, Texture and Arguments ''' - ''' Private Class BadgeDeclaration Public ID As Integer = 0 @@ -90,7 +88,6 @@ Public Class Badge ''' ''' Loads the badges. Only use after the GameMode got set. ''' - ''' Public Shared Sub Load() Badges.Clear() @@ -110,8 +107,6 @@ Public Class Badge ''' Gets the badge name. ''' ''' The ID of the badge. - ''' - ''' Public Shared Function GetBadgeName(ByVal ID As Integer) As String For Each b As BadgeDeclaration In Badges If b.ID = ID Then @@ -125,8 +120,6 @@ Public Class Badge ''' Gets the badge texture. ''' ''' The ID of the badge. - ''' - ''' Public Shared Function GetBadgeTexture(ByVal ID As Integer) As Texture2D For Each b As BadgeDeclaration In Badges If b.ID = ID Then @@ -139,8 +132,6 @@ Public Class Badge ''' ''' Gets the highest level cap the player can use traded Pokémon on. ''' - ''' - ''' Public Shared Function GetLevelCap() As Integer Dim trainerBadges As List(Of Integer) = Core.Player.Badges Dim highestCap As Integer = 10 @@ -156,8 +147,6 @@ Public Class Badge ''' Checks if the player is able to perform a certain HM move. ''' ''' The HM move the player tries to use. - ''' - ''' Public Shared Function CanUseHMMove(ByVal HM As HMMoves) As Boolean Dim trainerBadges As List(Of Integer) = Core.Player.Badges For Each b As BadgeDeclaration In Badges @@ -172,8 +161,6 @@ Public Class Badge ''' Gets the region. ''' ''' The index of the region in the badges enumeration. - ''' - ''' Public Shared Function GetRegion(ByVal index As Integer) As String Dim regions As New List(Of String) For Each b As BadgeDeclaration In Badges @@ -192,8 +179,6 @@ Public Class Badge ''' Gets the amount of badges in a certain region. ''' ''' The region to count the badges. - ''' - ''' Public Shared Function GetBadgesCount(ByVal region As String) As Integer Dim c As Integer = 0 For Each b As BadgeDeclaration In Badges @@ -207,8 +192,6 @@ Public Class Badge ''' ''' Returns the amount of regions that exists in total. ''' - ''' - ''' Public Shared Function GetRegionCount() As Integer Dim regions As New List(Of String) For Each b As BadgeDeclaration In Badges @@ -224,8 +207,6 @@ Public Class Badge ''' ''' The region this badge is from. ''' The index of this badge. - ''' - ''' Public Shared Function GetBadgeID(ByVal region As String, ByVal index As Integer) As Integer Dim cBadges As New List(Of BadgeDeclaration) For Each b As BadgeDeclaration In Badges @@ -244,12 +225,10 @@ Public Class Badge ''' Checks if the player has a certain badge. ''' ''' The Badge ID to check for. - ''' - ''' Public Shared Function PlayerHasBadge(ByVal BadgeID As Integer) As Boolean Return Core.Player.Badges.Contains(BadgeID) End Function #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/BaseEntity.vb b/2.5DHero/2.5DHero/World/BaseEntity.vb index bf6e4c1fe..5c69021a5 100644 --- a/2.5DHero/2.5DHero/World/BaseEntity.vb +++ b/2.5DHero/2.5DHero/World/BaseEntity.vb @@ -1,7 +1,6 @@ -''' +''' ''' The base for XmlEntity.vb and Entity.vb ''' -''' Public MustInherit Class BaseEntity Public Enum EntityTypes @@ -14,9 +13,6 @@ Public MustInherit Class BaseEntity ''' ''' The type of entity. ''' - ''' - ''' - ''' Public ReadOnly Property EntityType() As EntityTypes Get Return Me._entityType @@ -27,7 +23,6 @@ Public MustInherit Class BaseEntity ''' Creates a new instance of the BaseEntity class. ''' ''' The type of entity the super of this class is. - ''' Public Sub New(ByVal EntityType As EntityTypes) Me._entityType = EntityType End Sub @@ -35,8 +30,6 @@ Public MustInherit Class BaseEntity ''' ''' Converts the BaseEntity into an XmlEntity. ''' - ''' - ''' Public Function ToXmlEntity() As XmlLevel.XmlEntity If Me._entityType = EntityTypes.Entity Then Throw New Exceptions.InvalidEntityTypeException("Entity", "XmlEntity") @@ -48,8 +41,6 @@ Public MustInherit Class BaseEntity ''' ''' Converts the BaseEntity into an Entity. ''' - ''' - ''' Public Function ToEntity() As Entity If Me._entityType = EntityTypes.XmlEntity Then Throw New Exceptions.InvalidEntityTypeException("XmlEntity", "Entity") @@ -58,4 +49,4 @@ Public MustInherit Class BaseEntity Return CType(Me, Entity) End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/Level.vb b/2.5DHero/2.5DHero/World/Level.vb index 9969d6591..4e5e009a5 100644 --- a/2.5DHero/2.5DHero/World/Level.vb +++ b/2.5DHero/2.5DHero/World/Level.vb @@ -1,7 +1,6 @@ -''' +''' ''' A class that manages the collection of entities to represent a map. ''' -''' Public Class Level #Region "Fields" @@ -13,13 +12,11 @@ Public Class Level ''' ''' Stores warp data for warping to a new map. ''' - ''' Public WarpData As WarpDataStruct ''' ''' Stores temporary Pokémon encounter data. ''' - ''' Public PokemonEncounterData As PokemonEcounterDataStruct 'Level states: @@ -85,9 +82,6 @@ Public Class Level ''' ''' The Terrain of this level. ''' - ''' - ''' - ''' Public ReadOnly Property Terrain() As Terrain Get Return Me._terrain @@ -97,9 +91,6 @@ Public Class Level ''' ''' A RouteSign on the top left corner of the screen to display the map's name. ''' - ''' - ''' - ''' Public ReadOnly Property RouteSign() As RouteSign Get Return Me._routeSign @@ -109,9 +100,6 @@ Public Class Level ''' ''' Indicates wether the player is surfing. ''' - ''' - ''' - ''' Public Property Surfing() As Boolean Get Return _isSurfing @@ -124,9 +112,6 @@ Public Class Level ''' ''' Indicates wether the player is riding. ''' - ''' - ''' - ''' Public Property Riding() As Boolean Get Return Me._isRiding @@ -139,9 +124,6 @@ Public Class Level ''' ''' Indicates wether the player used Strength already. ''' - ''' - ''' - ''' Public Property UsedStrength() As Boolean Get Return Me._usedStrength @@ -154,9 +136,6 @@ Public Class Level ''' ''' The reference to the active OwnPlayer instance. ''' - ''' - ''' - ''' Public Property OwnPlayer() As OwnPlayer Get Return Me._ownPlayer @@ -169,9 +148,6 @@ Public Class Level ''' ''' The reference to the active OverworldPokemon instance. ''' - ''' - ''' - ''' Public Property OverworldPokemon() As OverworldPokemon Get Return Me._ownOverworldPokemon @@ -184,9 +160,6 @@ Public Class Level ''' ''' The array of entities composing the map. ''' - ''' - ''' - ''' Public Property Entities() As List(Of Entity) Get Return Me._entities @@ -199,9 +172,6 @@ Public Class Level ''' ''' The array of floors the player can move on. ''' - ''' - ''' - ''' Public Property Floors() As List(Of Entity) Get Return Me._floors @@ -214,9 +184,6 @@ Public Class Level ''' ''' The array of shaders that add specific lighting to the map. ''' - ''' - ''' - ''' Public Property Shaders() As List(Of Shader) Get Return Me._shaders @@ -229,9 +196,6 @@ Public Class Level ''' ''' The array of players on the server to render. ''' - ''' - ''' - ''' Public Property NetworkPlayers() As List(Of NetworkPlayer) Get Return Me._networkPlayers @@ -244,9 +208,6 @@ Public Class Level ''' ''' The array of Pokémon on the server to render. ''' - ''' - ''' - ''' Public Property NetworkPokemon() As List(Of NetworkPokemon) Get Return Me._networkPokemon @@ -259,9 +220,6 @@ Public Class Level ''' ''' The array of entities the offset maps are composed of. ''' - ''' - ''' - ''' Public Property OffsetmapEntities() As List(Of Entity) Get Return Me._offsetMapEntities @@ -274,9 +232,6 @@ Public Class Level ''' ''' The array of floors the offset maps are composed of. ''' - ''' - ''' - ''' Public Property OffsetmapFloors() As List(Of Entity) Get Return Me._offsetMapFloors @@ -289,8 +244,6 @@ Public Class Level ''' ''' The name of the current map. ''' - ''' - ''' ''' This name gets displayed on the RouteSign. Public Property MapName() As String Get @@ -304,8 +257,6 @@ Public Class Level ''' ''' The default background music for this level. ''' - ''' - ''' ''' Doesn't play for surfing, riding and radio. Public Property MusicLoop() As String Get @@ -319,8 +270,6 @@ Public Class Level ''' ''' The file this level got loaded from. ''' - ''' - ''' ''' The path is relative to the \maps\ or \GameMode\[gamemode]\maps\ path. Public Property LevelFile() As String Get @@ -334,9 +283,6 @@ Public Class Level ''' ''' Wether the player can use the move Teleport. ''' - ''' - ''' - ''' Public Property CanTeleport As Boolean Get Return Me._canTeleport @@ -349,9 +295,6 @@ Public Class Level ''' ''' Wether the player can use the move Dig or an Escape Rope. ''' - ''' - ''' - ''' Public Property CanDig As Boolean Get Return Me._canDig @@ -364,9 +307,6 @@ Public Class Level ''' ''' Wether the player can use the move Fly. ''' - ''' - ''' - ''' Public Property CanFly As Boolean Get Return Me._canFly @@ -379,8 +319,6 @@ Public Class Level ''' ''' The type of Ride the player can use on this map. ''' - ''' - ''' ''' 0 = Depends on CanDig and CanFly, 1 = True, 2 = False Public Property RideType As Integer Get @@ -394,8 +332,6 @@ Public Class Level ''' ''' The Weather on this map. ''' - ''' - ''' ''' For the weather, look at the WeatherTypes enumeration in World.vb Public Property WeatherType As Integer Get @@ -409,9 +345,6 @@ Public Class Level ''' ''' The environment type for this map. ''' - ''' - ''' - ''' Public Property EnvironmentType As Integer Get Return Me._environmentType @@ -424,9 +357,6 @@ Public Class Level ''' ''' Wether the player can encounter wild Pokémon in the Grass entities. ''' - ''' - ''' - ''' Public Property WildPokemonGrass As Boolean Get Return Me._wildPokemonGrass @@ -439,9 +369,6 @@ Public Class Level ''' ''' Wether the player can encounter wild Pokémon on every floor tile. ''' - ''' - ''' - ''' Public Property WildPokemonFloor As Boolean Get Return Me._wildPokemonFloor @@ -454,9 +381,6 @@ Public Class Level ''' ''' Wether the player can encounter wild Pokémon while surfing. ''' - ''' - ''' - ''' Public Property WildPokemonWater As Boolean Get Return Me._wildPokemonWater @@ -469,9 +393,6 @@ Public Class Level ''' ''' Wether the map is dark, and needs to be lightened up by Flash. ''' - ''' - ''' - ''' Public Property IsDark As Boolean Get Return Me._isDark @@ -484,9 +405,6 @@ Public Class Level ''' ''' Wether the Overworld Pokémon is visible. ''' - ''' - ''' - ''' Public Property ShowOverworldPokemon As Boolean Get Return Me._showOverworldPokemon @@ -499,9 +417,6 @@ Public Class Level ''' ''' The amount of walked steps on this map. ''' - ''' - ''' - ''' Public Property WalkedSteps As Integer Get Return Me._walkedSteps @@ -514,8 +429,6 @@ Public Class Level ''' ''' The region this map is assigned to. ''' - ''' - ''' ''' The default is "Johto". Public Property CurrentRegion As String Get @@ -529,9 +442,6 @@ Public Class Level ''' ''' Chance of a Hidden Ability being on a wild pokemon. ''' - ''' - ''' - ''' Public Property HiddenAbilityChance As Integer Get Return Me._hiddenabilitychance @@ -544,9 +454,6 @@ Public Class Level ''' ''' The LightingType of this map. More information in the Level\UpdateLighting. ''' - ''' - ''' - ''' Public Property LightingType As Integer Get Return Me._lightingType @@ -559,9 +466,6 @@ Public Class Level ''' ''' Wether the map is a part of the SafariZone. This changes the Battle Menu and the MenuScreen. ''' - ''' - ''' - ''' Public Property IsSafariZone As Boolean Get Return Me._isSafariZone @@ -574,9 +478,6 @@ Public Class Level ''' ''' Wether the map is a part of the BugCatchingContest. This changes the Battle Menu and the MenuScreen. ''' - ''' - ''' - ''' Public Property IsBugCatchingContest As Boolean Get Return Me._isBugCatchingContest @@ -589,8 +490,6 @@ Public Class Level ''' ''' Holds data for the Bug Catching Contest. ''' - ''' - ''' ''' Composed of 3 values, separated by ",": 0 = script location for ending the contest, 1 = script location for selecting the remaining balls item, 2 = Menu Item name for the remaining balls item. Public Property BugCatchingContestData As String Get @@ -604,8 +503,6 @@ Public Class Level ''' ''' Used to modify the Battle Map camera position. ''' - ''' - ''' ''' Data: MapName,x,y,z OR Mapname OR x,y,z OR empty Public Property BattleMapData() As String Get @@ -619,9 +516,6 @@ Public Class Level ''' ''' The instance of the World class, handling time, season and weather based operations. ''' - ''' - ''' - ''' Public Property World() As World Get Return Me._world @@ -634,9 +528,6 @@ Public Class Level ''' ''' Wether the radio is currently activated. ''' - ''' - ''' - ''' Public Property IsRadioOn() As Boolean Get Return Me._isRadioOn @@ -649,9 +540,6 @@ Public Class Level ''' ''' The currently selected radio station. If possible, this will replace the MusicLoop. ''' - ''' - ''' - ''' Public Property SelectedRadioStation() As GameJolt.PokegearScreen.RadioStation Get Return Me._selectedRadioStation @@ -664,9 +552,6 @@ Public Class Level ''' ''' Allowed radio channels on this map. ''' - ''' - ''' - ''' Public Property AllowedRadioChannels() As List(Of Decimal) Get Return Me._radioChannels @@ -679,9 +564,6 @@ Public Class Level ''' ''' Handles wild Pokémon encounters. ''' - ''' - ''' - ''' Public ReadOnly Property PokemonEncounter() As PokemonEncounter Get Return Me._pokemonEncounter @@ -691,9 +573,6 @@ Public Class Level ''' ''' The backdrop renderer of this level. ''' - ''' - ''' - ''' Public ReadOnly Property BackdropRenderer() As BackdropRenderer Get Return _backdropRenderer @@ -707,72 +586,60 @@ Public Class Level ''' ''' A structure to store warp data in. ''' - ''' Public Structure WarpDataStruct ''' ''' The destination map file. ''' - ''' Public WarpDestination As String ''' ''' The position to warp the player to. ''' - ''' Public WarpPosition As Vector3 ''' ''' The check to see if the player should get warped next tick. ''' - ''' Public DoWarpInNextTick As Boolean ''' ''' Amount of 90° rotations counter clockwise. ''' - ''' Public WarpRotations As Integer ''' ''' The correct camera yaw to set the camera to after the warping. ''' - ''' Public CorrectCameraYaw As Single ''' ''' If the warp action got triggered by a warp block. ''' - ''' Public IsWarpBlock As Boolean End Structure ''' ''' A structure to store wild pokémon encounter data in. ''' - ''' Public Structure PokemonEcounterDataStruct ''' ''' The assumed position the player will be in when encounterning the Pokémon. ''' - ''' Public Position As Vector3 ''' ''' Wether the player encountered a Pokémon. ''' - ''' Public EncounteredPokemon As Boolean ''' ''' The encounter method. ''' - ''' Public Method As Spawner.EncounterMethods ''' ''' The link to the .poke file used to spawn the Pokémon in. ''' - ''' Public PokeFile As String End Structure @@ -781,7 +648,6 @@ Public Class Level ''' ''' Creates a new instance of the Level class. ''' - ''' Public Sub New() Me._routeSign = New RouteSign() Me.WarpData = New WarpDataStruct() @@ -797,7 +663,6 @@ Public Class Level ''' ''' Initializes the offset map update cycle. ''' - ''' Public Sub StartOffsetMapUpdate() If Not Me._offsetTimer Is Nothing Then Me._offsetTimer.Stop() @@ -823,7 +688,6 @@ Public Class Level ''' Loads a level from a levelfile. ''' ''' The path to load the level from. Start with "|" to prevent loading a levelfile. - ''' Public Sub Load(ByVal Levelpath As String) 'Create a parameter array to pass over to the LevelLoader. Dim params As New List(Of Object) @@ -853,7 +717,6 @@ Public Class Level ''' ''' Renders the level. ''' - ''' Public Sub Draw() Me._backdropRenderer.Draw() @@ -894,7 +757,6 @@ Public Class Level ''' ''' Updates the level's logic. ''' - ''' Public Sub Update() Me._backdropRenderer.Update() @@ -922,7 +784,6 @@ Public Class Level ''' ''' Updates all entities on the map and offset map and sorts the enumarations. ''' - ''' Public Sub UpdateEntities() 'Update and remove entities: If LevelLoader.IsBusy = False Then @@ -962,7 +823,6 @@ Public Class Level ''' ''' Sorts the entity enumerations. ''' - ''' Public Sub SortEntities() If LevelLoader.IsBusy = False Then Entities = (From f In Entities Order By f.CameraDistance Descending).ToList() @@ -972,7 +832,6 @@ Public Class Level ''' ''' Sorts and updates offset map entities. ''' - ''' Public Sub UpdateOffsetMap() Me._isUpdatingOffsetMaps = True If Core.GameOptions.LoadOffsetMaps > 0 Then @@ -1021,7 +880,6 @@ Public Class Level ''' ''' Renders offset map entities. ''' - ''' Private Sub RenderOffsetMap() 'Render floors: For i = 0 To Me.OffsetmapFloors.Count - 1 @@ -1047,7 +905,6 @@ Public Class Level ''' ''' Draws the flash overlay to the screen. ''' - ''' Private Sub DrawFlashOverlay() Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Overworld\flash_overlay"), New Rectangle(0, 0, Core.windowSize.Width, Core.windowSize.Height), Color.White) End Sub @@ -1055,7 +912,6 @@ Public Class Level ''' ''' Handles warp events for the player. ''' - ''' Private Sub UpdatePlayerWarp() If WarpData.DoWarpInNextTick = True Then 'If a warp event got scheduled. 'Disable wild Pokémon: @@ -1175,8 +1031,6 @@ Public Class Level ''' ''' Returns a list of all NPCs on the map. ''' - ''' - ''' Public Function GetNPCs() As List(Of NPC) Dim reList As New List(Of NPC) @@ -1194,7 +1048,6 @@ Public Class Level ''' ''' The ID of the NPC to return from the level. ''' Returns either a matching NPC or Nothing. - ''' Public Function GetNPC(ByVal ID As Integer) As NPC For Each NPC As NPC In GetNPCs() If NPC.NPCID = ID Then @@ -1208,9 +1061,6 @@ Public Class Level ''' ''' Returns an NPC based on the entity ID. ''' - ''' - ''' - ''' Public Function GetEntity(ByVal ID As Integer) As Entity If ID = -1 Then Throw New Exception("-1 is the default value for NOT having an ID, therefore is not a valid ID.") @@ -1228,7 +1078,6 @@ Public Class Level ''' ''' Checks all NPCs on the map for if the player is in their line of sight. ''' - ''' Public Sub CheckTrainerSights() For Each Entity As Entity In Entities If Entity.EntityID = "NPC" Then @@ -1243,8 +1092,6 @@ Public Class Level ''' ''' Determines wether the player can use Ride on this map. ''' - ''' - ''' Public Function CanRide() As Boolean If GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then 'Always true for Sandboxmode and Debug mode. Return True @@ -1267,8 +1114,6 @@ Public Class Level ''' ''' Wether the player can move based on the entity around him. ''' - ''' - ''' Public Function CanMove() As Boolean For Each e As Entity In Me.Entities If e.Position.X = Screen.Camera.Position.X And e.Position.Z = Screen.Camera.Position.Z And CInt(e.Position.Y) = CInt(Screen.Camera.Position.Y) Then @@ -1278,4 +1123,4 @@ Public Class Level Return True End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/Lighting.vb b/2.5DHero/2.5DHero/World/Lighting.vb index 0d6af48ba..251931c1c 100644 --- a/2.5DHero/2.5DHero/World/Lighting.vb +++ b/2.5DHero/2.5DHero/World/Lighting.vb @@ -1,7 +1,6 @@ -''' +''' ''' A class to handle entity lighting. ''' -''' Public Class Lighting #Region "Enums" @@ -31,7 +30,6 @@ Public Class Lighting ''' ''' A reference to the BasicEffect that should receive the lighting update. ''' Checks, if the lighting update on the effect should be forced. - ''' Public Shared Sub UpdateLighting(ByRef refEffect As BasicEffect, Optional ByVal ForceLighting As Boolean = False) If Core.GameOptions.LightingEnabled = True Or ForceLighting = True Then 'Only update the lighting if either the currently loaded level instance allows this, or it's getting forced. 'Set default parameters: @@ -120,4 +118,4 @@ Public Class Lighting #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/OffsetMap.vb b/2.5DHero/2.5DHero/World/OffsetMap.vb index 0bbe2fe58..56a08be1d 100644 --- a/2.5DHero/2.5DHero/World/OffsetMap.vb +++ b/2.5DHero/2.5DHero/World/OffsetMap.vb @@ -1,4 +1,4 @@ -''' +''' ''' Represents an Offset Map to be stored by the LevelLoader. ''' Public Class OffsetMap @@ -6,40 +6,34 @@ Public Class OffsetMap ''' ''' The identifier of this offset map, which contains Weather, Time and Season. ''' - ''' Public ReadOnly Property Identifier() As String ''' ''' The name of the file relative to *\maps\ with extension. ''' Like Level.vb-LevelFile ''' - ''' Public ReadOnly Property MapName() As String ''' ''' If this map got loaded. ''' - ''' Public ReadOnly Property Loaded() As Boolean = False ''' ''' The list of entities. ''' Only filled if LoadMap was performed. ''' - ''' Public ReadOnly Property Entities() As List(Of Entity) = Nothing ''' ''' The list of floors. ''' Only filled if LoadMap was performed. ''' - ''' Public ReadOnly Property Floors() As List(Of Entity) = Nothing ''' ''' Creates a new instance of the OffsetMap class. ''' - ''' Public Sub New(ByVal MapName As String) _MapName = MapName @@ -60,4 +54,4 @@ Public Class OffsetMap End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/PokemonEncounter.vb b/2.5DHero/2.5DHero/World/PokemonEncounter.vb index e739b3005..5a61a7845 100644 --- a/2.5DHero/2.5DHero/World/PokemonEncounter.vb +++ b/2.5DHero/2.5DHero/World/PokemonEncounter.vb @@ -1,7 +1,6 @@ -''' +''' ''' A class to handle wild Pokémon encounters. ''' -''' Public Class PokemonEncounter #Region "Fields and Constants" @@ -17,7 +16,6 @@ Public Class PokemonEncounter ''' Creates a new instance of the PokemonEncounter class. ''' ''' The reference to the level instance. - ''' Public Sub New(ByVal levelReference As Level) Me._levelReference = levelReference End Sub @@ -32,7 +30,6 @@ Public Class PokemonEncounter ''' The position the encounter should happen. ''' The method of the encounter. ''' The source .poke file. If left empty, the game will assume the levelfile as source .poke file. - ''' Public Sub TryEncounterWildPokemon(ByVal Position As Vector3, ByVal Method As Spawner.EncounterMethods, ByVal pokeFile As String) With Me._levelReference @@ -106,7 +103,6 @@ Public Class PokemonEncounter ''' ''' Triggers a battle with a wild Pokémon if the requirements are met. ''' - ''' Public Sub TriggerBattle() 'If the encounter check is true. If Me._levelReference.PokemonEncounterData.EncounteredPokemon = True And Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then @@ -161,4 +157,4 @@ Public Class PokemonEncounter #End Region -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/Terrain.vb b/2.5DHero/2.5DHero/World/Terrain.vb index 79676adf2..a295d2532 100644 --- a/2.5DHero/2.5DHero/World/Terrain.vb +++ b/2.5DHero/2.5DHero/World/Terrain.vb @@ -1,7 +1,6 @@ -''' +''' ''' Defines and handles terrain definitions for a map. ''' -''' Public Class Terrain #Region "Enums" @@ -9,7 +8,6 @@ Public Class Terrain ''' ''' A terrain type defined in the Terrain tag of a map. ''' - ''' Public Enum TerrainTypes Plain Sand @@ -40,9 +38,6 @@ Public Class Terrain ''' ''' The terrain type of this Terrain instance. ''' - ''' - ''' - ''' Public Property TerrainType() As TerrainTypes Get Return Me._terrainType @@ -60,7 +55,6 @@ Public Class Terrain ''' Creates a new instance of the Terrain class and sets an initial TerrainType. ''' ''' The TerrainType for this instance. - ''' Public Sub New(ByVal InitialTerrainType As TerrainTypes) Me._terrainType = InitialTerrainType End Sub @@ -73,8 +67,6 @@ Public Class Terrain ''' Converts a Terrain name to the correct Terrain class instance. ''' ''' The Terrain name. - ''' - ''' Public Shared Function FromString(ByVal input As String) As Terrain.TerrainTypes Select Case input.ToLower() Case "plain" @@ -119,8 +111,6 @@ Public Class Terrain ''' ''' The first Terrain instance. ''' The second Terrain instance. - ''' - ''' Public Shared Operator =(ByVal value1 As Terrain, ByVal value2 As Terrain) As Boolean Return value1.TerrainType = value2.TerrainType End Operator @@ -130,10 +120,8 @@ Public Class Terrain ''' ''' The first Terrain instance. ''' The second Terrain instance. - ''' - ''' Public Shared Operator <>(ByVal value1 As Terrain, ByVal value2 As Terrain) As Boolean Return Not value1 = value2 End Operator -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/World.vb b/2.5DHero/2.5DHero/World/World.vb index 8c8a04c26..abfeec646 100644 --- a/2.5DHero/2.5DHero/World/World.vb +++ b/2.5DHero/2.5DHero/World/World.vb @@ -1,4 +1,4 @@ -Public Class World +Public Class World Private Shared _regionWeather As Weathers = Weathers.Clear Private Shared _regionWeatherSet As Boolean = False @@ -896,8 +896,6 @@ endsub: ''' ''' Returns the region weather and gets the server weather if needed. ''' - ''' - ''' Public Shared Function GetCurrentRegionWeather() As Weathers If NeedServerObject() = True Then Return ServerWeather @@ -924,4 +922,4 @@ endsub: End Set End Property -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/World/XML/XmlEntity.vb b/2.5DHero/2.5DHero/World/XML/XmlEntity.vb index 3ccfb9916..8f98992bc 100644 --- a/2.5DHero/2.5DHero/World/XML/XmlEntity.vb +++ b/2.5DHero/2.5DHero/World/XML/XmlEntity.vb @@ -1,4 +1,4 @@ -Namespace XmlLevel +Namespace XmlLevel Public Class XmlEntity @@ -16,8 +16,6 @@ ''' ''' The type of the property value. ''' The name of the property. - ''' - ''' Public Function GetPropertyValue(Of T)(ByVal Name As String) As T If _storedProperties.ContainsKey(Name.ToLower()) = True Then Return CType(_storedProperties(Name.ToLower()), T) @@ -33,8 +31,6 @@ ''' Returns a property of this entity based on its name. ''' ''' The name of the property. - ''' - ''' Private Function GetProperty(ByVal Name As String) As XmlProperty For i = 0 To Me._properties.Count - 1 If Me._properties(i).Name.ToLower() = Name.ToLower() Then @@ -54,7 +50,6 @@ ''' The type of the propertie's value ''' The name of the property. ''' The new value of the property. - ''' Public Sub SetPropertyValue(Of T)(ByVal Name As String, ByVal Value As T) If _storedProperties.ContainsKey(Name.ToLower()) = True Then _storedProperties(Name.ToLower()) = Value @@ -69,7 +64,6 @@ ''' ''' The name of the property. ''' The value of the property. - ''' Public Sub AddProperty(ByVal Name As String, ByVal Value As String) Dim defaultProperty As XmlProperty = XmlProperty.GetDefaultProperty(Name) Me._properties.Add(New XmlProperty(Name, Value, defaultProperty.Type)) @@ -97,8 +91,6 @@ ''' Checks if this entity has the requested PropertyListener. ''' ''' The name of the PropertyListener. - ''' - ''' Public Function HasPropertyListener(ByVal AssociatedPropertyName As String) As Boolean For Each PropertyListener As XmlPropertyListener In Me._propertyListeners If PropertyListener.AssociatedPropertyName.ToLower() = AssociatedPropertyName.ToLower() Then @@ -112,7 +104,6 @@ ''' Adds a PropertyListener to the list of PropertyListeners. ''' ''' The PropertyListener to add. - ''' Public Sub AddPropertyListener(ByVal PropertyListener As XmlPropertyListener) Me._propertyListeners.Add(PropertyListener) End Sub @@ -121,9 +112,6 @@ ''' Returns if a property with a specific name exists for this entity. ''' ''' The name of the property. - ''' - ''' - ''' Public ReadOnly Property PropertyExists(ByVal PropertyName As String) As Boolean Get For Each p As XmlProperty In Me._properties @@ -138,8 +126,6 @@ ''' ''' Returns a list of names of the properties of this entity. ''' - ''' - ''' Public Function GetPropertyNameList() As List(Of String) Dim ll As New List(Of String) @@ -506,4 +492,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/2.5DHero/2.5DHero/World/XML/XmlEntityRenderer.vb b/2.5DHero/2.5DHero/World/XML/XmlEntityRenderer.vb index ad25b5536..9866e012c 100644 --- a/2.5DHero/2.5DHero/World/XML/XmlEntityRenderer.vb +++ b/2.5DHero/2.5DHero/World/XML/XmlEntityRenderer.vb @@ -1,4 +1,4 @@ -Namespace XmlLevel +Namespace XmlLevel Public Class XmlEntityRenderer @@ -156,7 +156,6 @@ ''' ''' This sub applies all the shading effects done by weather and daytime to the model, if rendered. ''' - ''' Private Sub ApplyRenderModelEffect() 'Call this function before the model gets rendered. For Each mesh As ModelMesh In Me._renderModel.Meshes For Each part As ModelMeshPart In mesh.MeshParts @@ -197,4 +196,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace