From 4e4b1bac73cfd0392573092727c42722852b379b Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Tue, 30 May 2023 17:54:26 -0500 Subject: [PATCH] add juice properties to berries --- P3D/Pokemon/Items/Berries/AguavBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/ApicotBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/AspearBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/BabiriBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/BelueBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/BlukBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/ChartiBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/CheriBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/ChestoBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/ChilanBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/ChopleBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/CobaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/ColburBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/CornnBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/CustapBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/DurinBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/EnigmaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/FigyBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/GanlonBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/GrepaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/HabanBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/HondewBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/IapapaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/JabocaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/KasibBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/KebiaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/KeeBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/KelpsyBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/LansatBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/LeppaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/LiechiBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/LumBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/MagoBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/MagostBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/MarangaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/MicleBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/NanabBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/NomelBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/OccaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/OranBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PamtreBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PasshoBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PayapaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PechaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PersimBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PetayaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PinapBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/PomegBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/QualotBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/RabutaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/RawstBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/RazzBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/RindoBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/RoseliBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/RowapBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/SalacBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/ShucaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/SitrusBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/SpelonBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/StarfBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/TamatoBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/TangaBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/WacanBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/WatmelBerry.vb | 19 +++++++++++-------- P3D/Pokemon/Items/Berries/WepearBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/WikiBerry.vb | 2 ++ P3D/Pokemon/Items/Berries/YacheBerry.vb | 2 ++ P3D/Pokemon/Items/Berry.vb | 3 +++ .../V2/ScriptConstructs/DoInventory.vb | 19 +++++++++++++++++++ 69 files changed, 165 insertions(+), 8 deletions(-) diff --git a/P3D/Pokemon/Items/Berries/AguavBerry.vb b/P3D/Pokemon/Items/Berries/AguavBerry.vb index 35eea2d66..f5651de88 100644 --- a/P3D/Pokemon/Items/Berries/AguavBerry.vb +++ b/P3D/Pokemon/Items/Berries/AguavBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dragon Me.Power = 80 + Me.JuiceColor = "green" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ApicotBerry.vb b/P3D/Pokemon/Items/Berries/ApicotBerry.vb index 192a9f3f5..74107c7f0 100644 --- a/P3D/Pokemon/Items/Berries/ApicotBerry.vb +++ b/P3D/Pokemon/Items/Berries/ApicotBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ground Me.Power = 100 + Me.JuiceColor = "blue" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/AspearBerry.vb b/P3D/Pokemon/Items/Berries/AspearBerry.vb index 6f706ac6c..4db07131d 100644 --- a/P3D/Pokemon/Items/Berries/AspearBerry.vb +++ b/P3D/Pokemon/Items/Berries/AspearBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ice Me.Power = 80 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 1 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/BabiriBerry.vb b/P3D/Pokemon/Items/Berries/BabiriBerry.vb index 5fb6d8ed9..cd19bb942 100644 --- a/P3D/Pokemon/Items/Berries/BabiriBerry.vb +++ b/P3D/Pokemon/Items/Berries/BabiriBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Steel Me.Power = 80 + Me.JuiceColor = "green" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/BelueBerry.vb b/P3D/Pokemon/Items/Berries/BelueBerry.vb index 11ee4f628..de3fd1abb 100644 --- a/P3D/Pokemon/Items/Berries/BelueBerry.vb +++ b/P3D/Pokemon/Items/Berries/BelueBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Electric Me.Power = 100 + Me.JuiceColor = "purple" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/BlukBerry.vb b/P3D/Pokemon/Items/Berries/BlukBerry.vb index 822ebe6ea..6c376200b 100644 --- a/P3D/Pokemon/Items/Berries/BlukBerry.vb +++ b/P3D/Pokemon/Items/Berries/BlukBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fire Me.Power = 90 + Me.JuiceColor = "purple" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ChartiBerry.vb b/P3D/Pokemon/Items/Berries/ChartiBerry.vb index efbf1c3f8..c1bf0b415 100644 --- a/P3D/Pokemon/Items/Berries/ChartiBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChartiBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Rock Me.Power = 80 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CheriBerry.vb b/P3D/Pokemon/Items/Berries/CheriBerry.vb index bf7aafb91..780ebe29a 100644 --- a/P3D/Pokemon/Items/Berries/CheriBerry.vb +++ b/P3D/Pokemon/Items/Berries/CheriBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fire Me.Power = 80 + Me.JuiceColor = "red" + Me.JuiceGroup = 1 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/ChestoBerry.vb b/P3D/Pokemon/Items/Berries/ChestoBerry.vb index cd50aab89..68e637cf1 100644 --- a/P3D/Pokemon/Items/Berries/ChestoBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChestoBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Water Me.Power = 80 + Me.JuiceColor = "purple" + Me.JuiceGroup = 1 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/ChilanBerry.vb b/P3D/Pokemon/Items/Berries/ChilanBerry.vb index 4a2233ed4..b95f75c23 100644 --- a/P3D/Pokemon/Items/Berries/ChilanBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChilanBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Normal Me.Power = 80 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ChopleBerry.vb b/P3D/Pokemon/Items/Berries/ChopleBerry.vb index 8e4cf3da1..cb76bf857 100644 --- a/P3D/Pokemon/Items/Berries/ChopleBerry.vb +++ b/P3D/Pokemon/Items/Berries/ChopleBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fighting Me.Power = 80 + Me.JuiceColor = "red" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CobaBerry.vb b/P3D/Pokemon/Items/Berries/CobaBerry.vb index 2db82ba24..f7b2a3ecc 100644 --- a/P3D/Pokemon/Items/Berries/CobaBerry.vb +++ b/P3D/Pokemon/Items/Berries/CobaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Flying Me.Power = 80 + Me.JuiceColor = "blue" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ColburBerry.vb b/P3D/Pokemon/Items/Berries/ColburBerry.vb index ea1715c3c..dbca19894 100644 --- a/P3D/Pokemon/Items/Berries/ColburBerry.vb +++ b/P3D/Pokemon/Items/Berries/ColburBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dark Me.Power = 80 + Me.JuiceColor = "purple" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CornnBerry.vb b/P3D/Pokemon/Items/Berries/CornnBerry.vb index 5f687f857..ec93eaad2 100644 --- a/P3D/Pokemon/Items/Berries/CornnBerry.vb +++ b/P3D/Pokemon/Items/Berries/CornnBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Bug Me.Power = 90 + Me.JuiceColor = "purple" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/CustapBerry.vb b/P3D/Pokemon/Items/Berries/CustapBerry.vb index 36c2dc327..91f158d41 100644 --- a/P3D/Pokemon/Items/Berries/CustapBerry.vb +++ b/P3D/Pokemon/Items/Berries/CustapBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ghost Me.Power = 100 + Me.JuiceColor = "red" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/DurinBerry.vb b/P3D/Pokemon/Items/Berries/DurinBerry.vb index a4320892a..9c7bad28e 100644 --- a/P3D/Pokemon/Items/Berries/DurinBerry.vb +++ b/P3D/Pokemon/Items/Berries/DurinBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Water Me.Power = 100 + Me.JuiceColor = "grass" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/EnigmaBerry.vb b/P3D/Pokemon/Items/Berries/EnigmaBerry.vb index 62e256e1d..59e717fd7 100644 --- a/P3D/Pokemon/Items/Berries/EnigmaBerry.vb +++ b/P3D/Pokemon/Items/Berries/EnigmaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Bug Me.Power = 100 + Me.JuiceColor = "purple" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/FigyBerry.vb b/P3D/Pokemon/Items/Berries/FigyBerry.vb index 338b19c65..3e037352a 100644 --- a/P3D/Pokemon/Items/Berries/FigyBerry.vb +++ b/P3D/Pokemon/Items/Berries/FigyBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Bug Me.Power = 80 + Me.JuiceColor = "red" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/GanlonBerry.vb b/P3D/Pokemon/Items/Berries/GanlonBerry.vb index bcf11fa03..91bc8af22 100644 --- a/P3D/Pokemon/Items/Berries/GanlonBerry.vb +++ b/P3D/Pokemon/Items/Berries/GanlonBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ice Me.Power = 100 + Me.JuiceColor = "purple" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/GrepaBerry.vb b/P3D/Pokemon/Items/Berries/GrepaBerry.vb index d3093a4ce..3385fb555 100644 --- a/P3D/Pokemon/Items/Berries/GrepaBerry.vb +++ b/P3D/Pokemon/Items/Berries/GrepaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Flying Me.Power = 90 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 3 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/HabanBerry.vb b/P3D/Pokemon/Items/Berries/HabanBerry.vb index 7d68191da..c8fc1db8f 100644 --- a/P3D/Pokemon/Items/Berries/HabanBerry.vb +++ b/P3D/Pokemon/Items/Berries/HabanBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dragon Me.Power = 80 + Me.JuiceColor = "red" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/HondewBerry.vb b/P3D/Pokemon/Items/Berries/HondewBerry.vb index 1f915d856..f7e09defb 100644 --- a/P3D/Pokemon/Items/Berries/HondewBerry.vb +++ b/P3D/Pokemon/Items/Berries/HondewBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ground Me.Power = 90 + Me.JuiceColor = "green" + Me.JuiceGroup = 3 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/IapapaBerry.vb b/P3D/Pokemon/Items/Berries/IapapaBerry.vb index f3d7237c4..fb7b3dcfd 100644 --- a/P3D/Pokemon/Items/Berries/IapapaBerry.vb +++ b/P3D/Pokemon/Items/Berries/IapapaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dark Me.Power = 80 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/JabocaBerry.vb b/P3D/Pokemon/Items/Berries/JabocaBerry.vb index d169a92b3..e12236cfc 100644 --- a/P3D/Pokemon/Items/Berries/JabocaBerry.vb +++ b/P3D/Pokemon/Items/Berries/JabocaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dragon Me.Power = 100 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/KasibBerry.vb b/P3D/Pokemon/Items/Berries/KasibBerry.vb index fe0702104..dbb7e0b70 100644 --- a/P3D/Pokemon/Items/Berries/KasibBerry.vb +++ b/P3D/Pokemon/Items/Berries/KasibBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ghost Me.Power = 80 + Me.JuiceColor = "purple" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/KebiaBerry.vb b/P3D/Pokemon/Items/Berries/KebiaBerry.vb index 0d5c57749..8fa447506 100644 --- a/P3D/Pokemon/Items/Berries/KebiaBerry.vb +++ b/P3D/Pokemon/Items/Berries/KebiaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Poison Me.Power = 80 + Me.JuiceColor = "green" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/KeeBerry.vb b/P3D/Pokemon/Items/Berries/KeeBerry.vb index c4408097a..b5fcdf9b4 100644 --- a/P3D/Pokemon/Items/Berries/KeeBerry.vb +++ b/P3D/Pokemon/Items/Berries/KeeBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fairy Me.Power = 100 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/KelpsyBerry.vb b/P3D/Pokemon/Items/Berries/KelpsyBerry.vb index be5805508..422b39be9 100644 --- a/P3D/Pokemon/Items/Berries/KelpsyBerry.vb +++ b/P3D/Pokemon/Items/Berries/KelpsyBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fighting Me.Power = 90 + Me.JuiceColor = "blue" + Me.JuiceGroup = 3 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/LansatBerry.vb b/P3D/Pokemon/Items/Berries/LansatBerry.vb index 668913a2a..1bce72313 100644 --- a/P3D/Pokemon/Items/Berries/LansatBerry.vb +++ b/P3D/Pokemon/Items/Berries/LansatBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Flying Me.Power = 100 + Me.JuiceColor = "red" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/LeppaBerry.vb b/P3D/Pokemon/Items/Berries/LeppaBerry.vb index 7caa17208..7533b8f46 100644 --- a/P3D/Pokemon/Items/Berries/LeppaBerry.vb +++ b/P3D/Pokemon/Items/Berries/LeppaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fighting Me.Power = 80 + Me.JuiceColor = "red" + Me.JuiceGroup = 1 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/LiechiBerry.vb b/P3D/Pokemon/Items/Berries/LiechiBerry.vb index a5f6bee8b..e0842b7a7 100644 --- a/P3D/Pokemon/Items/Berries/LiechiBerry.vb +++ b/P3D/Pokemon/Items/Berries/LiechiBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Grass Me.Power = 100 + Me.JuiceColor = "red" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/LumBerry.vb b/P3D/Pokemon/Items/Berries/LumBerry.vb index 9f433f67e..42f70dcbe 100644 --- a/P3D/Pokemon/Items/Berries/LumBerry.vb +++ b/P3D/Pokemon/Items/Berries/LumBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Flying Me.Power = 80 + Me.JuiceColor = "green" + Me.JuiceGroup = 2 End Sub Public Overrides Sub Use() Dim selScreen = New PartyScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True} diff --git a/P3D/Pokemon/Items/Berries/MagoBerry.vb b/P3D/Pokemon/Items/Berries/MagoBerry.vb index 9163c5e74..9c3e67cf3 100644 --- a/P3D/Pokemon/Items/Berries/MagoBerry.vb +++ b/P3D/Pokemon/Items/Berries/MagoBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ghost Me.Power = 80 + Me.JuiceColor = "pink" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/MagostBerry.vb b/P3D/Pokemon/Items/Berries/MagostBerry.vb index c8791590c..df5cc722b 100644 --- a/P3D/Pokemon/Items/Berries/MagostBerry.vb +++ b/P3D/Pokemon/Items/Berries/MagostBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Rock Me.Power = 90 + Me.JuiceColor = "pink" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/MarangaBerry.vb b/P3D/Pokemon/Items/Berries/MarangaBerry.vb index dad0517fb..4fc5ca090 100644 --- a/P3D/Pokemon/Items/Berries/MarangaBerry.vb +++ b/P3D/Pokemon/Items/Berries/MarangaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dark Me.Power = 100 + Me.JuiceColor = "blue" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/MicleBerry.vb b/P3D/Pokemon/Items/Berries/MicleBerry.vb index d8504ab28..475d629f7 100644 --- a/P3D/Pokemon/Items/Berries/MicleBerry.vb +++ b/P3D/Pokemon/Items/Berries/MicleBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Rock Me.Power = 100 + Me.JuiceColor = "green" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/NanabBerry.vb b/P3D/Pokemon/Items/Berries/NanabBerry.vb index 8edf34e8d..9cf089e75 100644 --- a/P3D/Pokemon/Items/Berries/NanabBerry.vb +++ b/P3D/Pokemon/Items/Berries/NanabBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Water Me.Power = 90 + Me.JuiceColor = "pink" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/NomelBerry.vb b/P3D/Pokemon/Items/Berries/NomelBerry.vb index 9e6a954fc..5b5f662ae 100644 --- a/P3D/Pokemon/Items/Berries/NomelBerry.vb +++ b/P3D/Pokemon/Items/Berries/NomelBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dragon Me.Power = 90 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/OccaBerry.vb b/P3D/Pokemon/Items/Berries/OccaBerry.vb index 187c8b822..610ff04d1 100644 --- a/P3D/Pokemon/Items/Berries/OccaBerry.vb +++ b/P3D/Pokemon/Items/Berries/OccaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fire Me.Power = 80 + Me.JuiceColor = "red" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/OranBerry.vb b/P3D/Pokemon/Items/Berries/OranBerry.vb index 9bce54172..db3cd8372 100644 --- a/P3D/Pokemon/Items/Berries/OranBerry.vb +++ b/P3D/Pokemon/Items/Berries/OranBerry.vb @@ -18,6 +18,8 @@ Namespace Items.Berries Me.Type = Element.Types.Poison Me.Power = 80 + Me.JuiceColor = "blue" + Me.JuiceGroup = 1 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/PamtreBerry.vb b/P3D/Pokemon/Items/Berries/PamtreBerry.vb index abb4d8a99..84988bece 100644 --- a/P3D/Pokemon/Items/Berries/PamtreBerry.vb +++ b/P3D/Pokemon/Items/Berries/PamtreBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Steel Me.Power = 90 + Me.JuiceColor = "purple" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PasshoBerry.vb b/P3D/Pokemon/Items/Berries/PasshoBerry.vb index 2ccb723db..12a4a9162 100644 --- a/P3D/Pokemon/Items/Berries/PasshoBerry.vb +++ b/P3D/Pokemon/Items/Berries/PasshoBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Water Me.Power = 80 + Me.JuiceColor = "blue" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PayapaBerry.vb b/P3D/Pokemon/Items/Berries/PayapaBerry.vb index f15e811ee..e8da47793 100644 --- a/P3D/Pokemon/Items/Berries/PayapaBerry.vb +++ b/P3D/Pokemon/Items/Berries/PayapaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Psychic Me.Power = 80 + Me.JuiceColor = "purple" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PechaBerry.vb b/P3D/Pokemon/Items/Berries/PechaBerry.vb index 49c4539e8..6c745c917 100644 --- a/P3D/Pokemon/Items/Berries/PechaBerry.vb +++ b/P3D/Pokemon/Items/Berries/PechaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Electric Me.Power = 80 + Me.JuiceColor = "pink" + Me.JuiceGroup = 1 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/PersimBerry.vb b/P3D/Pokemon/Items/Berries/PersimBerry.vb index 1d1141e7c..1464d69b9 100644 --- a/P3D/Pokemon/Items/Berries/PersimBerry.vb +++ b/P3D/Pokemon/Items/Berries/PersimBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ground Me.Power = 80 + Me.JuiceColor = "pink" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PetayaBerry.vb b/P3D/Pokemon/Items/Berries/PetayaBerry.vb index 0c779f5ac..726b2a16f 100644 --- a/P3D/Pokemon/Items/Berries/PetayaBerry.vb +++ b/P3D/Pokemon/Items/Berries/PetayaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Poison Me.Power = 100 + Me.JuiceColor = "pink" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PinapBerry.vb b/P3D/Pokemon/Items/Berries/PinapBerry.vb index 21ac6fe38..1ce27171b 100644 --- a/P3D/Pokemon/Items/Berries/PinapBerry.vb +++ b/P3D/Pokemon/Items/Berries/PinapBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Grass Me.Power = 90 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/PomegBerry.vb b/P3D/Pokemon/Items/Berries/PomegBerry.vb index 3772898e0..dd0f06034 100644 --- a/P3D/Pokemon/Items/Berries/PomegBerry.vb +++ b/P3D/Pokemon/Items/Berries/PomegBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ice Me.Power = 90 + Me.JuiceColor = "red" + Me.JuiceGroup = 3 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/QualotBerry.vb b/P3D/Pokemon/Items/Berries/QualotBerry.vb index aa0db459f..78e5d6d4e 100644 --- a/P3D/Pokemon/Items/Berries/QualotBerry.vb +++ b/P3D/Pokemon/Items/Berries/QualotBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Poison Me.Power = 90 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 3 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/RabutaBerry.vb b/P3D/Pokemon/Items/Berries/RabutaBerry.vb index 3a8b89c6c..e59f3fba0 100644 --- a/P3D/Pokemon/Items/Berries/RabutaBerry.vb +++ b/P3D/Pokemon/Items/Berries/RabutaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ghost Me.Power = 90 + Me.JuiceColor = "green" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/RawstBerry.vb b/P3D/Pokemon/Items/Berries/RawstBerry.vb index 81b787143..25502a7a6 100644 --- a/P3D/Pokemon/Items/Berries/RawstBerry.vb +++ b/P3D/Pokemon/Items/Berries/RawstBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Grass Me.Power = 80 + Me.JuiceColor = "green" + Me.JuiceGroup = 1 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/RazzBerry.vb b/P3D/Pokemon/Items/Berries/RazzBerry.vb index 985bffb6b..6fc3e210b 100644 --- a/P3D/Pokemon/Items/Berries/RazzBerry.vb +++ b/P3D/Pokemon/Items/Berries/RazzBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Steel Me.Power = 80 + Me.JuiceColor = "red" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/RindoBerry.vb b/P3D/Pokemon/Items/Berries/RindoBerry.vb index 6948a0115..ae090ac6c 100644 --- a/P3D/Pokemon/Items/Berries/RindoBerry.vb +++ b/P3D/Pokemon/Items/Berries/RindoBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Grass Me.Power = 80 + Me.JuiceColor = "green" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/RoseliBerry.vb b/P3D/Pokemon/Items/Berries/RoseliBerry.vb index 5f724badb..65c15ff1a 100644 --- a/P3D/Pokemon/Items/Berries/RoseliBerry.vb +++ b/P3D/Pokemon/Items/Berries/RoseliBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fairy Me.Power = 80 + Me.JuiceColor = "pink" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/RowapBerry.vb b/P3D/Pokemon/Items/Berries/RowapBerry.vb index 2986bd73d..402f43e82 100644 --- a/P3D/Pokemon/Items/Berries/RowapBerry.vb +++ b/P3D/Pokemon/Items/Berries/RowapBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dark Me.Power = 100 + Me.JuiceColor = "blue" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/SalacBerry.vb b/P3D/Pokemon/Items/Berries/SalacBerry.vb index a90a0569d..be12adef9 100644 --- a/P3D/Pokemon/Items/Berries/SalacBerry.vb +++ b/P3D/Pokemon/Items/Berries/SalacBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Fighting Me.Power = 100 + Me.JuiceColor = "green" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/ShucaBerry.vb b/P3D/Pokemon/Items/Berries/ShucaBerry.vb index 5e473fced..d9927b7fb 100644 --- a/P3D/Pokemon/Items/Berries/ShucaBerry.vb +++ b/P3D/Pokemon/Items/Berries/ShucaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ground Me.Power = 80 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/SitrusBerry.vb b/P3D/Pokemon/Items/Berries/SitrusBerry.vb index 1eaa659de..6f6a576d7 100644 --- a/P3D/Pokemon/Items/Berries/SitrusBerry.vb +++ b/P3D/Pokemon/Items/Berries/SitrusBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Psychic Me.Power = 80 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 2 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/SpelonBerry.vb b/P3D/Pokemon/Items/Berries/SpelonBerry.vb index 2f389fc5b..9ef950d7d 100644 --- a/P3D/Pokemon/Items/Berries/SpelonBerry.vb +++ b/P3D/Pokemon/Items/Berries/SpelonBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Dark Me.Power = 90 + Me.JuiceColor = "red" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/StarfBerry.vb b/P3D/Pokemon/Items/Berries/StarfBerry.vb index 39c3c7ff5..16eced66f 100644 --- a/P3D/Pokemon/Items/Berries/StarfBerry.vb +++ b/P3D/Pokemon/Items/Berries/StarfBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Psychic Me.Power = 100 + Me.JuiceColor = "green" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/TamatoBerry.vb b/P3D/Pokemon/Items/Berries/TamatoBerry.vb index 012534634..47a446afa 100644 --- a/P3D/Pokemon/Items/Berries/TamatoBerry.vb +++ b/P3D/Pokemon/Items/Berries/TamatoBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Psychic Me.Power = 90 + Me.JuiceColor = "red" + Me.JuiceGroup = 3 End Sub Public Overrides Sub Use() diff --git a/P3D/Pokemon/Items/Berries/TangaBerry.vb b/P3D/Pokemon/Items/Berries/TangaBerry.vb index b893e2d35..15c877879 100644 --- a/P3D/Pokemon/Items/Berries/TangaBerry.vb +++ b/P3D/Pokemon/Items/Berries/TangaBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Bug Me.Power = 80 + Me.JuiceColor = "green" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/WacanBerry.vb b/P3D/Pokemon/Items/Berries/WacanBerry.vb index 6a3217856..a71d86c41 100644 --- a/P3D/Pokemon/Items/Berries/WacanBerry.vb +++ b/P3D/Pokemon/Items/Berries/WacanBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Electric Me.Power = 80 + Me.JuiceColor = "yellow" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/WatmelBerry.vb b/P3D/Pokemon/Items/Berries/WatmelBerry.vb index 16979b788..a616d4ff2 100644 --- a/P3D/Pokemon/Items/Berries/WatmelBerry.vb +++ b/P3D/Pokemon/Items/Berries/WatmelBerry.vb @@ -5,19 +5,22 @@ Public Class WatmelBerry Inherits Berry - Public Sub New() + Public Sub New() MyBase.New(64800, "Pokéblock ingredient. Plant in loamy soil to grow Watmel.", "25.0cm", "Soft", 1, 2) - Me.Spicy = 0 - Me.Dry = 0 - Me.Sweet = 30 - Me.Bitter = 10 - Me.Sour = 0 + Me.Spicy = 0 + Me.Dry = 0 + Me.Sweet = 30 + Me.Bitter = 10 + Me.Sour = 0 - Me.Type = Element.Types.Fire + Me.Type = Element.Types.Fire Me.Power = 100 + Me.JuiceColor = "pink" + Me.JuiceGroup = 1 + End Sub -End Class + End Class End Namespace diff --git a/P3D/Pokemon/Items/Berries/WepearBerry.vb b/P3D/Pokemon/Items/Berries/WepearBerry.vb index 9a27a7f3e..09a9e4685 100644 --- a/P3D/Pokemon/Items/Berries/WepearBerry.vb +++ b/P3D/Pokemon/Items/Berries/WepearBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Electric Me.Power = 90 + Me.JuiceColor = "green" + Me.JuiceGroup = 1 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/WikiBerry.vb b/P3D/Pokemon/Items/Berries/WikiBerry.vb index e50e27133..8c8415889 100644 --- a/P3D/Pokemon/Items/Berries/WikiBerry.vb +++ b/P3D/Pokemon/Items/Berries/WikiBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Rock Me.Power = 80 + Me.JuiceColor = "purple" + Me.JuiceGroup = 3 End Sub End Class diff --git a/P3D/Pokemon/Items/Berries/YacheBerry.vb b/P3D/Pokemon/Items/Berries/YacheBerry.vb index 34c2dae4f..4dc0f3e33 100644 --- a/P3D/Pokemon/Items/Berries/YacheBerry.vb +++ b/P3D/Pokemon/Items/Berries/YacheBerry.vb @@ -16,6 +16,8 @@ Namespace Items.Berries Me.Type = Element.Types.Ice Me.Power = 80 + Me.JuiceColor = "blue" + Me.JuiceGroup = 2 End Sub End Class diff --git a/P3D/Pokemon/Items/Berry.vb b/P3D/Pokemon/Items/Berry.vb index ad0b73ebd..86d8d118a 100644 --- a/P3D/Pokemon/Items/Berry.vb +++ b/P3D/Pokemon/Items/Berry.vb @@ -34,6 +34,9 @@ Public Type As Element.Types Public Power As Integer = 80 + Public JuiceColor As String = "red" + Public JuiceGroup As Integer = 1 + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100 Public Overrides ReadOnly Property FlingDamage As Integer = 10 Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoInventory.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoInventory.vb index cb5c9d857..e0d4a5532 100644 --- a/P3D/World/ActionScript/V2/ScriptConstructs/DoInventory.vb +++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoInventory.vb @@ -40,6 +40,25 @@ Return item.ID End If Return 0 + Case "juicecolor" + Dim ItemID As String = argument.GetSplit(0) + If Item.GetItemByID(ItemID).PluralName.ToLower.EndsWith("berries") Then + Dim b As Items.Berry = CType(Item.GetItemByID(ItemID), Items.Berry) + + Return b.JuiceColor + End If + + Return "black" + Case "juicegroup" + Dim ItemID As String = argument.GetSplit(0) + If Item.GetItemByID(ItemID).PluralName.ToLower.EndsWith("berries") Then + Dim b As Items.Berry = CType(Item.GetItemByID(ItemID), Items.Berry) + + Return b.JuiceGroup + End If + + Return 0 + End Select Return DEFAULTNULL End Function