From 74ef66cc28825138ecaac902309680caf6ce59cb Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 30 Jan 2019 16:57:18 +0200 Subject: [PATCH 1/4] Updated all medicine to GenVII --- P3D/Pokemon/Items/Medicine/EnergyPowder.vb | 4 +-- P3D/Pokemon/Items/Medicine/EnergyRoot.vb | 4 +-- P3D/Pokemon/Items/Medicine/FreshWater.vb | 2 +- P3D/Pokemon/Items/Medicine/HyperPotion.vb | 2 +- P3D/Pokemon/Items/Medicine/Lemonade.vb | 2 +- P3D/Pokemon/Items/Medicine/RageCandyBar.vb | 35 ++++++++++++++++++++-- P3D/Pokemon/Items/Medicine/SodaPop.vb | 2 +- P3D/Pokemon/Items/Medicine/SuperPotion.vb | 2 +- 8 files changed, 42 insertions(+), 11 deletions(-) diff --git a/P3D/Pokemon/Items/Medicine/EnergyPowder.vb b/P3D/Pokemon/Items/Medicine/EnergyPowder.vb index 3f8592216..c0cc8d002 100644 --- a/P3D/Pokemon/Items/Medicine/EnergyPowder.vb +++ b/P3D/Pokemon/Items/Medicine/EnergyPowder.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 500 - Public Overrides ReadOnly Property Description As String = "A bitter medicine powder. When consumed, it restores 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A bitter medicine powder. When consumed, it restores 60 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() @@ -25,7 +25,7 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Dim success As Boolean = HealPokemon(PokeIndex, 50) + Dim success As Boolean = HealPokemon(PokeIndex, 60) If success Then Core.Player.Pokemons(PokeIndex).ChangeFriendShip(Pokemon.FriendShipCauses.EnergyPowder) End If diff --git a/P3D/Pokemon/Items/Medicine/EnergyRoot.vb b/P3D/Pokemon/Items/Medicine/EnergyRoot.vb index 599c383ef..fa8e74f9f 100644 --- a/P3D/Pokemon/Items/Medicine/EnergyRoot.vb +++ b/P3D/Pokemon/Items/Medicine/EnergyRoot.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 800 - Public Overrides ReadOnly Property Description As String = "An extremely bitter medicinal root. When consumed, it restores 200 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "An extremely bitter medicinal root. When consumed, it restores 120 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() @@ -25,7 +25,7 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Dim r As Boolean = HealPokemon(PokeIndex, 200) + Dim r As Boolean = HealPokemon(PokeIndex, 120) If r = True Then Core.Player.Pokemons(PokeIndex).ChangeFriendShip(Pokemon.FriendShipCauses.EnergyRoot) End If diff --git a/P3D/Pokemon/Items/Medicine/FreshWater.vb b/P3D/Pokemon/Items/Medicine/FreshWater.vb index 5db2abed2..138422a83 100644 --- a/P3D/Pokemon/Items/Medicine/FreshWater.vb +++ b/P3D/Pokemon/Items/Medicine/FreshWater.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 - Public Overrides ReadOnly Property Description As String = "Water with a high mineral content. When consumed, it restores 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "Water with a high mineral content. When consumed, it restores 30 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/HyperPotion.vb b/P3D/Pokemon/Items/Medicine/HyperPotion.vb index 352ef04bd..d8a3547b0 100644 --- a/P3D/Pokemon/Items/Medicine/HyperPotion.vb +++ b/P3D/Pokemon/Items/Medicine/HyperPotion.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 200 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 120 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1500 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/Lemonade.vb b/P3D/Pokemon/Items/Medicine/Lemonade.vb index d87b9de10..34a9c3533 100644 --- a/P3D/Pokemon/Items/Medicine/Lemonade.vb +++ b/P3D/Pokemon/Items/Medicine/Lemonade.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A very sweet and refreshing drink. When consumed, it restores 80 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A very sweet and refreshing drink. When consumed, it restores 70 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 350 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/RageCandyBar.vb b/P3D/Pokemon/Items/Medicine/RageCandyBar.vb index 13076e66c..fe5098d00 100644 --- a/P3D/Pokemon/Items/Medicine/RageCandyBar.vb +++ b/P3D/Pokemon/Items/Medicine/RageCandyBar.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A famous Mahogany Town candy tourists like to buy and take home. It restores the HP of one Pokémon by 20 points." + Public Overrides ReadOnly Property Description As String = "A famous Mahogany Town candy tourists like to buy and take home. It can be used once to heal all the status conditions of a Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 Public Sub New() @@ -25,7 +25,38 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Return HealPokemon(PokeIndex, 20) + Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) + + If Pokemon.Status = P3D.Pokemon.StatusProblems.Fainted Then + Screen.TextBox.reDelay = 0.0F + Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {}) + + Return False + Else + If Pokemon.Status <> P3D.Pokemon.StatusProblems.None Or Pokemon.HasVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) = True Then + Pokemon.Status = P3D.Pokemon.StatusProblems.None + + If Pokemon.HasVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) = True Then + Pokemon.RemoveVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) + End If + + Screen.TextBox.reDelay = 0.0F + + Dim t As String = Pokemon.GetDisplayName() & "~gets healed up!" + t &= RemoveItem() + + SoundManager.PlaySound("single_heal", False) + Screen.TextBox.Show(t, {}) + PlayerStatistics.Track("[17]Medicine Items used", 1) + + Return True + Else + Screen.TextBox.reDelay = 0.0F + Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fully healed!", {}, True, True) + + Return False + End If + End If End Function End Class diff --git a/P3D/Pokemon/Items/Medicine/SodaPop.vb b/P3D/Pokemon/Items/Medicine/SodaPop.vb index 696f5f405..90a005dbd 100644 --- a/P3D/Pokemon/Items/Medicine/SodaPop.vb +++ b/P3D/Pokemon/Items/Medicine/SodaPop.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A highly carbonated soda drink. When consumed, it restores 60 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A highly carbonated soda drink. When consumed, it restores 50 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/SuperPotion.vb b/P3D/Pokemon/Items/Medicine/SuperPotion.vb index 6cb6cffa5..14887d122 100644 --- a/P3D/Pokemon/Items/Medicine/SuperPotion.vb +++ b/P3D/Pokemon/Items/Medicine/SuperPotion.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 60 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 700 Public Sub New() From 1b48590ebd5bb6a5a72b62f3b3bfda49304dd10c Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 30 Jan 2019 17:28:03 +0200 Subject: [PATCH 2/4] Implemented the item flame orb(battle effect was already implemented). --- P3D/P3D.vbproj | 3 +++ P3D/Pokemon/Items/Standard/FlameOrb.vb | 19 +++++++++++++++++++ P3D/Pokemon/Items/_itemList.txt | Bin 58300 -> 58296 bytes 3 files changed, 22 insertions(+) create mode 100644 P3D/Pokemon/Items/Standard/FlameOrb.vb diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 5386f41fc..71c6647c2 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25702,6 +25702,9 @@ + + PreserveNewest + diff --git a/P3D/Pokemon/Items/Standard/FlameOrb.vb b/P3D/Pokemon/Items/Standard/FlameOrb.vb new file mode 100644 index 000000000..14911e7bd --- /dev/null +++ b/P3D/Pokemon/Items/Standard/FlameOrb.vb @@ -0,0 +1,19 @@ +Namespace Items.Standard + + + Public Class FlameOrb + + Inherits Item + + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a bizarre orb that inflicts a burn on the holder in battle." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + + Public Sub New() + _textureRectangle = New Rectangle(480, 264, 24, 24) + End Sub + + End Class + +End Namespace diff --git a/P3D/Pokemon/Items/_itemList.txt b/P3D/Pokemon/Items/_itemList.txt index 69219fb2282650142f1267c8e0a463d90925d550..e5212e6b12171923b9983c94d5bfcd6af40bb446 100644 GIT binary patch delta 30 ocmV+(0O9|<#{;;>1F(<5lWi#qlbgW|lQ{+=lP?Yuv)#epA=uarUH||9 delta 26 kcmV+#0OkL<#{;~_1F(<5ll{dGlbgW`ljX)Zv)jSlA<7RAC;$Ke From e0ec22c487d0a5b618e420f69436479e4445b719 Mon Sep 17 00:00:00 2001 From: Ruan Pablo Date: Wed, 30 Jan 2019 16:06:01 -0200 Subject: [PATCH 3/4] fix garden tutor --- P3D/Content/Data/Scripts/liberty/room.dat | 1 - P3D/Content/Data/maps/liberty/garden.dat | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/P3D/Content/Data/Scripts/liberty/room.dat b/P3D/Content/Data/Scripts/liberty/room.dat index ba8ff1a7c..abb4c60b4 100644 --- a/P3D/Content/Data/Scripts/liberty/room.dat +++ b/P3D/Content/Data/Scripts/liberty/room.dat @@ -42,7 +42,6 @@ version=2 @npc.register(liberty\garden.dat|39|position|33,2,17) @npc.register(liberty\garden.dat|40|position|41,1,8) @npc.register(liberty\garden.dat|41|position|33,2,26) -@npc.register(liberty\garden.dat|42|position|28,2,24) @npc.register(liberty\garden.dat|1|remove|0) @npc.register(liberty\garden.dat|2|remove|0) diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat index 60107a8f0..cc5a85d61 100644 --- a/P3D/Content/Data/maps/liberty/garden.dat +++ b/P3D/Content/Data/maps/liberty/garden.dat @@ -491,4 +491,4 @@ NPC: {"NPC"{NPC[{"Position"{sngArr[41,-1,8]}}{"TextureID"{str[50]}}{"ID"{int[40]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Unova has many cool Pokémon.*Do you also have cool Pokémon~in your home region?]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}} {"NPC"{NPC[{"Position"{sngArr[33,-2,26]}}{"TextureID"{str[95]}}{"ID"{int[41]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're keeping our own~watercraft to secure the~island now.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} -{"NPC"{NPC[{"Position"{sngArr[19,-2,9]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file +{"NPC"{NPC[{"Position"{sngArr[19,2,8]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Tutor]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[3]}}{"Movement"{str[looking]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file From 69c570b205d4b619327b44188be779265c5d066d Mon Sep 17 00:00:00 2001 From: Ruan Pablo Date: Wed, 30 Jan 2019 20:10:29 -0200 Subject: [PATCH 4/4] Draco Meteor tutor --- .../Data/Scripts/dragonsden/dracotutor.dat | 19 ++++++++++++++++++ P3D/Content/Data/maps/dragonsden/main.dat | Bin 190992 -> 191464 bytes P3D/P3D.vbproj | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 P3D/Content/Data/Scripts/dragonsden/dracotutor.dat diff --git a/P3D/Content/Data/Scripts/dragonsden/dracotutor.dat b/P3D/Content/Data/Scripts/dragonsden/dracotutor.dat new file mode 100644 index 000000000..52d7f1322 --- /dev/null +++ b/P3D/Content/Data/Scripts/dragonsden/dracotutor.dat @@ -0,0 +1,19 @@ +version=2 +@text.show(If you've come to Dragon's~Den, you must be looking~to master the Dragon-type.) +:if:=dragon =dragon =493 =773 + :if:=false + @text.show(Your ~seems capable.*Do you want it to learn~Draco Meteor, the most~powerful Dragon move?) + @options.show(Yes,No) + :when:Yes + @text.show(I shall teach it, then.) + @pokemon.learnattack(0,434) + :when:No + @text.show(Such a waste of potential.) + :endwhen + :else + @text.show(Now that ~masters the draconic power,~nothing stands a chance!) + :endif +:else + @text.show(But your ~is no Dragon-type.*If you catch any,~show it to me.) +:endif +:end \ No newline at end of file diff --git a/P3D/Content/Data/maps/dragonsden/main.dat b/P3D/Content/Data/maps/dragonsden/main.dat index a516b64dd99e24af87ebd0dbb0f068970aa4a287..69a2a32f42e5f8bc54c240a6b35bbe15a121843e 100644 GIT binary patch delta 120 zcmbPmh5N;I?uHh|Eld&DrX6RpnVztfkz=x#h}86i<4gj~mJBA-15YwZPqvfinLg_{ zlL%)BLn%WELq0>% PreserveNewest + + PreserveNewest + PreserveNewest