diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index 1f8313d16..e660a1550 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -1807,7 +1807,7 @@ BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & " protected itself!")) If moveUsed.MakesContact = True Then - Me.LowerStat(own, Not own, BattleScreen, "Attack", 2, "", "move:kingsshield") + Me.LowerStat(own, Not own, BattleScreen, "Attack", 1, "", "move:kingsshield") End If Exit Sub @@ -4327,7 +4327,9 @@ Case "cloud nine" ChangeWeather(own, own, BattleWeather.WeatherTypes.Clear, 0, BattleScreen, "", "cloudnine") Case "intimidate" - LowerStat(Not own, own, BattleScreen, "Attack", 1, p.GetDisplayName() & "'s Intimidate cuts " & op.GetDisplayName() & "'s attack!", "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 + LowerStat(Not own, own, BattleScreen, "Attack", 1, p.GetDisplayName() & "'s Intimidate cuts " & op.GetDisplayName() & "'s attack!", "intimidate") + End If Case "trace" If op.Ability.Name.ToLower() <> "multitype" And op.Ability.Name.ToLower() <> "illusion" Then p.Ability = op.Ability diff --git a/P3D/Content/Items/ItemSheet.png b/P3D/Content/Items/ItemSheet.png index 8fc8ef7af..f2710e2c1 100644 Binary files a/P3D/Content/Items/ItemSheet.png and b/P3D/Content/Items/ItemSheet.png differ diff --git a/P3D/Content/Pokemon/Data/109.dat b/P3D/Content/Pokemon/Data/109.dat index e56d96836..2edbe16ed 100644 --- a/P3D/Content/Pokemon/Data/109.dat +++ b/P3D/Content/Pokemon/Data/109.dat @@ -15,8 +15,8 @@ CanBreed|1 Devolution|0 IsMale|50 Ability1|26 -Ability2|Nothing -HiddenAbility|Nothing +Ability2|256 +HiddenAbility|1 EggMoves|174,194,288,220,60,149,103,180,255,254,256,390,261 Machines|174,205,92,192,237,241,173,63,182,240,203,218,87,216,247,104,207,214,188,126,197,156,213,168,7,36,99,85,102,117,120,153,164,269,351,53,259,263,290,261,371,416,360,445,399,363,474,496,510,611,590,148 BaseHP|40 diff --git a/P3D/Content/Pokemon/Data/110.dat b/P3D/Content/Pokemon/Data/110.dat index 26caccec1..b6fde33d4 100644 --- a/P3D/Content/Pokemon/Data/110.dat +++ b/P3D/Content/Pokemon/Data/110.dat @@ -15,8 +15,8 @@ CanBreed|1 Devolution|109 IsMale|50 Ability1|26 -Ability2|Nothing -HiddenAbility|Nothing +Ability2|256 +HiddenAbility|1 EggMoves|174,194,288,220,60,149,103,180,255,254,256,390,261 Machines|174,205,92,192,237,241,173,63,182,240,203,218,87,216,247,104,207,214,188,126,197,156,213,168,36,99,85,102,117,120,153,164,269,351,53,259,263,290,261,371,416,360,445,399,363,474,496,510,611,590,148,560 BaseHP|65 diff --git a/P3D/Content/Pokemon/Data/681.dat b/P3D/Content/Pokemon/Data/681.dat index 4e602b42d..745f592b9 100644 --- a/P3D/Content/Pokemon/Data/681.dat +++ b/P3D/Content/Pokemon/Data/681.dat @@ -21,9 +21,9 @@ EggMoves|194,319,425,469 Machines|174,92,249,237,173,63,182,240,203,218,216,247,104,207,214,197,156,213,171,14,34,36,68,99,102,115,117,157,161,164,280,351,263,290,289,206,421,416,360,445,363,430,477,496,514,590,15 BaseHP|60 BaseAttack|50 -BaseDefense|150 +BaseDefense|140 BaseSpAttack|50 -BaseSpDefense|150 +BaseSpDefense|140 BaseSpeed|60 FPHP|0 FPAttack|0 diff --git a/P3D/Content/Pokemon/Data/681_blade.dat b/P3D/Content/Pokemon/Data/681_blade.dat index d6468713b..e9ae81df4 100644 --- a/P3D/Content/Pokemon/Data/681_blade.dat +++ b/P3D/Content/Pokemon/Data/681_blade.dat @@ -20,9 +20,9 @@ HiddenAbility|Nothing EggMoves|194,319,425,469 Machines|174,92,249,237,173,63,182,240,203,218,216,247,104,207,214,197,156,213,171,14,34,36,68,99,102,115,117,157,161,164,280,351,263,290,289,206,421,416,360,445,363,430,477,496,514,590,15 BaseHP|60 -BaseAttack|150 +BaseAttack|140 BaseDefense|50 -BaseSpAttack|150 +BaseSpAttack|140 BaseSpDefense|50 BaseSpeed|60 FPHP|0 diff --git a/P3D/Pokemon/Abilities/Ability.vb b/P3D/Pokemon/Abilities/Ability.vb index 819d33038..4d885f5d8 100644 --- a/P3D/Pokemon/Abilities/Ability.vb +++ b/P3D/Pokemon/Abilities/Ability.vb @@ -505,6 +505,56 @@ 'Prism Armor 'Case 233 'Neuroforce + 'Case 234 + 'Intrepid Sword + 'Case 235 + 'Dauntless Shield + 'Case 236 + 'Libero + 'Case 237 + 'Ball Fetch + 'Case 238 + 'Cotton Down + 'Case 239 + 'Propeller Tail + 'Case 240 + 'Mirror Armor + 'Case 241 + 'Gulp Missile + 'Case 242 + 'Stalwart + 'Case 243 + 'Steam Engine + 'Case 244 + 'Punk Rock + 'Case 245 + 'Sand Spit + 'Case 246 + 'Ice Scales + 'Case 247 + 'Ripen + 'Case 248 + 'Ice Face + 'Case 249 + 'Power Spot + 'Case 250 + 'Mimicry + 'Case 251 + 'Screen Cleaner + 'Case 252 + 'Steely Spirit + 'Case 253 + 'Perish Body + 'Case 254 + 'Wandering Spirit + 'Case 255 + 'Gorilla Tactics + 'Case 256 + 'Neutralizing Gas + 'Case 257 + 'Pastel Veil + 'Case 258 + 'Hunger Switch Case Else Return New Abilities.Stench End Select diff --git a/P3D/Pokemon/Attacks/Attack.vb b/P3D/Pokemon/Attacks/Attack.vb index be18ab2f7..0c04e71a7 100644 --- a/P3D/Pokemon/Attacks/Attack.vb +++ b/P3D/Pokemon/Attacks/Attack.vb @@ -1689,9 +1689,9 @@ 'Case 720 'returnMove = New Moves.Fire.MindBlown() 'Case 721 - 'Plasma Fists + 'returnMove = New Moves.Electric.PlasmaFists() 'Case 722 - 'Photon Geyser + 'returnMove = New Moves.Psychic.PhotonGeyser() '------------------------------------------------BEGIN Z MOVE STREAK 3 'Case 723 'Light That Burns The Sky - Z-Move @@ -1706,7 +1706,147 @@ 'Case 728 'Clangorous Soulblaze - Z-Move '------------------------------------------------END Z MOVE STREAK 3 + '------------------------------------------------BEGIN LGPE MOVE STREAK 'Case 729 + 'returnMove = New Moves.Electric.ZippyZap() + 'Case 730 + 'returnMove = New Moves.Water.SplishySplash() + 'Case 731 + 'returnMove = New Moves.Flying.FloatyFall() + 'Case 732 + 'returnMove = New Moves.Electric.PikaPapow() + 'Case 733 + 'returnMove = New Moves.Water.BouncyBubble() + 'Case 734 + 'returnMove = New Moves.Electric.BuzzyBuzz() + 'Case 735 + 'returnMove = New Moves.Fire.SizzlySlide() + 'Case 736 + 'returnMove = New Moves.Psychic.GlitzyGlow() + 'Case 737 + 'returnMove = New Moves.Dark.BaddyBad() + 'Case 738 + 'returnMove = New Moves.Grass.SappySeed() + 'Case 739 + 'returnMove = New Moves.Ice.FreezyFrost() + 'Case 740 + 'returnMove = New Moves.Fairy.SparklySwirl() + 'Case 741 + 'returnMove = New Moves.Normal.VeeveeVolley() + '------------------------------------------------END LGPE MOVE STREAK + 'Case 742 + 'returnMove = New Moves.Steel.DoubleIronBash() + 'Case 743 + 'Max Guard - Max Move + 'Case 744 + 'returnMove = New Moves.Dragon.DynamaxCannon() + 'Case 745 + 'returnMove = New Moves.Water.SnipeShot() + 'Case 746 + 'returnMove = New Moves.Dark.JawLock() + 'Case 747 + 'returnMove = New Moves.Normal.StuffCheeks() + 'Case 748 + 'returnMove = New Moves.Fighting.NoRetreat() + 'Case 749 + 'returnMove = New Moves.Rock.TarShot() + 'Case 750 + 'returnMove = New Moves.Psychic.MagicPowder() + 'Case 751 + 'returnMove = New Moves.Dragon.DragonDarts() + 'Case 752 + 'returnMove = New Moves.Normal.Teatime() + 'Case 753 + 'returnMove = New Moves.Fighting.Octolock() + 'Case 754 + 'returnMove = New Moves.Electric.BoltBeak() + 'Case 755 + 'returnMove = New Moves.Water.FishiousRend() + 'Case 756 + 'returnMove = New Moves.Normal.CourtChange() + '------------------------------------------------BEGIN MAX MOVE STREAK + 'Case 757 + 'Max Flare - Max Move + 'Case 758 + 'Max Flutterby - Max Move + 'Case 759 + 'Max Lightning - Max Move + 'Case 760 + 'Max Strike - Max Move + 'Case 761 + 'Max Knuckle - Max Move + 'Case 762 + 'Max Phantasm - Max Move + 'Case 763 + 'Max Hailstorm - Max Move + 'Case 764 + 'Max Ooze - Max Move + 'Case 765 + 'Max Geyser - Max Move + 'Case 766 + 'Max Aistream - Max Move + 'Case 767 + 'Max Starfall - Max Move + 'Case 768 + 'Max Wyrmwind - Max Move + 'Case 769 + 'Max Mindstorm - Max Move + 'Case 770 + 'Max Rockfall - Max Move + 'Case 771 + 'Max Quake - Max Move + 'Case 772 + 'Max Darkness - Max Move + 'Case 773 + 'Max Overgrowth - Max Move + 'Case 774 + 'Max Steelspike - Max Move + '------------------------------------------------END MAX MOVE STREAK + 'Case 775 + 'returnMove = New Moves.Dragon.ClangorousSoul() + 'Case 776 + 'returnMove = New Moves.Fighting.BodyPress() + 'Case 777 + 'returnMove = New Moves.Fairy.Decorate() + 'Case 778 + 'returnMove = New Moves.Grass.DrumBeating() + 'Case 779 + 'returnMove = New Moves.Grass.SnapTrap() + 'Case 780 + 'returnMove = New Moves.Fire.PyroBall() + 'Case 781 + 'returnMove = New Moves.Steel.BehemothBlade() + 'Case 782 + 'returnMove = New Moves.Steel.BehemothBash() + 'Case 783 + 'returnMove = New Moves.Electric.AuraWheel() + 'Case 784 + 'returnMove = New Moves.Dragon.BreakingSwipe() + 'Case 785 + 'returnMove = New Moves.Grass.BranchPoke() + 'Case 786 + 'returnMove = New Moves.Electric.Overdrive() + 'Case 787 + 'returnMove = New Moves.Grass.AppleAcid() + 'Case 788 + 'returnMove = New Moves.Grass.GravApple() + 'Case 789 + 'returnMove = New Moves.Fairy.SpiritBreak() + 'Case 790 + 'returnMove = New Moves.Fairy.StrangeSteam() + 'Case 791 + 'returnMove = New Moves.Water.LifeDew() + 'Case 792 + 'returnMove = New Moves.Dark.Obstruct() + 'Case 793 + 'returnMove = New Moves.Dark.FalseSurrender() + 'Case 794 + 'returnMove = New Moves.Fighting.MeteorAssault() + 'Case 795 + 'returnMove = New Moves.Dragon.Eternabeam() + 'Case 796 + 'returnMove = New Moves.Steel.SteelBeam() + 'Case 797 'Blank Case 999 If GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then diff --git a/P3D/Pokemon/Attacks/Normal/Howl.vb b/P3D/Pokemon/Attacks/Normal/Howl.vb index 77c9141bf..c079e11d5 100644 --- a/P3D/Pokemon/Attacks/Normal/Howl.vb +++ b/P3D/Pokemon/Attacks/Normal/Howl.vb @@ -16,10 +16,10 @@ Namespace BattleSystem.Moves.Normal Me.Category = Categories.Status Me.ContestCategory = ContestCategories.Cool Me.Name = "Howl" - Me.Description = "The user howls loudly to raise its spirit, which raises its Attack stat." + Me.Description = " The user howls loudly to raise the spirit of itself and allies. This raises their Attack stats." Me.CriticalChance = 0 Me.IsHMMove = False - Me.Target = Targets.Self + Me.Target = Targets.AllAllies Me.Priority = 0 Me.TimesToAttack = 1 '#End diff --git a/P3D/Pokemon/Attacks/Normal/RapidSpin.vb b/P3D/Pokemon/Attacks/Normal/RapidSpin.vb index 64163f3aa..5edcbdfa8 100644 --- a/P3D/Pokemon/Attacks/Normal/RapidSpin.vb +++ b/P3D/Pokemon/Attacks/Normal/RapidSpin.vb @@ -11,12 +11,12 @@ Namespace BattleSystem.Moves.Normal Me.OriginalPP = 40 Me.CurrentPP = 40 Me.MaxPP = 40 - Me.Power = 20 + Me.Power = 50 Me.Accuracy = 100 Me.Category = Categories.Physical Me.ContestCategory = ContestCategories.Cool Me.Name = "Rapid Spin" - Me.Description = "A spin attack that can also eliminate such moves as Bind, Wrap, Leech Seed, and Spikes." + Me.Description = "A spin attack that can also eliminate such moves as Bind, Wrap, Leech Seed, and Spikes. This also raises the user's Speed stat." Me.CriticalChance = 1 Me.IsHMMove = False Me.Target = Targets.OneAdjacentTarget @@ -50,9 +50,14 @@ Namespace BattleSystem.Moves.Normal Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True '#End + + Me.AIField1 = AIField.Damage + Me.AIField2 = AIField.RaiseSpeed + Me.AIField3 = AIField.Support End Sub Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen) + BattleScreen.Battle.RaiseStat(own, own, BattleScreen, "Speed", 1, "", "move:rapidspin") With BattleScreen.FieldEffects If own = True Then .OwnBind = 0