Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy
This commit is contained in:
Ruan Pablo
commit
dcbb8c2347
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -32,6 +32,7 @@ version=2
|
|||
:if:<Register.registered(LiHere)>=false <and> <Register.registered(LiNotHere)>=false <and> <register.registed(LiRematchTalk)>=True
|
||||
:if:<system.random(10)>=5
|
||||
@register.registertime(LiHere,4,hour)
|
||||
@register.registertime(LiNotHere,3,day)
|
||||
:endif
|
||||
:endif
|
||||
:if:<Register.registered(LiHere)>=true
|
||||
|
|
@ -40,13 +41,13 @@ version=2
|
|||
|
||||
:if:<Environment.day>=Sunday
|
||||
:if:<Environment.hour><4 <and> <Environment.hour>>0
|
||||
:if:<register.registered(TRTPreTalk)>=true
|
||||
:if:<register.registered(TRTPrematchTalk)>=true
|
||||
@npc.warp(30,~,3.2,~)
|
||||
@npc.warp(31,~,3.2,~)
|
||||
@npc.warp(32,~,3.2,~)
|
||||
:endif
|
||||
:endif
|
||||
:if:<Environment.hour><12 <and> <Environment.hour>>4
|
||||
:if:<Environment.hour><12 <and> <Environment.hour>>5
|
||||
:if:<register.registered(BugsyRematchTalk)>=true
|
||||
@npc.warp(10,~,0.2,~)
|
||||
:endif
|
||||
|
|
@ -147,7 +148,7 @@ version=2
|
|||
:endif
|
||||
:endif
|
||||
:if:<Environment.hour><15 <and> <Environment.hour>>9
|
||||
:if:<register.registered(OakRematchTalk)>=true
|
||||
:if:<register.registered(OakPrematchTalk)>=true
|
||||
@npc.warp(30,~,3.2,~)
|
||||
@npc.warp(31,~,3.2,~)
|
||||
:endif
|
||||
|
|
@ -244,7 +245,7 @@ version=2
|
|||
:endif
|
||||
:endif
|
||||
|
||||
:if:<register.registered(LeafAtClub)>=true
|
||||
:if:<register.registered(GreenAtClub)>=true
|
||||
@npc.warp(99,~,3.2,~)
|
||||
:endif
|
||||
|
||||
|
|
@ -257,5 +258,10 @@ version=2
|
|||
@text.show(Oh, Mister <player.name>.*It is so good to see you!*I am not sure what you told them, but all of the Gym Leaders from both Johto and Kanto have been frequenting the club!*The battles we have witnessed here have been spectacular!*I suspect our reputation for hosting the strongest trainers has begun to spread.*If you meet a worthy trainer feel free to invite them to visit us!)
|
||||
:endif
|
||||
@register.register(clubextendinvite)
|
||||
:if:<register.registered(shinycelebi)>=true
|
||||
@npc.register(tohjofalls\hideout.dat|3|position|~,0,~)
|
||||
@npc.register(tohjofalls\hideout.dat|4|position|~,0,~)
|
||||
@npc.register(tohjofalls\hideout.dat|5|position|~,0,~)
|
||||
:endif
|
||||
:endif
|
||||
:end
|
||||
|
|
|
|||
|
|
@ -317,6 +317,11 @@ version=2
|
|||
@screen.fadeout
|
||||
@sound.play(teleport)
|
||||
@player.warp(ilexforest.dat,10,0.1,26,0)
|
||||
:if:<register.registered(clubextendinvite)>=true
|
||||
@npc.register(tohjofalls\hideout.dat|3|position|~,0,~)
|
||||
@npc.register(tohjofalls\hideout.dat|4|position|~,0,~)
|
||||
@npc.register(tohjofalls\hideout.dat|5|position|~,0,~)
|
||||
:endif
|
||||
@level.update
|
||||
|
||||
@camera.set(0.8,1.5,3,1.15,-0.5)
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -127,7 +127,7 @@
|
|||
@text.show(There are still~many mysteries to solve.*That's why I study~Pokémon every day.)
|
||||
@text.show(But let's get~back to you.)
|
||||
|
||||
@screen.skinselection(Ethan,Lyra,Hilbert,Hilda,Nate,Rosa,Leaf)
|
||||
@screen.skinselection(Ethan,Lyra,Hilbert,Hilda,Nate,Rosa)
|
||||
|
||||
@player.wearskin(<screen.selectedskin>)
|
||||
@npc.wearskin(1,<screen.selectedskin>)
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -31,6 +31,13 @@ version=2
|
|||
:endif
|
||||
:endif
|
||||
|
||||
:if:<register.registered(clubextendinvite)>=true <and> <register.registered(kantostart1)>=true <and> <register.registered(OakPrematchTalk)>=false
|
||||
@text.show( )
|
||||
@register.register(OakPrematchTalk)
|
||||
:end
|
||||
|
||||
:endif
|
||||
|
||||
#This sets a flag for the evaldist script so that it knows where the call came from:
|
||||
@storage.set(str,pallet_oak_scriptcaller,flag)
|
||||
@script.start(pallet\evaldist)
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -3,7 +3,7 @@ version=2
|
|||
:if:<register.exists(<storage.get(string,leader)>rematch)>=false
|
||||
@text.show(<battle.intromessage(gymrematch\\<storage.get(string,leader)>)>)
|
||||
@battle.trainer(gymrematch\\<storage.get(string,leader)>)
|
||||
@register.registertime(<storage.get(string,leader)>rematch,1,day)
|
||||
@register.registertime(<storage.get(string,leader)>rematch,12,hours)
|
||||
:endif
|
||||
@text.show(<battle.defeatmessage(gymrematch\\<storage.get(string,leader)>)>)
|
||||
:end
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,4 +1,10 @@
|
|||
version=2
|
||||
:if:<register.registered(clubextendinvite)>=true <and> <register.registered(mortytruerematch)>=true <and> <register.registered(EusineRematchTalk)>=false
|
||||
@text.show( )
|
||||
@register.register(EusineRematchTalk)
|
||||
:end
|
||||
:endif
|
||||
|
||||
@storage.set(string,leader,morty<register.exists(earthbadge_obtain)>)
|
||||
@script.start(trainer\gymrematch\main)
|
||||
:end
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -254,10 +254,10 @@ TrainBridge:
|
|||
{"EntityField"{ENT[{"Size"{intArr[1,2]}}{"EntityID"{str[AllSidesObject]}}{"Position"{sngArr[27,3,12]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[224,0,16,16][208,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
|
||||
|
||||
Fences:
|
||||
{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,5.65,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
|
||||
{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,5.65,23]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
|
||||
{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[27,5.65,23]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
|
||||
{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,5.65,27]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
|
||||
{"EntityField"{ENT[{"Size"{intArr[5,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22.5,6,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
|
||||
{"EntityField"{ENT[{"Size"{intArr[1,5]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,6,22.5]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
|
||||
{"EntityField"{ENT[{"Size"{intArr[1,5]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[27,6,22.5]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
|
||||
{"EntityField"{ENT[{"Size"{intArr[5,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22.5,6,27]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
|
||||
|
||||
{"EntityField"{ENT[{"Size"{intArr[4,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[14,0,11]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
|
||||
{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,0,14]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -17,7 +17,7 @@ Public Class GameController
|
|||
''' <summary>
|
||||
''' The number of released iterations of the game.
|
||||
''' </summary>
|
||||
Public Const RELEASEVERSION As String = "96"
|
||||
Public Const RELEASEVERSION As String = "97"
|
||||
|
||||
''' <summary>
|
||||
''' The development stage the game is in.
|
||||
|
|
|
|||
293
P3D/P3D.vbproj
293
P3D/P3D.vbproj
|
|
@ -20,7 +20,7 @@
|
|||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<ApplicationIcon>Pokemon3D.ico</ApplicationIcon>
|
||||
<OptionExplicit>On</OptionExplicit>
|
||||
<OptionCompare>Text</OptionCompare>
|
||||
<OptionCompare>Binary</OptionCompare>
|
||||
<OptionStrict>Off</OptionStrict>
|
||||
<OptionInfer>On</OptionInfer>
|
||||
<StartupObject>P3D.Program</StartupObject>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<WarningsAsErrors>
|
||||
</WarningsAsErrors>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<CodeAnalysisRuleSet />
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)' == 'ReleaseNoContent'">
|
||||
<NoWarn>
|
||||
|
|
@ -13465,6 +13465,9 @@
|
|||
<Content Include="Content\Textures\chess.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\club.png">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Emblem\ancestor.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -13636,6 +13639,9 @@
|
|||
<Content Include="Content\Textures\NPC\95.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\NPC\Agatha.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\NPC\Aragas.png">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -25761,6 +25767,9 @@
|
|||
<Content Include="Content\Data\Scripts\quest\sevault\danceguy.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<None Include="Content\Data\maps\goldenrod\club.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\maps\kolben\assoffices.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
|
|
@ -25794,24 +25803,54 @@
|
|||
<None Include="Content\Data\maps\liberty\room.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\maps\poke\fortune\altering.poke">
|
||||
<Content Include="Content\Data\maps\poke\fortune\altering.poke">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</Content>
|
||||
<None Include="Content\Data\maps\poke\routes\route28.poke">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\cerulean\novenu.dat">
|
||||
<Content Include="Content\Data\Scripts\azalea\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\celadon\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\cerulean\novenu.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\cianwood\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\cinnabar\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\dragonsden\dracotutor.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\ecruteak\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<None Include="Content\Data\maps\structures\goldenrod\chair.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\dragonsden\dracotutor.dat">
|
||||
<None Include="Content\Data\maps\structures\goldenrod\chandelier.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\maps\structures\goldenrod\table.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\faraway\ancestoremblemcheck.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\ilex\spiky.dat">
|
||||
<Content Include="Content\Data\Scripts\goldenrod\clubmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\goldenrod\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\ilex\spiky.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<None Include="Content\Data\Scripts\kin\berryforestitems\2051.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
|
|
@ -25851,43 +25890,232 @@
|
|||
<None Include="Content\Data\Scripts\kin\berryforestitems\2063.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\kolben\botoff.dat">
|
||||
<Content Include="Content\Data\Scripts\kolben\botoff.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\kolben\boton.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\kolben\maid.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\kolben\omega.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\kolben\omega2.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\kolben\segis.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\liberty\garden.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\liberty\heal.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\liberty\room.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\liberty\tutor.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\liberty\victini.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\mahogany\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\mtember\eruptionemblemcheck.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\olivine\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\pewter\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\route25\nochar.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\saffron\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\blaine.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\blaine.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\blue.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\blue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\brock.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\brock.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\bugsy.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\bugsyfalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\bugsytrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\chuck.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\chuckfalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\chucktrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\clair.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\clairfalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\clairtrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\erika.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\erika.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\falkner.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\falknerfalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\falknertrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\janine.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\janine.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\jasmine.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\jasminefalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\Jasminetrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\main.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\misty.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\misty.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\morty.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\mortyfalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\mortytrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\pryce.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\prycefalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\prycetrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\sabrina.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\sabrina.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\surge.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\surge.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\whitney.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\whitneyfalse.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\gymrematch\whitneytrue.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<None Include="Content\Data\Scripts\mtmortar\bf1map.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\kolben\boton.dat">
|
||||
<None Include="Content\Data\Scripts\pallet\labmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\kolben\maid.dat">
|
||||
<None Include="Content\Data\Scripts\tohjofalls\jjm.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\kolben\omega.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\agatha.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\kolben\omega2.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\agatha.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\kolben\segis.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\elderli.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\liberty\garden.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\elderli.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\liberty\heal.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\eusine.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\liberty\room.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\eusine.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\liberty\tutor.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\green.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\liberty\victini.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\green.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\mtember\eruptionemblemcheck.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\james.dat" />
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\james.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\route25\nochar.dat">
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\jessie.dat" />
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\jessie.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\kiyo.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\kiyo.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\meowth.dat" />
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\oak.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\gymrematch\oak.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\kolben\Segis.trainer">
|
||||
|
|
@ -25965,16 +26193,25 @@
|
|||
<None Include="Content\Data\Scripts\trainer\liberty\inside\Petrel.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\mtsilver\red1.trainer">
|
||||
<Content Include="Content\Data\Scripts\trainer\mtsilver\red1.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\mtsilver\red2.trainer">
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\mtsilver\red2.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\trainer\mtsilver\red3.trainer">
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\trainer\mtsilver\red3.trainer">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Data\Scripts\underwatercave\deepseaemblemcheck.dat">
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\underwatercave\deepseaemblemcheck.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\violet\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Data\Scripts\viridian\gymmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<None Include="Content\Data\Scripts\violet\towertopmap.dat">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Content\Pokemon\Data\172_spiky-eared.dat">
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ Namespace Abilities
|
|||
|
||||
Public Shared Sub GatherHoney()
|
||||
For Each p As Pokemon In Core.Player.Pokemons
|
||||
If p.Ability.Name.ToLower() = "honey gather" Then
|
||||
If p.Ability IsNot Nothing AndAlso p.Ability.Name.ToLower() = "honey gather" Then
|
||||
If p.Item Is Nothing Then
|
||||
Dim chance As Integer = CInt(Math.Ceiling(p.Level / 10) * 5)
|
||||
If Core.Random.Next(0, 100) < chance Then
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ Namespace Abilities
|
|||
|
||||
Public Shared Sub Pickup()
|
||||
For Each p As Pokemon In Core.Player.Pokemons
|
||||
If p.Ability.Name.ToLower() = "pickup" Then
|
||||
If p.Ability IsNot Nothing AndAlso p.Ability.Name.ToLower() = "pickup" Then
|
||||
If p.Item Is Nothing Then
|
||||
Dim chance As Integer = Core.Random.Next(0, 100)
|
||||
Dim itemList As New List(Of Integer)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(471, "TM 171")>
|
||||
Public Class TM171
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 141)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(472, "TM 172")>
|
||||
Public Class TM172
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 693)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(473, "TM 173")>
|
||||
Public Class TM173
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 684)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(474, "TM 174")>
|
||||
Public Class TM174
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 694)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(475, "TM 175")>
|
||||
Public Class TM175
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 270)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(476, "TM 176")>
|
||||
Public Class TM176
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 492)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(477, "TM 177")>
|
||||
Public Class TM177
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 200)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(478, "TM 178")>
|
||||
Public Class TM178
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 583)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(478, "TM 179")>
|
||||
Public Class TM179
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 276)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(480, "TM 180")>
|
||||
Public Class TM180
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 529)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Namespace Items.Machines
|
||||
|
||||
<Item(481, "TM 181")>
|
||||
Public Class TM181
|
||||
|
||||
Inherits TechMachine
|
||||
|
||||
Public Sub New()
|
||||
MyBase.New(True, 2000, 224)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -5,7 +5,7 @@ Namespace Items.Standard
|
|||
|
||||
Inherits Item
|
||||
|
||||
Public Overrides ReadOnly Property Description As String = "Powers up Fairy-type moves."
|
||||
Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It's a pretty bow that boosts the power of Fairy-type moves."
|
||||
Public Overrides ReadOnly Property PokeDollarPrice As Integer = 100
|
||||
Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
|
||||
Public Overrides ReadOnly Property CanBeUsed As Boolean = False
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Namespace Items.Standard
|
||||
|
||||
<Item(286, "Rock Incense")>
|
||||
<Item(299, "Rock Incense")>
|
||||
Public Class RockIncense
|
||||
|
||||
Inherits Item
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -264,9 +264,11 @@ Public Class NewMainMenuScreen
|
|||
Private _sliderTarget As Integer = 0
|
||||
|
||||
Private _menuTexture As Texture2D = Nothing
|
||||
Private _oldMenuTexture As Texture2D
|
||||
|
||||
Private _profiles As New List(Of GameProfile)
|
||||
Private _selectedProfile As Integer = 0
|
||||
Private _yIndex As Integer = 0
|
||||
Private _menuIndex As Integer = 1 '0 = New Game, 1 = Profiles
|
||||
|
||||
Private _messageBox As UI.MessageBox
|
||||
|
|
@ -280,6 +282,7 @@ Public Class NewMainMenuScreen
|
|||
CanChat = False
|
||||
|
||||
_menuTexture = TextureManager.GetTexture("GUI\Menus\MainMenu")
|
||||
_oldMenuTexture = TextureManager.GetTexture("GUI\Menus\Menu")
|
||||
|
||||
_screenOffset.X = CSng(windowSize.Width / 2 - 80)
|
||||
_screenOffsetTarget.X = _screenOffset.X
|
||||
|
|
@ -316,8 +319,20 @@ Public Class NewMainMenuScreen
|
|||
Exit For
|
||||
End If
|
||||
Next
|
||||
If _profiles(_selectedProfile).IsGameJolt AndAlso _profiles(_selectedProfile).Loaded Then
|
||||
' Click on gamejolt buttons
|
||||
Dim _xOffset As Single = _screenOffset.X + (100 * (1 - _fadeIn))
|
||||
Dim r As New Vector2(_xOffset + 400, _screenOffset.Y + 200)
|
||||
If New Rectangle(CInt(r.X), CInt(r.Y), 32, 32).Contains(MouseHandler.MousePosition) Then
|
||||
ButtonChangeMale()
|
||||
ElseIf New Rectangle(CInt(r.X), CInt(r.Y) + 48, 32, 32).Contains(MouseHandler.MousePosition) Then
|
||||
ButtonChangeFemale()
|
||||
ElseIf New Rectangle(CInt(r.X), CInt(r.Y) + 48 + 48, 32, 32).Contains(MouseHandler.MousePosition) Then
|
||||
ButtonResetSave()
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
If Controls.Dismiss(True, False, False) Then
|
||||
If Controls.Dismiss(True, False, False) Then
|
||||
' Click on profiles.
|
||||
For x = 0 To _profiles.Count - 1
|
||||
Dim xOffset As Single = _screenOffset.X + x * 180 + ((x + 1) * 100 * (1 - _fadeIn))
|
||||
|
|
@ -334,19 +349,41 @@ Public Class NewMainMenuScreen
|
|||
If Controls.Right(True) And _selectedProfile < _profiles.Count - 1 Then
|
||||
_selectedProfile += 1
|
||||
_screenOffsetTarget.X -= 180
|
||||
_yIndex = 0
|
||||
End If
|
||||
If Controls.Left(True) And _selectedProfile > 0 Then
|
||||
_selectedProfile -= 1
|
||||
_screenOffsetTarget.X += 180
|
||||
_yIndex = 0
|
||||
End If
|
||||
If _profiles(_selectedProfile).IsGameJolt AndAlso _profiles(_selectedProfile).Loaded Then
|
||||
If Controls.Down(True, True, False) Then
|
||||
_yIndex += 1
|
||||
End If
|
||||
If Controls.Up(True, True, False) Then
|
||||
_yIndex -= 1
|
||||
End If
|
||||
_yIndex = Clamp(_yIndex, 0, 3)
|
||||
End If
|
||||
|
||||
_selectedProfile = _selectedProfile.Clamp(0, _profiles.Count - 1)
|
||||
|
||||
If _fadeIn = 1.0F Then
|
||||
If Controls.Accept(False, True, True) Then
|
||||
ClickedProfile()
|
||||
Select Case _yIndex
|
||||
Case 0
|
||||
ClickedProfile()
|
||||
Case 1
|
||||
ButtonChangeMale()
|
||||
Case 2
|
||||
ButtonChangeFemale()
|
||||
Case 3
|
||||
ButtonResetSave()
|
||||
End Select
|
||||
End If
|
||||
If Controls.Dismiss(False, True, True) Then
|
||||
DismissProfile()
|
||||
_yIndex = 0
|
||||
End If
|
||||
' Try to load the GameJolt profile once the player has logged in.
|
||||
_profiles(0).LoadGameJolt()
|
||||
|
|
@ -392,6 +429,31 @@ Public Class NewMainMenuScreen
|
|||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub ButtonChangeMale()
|
||||
If GameJoltSave.Gender = "0" Then
|
||||
Exit Sub
|
||||
End If
|
||||
GameJoltSave.Gender = "0"
|
||||
|
||||
Core.Player.Skin = GameJolt.Emblem.GetPlayerSpriteFile(GameJolt.Emblem.GetPlayerLevel(GameJoltSave.Points), GameJoltSave.GameJoltID, GameJoltSave.Gender)
|
||||
_profiles(_selectedProfile).Sprite = GameJolt.Emblem.GetPlayerSprite(GameJolt.Emblem.GetPlayerLevel(GameJoltSave.Points), GameJoltSave.GameJoltID, GameJoltSave.Gender)
|
||||
End Sub
|
||||
Private Sub ButtonChangeFemale()
|
||||
If GameJoltSave.Gender = "1" Then
|
||||
Exit Sub
|
||||
End If
|
||||
GameJoltSave.Gender = "1"
|
||||
|
||||
Core.Player.Skin = GameJolt.Emblem.GetPlayerSpriteFile(GameJolt.Emblem.GetPlayerLevel(GameJoltSave.Points), GameJoltSave.GameJoltID, GameJoltSave.Gender)
|
||||
_profiles(_selectedProfile).Sprite = GameJolt.Emblem.GetPlayerSprite(GameJolt.Emblem.GetPlayerLevel(GameJoltSave.Points), GameJoltSave.GameJoltID, GameJoltSave.Gender)
|
||||
End Sub
|
||||
Private Sub ButtonResetSave()
|
||||
GameJoltSave.ResetSave()
|
||||
_profiles(_selectedProfile).Sprite = GameJolt.Emblem.GetPlayerSprite(GameJolt.Emblem.GetPlayerLevel(GameJoltSave.Points), GameJoltSave.GameJoltID, GameJoltSave.Gender)
|
||||
_profiles(_selectedProfile).SetToDefault()
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub ClickedProfile()
|
||||
If _selectedProfile = 0 And Security.FileValidation.IsValid(False) = False Then
|
||||
_messageBox.Show("File validation failed!" & Environment.NewLine & "Redownload the game's files to solve this problem.")
|
||||
|
|
@ -452,13 +514,49 @@ Public Class NewMainMenuScreen
|
|||
End If
|
||||
End If
|
||||
End Sub
|
||||
Public Sub DrawGameJoltButtons(ByVal offset As Vector2)
|
||||
Dim r As New Rectangle(CInt(offset.X + 400), CInt(offset.Y + 200), 512, 128)
|
||||
Dim y As Integer = 0
|
||||
|
||||
Dim fontColor As Color = Color.White
|
||||
Dim dayTime = World.GetTime
|
||||
If dayTime = World.DayTime.Day OrElse dayTime = World.DayTime.Morning Then
|
||||
fontColor = Color.Black
|
||||
End If
|
||||
|
||||
If ScaleScreenRec(New Rectangle(r.X, r.Y, 32, 32)).Contains(MouseHandler.MousePosition) = True And GameInstance.IsMouseVisible OrElse Not GameInstance.IsMouseVisible And _yIndex = 1 Then
|
||||
y = 16
|
||||
|
||||
SpriteBatch.DrawInterfaceString(FontManager.MiniFont, "Change to male", New Vector2(r.X + 64 + 4, r.Y + 4), fontColor)
|
||||
End If
|
||||
SpriteBatch.DrawInterface(_oldMenuTexture, New Rectangle(r.X, r.Y, 32, 32), New Rectangle(144, 32 + y, 16, 16), Color.White)
|
||||
|
||||
y = 0
|
||||
If ScaleScreenRec(New Rectangle(r.X, r.Y + 48, 32, 32)).Contains(MouseHandler.MousePosition) = True And GameInstance.IsMouseVisible OrElse Not GameInstance.IsMouseVisible And _yIndex = 2 Then
|
||||
y = 16
|
||||
|
||||
SpriteBatch.DrawInterfaceString(FontManager.MiniFont, "Change to female", New Vector2(r.X + 64 + 4, r.Y + 4 + 48), fontColor)
|
||||
End If
|
||||
SpriteBatch.DrawInterface(_oldMenuTexture, New Rectangle(r.X, r.Y + 48, 32, 32), New Rectangle(160, 32 + y, 16, 16), Color.White)
|
||||
|
||||
y = 0
|
||||
If ScaleScreenRec(New Rectangle(r.X, r.Y + 48 + 48, 32, 32)).Contains(MouseHandler.MousePosition) = True And GameInstance.IsMouseVisible OrElse Not GameInstance.IsMouseVisible And _yIndex = 3 Then
|
||||
y = 16
|
||||
|
||||
SpriteBatch.DrawInterfaceString(FontManager.MiniFont, "Reset save", New Vector2(r.X + 64 + 4, r.Y + 4 + 48 + 48), fontColor)
|
||||
End If
|
||||
SpriteBatch.DrawInterface(_oldMenuTexture, New Rectangle(r.X, r.Y + 48 + 48, 32, 32), New Rectangle(176, 32 + y, 16, 16), Color.White)
|
||||
|
||||
End Sub
|
||||
Private Sub DrawProfiles()
|
||||
' Draw profiles.
|
||||
For x = 0 To _profiles.Count - 1
|
||||
Dim xOffset As Single = _screenOffset.X + x * 180 + ((x + 1) * 100 * (1 - _fadeIn))
|
||||
|
||||
_profiles(x).Draw(New Vector2(xOffset, _screenOffset.Y), CInt(_fadeIn * 255), (x = _selectedProfile), _menuTexture)
|
||||
If _profiles(x).IsGameJolt AndAlso _profiles(x).Loaded AndAlso (x = _selectedProfile) Then
|
||||
DrawGameJoltButtons(New Vector2(xOffset, _screenOffset.Y))
|
||||
End If
|
||||
Next
|
||||
|
||||
If _fadeIn = 1.0F Then
|
||||
|
|
@ -592,6 +690,15 @@ Public Class NewMainMenuScreen
|
|||
Private _logoBounce As Single = 0F
|
||||
Private ReadOnly _spriteOrder As Integer() = {0, 1, 0, 2}
|
||||
|
||||
Public Property Sprite As Texture2D
|
||||
Get
|
||||
Return _sprite
|
||||
End Get
|
||||
Set(value As Texture2D)
|
||||
_sprite = value
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property IsGameJolt As Boolean
|
||||
Get
|
||||
Return _isGameJolt
|
||||
|
|
@ -670,6 +777,13 @@ Public Class NewMainMenuScreen
|
|||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub SetToDefault()
|
||||
_timePlayed = "00:00:00"
|
||||
_location = "Your Room"
|
||||
_pokemonTextures.Clear()
|
||||
_badges = 0
|
||||
End Sub
|
||||
|
||||
Public Sub New(ByVal path As String, ByVal isNewGameButton As Boolean)
|
||||
If isNewGameButton Then
|
||||
_isNewGameButton = True
|
||||
|
|
@ -678,8 +792,6 @@ Public Class NewMainMenuScreen
|
|||
If path = "" Then
|
||||
_isGameJolt = True
|
||||
_loaded = False
|
||||
|
||||
|
||||
_sprite = TextureManager.GetTexture("Textures\UI\GameJolt\gameJoltIcon")
|
||||
|
||||
LoadGameJolt()
|
||||
|
|
@ -694,13 +806,13 @@ Public Class NewMainMenuScreen
|
|||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub LoadContent(ByVal data As String)
|
||||
Private Sub LoadContent(ByVal pokedata As String)
|
||||
If GameModeManager.GameModeExists(_gameMode) Then
|
||||
_gameModeExists = True
|
||||
|
||||
GameModeManager.SetGameModePointer(_gameMode)
|
||||
|
||||
Dim pokemonData As String() = data.SplitAtNewline()
|
||||
Dim pokemonData As String() = pokedata.SplitAtNewline()
|
||||
For Each line As String In pokemonData
|
||||
If line.StartsWith("{") Then
|
||||
_pokemonTextures.Add(Pokemon.GetPokemonByData(line).GetMenuTexture(True))
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
Shared _valid As Boolean = False
|
||||
|
||||
Const RUNVALIDATION As Boolean = False
|
||||
Const EXPECTEDSIZE As Integer = 46037401
|
||||
Const METAHASH As String = "MUEzRkM1NjhBMzNBMzUxM0IxOTg5ODJGMDEwREE5MDY="
|
||||
Const EXPECTEDSIZE As Integer = 46316258
|
||||
Const METAHASH As String = "OERBQURCRjlERUU1MTgzQTIwNzM4QTIzQkQ1QzZFNDM="
|
||||
|
||||
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
|
||||
Get
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue