diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index 7e517a2de..d2befacd7 100644 --- a/P3D/Content/Localization/Tokens_en.dat +++ b/P3D/Content/Localization/Tokens_en.dat @@ -3198,6 +3198,7 @@ move_name_749,Tar Shot move_name_790,Strange Steam move_name_796,Steel Beam move_name_797,Rage Fist +move_name_798,Psyshield Bash ------ Move Descriptions: move_desc_1,The target is physically pounded with a long tail or a foreleg, etc. diff --git a/P3D/Content/Pokemon/Data/234.dat b/P3D/Content/Pokemon/Data/234.dat index cc93643a2..9b38760fb 100644 --- a/P3D/Content/Pokemon/Data/234.dat +++ b/P3D/Content/Pokemon/Data/234.dat @@ -43,6 +43,7 @@ Move|10,95 Move|13,23 Move|16,28 Move|21,36 +Move|21,828 Move|23,109 Move|27,347 Move|33,272 diff --git a/P3D/Content/Pokemon/Data/899.dat b/P3D/Content/Pokemon/Data/899.dat index bc41498b4..d5783abb8 100644 --- a/P3D/Content/Pokemon/Data/899.dat +++ b/P3D/Content/Pokemon/Data/899.dat @@ -43,6 +43,7 @@ Move|10,95 Move|13,23 Move|16,28 Move|21,36 +Move|21,828 Move|23,109 Move|26,828 Move|30,347 diff --git a/P3D/Pokemon/Attacks/Attack.vb b/P3D/Pokemon/Attacks/Attack.vb index c5113a214..210a80c83 100644 --- a/P3D/Pokemon/Attacks/Attack.vb +++ b/P3D/Pokemon/Attacks/Attack.vb @@ -1883,6 +1883,8 @@ returnMove = New Moves.Ghost.RageFist() 'Case 798 'Blank + Case 828 + returnMove = New Moves.Psychic.PsyshieldBash Case 999 If GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then returnMove = New Moves.Special.TheDerpMove() diff --git a/P3D/Pokemon/Attacks/Psychic/PsyshieldBash.vb b/P3D/Pokemon/Attacks/Psychic/PsyshieldBash.vb new file mode 100644 index 000000000..a8245d1df --- /dev/null +++ b/P3D/Pokemon/Attacks/Psychic/PsyshieldBash.vb @@ -0,0 +1,73 @@ +Namespace BattleSystem.Moves.Psychic + + Public Class PsyshieldBash + + Inherits Attack + + Public Sub New() + '#Definitions + Me.Type = New Element(Element.Types.Psychic) + Me.ID = 828 + Me.OriginalPP = 10 + Me.CurrentPP = 10 + Me.MaxPP = 10 + Me.Power = 70 + Me.Accuracy = 90 + Me.Category = Categories.Physical + Me.ContestCategory = ContestCategories.Cool + Me.Name = Localization.GetString("move_name_" & Me.ID, "Psyshield Bash") + Me.Description = "Cloaking itself in psychic energy, the user slams into the target. This also boosts the user’s Defense stat." + 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 = False + + Me.DisabledWhileGravity = False + Me.UseEffectiveness = True + Me.ImmunityAffected = True + Me.RemovesOwnFrozen = False + Me.HasSecondaryEffect = True + + Me.IsHealingMove = False + Me.IsRecoilMove = False + + Me.IsDamagingMove = True + Me.IsProtectMove = False + + + Me.IsAffectedBySubstitute = True + Me.IsOneHitKOMove = False + Me.IsWonderGuardAffected = True + '#End + + Me.AIField1 = AIField.Damage + Me.AIField2 = AIField.RaiseDefense + + End Sub + + Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) + Dim p As Pokemon = BattleScreen.OwnPokemon + Dim op As Pokemon = BattleScreen.OppPokemon + If own = False Then + p = BattleScreen.OppPokemon + op = BattleScreen.OwnPokemon + End If + + BattleScreen.Battle.RaiseStat(own, own, BattleScreen, "defense", 1, "", "move:psyshieldbash") + + End Sub + + End Class + +End Namespace \ No newline at end of file