diff --git a/P3D/Content/Data/Scripts/goldenrod/clubmap.dat b/P3D/Content/Data/Scripts/goldenrod/clubmap.dat index 49a1ab696..8e759ea6b 100644 --- a/P3D/Content/Data/Scripts/goldenrod/clubmap.dat +++ b/P3D/Content/Data/Scripts/goldenrod/clubmap.dat @@ -47,9 +47,9 @@ version=2 :if:=Sunday :if:<4 >0 :if:=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:<12 >5 diff --git a/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat index 1281e78aa..61952f34e 100644 --- a/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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 ,~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,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat index 334e07f33..2716bdc0f 100644 --- a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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 ,~I won't stand for another~loss!) @register.register(ClairRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat index d197d1c16..0286266fd 100644 Binary files a/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat index ee380f592..1cd43e818 100644 Binary files a/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat index d6f9f755f..5b0dcaa0d 100644 --- a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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 ,~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,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat index e95db87e7..39bf1144e 100644 Binary files a/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat index 8d00b00dd..7a4cf82b4 100644 --- a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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 ,~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,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat index 4e78fd213..09b30a75f 100644 Binary files a/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat index 0ae4fbb30..8a05ada10 100644 --- a/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat index e917eafee..7e5cb643d 100644 Binary files a/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat index b88e225ec..12f7e8814 100644 --- a/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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, .*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,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat index 83adf43e5..38cb80a10 100644 Binary files a/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat index 77016f26f..89c20a581 100644 Binary files a/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/v_forest/002.trainer b/P3D/Content/Data/Scripts/trainer/v_forest/002.trainer index c3a39121d..04f8f130f 100644 Binary files a/P3D/Content/Data/Scripts/trainer/v_forest/002.trainer and b/P3D/Content/Data/Scripts/trainer/v_forest/002.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat index 557457528..cf91ab38b 100644 --- a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =true =false - @text.show(Hello, .*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,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat index 92f10d6e1..4fe13fca1 100644 --- a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat +++ b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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 ,~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,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat index cee2b1dd4..ed3365c8e 100644 Binary files a/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat differ diff --git a/P3D/Content/Items/ItemSheet.png b/P3D/Content/Items/ItemSheet.png index 4d946cbfe..6b3702bca 100644 Binary files a/P3D/Content/Items/ItemSheet.png and b/P3D/Content/Items/ItemSheet.png differ diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 318bc210f..c57b813d3 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25656,6 +25656,11 @@ PreserveNewest + + + + + @@ -25740,10 +25745,13 @@ + + + PreserveNewest diff --git a/P3D/Pokemon/Abilities/Ability.vb b/P3D/Pokemon/Abilities/Ability.vb index e75f56a61..e5a85ab6f 100644 --- a/P3D/Pokemon/Abilities/Ability.vb +++ b/P3D/Pokemon/Abilities/Ability.vb @@ -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 diff --git a/P3D/Pokemon/Abilities/Galvanize.vb b/P3D/Pokemon/Abilities/Galvanize.vb new file mode 100644 index 000000000..7b1250565 --- /dev/null +++ b/P3D/Pokemon/Abilities/Galvanize.vb @@ -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 \ No newline at end of file diff --git a/P3D/Pokemon/Abilities/PowerofAlchemy.vb b/P3D/Pokemon/Abilities/PowerofAlchemy.vb new file mode 100644 index 000000000..b656eba48 --- /dev/null +++ b/P3D/Pokemon/Abilities/PowerofAlchemy.vb @@ -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 \ No newline at end of file diff --git a/P3D/Pokemon/Abilities/SlushRush.vb b/P3D/Pokemon/Abilities/SlushRush.vb new file mode 100644 index 000000000..8741f481e --- /dev/null +++ b/P3D/Pokemon/Abilities/SlushRush.vb @@ -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 \ No newline at end of file diff --git a/P3D/Pokemon/Abilities/SurgeSurfer.vb b/P3D/Pokemon/Abilities/SurgeSurfer.vb new file mode 100644 index 000000000..7ecc2e675 --- /dev/null +++ b/P3D/Pokemon/Abilities/SurgeSurfer.vb @@ -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 \ No newline at end of file diff --git a/P3D/Pokemon/Abilities/TanglingHair.vb b/P3D/Pokemon/Abilities/TanglingHair.vb new file mode 100644 index 000000000..a38075466 --- /dev/null +++ b/P3D/Pokemon/Abilities/TanglingHair.vb @@ -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 \ No newline at end of file diff --git a/P3D/Pokemon/Items/Standard/CellBattery.vb b/P3D/Pokemon/Items/Standard/CellBattery.vb new file mode 100644 index 000000000..029b1d299 --- /dev/null +++ b/P3D/Pokemon/Items/Standard/CellBattery.vb @@ -0,0 +1,19 @@ +Namespace Items.Standard + + + 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 diff --git a/P3D/Pokemon/Items/Standard/Snowball.vb b/P3D/Pokemon/Items/Standard/Snowball.vb new file mode 100644 index 000000000..3f75e0d76 --- /dev/null +++ b/P3D/Pokemon/Items/Standard/Snowball.vb @@ -0,0 +1,19 @@ +Namespace Items.Standard + + + 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 diff --git a/P3D/Pokemon/Items/Stones/IceStone.vb b/P3D/Pokemon/Items/Stones/IceStone.vb new file mode 100644 index 000000000..7db5bdfd8 --- /dev/null +++ b/P3D/Pokemon/Items/Stones/IceStone.vb @@ -0,0 +1,16 @@ +Namespace Items.Stones + + + 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 diff --git a/P3D/Pokemon/Items/_itemList.txt b/P3D/Pokemon/Items/_itemList.txt index 400f0f539..815536673 100644 Binary files a/P3D/Pokemon/Items/_itemList.txt and b/P3D/Pokemon/Items/_itemList.txt differ