tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed item name not being found with localizations

This commit is contained in:
JappaWakka 2023-01-02 15:27:59 +01:00
parent 30c368f9be
commit add7f4ac6f
50 changed files with 200 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -1072,7 +1072,7 @@
End If
End With
If p.Item IsNot Nothing AndAlso p.Item.Name.ToLower() = "power herb" AndAlso BattleScreen.CanUseItems Then
If p.Item IsNot Nothing AndAlso p.Item.OriginalName.ToLower() = "power herb" AndAlso BattleScreen.CanUseItems Then
Return False
End If
Select Case moveUsed.Name.ToLower
@ -1336,7 +1336,7 @@
If own = True Then
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "choice band" Or p.Item.Name.ToLower() = "choice specs" Or p.Item.Name.ToLower() = "choice scarf" Then
If p.Item.OriginalName.ToLower() = "choice band" Or p.Item.OriginalName.ToLower() = "choice specs" Or p.Item.OriginalName.ToLower() = "choice scarf" Then
If Not BattleScreen.FieldEffects.OwnChoiceMove Is Nothing Then
If Not moveUsed Is BattleScreen.FieldEffects.OwnChoiceMove Then
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & "'s move was prevented due to " & p.Item.Name & "!"))
@ -1349,7 +1349,7 @@
End If
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "choice band" Or p.Item.Name.ToLower() = "choice specs" Or p.Item.Name.ToLower() = "choice scarf" Then
If p.Item.OriginalName.ToLower() = "choice band" Or p.Item.OriginalName.ToLower() = "choice specs" Or p.Item.OriginalName.ToLower() = "choice scarf" Then
If Not BattleScreen.FieldEffects.OppChoiceMove Is Nothing Then
If Not moveUsed Is BattleScreen.FieldEffects.OppChoiceMove Then
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & "'s move was prevented due to " & p.Item.Name & "!"))
@ -2264,7 +2264,7 @@
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 p.Item.OriginalName.ToLower() = "king's rock" Or p.Item.OriginalName.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
@ -2408,13 +2408,13 @@
If p.Item.IsMegaStone = True Then
canSteal = False
End If
If p.Ability.Name.ToLower() = "multitype" AndAlso p.Item.Name.ToLower().EndsWith(" plate") Then
If p.Ability.Name.ToLower() = "multitype" AndAlso p.Item.OriginalName.ToLower().EndsWith(" plate") Then
canSteal = False
End If
If p.Item.Name.ToLower() = "griseous orb" And p.Number = 487 Then
If p.Item.OriginalName.ToLower() = "griseous orb" And p.Number = 487 Then
canSteal = False
End If
If p.Item.Name.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
If p.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
canSteal = False
End If
If canSteal Then
@ -2454,13 +2454,13 @@
If op.Item.IsMegaStone = True Then
canSteal = False
End If
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.Name.ToLower().EndsWith(" plate") Then
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.OriginalName.ToLower().EndsWith(" plate") Then
canSteal = False
End If
If op.Item.Name.ToLower() = "griseous orb" AndAlso op.Number = 487 Then
If op.Item.OriginalName.ToLower() = "griseous orb" AndAlso op.Number = 487 Then
canSteal = False
End If
If op.Item.Name.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
canSteal = False
End If
If canSteal Then
@ -2483,7 +2483,7 @@
If substitute = 0 And op.HP > 0 Then
If Not op.Item Is Nothing Then
If BattleScreen.FieldEffects.CanUseItem(Not own) AndAlso BattleScreen.FieldEffects.CanUseOwnItem(Not own, BattleScreen) = True Then
Select Case op.Item.Name.ToLower()
Select Case op.Item.OriginalName.ToLower()
Case "enigma"
If RemoveHeldItem(Not own, Not own, BattleScreen, op.GetDisplayName() & " used the Enigma Berry to recover.", "berry:enigma") = True Then
GainHP(CInt(Math.Ceiling(op.MaxHP / 4)), Not own, Not own, BattleScreen, "", "berry:enigma")
@ -2587,7 +2587,7 @@
'ABILITY SHIT GOES HERE
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "sticky barb" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "sticky barb" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Ability.Name.ToLower() <> "magic guard" Then
ReduceHP(CInt(Math.Floor(p.MaxHP / 8)), True, True, BattleScreen, p.GetDisplayName() & " was harmed by Sticky Barb.", "stickybarb")
End If
@ -2603,7 +2603,7 @@
If p.HP > 0 Then
If Not p.Item Is Nothing AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "shell bell"
If p.HP < p.MaxHP Then
GainHP(CInt(AllDamage / 8), own, own, BattleScreen, p.GetDisplayName() & " gains some HP due to the Shell Bell.", "shellbell")
@ -2904,7 +2904,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "rawst" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "rawst" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:rawst") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Rawst Berry cured the burn of " & p.GetDisplayName() & "!", "berry:rawst")
@ -2913,7 +2913,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:lum") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Lum Berry cured the burn of " & p.GetDisplayName() & "!", "berry:lum")
@ -3049,7 +3049,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "aspear" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "aspear" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:aspear") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Aspear Berry thraw out " & p.GetDisplayName() & "!", "berry:aspear")
@ -3058,7 +3058,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:lum") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Lum Berry thraw out " & p.GetDisplayName() & "!", "berry:lum")
@ -3183,7 +3183,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "cheri" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "cheri" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:cheri") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Cheri Berry cured the paralysis of " & p.GetDisplayName() & "!", "berry:cheri")
@ -3192,7 +3192,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:lum") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Lum Berry cured the paralyzis of " & p.GetDisplayName() & "!", "berry:lum")
@ -3346,7 +3346,7 @@
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " fell asleep!"))
End Select
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "chesto" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "chesto" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:chesto") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Chesto Berry woke up " & p.GetDisplayName() & "!", "berry:chesto")
@ -3355,7 +3355,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:lum") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Lum Berry woke up " & p.GetDisplayName() & "!", "berry:lum")
@ -3503,7 +3503,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "pecha" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "pecha" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:pecha") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Pecha Berry cured the poison of " & p.GetDisplayName() & "!", "berry:pecha")
@ -3512,7 +3512,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:lum") = True Then
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
CureStatusProblem(own, own, BattleScreen, "The Lum Berry cured the poison of " & p.GetDisplayName() & "!", "berry:lum")
@ -3629,7 +3629,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "persim" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "persim" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:persim") = True Then
Me.ChangeCameraAngle(1, own, BattleScreen)
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
@ -3641,7 +3641,7 @@
End If
p.RemoveVolatileStatus(Pokemon.VolatileStatus.Confusion)
End If
ElseIf p.Item.Name.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
ElseIf p.Item.OriginalName.ToLower() = "lum" AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True AndAlso BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:lum") = True Then
Me.ChangeCameraAngle(1, own, BattleScreen)
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
@ -4262,7 +4262,7 @@
p.AddVolatileStatus(Pokemon.VolatileStatus.Infatuation)
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "destiny knot" And from <> own And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "destiny knot" And from <> own And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
Me.InflictInfatuate(Not own, Not own, BattleScreen, "Destiny Knot reflects the infatuation.", "destinyknot")
End If
End If
@ -4398,7 +4398,7 @@
HitAnimation.AnimationFade(Nothing, False, 1, True, 1, 3, 0)
BattleScreen.BattleQuery.Add(HitAnimation)
End If
If own = True Then
BattleScreen.BattleQuery.Add(New MathHPQueryObject(p.HP, p.MaxHP, HPAmount, New Vector2(200, 256)))
Else
@ -4427,7 +4427,7 @@
Dim effectiveness As Single = BattleCalculation.CalculateEffectiveness(Not own, lastMove, BattleScreen)
If effectiveness > 1.0F Then
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "enigma" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "enigma" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:enigma") = True Then
UseBerry(own, from, Item.GetItemByID(ItemID), BattleScreen, message, cause)
End If
@ -4438,7 +4438,7 @@
If p.HP > 0 And p.HP < CInt(Math.Ceiling(p.MaxHP / 3)) Then
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "oran" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "oran" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If RemoveHeldItem(own, own, BattleScreen, "", "berry:oran") = True Then
UseBerry(own, from, Item.GetItemByID(ItemID), BattleScreen, message, cause)
End If
@ -4448,7 +4448,7 @@
If p.HP > 0 And p.HP < CInt(Math.Ceiling(p.MaxHP / 2)) Then
If Not p.Item Is Nothing Then
If BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "sitrus"
If RemoveHeldItem(own, own, BattleScreen, "", "berry:sitrus") = True Then
UseBerry(own, from, Item.GetItemByID(ItemID), BattleScreen, message, cause)
@ -4460,7 +4460,7 @@
If p.HP > 0 And p.HP < CInt(Math.Ceiling(p.MaxHP / 4)) Then
If Not p.Item Is Nothing Then
If BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "figy"
If RemoveHeldItem(own, own, BattleScreen, "", "berry:figy") = True Then
UseBerry(own, from, Item.GetItemByID(ItemID), BattleScreen, message, cause)
@ -4535,7 +4535,7 @@
Dim berry As Items.Berry = CType(BerryItem, Items.Berry)
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False))
Select Case BerryItem.Name.ToLower()
Select Case BerryItem.OriginalName.ToLower()
Case "oran"
GainHP(10, own, from, BattleScreen, "The Oran Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:oran")
Case "sitrus"
@ -4744,7 +4744,7 @@
'If Not p.Item Is Nothing Then
' If BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
' Select Case p.Item.Name.ToLower()
' Select Case p.Item.OriginalName.ToLower()
' Case "damp rock"
' If newWeather = BattleWeather.WeatherTypes.Rain Then
' weatherRounds += 3
@ -4913,7 +4913,7 @@
Dim changeType As Boolean = False
Dim newType As Element = Nothing
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "draco plate"
changeType = True
newType = New Element(Element.Types.Dragon)
@ -5038,7 +5038,7 @@
End If
If Not p.Item Is Nothing Then
If .FieldEffects.CanUseItem(own) = True And .FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "electric seed"
If .FieldEffects.ElectricTerrain > 0 And p.StatDefense < 6 Then
If RemoveHeldItem(own, own, BattleScreen, "-1", "") = True Then
@ -5423,7 +5423,7 @@
End If
If .OwnPokemon.HP > 0 Then
If Not .OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "mental herb" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "mental herb" Then
Dim usedMentalHerb As Boolean = False
If .OwnPokemon.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) = True Then
.OwnPokemon.RemoveVolatileStatus(Pokemon.VolatileStatus.Infatuation)
@ -5455,7 +5455,7 @@
.OwnPokemon.Item = Nothing
End If
End If
If .OwnPokemon.Item.Name.ToLower() = "white herb" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "white herb" Then
Dim hasNegativeStats As Boolean = False
With .OwnPokemon
If .StatAttack < 0 Then
@ -5653,7 +5653,7 @@
If .FieldEffects.OppHealBlock = 0 Then
Dim healHP As Integer = CInt(BattleScreen.OwnPokemon.MaxHP / 16)
If Not BattleScreen.OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "big root" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "big root" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
healHP = CInt(healHP * 1.3F)
End If
End If
@ -5665,7 +5665,7 @@
If .FieldEffects.OppHealBlock = 0 Then
Dim healHP As Integer = CInt(BattleScreen.OwnPokemon.MaxHP / 16)
If Not .OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "big root" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "big root" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
healHP = CInt(healHP * 1.3F)
End If
End If
@ -5695,7 +5695,7 @@
End If
If Not .OwnPokemon.Item Is Nothing Then 'Black Sludge
If .OwnPokemon.Item.Name.ToLower() = "black sludge" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "black sludge" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Type1.Type = Element.Types.Poison Or .OwnPokemon.Type2.Type = Element.Types.Poison Then
If .OwnPokemon.HP < .OwnPokemon.MaxHP And .OwnPokemon.HP > 0 Then
GainHP(CInt(.OwnPokemon.MaxHP / 16), True, True, BattleScreen, .OwnPokemon.GetDisplayName() & " gained HP from Black Sludge!", "blacksludge")
@ -5711,7 +5711,7 @@
If .OwnPokemon.HP < .OwnPokemon.MaxHP And .OwnPokemon.HP > 0 Then
If .FieldEffects.OppHealBlock = 0 Then
If Not .OwnPokemon.Item Is Nothing Then 'Leftovers
If .OwnPokemon.Item.Name.ToLower() = "leftovers" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "leftovers" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
GainHP(CInt(.OwnPokemon.MaxHP / 16), True, True, BattleScreen, .OwnPokemon.GetDisplayName() & " restored some HP from Leftovers!", "leftovers")
End If
End If
@ -5728,7 +5728,7 @@
Dim addHP As Integer = loseHP
If Not .OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "big root" And .FieldEffects.CanUseItem(True) = True And .FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "big root" And .FieldEffects.CanUseItem(True) = True And .FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
addHP += CInt(Math.Ceiling(addHP * (30 / 100)))
End If
End If
@ -5882,7 +5882,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -5919,7 +5919,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -5946,7 +5946,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -5960,7 +5960,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -5996,7 +5996,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -6027,7 +6027,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -6041,7 +6041,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -6055,7 +6055,7 @@
Else
Dim multiHP As Integer = CInt(.OwnPokemon.MaxHP / 8)
If Not .OppPokemon.Item Is Nothing And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.Name.ToLower() = "binding band" Then
If .OppPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OwnPokemon.MaxHP / 6)
End If
End If
@ -6179,7 +6179,7 @@
If .OwnPokemon.HP > 0 And .OwnPokemon.Status = Pokemon.StatusProblems.None Then
If Not .OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "flame orb" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "flame orb" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
InflictBurn(True, True, BattleScreen, "Flame Orb inflicts a burn!", "flameorb")
End If
End If
@ -6187,7 +6187,7 @@
If .OwnPokemon.HP > 0 And .OwnPokemon.Status = Pokemon.StatusProblems.None Then
If Not .OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "toxic orb" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "toxic orb" And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
InflictPoison(True, True, BattleScreen, True, "Toxic Orb inflicts a poisoning!", "toxicorb")
End If
End If
@ -6319,7 +6319,7 @@
End If
If .OppPokemon.HP > 0 Then
If Not .OppPokemon.Item Is Nothing Then
If .OppPokemon.Item.Name.ToLower() = "mental herb" Then
If .OppPokemon.Item.OriginalName.ToLower() = "mental herb" Then
Dim usedMentalHerb As Boolean = False
If .OppPokemon.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) = True Then
.OppPokemon.RemoveVolatileStatus(Pokemon.VolatileStatus.Infatuation)
@ -6351,7 +6351,7 @@
.OppPokemon.Item = Nothing
End If
End If
If .OppPokemon.Item.Name.ToLower() = "white herb" Then
If .OppPokemon.Item.OriginalName.ToLower() = "white herb" Then
Dim hasNegativeStats As Boolean = False
With .OppPokemon
If .StatAttack < 0 Then
@ -6544,7 +6544,7 @@
If .FieldEffects.OwnHealBlock = 0 Then
Dim healHP As Integer = CInt(BattleScreen.OppPokemon.MaxHP / 16)
If Not BattleScreen.OppPokemon.Item Is Nothing Then
If .OppPokemon.Item.Name.ToLower() = "big root" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "big root" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
healHP = CInt(healHP * 1.3F)
End If
End If
@ -6556,7 +6556,7 @@
If .FieldEffects.OwnHealBlock = 0 Then
Dim healHP As Integer = CInt(BattleScreen.OppPokemon.MaxHP / 16)
If Not .OppPokemon.Item Is Nothing Then
If .OppPokemon.Item.Name.ToLower() = "big root" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "big root" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
healHP = CInt(healHP * 1.3F)
End If
End If
@ -6586,7 +6586,7 @@
End If
If Not .OppPokemon.Item Is Nothing Then 'Black Sludge
If .OppPokemon.Item.Name.ToLower() = "black sludge" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "black sludge" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Type1.Type = Element.Types.Poison Or .OppPokemon.Type2.Type = Element.Types.Poison Then
If .OppPokemon.HP < .OppPokemon.MaxHP And .OppPokemon.HP > 0 Then
GainHP(CInt(.OppPokemon.MaxHP / 16), False, False, BattleScreen, .OppPokemon.GetDisplayName() & " gained HP from Black Sludge!", "blacksludge")
@ -6602,7 +6602,7 @@
If .OppPokemon.HP < .OppPokemon.MaxHP And .OppPokemon.HP > 0 Then
If .FieldEffects.OwnHealBlock = 0 Then
If Not .OppPokemon.Item Is Nothing Then 'Leftovers
If .OppPokemon.Item.Name.ToLower() = "leftovers" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "leftovers" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
GainHP(CInt(.OppPokemon.MaxHP / 16), False, False, BattleScreen, .OppPokemon.GetDisplayName() & " restored some HP from Leftovers!", "leftovers")
End If
End If
@ -6619,7 +6619,7 @@
Dim addHP As Integer = loseHP
If Not .OppPokemon.Item Is Nothing Then
If .OppPokemon.Item.Name.ToLower() = "big root" And .FieldEffects.CanUseItem(False) = True And .FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "big root" And .FieldEffects.CanUseItem(False) = True And .FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
addHP += CInt(Math.Ceiling(addHP * (30 / 100)))
End If
End If
@ -6774,7 +6774,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -6810,7 +6810,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -6836,7 +6836,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -6850,7 +6850,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -6886,7 +6886,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -6917,7 +6917,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -6931,7 +6931,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -6945,7 +6945,7 @@
Else
Dim multiHP As Integer = CInt(.OppPokemon.MaxHP / 8)
If Not .OwnPokemon.Item Is Nothing And .FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.Name.ToLower() = "binding band" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "binding band" Then
multiHP = CInt(.OppPokemon.MaxHP / 6)
End If
End If
@ -7068,7 +7068,7 @@
If .OppPokemon.HP > 0 And .OppPokemon.Status <> Pokemon.StatusProblems.Burn Then
If Not .OppPokemon.Item Is Nothing Then
If .OppPokemon.Item.Name.ToLower() = "flame orb" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "flame orb" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
InflictBurn(False, False, BattleScreen, "Flame Orb inflicts a burn!", "flameorb")
End If
End If
@ -7076,7 +7076,7 @@
If .OppPokemon.HP > 0 And .OppPokemon.Status <> Pokemon.StatusProblems.Poison And .OppPokemon.Status <> Pokemon.StatusProblems.BadPoison Then
If Not .OppPokemon.Item Is Nothing Then
If .OppPokemon.Item.Name.ToLower() = "toxic orb" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "toxic orb" And .FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
InflictPoison(False, False, BattleScreen, True, "Toxic Orb inflicts a poisoning!", "toxicorb")
End If
End If
@ -7492,7 +7492,7 @@
End If
If Not .OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "amulet coin" Or .OwnPokemon.Item.Name.ToLower() = "luck incense" Then
If .OwnPokemon.Item.OriginalName.ToLower() = "amulet coin" Or .OwnPokemon.Item.OriginalName.ToLower() = "luck incense" Then
If .FieldEffects.CanUseItem(True) = True And .FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
BattleScreen.FieldEffects.AmuletCoin += 1
End If
@ -8102,7 +8102,7 @@
Next
For i = 0 To Core.Player.Pokemons.Count - 1
If expPokemon.Contains(i) = False And Not Core.Player.Pokemons(i).Item Is Nothing AndAlso Core.Player.Pokemons(i).Item.Name.ToLower() = "exp share" AndAlso Core.Player.Pokemons(i).Status <> Pokemon.StatusProblems.Fainted AndAlso Core.Player.Pokemons(i).IsEgg() = False Then
If expPokemon.Contains(i) = False And Not Core.Player.Pokemons(i).Item Is Nothing AndAlso Core.Player.Pokemons(i).Item.OriginalName.ToLower() = "exp share" AndAlso Core.Player.Pokemons(i).Status <> Pokemon.StatusProblems.Fainted AndAlso Core.Player.Pokemons(i).IsEgg() = False Then
expPokemon.Add(i)
End If
Next

