diff --git a/P3D/Pokemon/Items/Berries/AguavBerry.vb b/P3D/Pokemon/Items/Berries/AguavBerry.vb index 5acb75555..35eea2d66 100644 --- a/P3D/Pokemon/Items/Berries/AguavBerry.vb +++ b/P3D/Pokemon/Items/Berries/AguavBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Dragon - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ApicotBerry.vb b/P3D/Pokemon/Items/Berries/ApicotBerry.vb index 88c2c297d..192a9f3f5 100644 --- a/P3D/Pokemon/Items/Berries/ApicotBerry.vb +++ b/P3D/Pokemon/Items/Berries/ApicotBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 30 Me.Type = Element.Types.Ground - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/AspearBerry.vb b/P3D/Pokemon/Items/Berries/AspearBerry.vb index 43ed36a97..6f706ac6c 100644 --- a/P3D/Pokemon/Items/Berries/AspearBerry.vb +++ b/P3D/Pokemon/Items/Berries/AspearBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Ice - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/BabiriBerry.vb b/P3D/Pokemon/Items/Berries/BabiriBerry.vb index cee4f3797..5fb6d8ed9 100644 --- a/P3D/Pokemon/Items/Berries/BabiriBerry.vb +++ b/P3D/Pokemon/Items/Berries/BabiriBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Steel - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/BelueBerry.vb b/P3D/Pokemon/Items/Berries/BelueBerry.vb index 86fa10300..11ee4f628 100644 --- a/P3D/Pokemon/Items/Berries/BelueBerry.vb +++ b/P3D/Pokemon/Items/Berries/BelueBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 30 Me.Type = Element.Types.Electric - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/BlukBerry.vb b/P3D/Pokemon/Items/Berries/BlukBerry.vb index 46a194c0d..822ebe6ea 100644 --- a/P3D/Pokemon/Items/Berries/BlukBerry.vb +++ b/P3D/Pokemon/Items/Berries/BlukBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Fire - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ChartiBerry.vb b/P3D/Pokemon/Items/Berries/ChartiBerry.vb index 4416d7171..efbf1c3f8 100644 --- a/P3D/Pokemon/Items/Berries/ChartiBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChartiBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Rock - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CheriBerry.vb b/P3D/Pokemon/Items/Berries/CheriBerry.vb index b9b6f6087..bf7aafb91 100644 --- a/P3D/Pokemon/Items/Berries/CheriBerry.vb +++ b/P3D/Pokemon/Items/Berries/CheriBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Fire - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/ChestoBerry.vb b/P3D/Pokemon/Items/Berries/ChestoBerry.vb index ef2b27701..cd50aab89 100644 --- a/P3D/Pokemon/Items/Berries/ChestoBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChestoBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Water - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/ChilanBerry.vb b/P3D/Pokemon/Items/Berries/ChilanBerry.vb index c10023297..c31290c13 100644 --- a/P3D/Pokemon/Items/Berries/ChilanBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChilanBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Normal - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ChopleBerry.vb b/P3D/Pokemon/Items/Berries/ChopleBerry.vb index ead179959..8e4cf3da1 100644 --- a/P3D/Pokemon/Items/Berries/ChopleBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChopleBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Fighting - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CobaBerry.vb b/P3D/Pokemon/Items/Berries/CobaBerry.vb index aa41e0e70..2db82ba24 100644 --- a/P3D/Pokemon/Items/Berries/CobaBerry.vb +++ b/P3D/Pokemon/Items/Berries/CobaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Flying - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ColburBerry.vb b/P3D/Pokemon/Items/Berries/ColburBerry.vb index 96a0627cd..ea1715c3c 100644 --- a/P3D/Pokemon/Items/Berries/ColburBerry.vb +++ b/P3D/Pokemon/Items/Berries/ColburBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 20 Me.Type = Element.Types.Dark - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CornnBerry.vb b/P3D/Pokemon/Items/Berries/CornnBerry.vb index f146b9123..5f687f857 100644 --- a/P3D/Pokemon/Items/Berries/CornnBerry.vb +++ b/P3D/Pokemon/Items/Berries/CornnBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Bug - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CustapBerry.vb b/P3D/Pokemon/Items/Berries/CustapBerry.vb index 1fc5d8f5a..36c2dc327 100644 --- a/P3D/Pokemon/Items/Berries/CustapBerry.vb +++ b/P3D/Pokemon/Items/Berries/CustapBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ghost - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/DurinBerry.vb b/P3D/Pokemon/Items/Berries/DurinBerry.vb index 33c82c3fd..a4320892a 100644 --- a/P3D/Pokemon/Items/Berries/DurinBerry.vb +++ b/P3D/Pokemon/Items/Berries/DurinBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Water - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/EnigmaBerry.vb b/P3D/Pokemon/Items/Berries/EnigmaBerry.vb index aff44ef4d..62e256e1d 100644 --- a/P3D/Pokemon/Items/Berries/EnigmaBerry.vb +++ b/P3D/Pokemon/Items/Berries/EnigmaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Bug - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/FigyBerry.vb b/P3D/Pokemon/Items/Berries/FigyBerry.vb index 9a828096a..338b19c65 100644 --- a/P3D/Pokemon/Items/Berries/FigyBerry.vb +++ b/P3D/Pokemon/Items/Berries/FigyBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Bug - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/GanlonBerry.vb b/P3D/Pokemon/Items/Berries/GanlonBerry.vb index 35029a0e4..bcf11fa03 100644 --- a/P3D/Pokemon/Items/Berries/GanlonBerry.vb +++ b/P3D/Pokemon/Items/Berries/GanlonBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ice - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/GrepaBerry.vb b/P3D/Pokemon/Items/Berries/GrepaBerry.vb index 9c076efbf..d3093a4ce 100644 --- a/P3D/Pokemon/Items/Berries/GrepaBerry.vb +++ b/P3D/Pokemon/Items/Berries/GrepaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Flying - Me.Power = 70 + Me.Power = 90 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/HabanBerry.vb b/P3D/Pokemon/Items/Berries/HabanBerry.vb index 2d186ccbe..7d68191da 100644 --- a/P3D/Pokemon/Items/Berries/HabanBerry.vb +++ b/P3D/Pokemon/Items/Berries/HabanBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Dragon - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/HondewBerry.vb b/P3D/Pokemon/Items/Berries/HondewBerry.vb index 778b6fbbe..1f915d856 100644 --- a/P3D/Pokemon/Items/Berries/HondewBerry.vb +++ b/P3D/Pokemon/Items/Berries/HondewBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ground - Me.Power = 70 + Me.Power = 90 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/IapapaBerry.vb b/P3D/Pokemon/Items/Berries/IapapaBerry.vb index d3b75821b..f3d7237c4 100644 --- a/P3D/Pokemon/Items/Berries/IapapaBerry.vb +++ b/P3D/Pokemon/Items/Berries/IapapaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 15 Me.Type = Element.Types.Dark - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/JabocaBerry.vb b/P3D/Pokemon/Items/Berries/JabocaBerry.vb index bb4d4c692..d169a92b3 100644 --- a/P3D/Pokemon/Items/Berries/JabocaBerry.vb +++ b/P3D/Pokemon/Items/Berries/JabocaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Dragon - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/KasibBerry.vb b/P3D/Pokemon/Items/Berries/KasibBerry.vb index 80df18814..fe0702104 100644 --- a/P3D/Pokemon/Items/Berries/KasibBerry.vb +++ b/P3D/Pokemon/Items/Berries/KasibBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ghost - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/KebiaBerry.vb b/P3D/Pokemon/Items/Berries/KebiaBerry.vb index 4a6cbbc2e..0d5c57749 100644 --- a/P3D/Pokemon/Items/Berries/KebiaBerry.vb +++ b/P3D/Pokemon/Items/Berries/KebiaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Poison - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/KeeBerry.vb b/P3D/Pokemon/Items/Berries/KeeBerry.vb new file mode 100644 index 000000000..c4408097a --- /dev/null +++ b/P3D/Pokemon/Items/Berries/KeeBerry.vb @@ -0,0 +1,23 @@ +Namespace Items.Berries + + + Public Class KeeBerry + + Inherits Berry + + Public Sub New() + MyBase.New(86400, "If held by a Pokémon, this Berry will increase the holder's Defense if it's hit with a physical move.", "5.0cm", "Very Soft", 1, 5) + + Me.Spicy = 10 + Me.Dry = 0 + Me.Sweet = 0 + Me.Bitter = 0 + Me.Sour = 40 + + Me.Type = Element.Types.Fairy + Me.Power = 100 + End Sub + + End Class + +End Namespace diff --git a/P3D/Pokemon/Items/Berries/KelpsyBerry.vb b/P3D/Pokemon/Items/Berries/KelpsyBerry.vb index 1bd0c2a9b..be5805508 100644 --- a/P3D/Pokemon/Items/Berries/KelpsyBerry.vb +++ b/P3D/Pokemon/Items/Berries/KelpsyBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Fighting - Me.Power = 70 + Me.Power = 90 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/LansatBerry.vb b/P3D/Pokemon/Items/Berries/LansatBerry.vb index e8384e503..668913a2a 100644 --- a/P3D/Pokemon/Items/Berries/LansatBerry.vb +++ b/P3D/Pokemon/Items/Berries/LansatBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 30 Me.Type = Element.Types.Flying - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/LeppaBerry.vb b/P3D/Pokemon/Items/Berries/LeppaBerry.vb index 48d0b87db..d7137040c 100644 --- a/P3D/Pokemon/Items/Berries/LeppaBerry.vb +++ b/P3D/Pokemon/Items/Berries/LeppaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Fighting - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/LiechiBerry.vb b/P3D/Pokemon/Items/Berries/LiechiBerry.vb index ab9061c8f..a5f6bee8b 100644 --- a/P3D/Pokemon/Items/Berries/LiechiBerry.vb +++ b/P3D/Pokemon/Items/Berries/LiechiBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Grass - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/LumBerry.vb b/P3D/Pokemon/Items/Berries/LumBerry.vb index 8e0679c6a..6e9506c98 100644 --- a/P3D/Pokemon/Items/Berries/LumBerry.vb +++ b/P3D/Pokemon/Items/Berries/LumBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Flying - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/MagoBerry.vb b/P3D/Pokemon/Items/Berries/MagoBerry.vb index fe488c787..9163c5e74 100644 --- a/P3D/Pokemon/Items/Berries/MagoBerry.vb +++ b/P3D/Pokemon/Items/Berries/MagoBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ghost - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/MagostBerry.vb b/P3D/Pokemon/Items/Berries/MagostBerry.vb index 2e52cd01d..c8791590c 100644 --- a/P3D/Pokemon/Items/Berries/MagostBerry.vb +++ b/P3D/Pokemon/Items/Berries/MagostBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Rock - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/MarangaBerry.vb b/P3D/Pokemon/Items/Berries/MarangaBerry.vb new file mode 100644 index 000000000..dad0517fb --- /dev/null +++ b/P3D/Pokemon/Items/Berries/MarangaBerry.vb @@ -0,0 +1,23 @@ +Namespace Items.Berries + + + Public Class MarangaBerry + + Inherits Berry + + Public Sub New() + MyBase.New(86400, "If held by a Pokémon, this Berry will increase the holder's Sp. Def if it's hit with a special move.", "18.6cm", "Hard", 1, 5) + + Me.Spicy = 10 + Me.Dry = 0 + Me.Sweet = 40 + Me.Bitter = 0 + Me.Sour = 0 + + Me.Type = Element.Types.Dark + Me.Power = 100 + End Sub + + End Class + +End Namespace diff --git a/P3D/Pokemon/Items/Berries/MicleBerry.vb b/P3D/Pokemon/Items/Berries/MicleBerry.vb index 259cba991..d8504ab28 100644 --- a/P3D/Pokemon/Items/Berries/MicleBerry.vb +++ b/P3D/Pokemon/Items/Berries/MicleBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Rock - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/NanabBerry.vb b/P3D/Pokemon/Items/Berries/NanabBerry.vb index b5142d66c..8edf34e8d 100644 --- a/P3D/Pokemon/Items/Berries/NanabBerry.vb +++ b/P3D/Pokemon/Items/Berries/NanabBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Water - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/NomelBerry.vb b/P3D/Pokemon/Items/Berries/NomelBerry.vb index 71d84f8ca..9e6a954fc 100644 --- a/P3D/Pokemon/Items/Berries/NomelBerry.vb +++ b/P3D/Pokemon/Items/Berries/NomelBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 20 Me.Type = Element.Types.Dragon - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/OccaBerry.vb b/P3D/Pokemon/Items/Berries/OccaBerry.vb index 1527b9649..187c8b822 100644 --- a/P3D/Pokemon/Items/Berries/OccaBerry.vb +++ b/P3D/Pokemon/Items/Berries/OccaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Fire - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/OranBerry.vb b/P3D/Pokemon/Items/Berries/OranBerry.vb index 4f1aa0ed9..746cae6d4 100644 --- a/P3D/Pokemon/Items/Berries/OranBerry.vb +++ b/P3D/Pokemon/Items/Berries/OranBerry.vb @@ -17,7 +17,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Poison - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/PamtreBerry.vb b/P3D/Pokemon/Items/Berries/PamtreBerry.vb index 67d980e8c..abb4d8a99 100644 --- a/P3D/Pokemon/Items/Berries/PamtreBerry.vb +++ b/P3D/Pokemon/Items/Berries/PamtreBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Steel - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PasshoBerry.vb b/P3D/Pokemon/Items/Berries/PasshoBerry.vb index d7d40a6bf..2ccb723db 100644 --- a/P3D/Pokemon/Items/Berries/PasshoBerry.vb +++ b/P3D/Pokemon/Items/Berries/PasshoBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Water - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PayapaBerry.vb b/P3D/Pokemon/Items/Berries/PayapaBerry.vb index 9dc08fa93..f15e811ee 100644 --- a/P3D/Pokemon/Items/Berries/PayapaBerry.vb +++ b/P3D/Pokemon/Items/Berries/PayapaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 15 Me.Type = Element.Types.Psychic - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PechaBerry.vb b/P3D/Pokemon/Items/Berries/PechaBerry.vb index 4d19b892d..49c4539e8 100644 --- a/P3D/Pokemon/Items/Berries/PechaBerry.vb +++ b/P3D/Pokemon/Items/Berries/PechaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Electric - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/PersimBerry.vb b/P3D/Pokemon/Items/Berries/PersimBerry.vb index 2b71010bb..1d1141e7c 100644 --- a/P3D/Pokemon/Items/Berries/PersimBerry.vb +++ b/P3D/Pokemon/Items/Berries/PersimBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Ground - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PetayaBerry.vb b/P3D/Pokemon/Items/Berries/PetayaBerry.vb index db7dcaed2..0c779f5ac 100644 --- a/P3D/Pokemon/Items/Berries/PetayaBerry.vb +++ b/P3D/Pokemon/Items/Berries/PetayaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Poison - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PinapBerry.vb b/P3D/Pokemon/Items/Berries/PinapBerry.vb index 6680731d5..21ac6fe38 100644 --- a/P3D/Pokemon/Items/Berries/PinapBerry.vb +++ b/P3D/Pokemon/Items/Berries/PinapBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Grass - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PomegBerry.vb b/P3D/Pokemon/Items/Berries/PomegBerry.vb index b32061184..3772898e0 100644 --- a/P3D/Pokemon/Items/Berries/PomegBerry.vb +++ b/P3D/Pokemon/Items/Berries/PomegBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ice - Me.Power = 70 + Me.Power = 90 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/QualotBerry.vb b/P3D/Pokemon/Items/Berries/QualotBerry.vb index 78b0535d9..aa0db459f 100644 --- a/P3D/Pokemon/Items/Berries/QualotBerry.vb +++ b/P3D/Pokemon/Items/Berries/QualotBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Poison - Me.Power = 60 + Me.Power = 90 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/RabutaBerry.vb b/P3D/Pokemon/Items/Berries/RabutaBerry.vb index 638071cb9..3a8b89c6c 100644 --- a/P3D/Pokemon/Items/Berries/RabutaBerry.vb +++ b/P3D/Pokemon/Items/Berries/RabutaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Ghost - Me.Power = 60 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/RawstBerry.vb b/P3D/Pokemon/Items/Berries/RawstBerry.vb index 07a491c30..81b787143 100644 --- a/P3D/Pokemon/Items/Berries/RawstBerry.vb +++ b/P3D/Pokemon/Items/Berries/RawstBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Grass - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/RazzBerry.vb b/P3D/Pokemon/Items/Berries/RazzBerry.vb index 0b8307810..985bffb6b 100644 --- a/P3D/Pokemon/Items/Berries/RazzBerry.vb +++ b/P3D/Pokemon/Items/Berries/RazzBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Steel - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/RindoBerry.vb b/P3D/Pokemon/Items/Berries/RindoBerry.vb index 73bd2a4ba..6948a0115 100644 --- a/P3D/Pokemon/Items/Berries/RindoBerry.vb +++ b/P3D/Pokemon/Items/Berries/RindoBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Grass - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/RoseliBerry.vb b/P3D/Pokemon/Items/Berries/RoseliBerry.vb new file mode 100644 index 000000000..5f724badb --- /dev/null +++ b/P3D/Pokemon/Items/Berries/RoseliBerry.vb @@ -0,0 +1,23 @@ +Namespace Items.Berries + + + Public Class RoseliBerry + + Inherits Berry + + Public Sub New() + MyBase.New(64800, "If held by a Pokémon, this Berry will lessen the damage taken from one supereffective Fairy-type attack.", "3.2cm", "Soft", 1, 5) + + Me.Spicy = 0 + Me.Dry = 0 + Me.Sweet = 25 + Me.Bitter = 0 + Me.Sour = 10 + + Me.Type = Element.Types.Fairy + Me.Power = 80 + End Sub + + End Class + +End Namespace diff --git a/P3D/Pokemon/Items/Berries/RowapBerry.vb b/P3D/Pokemon/Items/Berries/RowapBerry.vb index 86516217c..2986bd73d 100644 --- a/P3D/Pokemon/Items/Berries/RowapBerry.vb +++ b/P3D/Pokemon/Items/Berries/RowapBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 40 Me.Type = Element.Types.Dark - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/SalacBerry.vb b/P3D/Pokemon/Items/Berries/SalacBerry.vb index 3ac3e7587..a90a0569d 100644 --- a/P3D/Pokemon/Items/Berries/SalacBerry.vb +++ b/P3D/Pokemon/Items/Berries/SalacBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 30 Me.Type = Element.Types.Fighting - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ShucaBerry.vb b/P3D/Pokemon/Items/Berries/ShucaBerry.vb index 7b9917091..5e473fced 100644 --- a/P3D/Pokemon/Items/Berries/ShucaBerry.vb +++ b/P3D/Pokemon/Items/Berries/ShucaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ground - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/SitrusBerry.vb b/P3D/Pokemon/Items/Berries/SitrusBerry.vb index 828668a9d..10a6bbdf9 100644 --- a/P3D/Pokemon/Items/Berries/SitrusBerry.vb +++ b/P3D/Pokemon/Items/Berries/SitrusBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Psychic - Me.Power = 60 + Me.Power = 80 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/SpelonBerry.vb b/P3D/Pokemon/Items/Berries/SpelonBerry.vb index 7d5b0bf87..2f389fc5b 100644 --- a/P3D/Pokemon/Items/Berries/SpelonBerry.vb +++ b/P3D/Pokemon/Items/Berries/SpelonBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Dark - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/StarfBerry.vb b/P3D/Pokemon/Items/Berries/StarfBerry.vb index 26c1a14da..39c3c7ff5 100644 --- a/P3D/Pokemon/Items/Berries/StarfBerry.vb +++ b/P3D/Pokemon/Items/Berries/StarfBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 30 Me.Type = Element.Types.Psychic - Me.Power = 80 + Me.Power = 100 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/TamatoBerry.vb b/P3D/Pokemon/Items/Berries/TamatoBerry.vb index 8db5d3afd..012534634 100644 --- a/P3D/Pokemon/Items/Berries/TamatoBerry.vb +++ b/P3D/Pokemon/Items/Berries/TamatoBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Psychic - Me.Power = 70 + Me.Power = 90 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/TangaBerry.vb b/P3D/Pokemon/Items/Berries/TangaBerry.vb index 82c32670a..b893e2d35 100644 --- a/P3D/Pokemon/Items/Berries/TangaBerry.vb +++ b/P3D/Pokemon/Items/Berries/TangaBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Bug - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/WacanBerry.vb b/P3D/Pokemon/Items/Berries/WacanBerry.vb index a549df708..6a3217856 100644 --- a/P3D/Pokemon/Items/Berries/WacanBerry.vb +++ b/P3D/Pokemon/Items/Berries/WacanBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Electric - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/WatmelBerry.vb b/P3D/Pokemon/Items/Berries/WatmelBerry.vb index ef2b94b8f..16979b788 100644 --- a/P3D/Pokemon/Items/Berries/WatmelBerry.vb +++ b/P3D/Pokemon/Items/Berries/WatmelBerry.vb @@ -15,8 +15,8 @@ Public Class WatmelBerry Me.Sour = 0 Me.Type = Element.Types.Fire - Me.Power = 80 - End Sub + Me.Power = 100 + End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/WepearBerry.vb b/P3D/Pokemon/Items/Berries/WepearBerry.vb index 6742c0ec0..9a27a7f3e 100644 --- a/P3D/Pokemon/Items/Berries/WepearBerry.vb +++ b/P3D/Pokemon/Items/Berries/WepearBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 10 Me.Type = Element.Types.Electric - Me.Power = 70 + Me.Power = 90 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/WikiBerry.vb b/P3D/Pokemon/Items/Berries/WikiBerry.vb index 7bd09f57d..e50e27133 100644 --- a/P3D/Pokemon/Items/Berries/WikiBerry.vb +++ b/P3D/Pokemon/Items/Berries/WikiBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Rock - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/YacheBerry.vb b/P3D/Pokemon/Items/Berries/YacheBerry.vb index 278b35b5c..34c2dae4f 100644 --- a/P3D/Pokemon/Items/Berries/YacheBerry.vb +++ b/P3D/Pokemon/Items/Berries/YacheBerry.vb @@ -15,7 +15,7 @@ Namespace Items.Berries Me.Sour = 0 Me.Type = Element.Types.Ice - Me.Power = 60 + Me.Power = 80 End Sub End Class diff --git a/P3D/Pokemon/Items/_itemList.txt b/P3D/Pokemon/Items/_itemList.txt index 815536673..31904c523 100644 Binary files a/P3D/Pokemon/Items/_itemList.txt and b/P3D/Pokemon/Items/_itemList.txt differ