mirror of
https://github.com/P3D-Legacy/P3D-Legacy.git
synced 2025-07-28 16:24:45 +02:00
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:
parent
c894dabefe
commit
82f0ae68cd
@ -457,7 +457,7 @@
|
|||||||
End Select
|
End Select
|
||||||
p.ReloadDefinitions()
|
p.ReloadDefinitions()
|
||||||
p.CalculateStats()
|
p.CalculateStats()
|
||||||
p.LoadMegaAbility()
|
p.LoadAltAbility()
|
||||||
Me.ChangeCameraAngel(1, own, BattleScreen)
|
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 ToggleEntityQueryObject(own, ToggleEntityQueryObject.BattleEntities.OwnPokemon, PokemonForms.GetOverworldSpriteName(p), 0, 1, -1, -1))
|
||||||
BattleScreen.BattleQuery.Add(New TextQueryObject(_base & " has Mega Evolved!"))
|
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)
|
Public Sub DoAttackRound(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal moveUsed As Attack)
|
||||||
'p: the attacking pokemon
|
'p: the attacking pokemon
|
||||||
'op: the target pokemon
|
'op: the target pokemon
|
||||||
Dim p As Pokemon = BattleScreen.OwnPokemon
|
Dim p As Pokemon
|
||||||
Dim op As Pokemon = BattleScreen.OppPokemon
|
Dim op As Pokemon
|
||||||
If own Then
|
If own Then
|
||||||
|
p = BattleScreen.OwnPokemon
|
||||||
|
op = BattleScreen.OppPokemon
|
||||||
BattleScreen.FieldEffects.OwnLastMove = moveUsed
|
BattleScreen.FieldEffects.OwnLastMove = moveUsed
|
||||||
Else
|
Else
|
||||||
BattleScreen.FieldEffects.OppLastMove = moveUsed
|
|
||||||
End If
|
|
||||||
If Not own Then
|
|
||||||
p = BattleScreen.OppPokemon
|
p = BattleScreen.OppPokemon
|
||||||
op = BattleScreen.OwnPokemon
|
op = BattleScreen.OwnPokemon
|
||||||
|
BattleScreen.FieldEffects.OppLastMove = moveUsed
|
||||||
End If
|
End If
|
||||||
If WildHasEscaped Then
|
If WildHasEscaped Then
|
||||||
WildHasEscaped = False
|
WildHasEscaped = False
|
||||||
@ -1241,16 +1241,6 @@
|
|||||||
End If
|
End If
|
||||||
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)
|
moveUsed.PreAttack(own, BattleScreen)
|
||||||
|
|
||||||
If p.HasVolatileStatus(Pokemon.VolatileStatus.Flinch) = True Then
|
If p.HasVolatileStatus(Pokemon.VolatileStatus.Flinch) = True Then
|
||||||
@ -1885,8 +1875,19 @@
|
|||||||
moveUsed.MoveHits(own, BattleScreen)
|
moveUsed.MoveHits(own, BattleScreen)
|
||||||
End If
|
End If
|
||||||
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.MoveRecoil(own, BattleScreen)
|
||||||
moveUsed.MoveRecharge(own, BattleScreen)
|
moveUsed.MoveRecharge(own, BattleScreen)
|
||||||
|
|
||||||
If op.HP > 0 Then
|
If op.HP > 0 Then
|
||||||
If own = True Then
|
If own = True Then
|
||||||
If BattleScreen.FieldEffects.OppRageCounter > 0 Then
|
If BattleScreen.FieldEffects.OppRageCounter > 0 Then
|
||||||
|
@ -990,7 +990,9 @@ nextIndex:
|
|||||||
p.AdditionalData = PokemonForms.GetInitialAdditionalData(p)
|
p.AdditionalData = PokemonForms.GetInitialAdditionalData(p)
|
||||||
p.ReloadDefinitions()
|
p.ReloadDefinitions()
|
||||||
p.CalculateStats()
|
p.CalculateStats()
|
||||||
p.RestoreAbility()
|
If str <> "blade" Then
|
||||||
|
p.RestoreAbility() 'currently only used for mega evolutions
|
||||||
|
End If
|
||||||
End Select
|
End Select
|
||||||
If Not p.Ability Is Nothing Then
|
If Not p.Ability Is Nothing Then
|
||||||
p.Ability.EndBattle(p)
|
p.Ability.EndBattle(p)
|
||||||
|
@ -10,12 +10,12 @@ Public Class GameController
|
|||||||
''' <summary>
|
''' <summary>
|
||||||
''' The current version of the game.
|
''' The current version of the game.
|
||||||
''' </summary>
|
''' </summary>
|
||||||
Public Const GAMEVERSION As String = "0.54.1"
|
Public Const GAMEVERSION As String = "0.54.2"
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' The number of released iterations of the game.
|
''' The number of released iterations of the game.
|
||||||
''' </summary>
|
''' </summary>
|
||||||
Public Const RELEASEVERSION As String = "92"
|
Public Const RELEASEVERSION As String = "93"
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' The development stage the game is in.
|
''' The development stage the game is in.
|
||||||
|
@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
|
|||||||
' Build Number
|
' Build Number
|
||||||
' Revision
|
' Revision
|
||||||
'
|
'
|
||||||
<Assembly: AssemblyVersion("0.54.1")>
|
<Assembly: AssemblyVersion("0.54.2")>
|
@ -1030,7 +1030,7 @@ Public Class Pokemon
|
|||||||
|
|
||||||
'Just use these subs when doing/reverting mega evolutions.
|
'Just use these subs when doing/reverting mega evolutions.
|
||||||
Public NormalAbility As Ability = New Abilities.Stench
|
Public NormalAbility As Ability = New Abilities.Stench
|
||||||
Public Sub LoadMegaAbility()
|
Public Sub LoadAltAbility()
|
||||||
NormalAbility = Ability
|
NormalAbility = Ability
|
||||||
Me.Ability = NewAbilities(0)
|
Me.Ability = NewAbilities(0)
|
||||||
End Sub
|
End Sub
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
Shared _valid As Boolean = False
|
Shared _valid As Boolean = False
|
||||||
|
|
||||||
Const RUNVALIDATION As Boolean = False
|
Const RUNVALIDATION As Boolean = False
|
||||||
Const EXPECTEDSIZE As Integer = 42420203
|
Const EXPECTEDSIZE As Integer = 42420205
|
||||||
Const METAHASH As String = "MjJEMDcyQ0IwRUFGNjU1MERGNjQ1QTI1RUQwQUY4Q0Y="
|
Const METAHASH As String = "MEEzNjIzMUE5RkEwNEFCQjgwQUQwODQ1NDVDRjVCNzQ="
|
||||||
|
|
||||||
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
|
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
|
||||||
Get
|
Get
|
||||||
|
Binary file not shown.
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user