From 8f2bf06fc5b92fb04451e073a70afa453c04e54a Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Wed, 13 Apr 2022 19:09:10 -0500 Subject: [PATCH] various move ability and pokemon data fixes --- P3D/Content/Pokemon/Data/197.dat | 2 +- P3D/Content/Pokemon/Data/338.dat | 2 +- P3D/Content/Pokemon/Data/839.dat | 10 +++++----- P3D/Content/Pokemon/Data/884.dat | Bin 2292 -> 2290 bytes P3D/Pokemon/Attacks/Grass/TropKick.vb | 2 +- P3D/Pokemon/Attacks/Steel/SmartStrike.vb | 2 +- P3D/Pokemon/Items/KeyItems/MegaBracelet.vb | 2 +- P3D/Pokemon/Items/XItems/XSpAtk.vb | 4 ++-- P3D/Pokemon/Items/_itemList.txt | Bin 66244 -> 66318 bytes 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/P3D/Content/Pokemon/Data/197.dat b/P3D/Content/Pokemon/Data/197.dat index 0b62c1611..ac15830d9 100644 --- a/P3D/Content/Pokemon/Data/197.dat +++ b/P3D/Content/Pokemon/Data/197.dat @@ -18,7 +18,7 @@ Ability1|28 Ability2|Nothing HiddenAbility|39 EggMoves|445,204,343,174,197,203,313,175,363,500,485,321,273,281 -Machines|15,63,29,174,92,192,244,237,241,173,63,182,240,203,218,231,216,91,94,247,189,104,207,214,129,138,197,156,213,171,25,34,36,38,99,102,117,130,164,269,259,263,290,289,371,416,445,399,363,496,497,514,526,555,590,15,148,56091,92,94,104,138,148,156,164,182,207,213,216,218,237,240,241,244,247,259,263,269,371,416,496,497,514,526,555,29,189,560 +Machines|29,174,92,192,244,237,241,173,182,240,203,218,231,216,91,94,247,189,104,207,214,129,138,197,156,171,25,34,36,38,99,102,117,130,164,269,259,263,290,289,371,399,363,496,497,514,526,555,590,270,492,15,148,560 BaseHP|95 BaseAttack|65 BaseDefense|110 diff --git a/P3D/Content/Pokemon/Data/338.dat b/P3D/Content/Pokemon/Data/338.dat index 98b4b97c1..e74c89eea 100644 --- a/P3D/Content/Pokemon/Data/338.dat +++ b/P3D/Content/Pokemon/Data/338.dat @@ -17,7 +17,7 @@ IsMale|0.0 Ability1|26 Ability2|Nothing HiddenAbility|Nothing -Machines|174,20174,205,92,244,237,241,173,63,182,203,218,76,89,216,94,247,104,207,214,201,126,129,111,138,197,156,213,34,36,38,99,100,102,115,117,120,149,153,157,161,164,347,113,219,53,317,263,290,285,315,451,261,373,278,416,397,444,360,446,445,363,447,433,473,477,479,496,510,512,523,590,1485,92,244,237,241,173,63,182,203,218,76,89,216,94,247,104,207,214,201,126,129,111,138,197,156,213,34,36,38,99,100,102,115,117,120,149,153,157,161,164,347,113,219,53,317,263,290,285,315,451,261,373,278,416,397,444,360,446,445,363,447,433,473,477,479,496,510,512,523,590,148 +Machines|174,205,92,244,237,241,173,182,203,218,76,89,216,94,247,104,207,214,201,126,129,111,138,197,156,34,36,38,99,100,102,115,117,120,149,153,157,161,164,347,113,219,53,317,263,290,285,315,451,261,373,278,397,444,360,446,363,447,433,473,477,479,496,510,512,523,590,270,148 BaseHP|90 BaseAttack|95 BaseDefense|85 diff --git a/P3D/Content/Pokemon/Data/839.dat b/P3D/Content/Pokemon/Data/839.dat index f00407156..aa002d37b 100644 --- a/P3D/Content/Pokemon/Data/839.dat +++ b/P3D/Content/Pokemon/Data/839.dat @@ -18,11 +18,11 @@ Ability2|85 HiddenAbility|18 EggMoves|153,335,189 Machines|29,174,205,46,92,249,237,173,182,203,218,76,225,89,216,91,189,104,207,214,201,126,129,111,156,7,5,25,34,36,38,99,90,102,115,117,120,130,153,157,164,53,317,263,290,315,261,397,444,360,446,363,479,488,496,503,510,523,590,270,529,70,148,431 -BaseHP|30 -BaseAttack|40 -BaseDefense|50 -BaseSpAttack|40 -BaseSpDefense|50 +BaseHP|110 +BaseAttack|80 +BaseDefense|120 +BaseSpAttack|80 +BaseSpDefense|90 BaseSpeed|30 FPHP|0 FPAttack|0 diff --git a/P3D/Content/Pokemon/Data/884.dat b/P3D/Content/Pokemon/Data/884.dat index 53d3908cc655cf47b36ded65ddefb3bb0063fc56..0050f00cfae89dcd08aad20f486966c2e5f53aa7 100644 GIT binary patch delta 22 ccmew&_(^bsIXkB#Lk5N0yuY<6JZ#0UUk*9RW} diff --git a/P3D/Pokemon/Attacks/Grass/TropKick.vb b/P3D/Pokemon/Attacks/Grass/TropKick.vb index 0a806f764..40c2ba0a5 100644 --- a/P3D/Pokemon/Attacks/Grass/TropKick.vb +++ b/P3D/Pokemon/Attacks/Grass/TropKick.vb @@ -16,7 +16,7 @@ Namespace BattleSystem.Moves.Grass Me.Category = Categories.Physical Me.ContestCategory = ContestCategories.Beauty Me.Name = "Trop Kick" - Me.Description = " The user lands an intense kick of tropical origins on the target. This also lowers the target's Attack stat." + Me.Description = "The user lands an intense kick of tropical origins on the target. This also lowers the target's Attack stat." Me.CriticalChance = 1 Me.IsHMMove = False Me.Target = Targets.OneAdjacentTarget diff --git a/P3D/Pokemon/Attacks/Steel/SmartStrike.vb b/P3D/Pokemon/Attacks/Steel/SmartStrike.vb index b5fc78af4..b8ca0088a 100644 --- a/P3D/Pokemon/Attacks/Steel/SmartStrike.vb +++ b/P3D/Pokemon/Attacks/Steel/SmartStrike.vb @@ -16,7 +16,7 @@ Namespace BattleSystem.Moves.Steel Me.Category = Categories.Physical Me.ContestCategory = ContestCategories.Smart Me.Name = "Smart Strike" - Me.Description = " The user stabs the target with a sharp horn. This attack never misses." + Me.Description = "The user stabs the target with a sharp horn. This attack never misses." Me.CriticalChance = 1 Me.IsHMMove = False Me.Target = Targets.OneAdjacentTarget diff --git a/P3D/Pokemon/Items/KeyItems/MegaBracelet.vb b/P3D/Pokemon/Items/KeyItems/MegaBracelet.vb index f45a834e8..bed2c3d2d 100644 --- a/P3D/Pokemon/Items/KeyItems/MegaBracelet.vb +++ b/P3D/Pokemon/Items/KeyItems/MegaBracelet.vb @@ -5,7 +5,7 @@ Namespace Items.KeyItems Inherits KeyItem - Public Overrides ReadOnly Property Description As String = "This bracelet contains an untold power that somehow enables Pokémon carrying a Mega Stone to Mega Evolve in battle. " + Public Overrides ReadOnly Property Description As String = "This bracelet contains an untold power that somehow enables Pokémon carrying a Mega Stone to Mega Evolve in battle." Public Sub New() _textureRectangle = New Rectangle(312, 288, 24, 24) diff --git a/P3D/Pokemon/Items/XItems/XSpAtk.vb b/P3D/Pokemon/Items/XItems/XSpAtk.vb index 09c94b337..2e784f9e3 100644 --- a/P3D/Pokemon/Items/XItems/XSpAtk.vb +++ b/P3D/Pokemon/Items/XItems/XSpAtk.vb @@ -1,7 +1,7 @@ Namespace Items.XItems - Public Class XSpecial + Public Class XSpAtk Inherits XItem @@ -38,7 +38,7 @@ Namespace Items.XItems Screen.TextBox.Show("Cannot boost~ " & p.GetDisplayName() & "'s Special Attack!", {}, False, False) Return False Else - Logger.Log(Logger.LogTypes.Warning, "XSpecial.vb: Used outside of battle environment!") + Logger.Log(Logger.LogTypes.Warning, "XSpAtk.vb: Used outside of battle environment!") Return False End If End Function diff --git a/P3D/Pokemon/Items/_itemList.txt b/P3D/Pokemon/Items/_itemList.txt index e3726bbcb68b9643a52c051369550e0edc232d38..f23eee6a23c23bab0fdfc061314afe2bb9cd4992 100644 GIT binary patch delta 416 zcmX@o%F@@yvSF<-vm-;vFrEa8GygeqO1`*|+&XBFrWXmXkN!)dq?QO+I{E1}G*l`R#3v$=mO$Og`@d zH0#berpfbx3e6Y{zzYB07n?tKjLB1qNA#~|MbFv8p|G+Flv oSQVo&+{e?OD1p_Oz(ts!g4``IS@$Wzq|B!vR|#yM`cz*Q03Slk?*IS* delta 398 zcmeBcV>!~wvSF<-YbrxBL*`@!7V*tTh5aHXI~s{?*32nmoUG5yG1)#>W%KD=uiVM= zZ}3f4EU=lJd|PZXHxC!1+2jWcbtl_j7MXnVw$$YJg&>gwvAUb(?>u9g{8NHw@<$t; z$?*?`CI{b_nmqRf*W}9kJd>@LsZ6$gBrtjReHoA#vl)ZgZ3}|$nxFJxLz-0D^V4Xmb1*NgJPnZQOkOsj(~oRGO%u