tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-24 22:35:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

Browse Source
This commit is contained in:
darkfire006 2019-11-23 17:24:27 -06:00
commit 2ae7a11465
6 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4055,31 +4055,31 @@
Case "sitrus" Case "sitrus"
GainHP(CInt(p.MaxHP / 4), own, own, BattleScreen, "The Sitrus Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:sitrus") GainHP(CInt(p.MaxHP / 4), own, own, BattleScreen, "The Sitrus Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:sitrus")
Case "figy" Case "figy"
Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2)) Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
GainHP(healHP, own, own, BattleScreen, "The Figy Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:figy") GainHP(healHP, own, own, BattleScreen, "The Figy Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:figy")
If berry.PokemonLikes(p) = False Then If berry.PokemonLikes(p) = False Then
InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Figy Berry!", "berry:figy") InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Figy Berry!", "berry:figy")
End If End If
Case "wiki" Case "wiki"
Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2)) Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
GainHP(healHP, own, own, BattleScreen, "The Wiki Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:wiki") GainHP(healHP, own, own, BattleScreen, "The Wiki Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:wiki")
If berry.PokemonLikes(p) = False Then If berry.PokemonLikes(p) = False Then
InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Wiki Berry!", "berry:wiki") InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Wiki Berry!", "berry:wiki")
End If End If
Case "mago" Case "mago"
Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2)) Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
GainHP(healHP, own, own, BattleScreen, "The Mago Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:mago") GainHP(healHP, own, own, BattleScreen, "The Mago Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:mago")
If berry.PokemonLikes(p) = False Then If berry.PokemonLikes(p) = False Then
InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Mago Berry!", "mago") InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Mago Berry!", "mago")
End If End If
Case "aguav" Case "aguav"
Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2)) Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
GainHP(healHP, own, own, BattleScreen, "The Aguav Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:aguav") GainHP(healHP, own, own, BattleScreen, "The Aguav Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:aguav")
If berry.PokemonLikes(p) = False Then If berry.PokemonLikes(p) = False Then
InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Aguav Berry!", "aguav") InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Aguav Berry!", "aguav")
End If End If
Case "iapapa" Case "iapapa"
Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2)) Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
GainHP(healHP, own, own, BattleScreen, "The Iapapa Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:iapapa") GainHP(healHP, own, own, BattleScreen, "The Iapapa Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:iapapa")
If berry.PokemonLikes(p) = False Then If berry.PokemonLikes(p) = False Then
InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Iapapa Berry!", "berry:iapapa") InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Iapapa Berry!", "berry:iapapa")
@ -4327,9 +4327,14 @@
Case "cloud nine" Case "cloud nine"
ChangeWeather(own, own, BattleWeather.WeatherTypes.Clear, 0, BattleScreen, "", "cloudnine") ChangeWeather(own, own, BattleWeather.WeatherTypes.Clear, 0, BattleScreen, "", "cloudnine")
Case "intimidate" Case "intimidate"
If Not op.Ability.Name.ToLower() = "Oblivious" Or Not op.Ability.Name.ToLower() = "Inner Focus" Or Not op.Ability.Name.ToLower() = "Own Tempo" Or Not op.Ability.Name.ToLower() = "Scrappy" Then If op.Ability.Name.ToLower() = "oblivious" Or op.Ability.Name.ToLower() = "inner focus" Or op.Ability.Name.ToLower() = "own tempo" Or op.Ability.Name.ToLower() = "scrappy" Then
.BattleQuery.Add(New TextQueryObject("Intimidate's effect was prevented!"))
Else
LowerStat(Not own, own, BattleScreen, "Attack", 1, p.GetDisplayName() & "'s Intimidate cuts " & op.GetDisplayName() & "'s attack!", "intimidate") LowerStat(Not own, own, BattleScreen, "Attack", 1, p.GetDisplayName() & "'s Intimidate cuts " & op.GetDisplayName() & "'s attack!", "intimidate")
End If End If
If op.Ability.Name.ToLower() = "rattled" Then
RaiseStat(Not own, Not own, BattleScreen, "Speed", 1, op.GetDisplayName() & "'s Rattled affected it's clairaudience.", "rattled")
End If
Case "trace" Case "trace"
If op.Ability.Name.ToLower() <> "multitype" And op.Ability.Name.ToLower() <> "illusion" Then If op.Ability.Name.ToLower() <> "multitype" And op.Ability.Name.ToLower() <> "illusion" Then
p.Ability = op.Ability p.Ability = op.Ability
@ -4578,10 +4583,12 @@
End If End If
Case "berserk gene" Case "berserk gene"
If p.StatAttack <> 6 OrElse p.StatSpAttack <> 6 Then If p.StatAttack <> 6 OrElse p.StatSpAttack <> 6 Then
If RemoveHeldItem(own, own, BattleScreen, "-1", "") = True Then If p.HP < CInt(Math.Floor(p.MaxHP / 3)) Then
InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " went berserk due to the Berserk Gene!", "item:berserkgene") If RemoveHeldItem(own, own, BattleScreen, "-1", "") = True Then
RaiseStat(own, own, BattleScreen, "Attack", 1, "", "item:berserkgene") InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " went berserk due to the Berserk Gene!", "item:berserkgene")
RaiseStat(own, own, BattleScreen, "Special Attack", 1, "", "item:berserkgene") RaiseStat(own, own, BattleScreen, "Attack", 2, "", "item:berserkgene")
RaiseStat(own, own, BattleScreen, "Special Attack", 2, "", "item:berserkgene")
End If
End If End If
End If End If
End Select End Select
@ -5588,21 +5595,21 @@
ElseIf .OwnPokemon.StatSpeed = -6 Then ElseIf .OwnPokemon.StatSpeed = -6 Then
cannotLower.Add(4) cannotLower.Add(4)
End If End If
If .OwnPokemon.Accuracy = 6 Then 'If .OwnPokemon.Accuracy = 6 Then
cannotRaise.Add(5) ' cannotRaise.Add(5)
ElseIf .OwnPokemon.Accuracy = -6 Then 'ElseIf .OwnPokemon.Accuracy = -6 Then
cannotLower.Add(5) ' cannotLower.Add(5)
End If 'End If
If .OwnPokemon.Evasion = 6 Then 'If .OwnPokemon.Evasion = 6 Then
cannotRaise.Add(6) ' cannotRaise.Add(6)
ElseIf .OwnPokemon.Evasion = -6 Then 'ElseIf .OwnPokemon.Evasion = -6 Then
cannotLower.Add(6) ' cannotLower.Add(6)
End If 'End If
If cannotRaise.Count < 7 Then If cannotRaise.Count < 5 Then
Dim statToRaise As Integer = Core.Random.Next(0, 7) Dim statToRaise As Integer = Core.Random.Next(0, 5)
While cannotRaise.Contains(statToRaise) = True While cannotRaise.Contains(statToRaise) = True
statToRaise = Core.Random.Next(0, 7) statToRaise = Core.Random.Next(0, 5)
End While End While
Select Case statToRaise Select Case statToRaise
@ -5616,10 +5623,10 @@
RaiseStat(True, True, BattleScreen, "Special Defense", 2, "Moody raised a stat.", "moody") RaiseStat(True, True, BattleScreen, "Special Defense", 2, "Moody raised a stat.", "moody")
Case 4 Case 4
RaiseStat(True, True, BattleScreen, "Speed", 2, "Moody raised a stat.", "moody") RaiseStat(True, True, BattleScreen, "Speed", 2, "Moody raised a stat.", "moody")
Case 5 'Case 5
RaiseStat(True, True, BattleScreen, "Accuracy", 2, "Moody raised a stat.", "moody") ' RaiseStat(True, True, BattleScreen, "Accuracy", 2, "Moody raised a stat.", "moody")
Case 6 'Case 6
RaiseStat(True, True, BattleScreen, "Evasion", 2, "Moody raised a stat.", "moody") ' RaiseStat(True, True, BattleScreen, "Evasion", 2, "Moody raised a stat.", "moody")
End Select End Select
If cannotLower.Contains(statToRaise) = False Then If cannotLower.Contains(statToRaise) = False Then
@ -5627,10 +5634,10 @@
End If End If
End If End If
If cannotLower.Count < 7 Then If cannotLower.Count < 5 Then
Dim statToLower As Integer = Core.Random.Next(0, 7) Dim statToLower As Integer = Core.Random.Next(0, 5)
While cannotLower.Contains(statToLower) = True While cannotLower.Contains(statToLower) = True
statToLower = Core.Random.Next(0, 7) statToLower = Core.Random.Next(0, 5)
End While End While
Select Case statToLower Select Case statToLower
@ -5644,10 +5651,10 @@
LowerStat(True, True, BattleScreen, "Special Defense", 1, "Moody lowered a stat.", "moody") LowerStat(True, True, BattleScreen, "Special Defense", 1, "Moody lowered a stat.", "moody")
Case 4 Case 4
LowerStat(True, True, BattleScreen, "Speed", 1, "Moody lowered a stat.", "moody") LowerStat(True, True, BattleScreen, "Speed", 1, "Moody lowered a stat.", "moody")
Case 5 'Case 5
LowerStat(True, True, BattleScreen, "Accuracy", 1, "Moody lowered a stat.", "moody") ' LowerStat(True, True, BattleScreen, "Accuracy", 1, "Moody lowered a stat.", "moody")
Case 6 'Case 6
LowerStat(True, True, BattleScreen, "Evasion", 1, "Moody lowered a stat.", "moody") ' LowerStat(True, True, BattleScreen, "Evasion", 1, "Moody lowered a stat.", "moody")
End Select End Select
End If End If
End If End If
@ -6337,21 +6344,21 @@
ElseIf .OppPokemon.StatSpeed = -6 Then ElseIf .OppPokemon.StatSpeed = -6 Then
cannotLower.Add(4) cannotLower.Add(4)
End If End If
If .OppPokemon.Accuracy = 6 Then 'If .OppPokemon.Accuracy = 6 Then
cannotRaise.Add(5) ' cannotRaise.Add(5)
ElseIf .OppPokemon.Accuracy = -6 Then 'ElseIf .OppPokemon.Accuracy = -6 Then
cannotLower.Add(5) ' cannotLower.Add(5)
End If 'End If
If .OppPokemon.Evasion = 6 Then 'If .OppPokemon.Evasion = 6 Then
cannotRaise.Add(6) ' cannotRaise.Add(6)
ElseIf .OppPokemon.Evasion = -6 Then 'ElseIf .OppPokemon.Evasion = -6 Then
cannotLower.Add(6) ' cannotLower.Add(6)
End If 'End If
If cannotRaise.Count < 7 Then If cannotRaise.Count < 5 Then
Dim statToRaise As Integer = Core.Random.Next(0, 7) Dim statToRaise As Integer = Core.Random.Next(0, 5)
While cannotRaise.Contains(statToRaise) = True While cannotRaise.Contains(statToRaise) = True
statToRaise = Core.Random.Next(0, 7) statToRaise = Core.Random.Next(0, 5)
End While End While
Select Case statToRaise Select Case statToRaise
@ -6365,10 +6372,10 @@
RaiseStat(False, False, BattleScreen, "Special Defense", 2, "Moody raised a stat.", "moody") RaiseStat(False, False, BattleScreen, "Special Defense", 2, "Moody raised a stat.", "moody")
Case 4 Case 4
RaiseStat(False, False, BattleScreen, "Speed", 2, "Moody raised a stat.", "moody") RaiseStat(False, False, BattleScreen, "Speed", 2, "Moody raised a stat.", "moody")
Case 5 'Case 5
RaiseStat(False, False, BattleScreen, "Accuracy", 2, "Moody raised a stat.", "moody") ' RaiseStat(False, False, BattleScreen, "Accuracy", 2, "Moody raised a stat.", "moody")
Case 6 'Case 6
RaiseStat(False, False, BattleScreen, "Evasion", 2, "Moody raised a stat.", "moody") ' RaiseStat(False, False, BattleScreen, "Evasion", 2, "Moody raised a stat.", "moody")
End Select End Select
If cannotLower.Contains(statToRaise) = False Then If cannotLower.Contains(statToRaise) = False Then
@ -6376,10 +6383,10 @@
End If End If
End If End If
If cannotLower.Count < 7 Then If cannotLower.Count < 5 Then
Dim statToLower As Integer = Core.Random.Next(0, 7) Dim statToLower As Integer = Core.Random.Next(0, 5)
While cannotLower.Contains(statToLower) = True While cannotLower.Contains(statToLower) = True
statToLower = Core.Random.Next(0, 7) statToLower = Core.Random.Next(0, 5)
End While End While
Select Case statToLower Select Case statToLower
@ -6393,10 +6400,10 @@
LowerStat(False, False, BattleScreen, "Special Defense", 1, "Moody lowered a stat.", "moody") LowerStat(False, False, BattleScreen, "Special Defense", 1, "Moody lowered a stat.", "moody")
Case 4 Case 4
LowerStat(False, False, BattleScreen, "Speed", 1, "Moody lowered a stat.", "moody") LowerStat(False, False, BattleScreen, "Speed", 1, "Moody lowered a stat.", "moody")
Case 5 'Case 5
LowerStat(False, False, BattleScreen, "Accuracy", 1, "Moody lowered a stat.", "moody") ' LowerStat(False, False, BattleScreen, "Accuracy", 1, "Moody lowered a stat.", "moody")
Case 6 'Case 6
LowerStat(False, False, BattleScreen, "Evasion", 1, "Moody lowered a stat.", "moody") ' LowerStat(False, False, BattleScreen, "Evasion", 1, "Moody lowered a stat.", "moody")
End Select End Select
End If End If
End If End If

