add juice properties to berries

This commit is contained in:
darkfire006 2023-05-30 17:54:26 -05:00
parent a6170d0e01
commit 4e4b1bac73
69 changed files with 165 additions and 8 deletions

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dragon Me.Type = Element.Types.Dragon
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "green"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ground Me.Type = Element.Types.Ground
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "blue"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ice Me.Type = Element.Types.Ice
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "yellow"
Me.JuiceGroup = 1
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Steel Me.Type = Element.Types.Steel
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "green"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Electric Me.Type = Element.Types.Electric
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "purple"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fire Me.Type = Element.Types.Fire
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "purple"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Rock Me.Type = Element.Types.Rock
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "yellow"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fire Me.Type = Element.Types.Fire
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "red"
Me.JuiceGroup = 1
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Water Me.Type = Element.Types.Water
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "purple"
Me.JuiceGroup = 1
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Normal Me.Type = Element.Types.Normal
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "yellow"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fighting Me.Type = Element.Types.Fighting
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "red"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Flying Me.Type = Element.Types.Flying
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "blue"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dark Me.Type = Element.Types.Dark
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "purple"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Bug Me.Type = Element.Types.Bug
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "purple"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ghost Me.Type = Element.Types.Ghost
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "red"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Water Me.Type = Element.Types.Water
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "grass"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Bug Me.Type = Element.Types.Bug
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "purple"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Bug Me.Type = Element.Types.Bug
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "red"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ice Me.Type = Element.Types.Ice
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "purple"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Flying Me.Type = Element.Types.Flying
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "yellow"
Me.JuiceGroup = 3
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dragon Me.Type = Element.Types.Dragon
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "red"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ground Me.Type = Element.Types.Ground
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "green"
Me.JuiceGroup = 3
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dark Me.Type = Element.Types.Dark
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "yellow"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dragon Me.Type = Element.Types.Dragon
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "yellow"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ghost Me.Type = Element.Types.Ghost
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "purple"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Poison Me.Type = Element.Types.Poison
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "green"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fairy Me.Type = Element.Types.Fairy
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "yellow"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fighting Me.Type = Element.Types.Fighting
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "blue"
Me.JuiceGroup = 3
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Flying Me.Type = Element.Types.Flying
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "red"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fighting Me.Type = Element.Types.Fighting
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "red"
Me.JuiceGroup = 1
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Grass Me.Type = Element.Types.Grass
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "red"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Flying Me.Type = Element.Types.Flying
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "green"
Me.JuiceGroup = 2
End Sub End Sub
Public Overrides Sub Use() 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} Dim selScreen = New PartyScreen(Core.CurrentScreen, Me, AddressOf Me.UseOnPokemon, "Use " & Me.Name, True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ghost Me.Type = Element.Types.Ghost
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "pink"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Rock Me.Type = Element.Types.Rock
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "pink"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dark Me.Type = Element.Types.Dark
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "blue"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Rock Me.Type = Element.Types.Rock
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "green"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Water Me.Type = Element.Types.Water
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "pink"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dragon Me.Type = Element.Types.Dragon
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "yellow"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fire Me.Type = Element.Types.Fire
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "red"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -18,6 +18,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Poison Me.Type = Element.Types.Poison
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "blue"
Me.JuiceGroup = 1
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Steel Me.Type = Element.Types.Steel
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "purple"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Water Me.Type = Element.Types.Water
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "blue"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Psychic Me.Type = Element.Types.Psychic
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "purple"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Electric Me.Type = Element.Types.Electric
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "pink"
Me.JuiceGroup = 1
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ground Me.Type = Element.Types.Ground
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "pink"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Poison Me.Type = Element.Types.Poison
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "pink"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Grass Me.Type = Element.Types.Grass
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "yellow"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ice Me.Type = Element.Types.Ice
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "red"
Me.JuiceGroup = 3
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Poison Me.Type = Element.Types.Poison
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "yellow"
Me.JuiceGroup = 3
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ghost Me.Type = Element.Types.Ghost
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "green"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Grass Me.Type = Element.Types.Grass
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "green"
Me.JuiceGroup = 1
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Steel Me.Type = Element.Types.Steel
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "red"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Grass Me.Type = Element.Types.Grass
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "green"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fairy Me.Type = Element.Types.Fairy
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "pink"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dark Me.Type = Element.Types.Dark
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "blue"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Fighting Me.Type = Element.Types.Fighting
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "green"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ground Me.Type = Element.Types.Ground
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "yellow"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Psychic Me.Type = Element.Types.Psychic
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "yellow"
Me.JuiceGroup = 2
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Dark Me.Type = Element.Types.Dark
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "red"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Psychic Me.Type = Element.Types.Psychic
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "green"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Psychic Me.Type = Element.Types.Psychic
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "red"
Me.JuiceGroup = 3
End Sub End Sub
Public Overrides Sub Use() Public Overrides Sub Use()

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Bug Me.Type = Element.Types.Bug
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "green"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Electric Me.Type = Element.Types.Electric
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "yellow"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -5,19 +5,22 @@ Public Class WatmelBerry
Inherits Berry 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) MyBase.New(64800, "Pokéblock ingredient. Plant in loamy soil to grow Watmel.", "25.0cm", "Soft", 1, 2)
Me.Spicy = 0 Me.Spicy = 0
Me.Dry = 0 Me.Dry = 0
Me.Sweet = 30 Me.Sweet = 30
Me.Bitter = 10 Me.Bitter = 10
Me.Sour = 0 Me.Sour = 0
Me.Type = Element.Types.Fire Me.Type = Element.Types.Fire
Me.Power = 100 Me.Power = 100
Me.JuiceColor = "pink"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class
End Namespace End Namespace

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Electric Me.Type = Element.Types.Electric
Me.Power = 90 Me.Power = 90
Me.JuiceColor = "green"
Me.JuiceGroup = 1
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Rock Me.Type = Element.Types.Rock
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "purple"
Me.JuiceGroup = 3
End Sub End Sub
End Class End Class

View File

@ -16,6 +16,8 @@ Namespace Items.Berries
Me.Type = Element.Types.Ice Me.Type = Element.Types.Ice
Me.Power = 80 Me.Power = 80
Me.JuiceColor = "blue"
Me.JuiceGroup = 2
End Sub End Sub
End Class End Class

View File

@ -34,6 +34,9 @@
Public Type As Element.Types Public Type As Element.Types
Public Power As Integer = 80 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 PokeDollarPrice As Integer = 100
Public Overrides ReadOnly Property FlingDamage As Integer = 10 Public Overrides ReadOnly Property FlingDamage As Integer = 10
Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.Plants

View File

@ -40,6 +40,25 @@
Return item.ID Return item.ID
End If End If
Return 0 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 End Select
Return DEFAULTNULL Return DEFAULTNULL
End Function End Function