42
P3D/Battle/BattleSystemV2/BattleCalculation.vb
View File

@ -12,7 +12,7 @@
End If
Dim ability As String = p.Ability.Name.ToLower()
If p.Item IsNot Nothing AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "damp rock"
If ability = "drizzle" Or moveName = "rain dance" Then
turns = 8
@ -242,7 +242,7 @@
End If
Dim SlowDownItems As List(Of String) = {"iron ball", "macho brace", "power bracer", "power belt", "power lens", "power band", "power anklet", "power weight"}.ToList()
If SlowDownItems.Contains(p.Item.Name.ToLower()) = True And BattleScreen.FieldEffects.CanUseItem(own) = True Then
If SlowDownItems.Contains(p.Item.OriginalName.ToLower()) = True And BattleScreen.FieldEffects.CanUseItem(own) = True Then
speed = CInt(speed / 2)
End If
@ -505,13 +505,13 @@
result = INIT * ACCM
If Not op.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Not own) = True Then
If op.Item.Name.ToLower() = "bright powder" Or op.Item.Name.ToLower() = "lax incense" Then
If op.Item.OriginalName.ToLower() = "bright powder" Or op.Item.OriginalName.ToLower() = "lax incense" Then
result *= 0.9F
End If
End If
If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(own) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "wide lens"
result *= 1.1F
Case "zoom lens"
@ -633,7 +633,7 @@
End If
If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(own) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "lucky punch"
If p.Number = 113 Then
C += 2
@ -697,7 +697,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "smoke ball" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "smoke ball" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
Return True
End If
End If
@ -876,7 +876,7 @@
End If
If Not op.Item Is Nothing Then
If op.Item.Name.ToLower() = "ring target" And BattleScreen.FieldEffects.CanUseItem(Not own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not own, BattleScreen) = True Then
If op.Item.OriginalName.ToLower() = "ring target" And BattleScreen.FieldEffects.CanUseItem(Not own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not own, BattleScreen) = True Then
If Type1 = 0 Then
effectiveness = Type2
End If
@ -1004,7 +1004,7 @@
Dim e As Double = 1D
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "lucky egg" Then
If p.Item.OriginalName.ToLower() = "lucky egg" Then
e = 1.5D
End If
End If
@ -1017,7 +1017,7 @@
Dim expShares As Integer = 0
For Each po As Pokemon In Core.Player.Pokemons
If Not po.Item Is Nothing Then
If po.Item.Name.ToLower() = "exp share" Then
If po.Item.OriginalName.ToLower() = "exp. share" Then
expShares += 1
End If
End If
@ -1025,7 +1025,7 @@
If expShares > 0 Then
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "exp share" Then
If p.Item.OriginalName.ToLower() = "exp. share" Then
s = 2D
Else
s = (PokemonList.Count * 2D) * expShares
@ -1106,7 +1106,7 @@
With BattleScreen
If Not .OwnPokemon.Item Is Nothing Then
If .OwnPokemon.Item.Name.ToLower() = "shed shell" And .FieldEffects.CanUseItem(True) = True And .FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If .OwnPokemon.Item.OriginalName.ToLower() = "shed shell" And .FieldEffects.CanUseItem(True) = True And .FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
Return True
End If
End If
@ -1154,7 +1154,7 @@
With BattleScreen
If Not .OppPokemon.Item Is Nothing Then
If .OppPokemon.Item.Name.ToLower() = "shed shell" And .FieldEffects.CanUseItem(False) = True And .FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If .OppPokemon.Item.OriginalName.ToLower() = "shed shell" And .FieldEffects.CanUseItem(False) = True And .FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
Return True
End If
End If
@ -1222,7 +1222,7 @@
'IT (Item attack power modifier)
If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "muscle band"
If Attack.Category = Attack.Categories.Physical Then
IT = 1.1F
@ -1686,7 +1686,7 @@
End Select
If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "choice band"
IM = 1.5F
Case "light ball"
@ -1731,7 +1731,7 @@
End Select
If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "choice specs"
IM = 1.5F
Case "light ball"
@ -1814,7 +1814,7 @@
End If
If Not Op.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
Select Case Op.Item.Name.ToLower()
Select Case Op.Item.OriginalName.ToLower()
Case "metal powder"
If Op.Number = 132 Then
DMod = 1.5F
@ -1857,7 +1857,7 @@
End If
If Not Op.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
Select Case Op.Item.Name.ToLower()
Select Case Op.Item.OriginalName.ToLower()
Case "metal powder"
If Op.Number = 132 Then
DMod = 1.5F
@ -2022,7 +2022,7 @@
Dim Mod2 As Single = 1.0F
If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.Name.ToLower() = "life orb" Then
If p.Item.OriginalName.ToLower() = "life orb" Then
Mod2 = 1.3F
End If
End If
@ -2066,14 +2066,14 @@
End If
If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.Name.ToLower() = "expert belt" Then
If p.Item.OriginalName.ToLower() = "expert belt" Then
EB = 1.2F
End If
End If
If Not Op.Item Is Nothing Then
If BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
Select Case Op.Item.Name.ToLower()
Select Case Op.Item.OriginalName.ToLower()
Case "occa"
If Attack.Type.Type = Element.Types.Fire Then
If BattleScreen.Battle.RemoveHeldItem(Not Own, Not Own, BattleScreen, "The Occa Berry weakened the effect of " & Attack.Name & " on " & Op.GetDisplayName() & "!", "berry:occa") = True Then
@ -2183,7 +2183,7 @@
If Not Op.Item Is Nothing Then
If BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
If Op.Item.Name.ToLower() = "chilan" Then
If Op.Item.OriginalName.ToLower() = "chilan" Then
If Attack.Type.Type = Element.Types.Normal Then
If BattleScreen.Battle.RemoveHeldItem(Not Own, Not Own, BattleScreen, "The Chilan Berry weakened the effect of " & Attack.Name & " on " & Op.GetDisplayName() & "!", "berry:chilan") = True Then
TRB = 0.5F

8
P3D/Battle/BattleSystemV2/FieldEffects.vb
View File

@ -364,10 +364,10 @@
grounded = False
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
grounded = False
End If
If p.Item.Name.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
grounded = True
End If
End If
@ -387,10 +387,10 @@
grounded = False
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
grounded = False
End If
If p.Item.Name.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
grounded = True
End If
End If

2
P3D/Pokemon/Attacks/Bug/Infestation.vb
View File

@ -69,7 +69,7 @@ Namespace BattleSystem.Moves.Bug
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

2
P3D/Pokemon/Attacks/Bug/LeechLife.vb
View File

@ -77,7 +77,7 @@
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Dark/Fling.vb
View File

@ -93,7 +93,7 @@
'Clear prior effect chances to add the chance depending on the item.
Me.EffectChances.Clear()
Select Case p.Item.Name.ToLower()
Select Case p.Item.OriginalName.ToLower()
Case "flame orb" 'cause burn
Me.EffectChances.Add(30)
If Core.Random.Next(0, 100) < Me.GetEffectChance(0, own, BattleScreen) Then

20
P3D/Pokemon/Attacks/Dark/KnockOff.vb
View File

@ -67,19 +67,19 @@
If op.Item.IsMegaStone = True Then
Return Power
End If
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.Name.ToLower().EndsWith(" plate") Then
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.OriginalName.ToLower().EndsWith(" plate") Then
Return Power
End If
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.Name.ToLower().EndsWith(" memory") Then
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") Then
Return Power
End If
If op.Item.Name.ToLower() = "griseous orb" And op.Number = 487 Then
If op.Item.OriginalName.ToLower() = "griseous orb" And op.Number = 487 Then
Return Power
End If
If op.Item.Name.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
Return Power
End If
If op.Item.Name.ToLower().EndsWith(" mail") = True Then
If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
Return Power
End If
@ -101,19 +101,19 @@
If op.Item.IsMegaStone = True Then
Exit Sub
End If
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.Name.ToLower().EndsWith(" plate") Then
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.OriginalName.ToLower().EndsWith(" plate") Then
Exit Sub
End If
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.Name.ToLower().EndsWith(" memory") Then
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") Then
Exit Sub
End If
If op.Item.Name.ToLower() = "griseous orb" And op.Number = 487 Then
If op.Item.OriginalName.ToLower() = "griseous orb" And op.Number = 487 Then
Exit Sub
End If
If op.Item.Name.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
Exit Sub
End If
If op.Item.Name.ToLower().EndsWith(" mail") = True Then
If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
Exit Sub
End If

