Updated AssemblyInfo and GameController to v0.54.2. Fixed the following bugs:

- Fixed most interactions with King's Rock in battle
- Fixed Aegislash losing Stance Change permanently under certain conditions
- Fixed typo in the dialogue of some NPC in Six Island pokecenter
This commit is contained in:
CaptainSegis 2017-07-25 18:38:37 -05:00
parent c894dabefe
commit 82f0ae68cd
8 changed files with 27 additions and 24 deletions

View File

@ -457,7 +457,7 @@
End Select
p.ReloadDefinitions()
p.CalculateStats()
p.LoadMegaAbility()
p.LoadAltAbility()
Me.ChangeCameraAngel(1, own, BattleScreen)
BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(own, ToggleEntityQueryObject.BattleEntities.OwnPokemon, PokemonForms.GetOverworldSpriteName(p), 0, 1, -1, -1))
BattleScreen.BattleQuery.Add(New TextQueryObject(_base & " has Mega Evolved!"))
@ -1040,16 +1040,16 @@
Public Sub DoAttackRound(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal moveUsed As Attack)
'p: the attacking pokemon
'op: the target pokemon
Dim p As Pokemon = BattleScreen.OwnPokemon
Dim op As Pokemon = BattleScreen.OppPokemon
Dim p As Pokemon
Dim op As Pokemon
If own Then
p = BattleScreen.OwnPokemon
op = BattleScreen.OppPokemon
BattleScreen.FieldEffects.OwnLastMove = moveUsed
Else
BattleScreen.FieldEffects.OppLastMove = moveUsed
End If
If Not own Then
p = BattleScreen.OppPokemon
op = BattleScreen.OwnPokemon
BattleScreen.FieldEffects.OppLastMove = moveUsed
End If
If WildHasEscaped Then
WildHasEscaped = False
@ -1241,16 +1241,6 @@
End If
End If
If op.HP > 0 And op.Status <> Pokemon.StatusProblems.Fainted Then
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "king's rock" Or p.Item.Name.ToLower() = "razor fang" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If Core.Random.Next(0, 100) < 10 Then
op.AddVolatileStatus(Pokemon.VolatileStatus.Flinch)
End If
End If
End If
End If
moveUsed.PreAttack(own, BattleScreen)
If p.HasVolatileStatus(Pokemon.VolatileStatus.Flinch) = True Then
@ -1885,8 +1875,19 @@
moveUsed.MoveHits(own, BattleScreen)
End If
End If
If op.HP > 0 AndAlso op.Status <> Pokemon.StatusProblems.Fainted Then
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "king's rock" Or p.Item.Name.ToLower() = "razor fang" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If Core.Random.Next(0, 100) < 10 Then
InflictFlinch(Not own, own, BattleScreen, "", "item:king's rock")
End If
End If
End If
End If
moveUsed.MoveRecoil(own, BattleScreen)
moveUsed.MoveRecharge(own, BattleScreen)
If op.HP > 0 Then
If own = True Then
If BattleScreen.FieldEffects.OppRageCounter > 0 Then

View File

@ -990,7 +990,9 @@ nextIndex:
p.AdditionalData = PokemonForms.GetInitialAdditionalData(p)
p.ReloadDefinitions()
p.CalculateStats()
p.RestoreAbility()
If str <> "blade" Then
p.RestoreAbility() 'currently only used for mega evolutions
End If
End Select
If Not p.Ability Is Nothing Then
p.Ability.EndBattle(p)

View File

@ -10,12 +10,12 @@ Public Class GameController
''' <summary>
''' The current version of the game.
''' </summary>
Public Const GAMEVERSION As String = "0.54.1"
Public Const GAMEVERSION As String = "0.54.2"
''' <summary>
''' The number of released iterations of the game.
''' </summary>
Public Const RELEASEVERSION As String = "92"
Public Const RELEASEVERSION As String = "93"
''' <summary>
''' The development stage the game is in.

View File

@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' Build Number
' Revision
'
<Assembly: AssemblyVersion("0.54.1")>
<Assembly: AssemblyVersion("0.54.2")>

View File

@ -1030,7 +1030,7 @@ Public Class Pokemon
'Just use these subs when doing/reverting mega evolutions.
Public NormalAbility As Ability = New Abilities.Stench
Public Sub LoadMegaAbility()
Public Sub LoadAltAbility()
NormalAbility = Ability
Me.Ability = NewAbilities(0)
End Sub

View File

@ -6,8 +6,8 @@
Shared _valid As Boolean = False
Const RUNVALIDATION As Boolean = False
Const EXPECTEDSIZE As Integer = 42420203
Const METAHASH As String = "MjJEMDcyQ0IwRUFGNjU1MERGNjQ1QTI1RUQwQUY4Q0Y="
Const EXPECTEDSIZE As Integer = 42420205
Const METAHASH As String = "MEEzNjIzMUE5RkEwNEFCQjgwQUQwODQ1NDVDRjVCNzQ="
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
Get

File diff suppressed because one or more lines are too long