BIN
P3D/Content/Items/Fossils.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
P3D/Content/Items/ItemSheet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 177 KiB

After

Width:  |  Height:  |  Size: 188 KiB

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

@ -5,7 +5,7 @@ Namespace Items.Standard
Inherits Item Inherits Item
Public Overrides ReadOnly Property Description As String = "A strand of DNA that overflows with energy. It raises offensive capabilities, but causes confusion." Public Overrides ReadOnly Property Description As String = "A strand of DNA that overflows with pulsating energy. It sharply raises offensive capabilities in a pinch, but causes confusion."
Public Overrides ReadOnly Property PokeDollarPrice As Integer = 3000 Public Overrides ReadOnly Property PokeDollarPrice As Integer = 3000
Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
Public Overrides ReadOnly Property CanBeUsed As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False

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

@ -1818,9 +1818,9 @@ Public Class Pokemon
'Synchronize ability: 'Synchronize ability:
If Core.Player.Pokemons.Count > 0 Then If Core.Player.Pokemons.Count > 0 Then
If Core.Player.Pokemons(0).Ability.Name.ToLower() = "synchronize" Then If Core.Player.Pokemons(0).Ability.Name.ToLower() = "synchronize" Then
If Core.Random.Next(0, 100) < 50 Then 'If Core.Random.Next(0, 100) < 50 Then # GEN 8 FORCES A NATURE 100% OF TIME
Me.Nature = Core.Player.Pokemons(0).Nature Me.Nature = Core.Player.Pokemons(0).Nature
End If 'End If
End If End If
End If End If

4
P3D/Screens/Battle/BattleCatchScreen.vb
View File

@ -379,6 +379,10 @@
End If End If
Case "timer ball" Case "timer ball"
BallRate = CInt(1 + BattleScreen.FieldEffects.Rounds * 0.3).Clamp(1, 4) BallRate = CInt(1 + BattleScreen.FieldEffects.Rounds * 0.3).Clamp(1, 4)
Case "dream ball"
If cp.Status = Pokemon.StatusProblems.Sleep Then
BallRate = 3.0F
End If
End Select End Select
Dim Status As Single = 1.0F Dim Status As Single = 1.0F