20
P3D/Pokemon/Attacks/Dark/Switcheroo.vb
View File

@ -69,34 +69,34 @@ Namespace BattleSystem.Moves.Dark
If BattleScreen.FieldEffects.CanUseAbility(Not own, BattleScreen) AndAlso op.Ability.Name.ToLower() = "sticky hold" Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower() = "griseous orb" AndAlso p.Number = 487 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower() = "griseous orb" AndAlso p.Number = 487 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower() = "griseous orb" AndAlso op.Number = 487 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower() = "griseous orb" AndAlso op.Number = 487 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" plate") = True AndAlso p.Number = 493 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" plate") = True AndAlso p.Number = 493 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" plate") = True AndAlso op.Number = 493 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" plate") = True AndAlso op.Number = 493 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" memory") = True AndAlso p.Number = 773 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" memory") = True AndAlso p.Number = 773 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" memory") = True AndAlso op.Number = 773 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") = True AndAlso op.Number = 773 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" mail") = True Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" mail") = True Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
CanSwitchItems = False
End If
If (p.Item IsNot Nothing AndAlso p.Item.IsMegaStone) OrElse (op.Item IsNot Nothing AndAlso op.Item.IsMegaStone) Then

10
P3D/Pokemon/Attacks/Dark/Thief.vb
View File

@ -67,19 +67,19 @@
If op.Item.IsMegaStone = True Then
Exit Sub
End If
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.Name.ToLower().EndsWith(" plate") Then
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.OriginalName.ToLower().EndsWith(" plate") Then
Exit Sub
End If
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.Name.ToLower().EndsWith(" memory") Then
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") Then
Exit Sub
End If
If op.Item.Name.ToLower() = "griseous orb" And op.Number = 487 Then
If op.Item.OriginalName.ToLower() = "griseous orb" And op.Number = 487 Then
Exit Sub
End If
If op.Item.Name.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
Exit Sub
End If
If op.Item.Name.ToLower().EndsWith(" mail") = True Then
If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
Exit Sub
End If

2
P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb
View File

@ -77,7 +77,7 @@ Namespace BattleSystem.Moves.Electric
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Fairy/DrainingKiss.vb
View File

@ -77,7 +77,7 @@ Namespace BattleSystem.Moves.Fairy
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Fairy/Geomancy.vb
View File

@ -77,7 +77,7 @@ Namespace BattleSystem.Moves.Fairy
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Geomancy!", "move:geomancy") = True Then
geomancy = 1
End If

2
P3D/Pokemon/Attacks/Fighting/DrainPunch.vb
View File

@ -77,7 +77,7 @@
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

6
P3D/Pokemon/Attacks/Fire/Ember.vb
View File

@ -87,7 +87,11 @@
TextureYOffset = 32
End If
Dim FireballEntity = MoveAnimation.SpawnEntity(New Vector3(-2.0, 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall", New Rectangle(0, TextureYOffset, 32, 32), ""), New Vector3(0.5F), 1.0F)
MoveAnimation.AnimationMove(FireballEntity, True, -0.05, 0.0, 0.0, 0.05, False, True, 0.0, 1.0,, -0.5)
If BattleFlip = False Then
MoveAnimation.AnimationMove(FireballEntity, True, -0.05, 0.0, 0.0, 0.05, False, True, 0.0, 1.0,, -0.5)
Else
MoveAnimation.AnimationMove(FireballEntity, True, -0.05, 0.0, 0.0, 0.05, False, True, 0.0, 1.0,, 0.5)
End If
MoveAnimation.AnimationPlaySound("Battle\Attacks\Fire\Ember_Hit", 4, 0)

2
P3D/Pokemon/Attacks/Fire/FireSpin.vb
View File

@ -69,7 +69,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

2
P3D/Pokemon/Attacks/Fire/Incinerate.vb
View File

@ -64,7 +64,7 @@
End If
If Not op.Item Is Nothing Then
If op.Item.IsBerry = True OrElse op.Item.Name.ToLower().EndsWith(" gem") Then
If op.Item.IsBerry = True OrElse op.Item.OriginalName.ToLower().EndsWith(" gem") Then
Dim ItemID As Integer = op.Item.ID
BattleScreen.Battle.RemoveHeldItem(Not own, own, BattleScreen, op.GetDisplayName() & "'s " & op.Item.Name & " got burned up!", "move:incinerate")
End If

2
P3D/Pokemon/Attacks/Fire/MagmaStorm.vb
View File

@ -69,7 +69,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

2
P3D/Pokemon/Attacks/Flying/Bounce.vb
View File

@ -95,7 +95,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Bounce!", "move:bounce") = True Then
bounce = 1
End If

2
P3D/Pokemon/Attacks/Flying/Fly.vb
View File

@ -95,7 +95,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Fly!", "move:fly") = True Then
fly = 1
End If

2
P3D/Pokemon/Attacks/Flying/OblivionWing.vb
View File

@ -77,7 +77,7 @@ Namespace BattleSystem.Moves.Flying
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Flying/SkyAttack.vb
View File

@ -97,7 +97,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Sky Attack!", "move:skyattack") = True Then
skyattack = 1
End If

2
P3D/Pokemon/Attacks/Ghost/PhantomForce.vb
View File

@ -99,7 +99,7 @@ Namespace BattleSystem.Moves.Ghost
Dim hasToCharge As Boolean = True
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Phantom Force!", "move:phantomforce") = True Then
hasToCharge = False
End If

2
P3D/Pokemon/Attacks/Ghost/ShadowForce.vb
View File

@ -99,7 +99,7 @@ Namespace BattleSystem.Moves.Ghost
Dim hasToCharge As Boolean = True
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Shadow Force!", "move:shadowforce") = True Then
hasToCharge = False
End If

2
P3D/Pokemon/Attacks/Grass/Absorb.vb
View File

@ -77,7 +77,7 @@
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Grass/GigaDrain.vb
View File

@ -77,7 +77,7 @@
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Grass/HornLeech.vb
View File

@ -77,7 +77,7 @@
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Grass/MegaDrain.vb
View File

@ -77,7 +77,7 @@
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Grass/SolarBeam.vb
View File

@ -105,7 +105,7 @@
hasToCharge = False
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Solar Beam!", "move:solarbeam") = True Then
hasToCharge = False
End If

2
P3D/Pokemon/Attacks/Grass/SolarBlade.vb
View File

@ -104,7 +104,7 @@
hasToCharge = False
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Solar Blade!", "move:solarblade") = True Then
hasToCharge = False
End If

2
P3D/Pokemon/Attacks/Grass/Strength Sap.vb
View File

@ -70,7 +70,7 @@
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(heal * (130 / 100)))
End If
End If

2
P3D/Pokemon/Attacks/Ground/Dig.vb
View File

@ -95,7 +95,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Dig!", "move:dig") = True Then
digCounter = 1
End If

2
P3D/Pokemon/Attacks/Ground/SandTomb.vb
View File

@ -69,7 +69,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

2
P3D/Pokemon/Attacks/Ice/FreezeShock.vb
View File

@ -72,7 +72,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Freeze Shock!", "move:freezeshock") = True Then
freezeshock = 1
End If

2
P3D/Pokemon/Attacks/Ice/IceBurn.vb
View File

@ -72,7 +72,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Ice Burn!", "move:iceburn") = True Then
iceburn = 1
End If

10
P3D/Pokemon/Attacks/Normal/Bestow.vb
View File

@ -72,21 +72,21 @@
If p.Item.IsMegaStone = True Then
b = True
End If
If p.Ability.Name.ToLower() = "multitype" AndAlso p.Item.Name.ToLower().EndsWith(" plate") Then
If p.Ability.Name.ToLower() = "multitype" AndAlso p.Item.OriginalName.ToLower().EndsWith(" plate") Then
b = True
End If
If p.Ability.Name.ToLower() = "rks system" AndAlso p.Item.Name.ToLower().EndsWith(" memory") Then
If p.Ability.Name.ToLower() = "rks system" AndAlso p.Item.OriginalName.ToLower().EndsWith(" memory") Then
b = True
End If
'Giratina
If p.Item.Name.ToLower() = "griseous orb" And p.Number = 487 Then
If p.Item.OriginalName.ToLower() = "griseous orb" And p.Number = 487 Then
b = True
End If
'Genesect
If p.Item.Name.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
If p.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
b = True
End If
If p.Item.Name.ToLower().EndsWith(" mail") = True Then
If p.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
b = True
End If
Else

2
P3D/Pokemon/Attacks/Normal/Bind.vb
View File

@ -69,7 +69,7 @@ Namespace BattleSystem.Moves.Normal
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

10
P3D/Pokemon/Attacks/Normal/Covet.vb
View File

@ -70,19 +70,19 @@ Namespace BattleSystem.Moves.Normal
If op.Item.IsMegaStone = True Then
Exit Sub
End If
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.Name.ToLower().EndsWith(" plate") Then
If op.Ability.Name.ToLower() = "multitype" AndAlso op.Item.OriginalName.ToLower().EndsWith(" plate") Then
Exit Sub
End If
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.Name.ToLower().EndsWith(" memory") Then
If op.Ability.Name.ToLower() = "rks system" AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") Then
Exit Sub
End If
If op.Item.Name.ToLower() = "griseous orb" And op.Number = 487 Then
If op.Item.OriginalName.ToLower() = "griseous orb" And op.Number = 487 Then
Exit Sub
End If
If op.Item.Name.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
Exit Sub
End If
If op.Item.Name.ToLower().EndsWith(" mail") = True Then
If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
Exit Sub
End If

2
P3D/Pokemon/Attacks/Normal/PayDay.vb
View File

@ -63,7 +63,7 @@ Namespace BattleSystem.Moves.Normal
Dim coinAmount As Integer = p.Level * 5
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "amulet coin" Or p.Item.Name.ToLower() = "luck incense" Then
If p.Item.OriginalName.ToLower() = "amulet coin" Or p.Item.OriginalName.ToLower() = "luck incense" Then
coinAmount *= 2
End If
End If

2
P3D/Pokemon/Attacks/Normal/RazorWind.vb
View File

@ -95,7 +95,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Razor Wind!", "move:razorwind") = True Then
razorWind = 1
End If

2
P3D/Pokemon/Attacks/Normal/SkullBash.vb
View File

@ -96,7 +96,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Skull Bash!", "move:skullbash") = True Then
skullBash = 1
End If

2
P3D/Pokemon/Attacks/Normal/Wrap.vb
View File

@ -69,7 +69,7 @@
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

2
P3D/Pokemon/Attacks/Psychic/DreamEater.vb
View File

@ -88,7 +88,7 @@ Namespace BattleSystem.Moves.Psychic
BattleScreen.Battle.ReduceHP(heal, own, own, BattleScreen, "Liquid Ooze damaged " & p.GetDisplayName() & "!", "liquidooze")
Else
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "big root" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
heal = CInt(Math.Ceiling(damage * (80 / 100)))
End If
End If

20
P3D/Pokemon/Attacks/Psychic/Trick.vb
View File

@ -69,34 +69,34 @@ Namespace BattleSystem.Moves.Psychic
If BattleScreen.FieldEffects.CanUseAbility(Not own, BattleScreen) AndAlso op.Ability.Name.ToLower() = "sticky hold" Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower() = "griseous orb" AndAlso p.Number = 487 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower() = "griseous orb" AndAlso p.Number = 487 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower() = "griseous orb" AndAlso op.Number = 487 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower() = "griseous orb" AndAlso op.Number = 487 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" plate") = True AndAlso p.Number = 493 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" plate") = True AndAlso p.Number = 493 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" plate") = True AndAlso op.Number = 493 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" plate") = True AndAlso op.Number = 493 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" memory") = True AndAlso p.Number = 773 Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" memory") = True AndAlso p.Number = 773 Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" memory") = True AndAlso op.Number = 773 Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") = True AndAlso op.Number = 773 Then
CanSwitchItems = False
End If
If Not p.Item Is Nothing AndAlso p.Item.Name.ToLower().EndsWith(" mail") = True Then
If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
CanSwitchItems = False
End If
If Not op.Item Is Nothing AndAlso op.Item.Name.ToLower().EndsWith(" mail") = True Then
If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
CanSwitchItems = False
End If
If (p.Item IsNot Nothing AndAlso p.Item.IsMegaStone) OrElse (op.Item IsNot Nothing AndAlso op.Item.IsMegaStone) Then

2
P3D/Pokemon/Attacks/Water/Clamp.vb
View File

@ -69,7 +69,7 @@ Namespace BattleSystem.Moves.Water
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

2
P3D/Pokemon/Attacks/Water/Dive.vb
View File

@ -97,7 +97,7 @@
Dim hasToCharge As Boolean = True
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "power herb" And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
If BattleScreen.Battle.RemoveHeldItem(Own, Own, BattleScreen, "Power Herb pushed the use of Dive!", "move:dive") = True Then
hasToCharge = False
End If

2
P3D/Pokemon/Attacks/Water/Whirlpool.vb
View File

@ -82,7 +82,7 @@ Namespace BattleSystem.Moves.Water
End If
If Not p.Item Is Nothing Then
If p.Item.Name.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If p.Item.OriginalName.ToLower() = "grip claw" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
turns = 5
End If
End If

4
P3D/Pokemon/Items/Item.vb
View File

@ -33,6 +33,10 @@ Public MustInherit Class Item
Return _attribute
End Function
Public Function OriginalName() As String
Return GetAttribute().Name
End Function
''' <summary>
''' The singular item name.
''' </summary>

2
P3D/Pokemon/Items/Standard/ExpShare.vb
View File

@ -1,6 +1,6 @@
Namespace Items.Standard
<Item(57, "Exp Share")>
<Item(57, "Exp. Share")>
Public Class ExpShare
Inherits Item

2
P3D/Pokemon/Monster/Pokemon.vb
View File

@ -2473,7 +2473,7 @@ Public Class Pokemon
add += 1
End If
If Not Me.Item Is Nothing Then
If Me.Item.Name.ToLower() = "soothe bell" Then
If Me.Item.OriginalName.ToLower() = "soothe bell" Then
add *= 2
End If
End If

24
P3D/Screens/Pokemon/Daycare.vb
View File

@ -49,24 +49,24 @@
Select Case DittoAsParent
Case 0
If parent1.Gender = P3D.Pokemon.Genders.Female Then
If parent1.Item IsNot Nothing AndAlso parent1.Item.Name.ToLower() = "everstone" Then
If parent1.Item IsNot Nothing AndAlso parent1.Item.OriginalName.ToLower() = "everstone" Then
p.AdditionalData = parent1.AdditionalData
ElseIf parent2.Number = parent1.Number And parent2.Item IsNot Nothing AndAlso parent2.Item.Name.ToLower() = "everstone" Then
ElseIf parent2.Number = parent1.Number And parent2.Item IsNot Nothing AndAlso parent2.Item.OriginalName.ToLower() = "everstone" Then
p.AdditionalData = parent2.AdditionalData
End If
Else
If parent2.Item IsNot Nothing AndAlso parent2.Item.Name.ToLower() = "everstone" Then
If parent2.Item IsNot Nothing AndAlso parent2.Item.OriginalName.ToLower() = "everstone" Then
p.AdditionalData = parent2.AdditionalData
ElseIf parent1.Number = parent2.Number And parent1.Item IsNot Nothing AndAlso parent1.Item.Name.ToLower() = "everstone" Then
ElseIf parent1.Number = parent2.Number And parent1.Item IsNot Nothing AndAlso parent1.Item.OriginalName.ToLower() = "everstone" Then
p.AdditionalData = parent1.AdditionalData
End If
End If
Case 1
If parent2.Item IsNot Nothing AndAlso parent2.Item.Name.ToLower() = "everstone" Then
If parent2.Item IsNot Nothing AndAlso parent2.Item.OriginalName.ToLower() = "everstone" Then
p.AdditionalData = parent2.AdditionalData
End If
Case 2
If parent1.Item IsNot Nothing AndAlso parent1.Item.Name.ToLower() = "everstone" Then
If parent1.Item IsNot Nothing AndAlso parent1.Item.OriginalName.ToLower() = "everstone" Then
p.AdditionalData = parent1.AdditionalData
End If
End Select
@ -186,8 +186,8 @@
Dim EVItems() As String = {"power weight", "power bracer", "power belt", "power lens", "power band", "power anklet", "destiny knot"}
If Not parent1.Item Is Nothing Then
If EVItems.Contains(parent1.Item.Name.ToLower()) = True Then
Select Case parent1.Item.Name.ToLower()
If EVItems.Contains(parent1.Item.OriginalName.ToLower()) = True Then
Select Case parent1.Item.OriginalName.ToLower()
Case "power weight"
EVStat1 = "HP"
Case "power bracer"
@ -206,8 +206,8 @@
End If
End If
If Not parent2.Item Is Nothing Then
If EVItems.Contains(parent2.Item.Name.ToLower()) = True Then
Select Case parent2.Item.Name.ToLower()
If EVItems.Contains(parent2.Item.OriginalName.ToLower()) = True Then
Select Case parent2.Item.OriginalName.ToLower()
Case "power weight"
EVStat2 = "HP"
Case "power bracer"
@ -303,12 +303,12 @@
Dim EStone2 As Boolean = False
If Not parent1.Item Is Nothing Then
If parent1.Item.Name.ToLower() = "everstone" Then
If parent1.Item.OriginalName.ToLower() = "everstone" Then
EStone1 = True
End If
End If
If Not parent2.Item Is Nothing Then
If parent2.Item.Name.ToLower() = "everstone" Then
If parent2.Item.OriginalName.ToLower() = "everstone" Then
EStone2 = True
End If
End If