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

Minor Move and Item name update 

Leek updated
Vise Grip updated
Steel Beam half implemented
This commit is contained in:
TheOmegaGhost 2020-04-10 00:07:57 -03:00
parent e1bbb6f340
commit 9949c565e1
7 changed files with 101 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,7 +638,7 @@
If p.Number = 113 Then
C += 2
End If
Case "stick"
Case "leek"
If p.Number = 83 Then
C += 2
End If

5
P3D/P3D.vbproj
View File

@ -26196,6 +26196,7 @@
<Compile Include="Pokemon\Attacks\Steel\GearUp.vb" />
<Compile Include="Pokemon\Attacks\Steel\AnchorShot.vb" />
<Compile Include="Pokemon\Attacks\Electric\ZingZap.vb" />
<Compile Include="Pokemon\Attacks\Steel\SteelBeam.vb" />
<Compile Include="Pokemon\Attacks\Water\OriginPulse.vb" />
<Compile Include="Pokemon\Attacks\Water\Liquidation.vb" />
<Compile Include="Pokemon\Attacks\Water\SparklingAria.vb" />
@ -28217,7 +28218,7 @@
<Compile Include="Pokemon\Attacks\Normal\TriAttack.vb" />
<Compile Include="Pokemon\Attacks\Normal\TrumpCard.vb" />
<Compile Include="Pokemon\Attacks\Normal\Uproar.vb" />
<Compile Include="Pokemon\Attacks\Normal\ViceGrip.vb" />
<Compile Include="Pokemon\Attacks\Normal\ViseGrip.vb" />
<Compile Include="Pokemon\Attacks\Normal\WeatherBall.vb" />
<Compile Include="Pokemon\Attacks\Normal\Whirlwind.vb" />
<Compile Include="Pokemon\Attacks\Normal\Wish.vb" />
@ -28898,7 +28899,7 @@
<Compile Include="Pokemon\Items\Standard\SpellTag.vb" />
<Compile Include="Pokemon\Items\Standard\Stardust.vb" />
<Compile Include="Pokemon\Items\Standard\StarPiece.vb" />
<Compile Include="Pokemon\Items\Standard\Stick.vb" />
<Compile Include="Pokemon\Items\Standard\Leek.vb" />
<Compile Include="Pokemon\Items\Standard\StickyBarb.vb" />
<Compile Include="Pokemon\Items\Standard\ThickClub.vb" />
<Compile Include="Pokemon\Items\Standard\TinyMushroom.vb" />

6
P3D/Pokemon/Attacks/Attack.vb
View File

@ -265,7 +265,7 @@
Case 10
returnMove = New Moves.Normal.Scratch()
Case 11
returnMove = New Moves.Normal.ViceGrip()
returnMove = New Moves.Normal.ViseGrip()
Case 12
returnMove = New Moves.Normal.Guillotine()
Case 13
@ -1844,8 +1844,8 @@
'returnMove = New Moves.Fighting.MeteorAssault()
'Case 795
'returnMove = New Moves.Dragon.Eternabeam()
'Case 796
'returnMove = New Moves.Steel.SteelBeam()
Case 796
returnMove = New Moves.Steel.SteelBeam()
'Case 797
'Blank
Case 999

4
P3D/Pokemon/Attacks/Normal/ViceGrip.vb → P3D/Pokemon/Attacks/Normal/ViseGrip.vb
View File

@ -1,6 +1,6 @@
Namespace BattleSystem.Moves.Normal
Public Class ViceGrip
Public Class ViseGrip
Inherits Attack
@ -15,7 +15,7 @@
Me.Accuracy = 100
Me.Category = Categories.Physical
Me.ContestCategory = ContestCategories.Tough
Me.Name = "Vice Grip"
Me.Name = "Vise Grip"
Me.Description = "The target is gripped and squeezed from both sides to inflict damage."
Me.CriticalChance = 1
Me.IsHMMove = False

90
P3D/Pokemon/Attacks/Steel/SteelBeam.vb Normal file
View File

@ -0,0 +1,90 @@
Namespace BattleSystem.Moves.Steel
Public Class SteelBeam
Inherits Attack
Public Sub New()
'#Definitions
Me.Type = New Element(Element.Types.Steel)
Me.ID = 796
Me.OriginalPP = 5
Me.CurrentPP = 5
Me.MaxPP = 5
Me.Power = 140
Me.Accuracy = 95
Me.Category = Categories.Special
Me.ContestCategory = ContestCategories.Smart
Me.Name = "Steel Beam"
Me.Description = "The user fires a beam of steel that it collected from its entire body. This also damages the user."
Me.CriticalChance = 1
Me.IsHMMove = False
Me.Target = Targets.OneAdjacentTarget
Me.Priority = 0
Me.TimesToAttack = 1
'#End
'#SpecialDefinitions
Me.MakesContact = True
Me.ProtectAffected = True
Me.MagicCoatAffected = False
Me.SnatchAffected = False
Me.MirrorMoveAffected = True
Me.KingsrockAffected = True
Me.CounterAffected = True
Me.DisabledWhileGravity = False
Me.UseEffectiveness = True
Me.ImmunityAffected = True
Me.HasSecondaryEffect = False
Me.RemovesFrozen = False
Me.IsHealingMove = False
Me.IsRecoilMove = True
Me.IsPunchingMove = False
Me.IsDamagingMove = True
Me.IsProtectMove = False
Me.IsSoundMove = False
Me.IsAffectedBySubstitute = True
Me.IsOneHitKOMove = False
Me.IsWonderGuardAffected = True
'#End
Me.AIField1 = AIField.Damage
Me.AIField2 = AIField.Recoil
End Sub
Private Sub InflictCrashDamage(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
Dim p As Pokemon = BattleScreen.OwnPokemon
If own = False Then
p = BattleScreen.OppPokemon
End If
BattleScreen.Battle.InflictRecoil(own, own, BattleScreen, Me, CInt(Math.Floor(p.MaxHP / 2)), "-1", "move:steelbeam")
End Sub
Public Overrides Sub MoveMisses(own As Boolean, BattleScreen As BattleScreen)
InflictCrashDamage(own, BattleScreen)
End Sub
Public Overrides Sub MoveProtectedDetected(own As Boolean, BattleScreen As BattleScreen)
InflictCrashDamage(own, BattleScreen)
End Sub
Public Overrides Sub MoveHasNoEffect(own As Boolean, BattleScreen As BattleScreen)
InflictCrashDamage(own, BattleScreen)
End Sub
Public Overrides Sub MoveRecoil(own As Boolean, BattleScreen As BattleScreen)
Dim p As Pokemon = BattleScreen.OwnPokemon
If own = False Then
p = BattleScreen.OppPokemon
End If
BattleScreen.Battle.InflictRecoil(own, own, BattleScreen, Me, CInt(Math.Floor(p.MaxHP / 2)), "-1", "move:steelbeam")
End Sub
End Class
End Namespace

4
P3D/Pokemon/Items/Standard/Stick.vb → P3D/Pokemon/Items/Standard/Leek.vb
View File

@ -1,7 +1,7 @@
Namespace Items.Standard
<Item(105, "Stick")>
Public Class Stick
<Item(105, "Leek")>
Public Class Leek
Inherits Item

BIN
P3D/Pokemon/Items/_itemList.txt
View File

Binary file not shown.