tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 

# Conflicts:
#	P3D/P3D.vbproj
This commit is contained in:
darkfire006 2019-01-30 22:29:45 -06:00
parent d0a19ba735 69c570b205
commit f581a1ecca
14 changed files with 81 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
P3D/Content/Data/Scripts/dragonsden/dracotutor.dat Normal file
View File

@ -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:<pokemon.type1(0)>=dragon <or> <pokemon.type2(0)>=dragon <or> <pokemon.number(0)>=493 <or> <pokemon.number(0)>=773
:if:<pokemon.hasattack(0,434)>=false
@text.show(Your <pokemon.name(0)>~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 <pokemon.name(0)>~masters the draconic power,~nothing stands a chance!)
:endif
:else
@text.show(But your <pokemon.name(0)>~is no Dragon-type.*If you catch any,~show it to me.)
:endif
:end

1
P3D/Content/Data/Scripts/liberty/room.dat
View File

@ -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)

BIN
P3D/Content/Data/maps/dragonsden/main.dat
View File

Binary file not shown.

2
P3D/Content/Data/maps/liberty/garden.dat
View File

@ -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[]}}]}}
{"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[]}}]}}

4
P3D/Pokemon/Items/Medicine/EnergyPowder.vb
View File

@ -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

4
P3D/Pokemon/Items/Medicine/EnergyRoot.vb
View File

@ -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

2
P3D/Pokemon/Items/Medicine/FreshWater.vb
View File

@ -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()

2
P3D/Pokemon/Items/Medicine/HyperPotion.vb
View File

@ -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()

2
P3D/Pokemon/Items/Medicine/Lemonade.vb
View File

@ -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()

35
P3D/Pokemon/Items/Medicine/RageCandyBar.vb
View File

@ -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

2
P3D/Pokemon/Items/Medicine/SodaPop.vb
View File

@ -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()

2
P3D/Pokemon/Items/Medicine/SuperPotion.vb
View File

@ -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()

19
P3D/Pokemon/Items/Standard/FlameOrb.vb Normal file
View File

@ -0,0 +1,19 @@
Namespace Items.Standard
<Item(577, "Flame Orb")>
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

BIN
P3D/Pokemon/Items/_itemList.txt
View File

Binary file not shown.