gym leader dialog (merge)

This commit is contained in:
Ruan Pablo 2019-05-03 00:12:50 -03:00
commit 78dedaa3b0
30 changed files with 230 additions and 103 deletions

View File

@ -47,9 +47,9 @@ version=2
:if:<Environment.day>=Sunday
:if:<Environment.hour><4 <and> <Environment.hour>>0
:if:<register.registered(TRTPrematchTalk)>=true
@npc.warp(30,~,3.2,~)
@npc.warp(31,~,3.2,~)
@npc.warp(32,~,3.2,~)
@npc.warp(20,~,3.2,~)
@npc.warp(21,~,3.2,~)
@npc.warp(22,~,3.2,~)
:endif
:endif
:if:<Environment.hour><12 <and> <Environment.hour>>5

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(BugsyRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe mornings during~the beginning of the week?*If you visit while~I am there maybe~we could battle.)
@text.show(Hey <player.name>,~hear this.*Last season I was able to~catch a whole bunch of bug~Pokémon that migrated from~Kanto.*I am itching to test them~out in battle.*Rumor is that Goldenrod has~opened a new battle bar~in the city center.*I will make sure to be there~a few mornings if you are~interested in a rematch.)
@register.register(BugsyRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(ClairRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe evenings during~the end of the week?*If you visit while~I am there maybe~we could battle.)
@text.show(Ah, here is our~new champion.*So you made it huh?*Well don't get too cocky,~you just got lucky last time.*Huh? A battle bar?*Sounds like the perfect~opportunity to have my~revenge!*If you are up to it,~I will be present some~evenings.*You'd better be~ready <player.name>,~I won't stand for another~loss!)
@register.register(ClairRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(ChuckRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe Monday/Wednesday/~Friday early mornings?*If you visit while~I am there maybe~we could battle.)
@text.show(Yo <player.name>,~good to see you!*I'd love to battle you again~but I am currently in the~middle of my training session.*Hah!~Here's an idea,~I recently heard of a place~in Goldenrod called the~Battle Bar.*If you would like to witness~my new skills I can be there~some mornings.*If you're up to the challenge~that is, Yahaha!)
@register.register(ChuckRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(MortyRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe around midnight?*If you visit while~I am there maybe~we could battle.)
@text.show(Hello <player.name>,~it's been a while.*To be honest not many really~strong trainers have passed~through here after you,~but that doesn't mean I~haven't been training!*What's that?*The new battle bar?*My ghosts prefer battling in~a quieter place but this~sounds like the ideal place~to improve my skills.*If we were to have another~battle we'd need to do~it when I'm free.*Usually around midnight~will work out.)
@register.register(MortyRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(WhitneyRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe evenings?*If you visit while~I am there maybe~we could battle.)
@text.show(Hi there!~So good to see you again!*I've been so bored lately,~we should totally have a~rematch!*Um, have you heard about~this new Battle Bar?*It's supposed to be like the~coolest place in town!*If you want I could be~there in the evenings.*Don't be late!)
@register.register(WhitneyRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(JasmineRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe Monday/Wednesday/~Friday early afternoons?*If you visit while~I am there maybe~we could battle.)
@text.show(...Um*Hello, <player.name>.*I would like to thank you~again for helping me back~then at the lighthouse.*Ampharos has been completely~healthy, all thanks to you...*Um...*a battle bar?*I don't usually leave the city~too much but I could start~showing up there.*How do a few afternoons sound?*Um...*I'll see you there then, ok?)
@register.register(JasmineRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(earthbadge_obtain)>=true <and> <register.registered(SurgeRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe afternoons during~the end of the week?*If you visit while~I am there maybe~we could battle.)
@text.show(Well look who it is!*What brings you~back here kid?*The Battle Bar?*Sounds like the perfect~place for some training!*How do a few afternoons~sound?*You'd better be there too~kiddo, that's a veterans~promise!)
@register.register(SurgeRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

View File

@ -1,6 +1,6 @@
version=2
:if:<register.registered(clubintro)>=true <and> <register.registered(FalknerRematchTalk)>=false
@text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe mornings?*If you visit while~I am there maybe~we could battle.)
@text.show(Hello <player.name>,~how are you doing?*Me and my birds have honed~our abilities and soared to~new heights in battling!*I'd show you but we are~currently renovating the~Gym's scaffolding.*What?~A battle bar?*That sounds like the perfect~place for a rematch!*I can visit in the mornings.)
@register.register(FalknerRematchTalk)
@register.change(clubregisters,<register.value(clubregisters)>+1)
:end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -25656,6 +25656,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Compile Include="Pokemon\Abilities\Aerilate.vb" />
<Compile Include="Pokemon\Abilities\TanglingHair.vb" />
<Compile Include="Pokemon\Abilities\SlushRush.vb" />
<Compile Include="Pokemon\Abilities\PowerofAlchemy.vb" />
<Compile Include="Pokemon\Abilities\Galvanize.vb" />
<Compile Include="Pokemon\Abilities\SurgeSurfer.vb" />
<Compile Include="Pokemon\Abilities\ParentalBond.vb" />
<Compile Include="Pokemon\Attacks\Bug\PollenPuff.vb" />
<Compile Include="Pokemon\Attacks\Bug\FirstImpression.vb" />
@ -25740,10 +25745,13 @@
<Compile Include="Pokemon\Items\Machines\TM173.vb" />
<Compile Include="Pokemon\Items\Standard\DouseDrive.vb" />
<Compile Include="Pokemon\Items\Standard\ChillDrive.vb" />
<Compile Include="Pokemon\Items\Standard\Snowball.vb" />
<Compile Include="Pokemon\Items\Standard\CellBattery.vb" />
<Compile Include="Pokemon\Items\Standard\FlameOrb.vb" />
<Compile Include="Pokemon\Items\Standard\ShockDrive.vb" />
<Compile Include="Pokemon\Items\Standard\BurnDrive.vb" />
<Compile Include="Pokemon\Items\Standard\ExpertBelt.vb" />
<Compile Include="Pokemon\Items\Stones\IceStone.vb" />
<Compile Include="Resources\Blur\BlurHandler.vb" />
<Content Include="Content\Data\Scripts\faraway\mewtwonite_y.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

View File

@ -415,98 +415,98 @@
Return New Abilities.FairyAura
Case 188
Return New Abilities.AuraBreak
'Case 189
'Primordial Sea
'Case 190
'Desolate Land
'Case 191
'Delta Stream
'Case 192
'Stamina
'Case 193
'Wimp Out
'Case 194
'Emergency Exit
'Case 195
'Water Compaction
'Case 196
'Merciless
'Case 197
'Shields Down
'Case 198
'Stakeout
'Case 199
'Water Bubble
'Case 200
'Steelworker
'Case 201
'Berserk
'Case 202
'Slush Rush
'Case 203
'Long Reach
'Case 204
'Liquid Voice
'Case 205
'Triage
'Case 206
'Galvanize
'Case 207
'Surge Surfer
'Case 208
'Schooling
'Case 209
'Disguise
'Case 210
'Battle Bond
'Case 211
'Power Construct
'Case 212
'Corrosion
'Case 213
'Comatose
'Case 214
'Queenly Majesty
'Case 215
'Innards Out
'Case 216
'Dancer
'Case 217
'Battery
'Case 218
'Fluffy
'Case 219
'Dazzling
'Case 220
'Soul-Heart
'Case 221
'Tangling Hair
'Case 222
'Receiver
'Case 223
'Power of Alchemy
'Case 224
'Beast Boost
'Case 225
'RKS System
'Case 226
'Electric Surge
'Case 227
'Psychic Surge
'Case 228
'Misty Surge
'Case 229
'Grassy Surge
'Case 230
'Full Metal Body
'Case 231
'Shadow Shield
'Case 232
'Prism Armor
'Case 233
'Neuroforce
'Case 234
'Blank
'Case 189
'Primordial Sea
'Case 190
'Desolate Land
'Case 191
'Delta Stream
'Case 192
'Stamina
'Case 193
'Wimp Out
'Case 194
'Emergency Exit
'Case 195
'Water Compaction
'Case 196
'Merciless
'Case 197
'Shields Down
'Case 198
'Stakeout
'Case 199
'Water Bubble
'Case 200
'Steelworker
'Case 201
'Berserk
Case 202
Return New Abilities.SlushRush()
'Case 203
'Long Reach
'Case 204
'Liquid Voice
'Case 205
'Triage
Case 206
Return New Abilities.Galvanize()
Case 207
Return New Abilities.SurgeSurfer()
'Case 208
'Schooling
'Case 209
'Disguise
'Case 210
'Battle Bond
'Case 211
'Power Construct
'Case 212
'Corrosion
'Case 213
'Comatose
'Case 214
'Queenly Majesty
'Case 215
'Innards Out
'Case 216
'Dancer
'Case 217
'Battery
'Case 218
'Fluffy
'Case 219
'Dazzling
'Case 220
'Soul-Heart
Case 221
Return New Abilities.TanglingHair()
'Case 222
'Receiver
Case 223
Return New Abilities.PowerofAlchemy()
'Case 224
'Beast Boost
'Case 225
'RKS System
'Case 226
'Electric Surge
'Case 227
'Psychic Surge
'Case 228
'Misty Surge
'Case 229
'Grassy Surge
'Case 230
'Full Metal Body
'Case 231
'Shadow Shield
'Case 232
'Prism Armor
'Case 233
'Neuroforce
'Case 234
'Blank
Case Else
Return New Abilities.Stench
End Select

View File

@ -0,0 +1,13 @@
Namespace Abilities
Public Class Galvanize
Inherits Ability
Public Sub New()
MyBase.New(206, "Galvanize", "Normal-type moves become Electric-type moves. The power of those moves is boosted a little.")
End Sub
End Class
End Namespace

View File

@ -0,0 +1,13 @@
Namespace Abilities
Public Class PowerofAlchemy
Inherits Ability
Public Sub New()
MyBase.New(223, "Power of Alchemy", "The Pokémon copies the Ability of a defeated ally.")
End Sub
End Class
End Namespace

View File

@ -0,0 +1,13 @@
Namespace Abilities
Public Class SlushRush
Inherits Ability
Public Sub New()
MyBase.New(202, "Slush Rush", "Boosts the Pokémon's Speed stat in a hailstorm.")
End Sub
End Class
End Namespace

View File

@ -0,0 +1,13 @@
Namespace Abilities
Public Class SurgeSurfer
Inherits Ability
Public Sub New()
MyBase.New(207, "Surge Surfer", "Doubles the Pokémon's Speed stat on Electric Terrain.")
End Sub
End Class
End Namespace

View File

@ -0,0 +1,13 @@
Namespace Abilities
Public Class TanglingHair
Inherits Ability
Public Sub New()
MyBase.New(221, "Tangling Hair", "Contact with the Pokémon lowers the attacker's Speed stat.")
End Sub
End Class
End Namespace

View File

@ -0,0 +1,19 @@
Namespace Items.Standard
<Item(595, "CellBattery")>
Public Class CellBattery
Inherits Item
Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It boosts Attack if hit with an Electric-type attack. It can only be used once."
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(192, 312, 24, 24)
End Sub
End Class
End Namespace

View File

@ -0,0 +1,19 @@
Namespace Items.Standard
<Item(594, "Snowball")>
Public Class Snowball
Inherits Item
Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It boosts Attack if hit with an Ice-type attack. It can only be used once."
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(168, 312, 24, 24)
End Sub
End Class
End Namespace

View File

@ -0,0 +1,16 @@
Namespace Items.Stones
<Item(593, "Ice Stone")>
Public Class IceStone
Inherits StoneItem
Public Overrides ReadOnly Property Description As String = "A peculiar stone that can make certain species of Pokémon evolve. It has an unmistakable snowflake pattern."
Public Sub New()
_textureRectangle = New Rectangle(144, 312, 24, 24)
End Sub
End Class
End Namespace

Binary file not shown.