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

This commit is contained in:
OmegaRuan 2018-09-10 04:53:36 -03:00
parent c2cc7fbc4b 64bc0368f4
commit c98063e8ff
12 changed files with 93 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
P3D/Content/Data/Scripts/ilex/spiky.dat
View File

@ -47,8 +47,8 @@ version=2
@register.register(spiky)
@pokemon.cry(172)
@pokemon.add(172_spiky-eared,50,Obtained at,5,Ilex Forest)
@pokemon.add(172,50,Obtained at,5,Ilex Forest)
@pokemon.setadditionalvalue(<pokemon.count>-1,spiky-eared)
@pokemon.setshiny(<pokemon.count>-1,0)
@pokemon.setgender(<pokemon.count>-1,1)
@pokemon.clearattacks(<pokemon.count>-1)
@ -56,6 +56,7 @@ version=2
@pokemon.addattack(<pokemon.count>-1,207)
@pokemon.addattack(<pokemon.count>-1,344)
@pokemon.addattack(<pokemon.count>-1,220)
@pokemon.reloadall
@sound.play(success_small)
@text.show(Spiky-Eared Pichu has~joined your party!)
@pokemon.rename(last)

5
P3D/Content/Data/Scripts/trainer/fortune/north/006.dat
View File

@ -9,6 +9,7 @@ version=2
@level.update
@level.wait(15)
@screen.fadein
@text.show(He left something behind.*It's a boat pass!)
@item.messagegive(500,1)
@text.show(He left something behind.*It's a sea map!)
@item.give(592,1)
@item.messagegive(592,1)
:end

22
P3D/Content/Data/Scripts/vermilion/dockhand3.dat
View File

@ -1,7 +1,7 @@
version=2
:if:<register.registered(specialmap-tixreg)>=false
@text.show(Yo!*I am the navigator.*If you ever find any odd~maps or specialty tickets, come~talk to me.*For our regularly scheduled~trips, talk to the first~mate next to me.)
@text.show(Yo!*I am the navigator.*If you ever find any odd~maps, come talk to me.*For our regularly scheduled~trips, talk to the first~mate next to me.)
:endif
:if:<inventory.countitem(285)>>0 <and> <register.registered(oldseamaptonav)>=false
@ -39,9 +39,9 @@ version=2
:end
:endif
:if:<inventory.countitem(500)>>0 <and> <register.registered(libertypasstonav)>=false
@text.show(Oh, this is a nice pass!*It's a tourist trip to~"Liberty Garden" in Unova.*We can take you~there if you want.)
@register.register(libertypasstonav)
:if:<inventory.countitem(592)>>0 <and> <register.registered(libertyseamaptonav)>=false
@text.show(Oh, this is a nice map!*It's a map to "Liberty Garden"~in far-off Unova.*We can take you~there if you want.)
@register.register(libertyseamaptonav)
@register.register(specialmap-tixreg)
@options.show(Yes,No)
:when:Yes
@ -60,7 +60,7 @@ version=2
:if:<register.registered(specialmap-tixreg)>=true
@text.show(Where would you like to go?)
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertypasstonav)>=false
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertyseamaptonav)>=false
@options.show(Faraway Island,Quit)
:when:Faraway Island
@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@ -73,7 +73,7 @@ version=2
:end
:endif
:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=false
:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertyseamaptonav)>=false
@options.show(Open Sea,Quit)
:when:Open Sea
@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@ -87,7 +87,7 @@ version=2
:end
:endif
:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertypasstonav)>=true
:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertyseamaptonav)>=true
@options.show(Liberty Garden,Quit)
:when:Liberty Garden
@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@ -101,7 +101,7 @@ version=2
:end
:endif
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=false
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertyseamaptonav)>=false
@options.show(Faraway Island,Open Sea,Quit)
:when:Faraway Island
@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@ -122,7 +122,7 @@ version=2
:end
:endif
:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=true
:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertyseamaptonav)>=true
@options.show(Open Sea,Liberty Garden,Quit)
:when:Open Sea
@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@ -144,7 +144,7 @@ version=2
:end
:endif
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertypasstonav)>=true
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertyseamaptonav)>=true
@options.show(Faraway Island,Liberty Garden,Quit)
:when:Faraway Island
@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@ -165,7 +165,7 @@ version=2
:end
:endif
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=true
:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertyseamaptonav)>=true
@options.show(Faraway Island,Open Sea,Liberty Garden,Quit)
:when:Faraway Island
@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)

BIN
P3D/Content/Data/maps/dungeon/2/mega.dat
View File

Binary file not shown.

119
P3D/P3D.vbproj
View File

@ -25548,6 +25548,7 @@
</Content>
<Compile Include="Pokemon\Abilities\Aerilate.vb" />
<Compile Include="Pokemon\Abilities\ParentalBond.vb" />
<Compile Include="Pokemon\Items\KeyItems\LibertySeaMap.vb" />
<Compile Include="Pokemon\Items\Standard\ExpertBelt.vb" />
<Compile Include="Resources\Blur\BlurHandler.vb" />
<Content Include="Content\Data\Scripts\faraway\mewtwonite_y.dat">
@ -25563,31 +25564,31 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Content\Data\maps\battle\kolben\basement.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\battle\kolben\biome\desert.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\battle\kolben\biome\rainforest.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\battle\kolben\biome\savanna.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\battle\kolben\biome\taiga.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\battle\liberty\garden.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\battle\liberty\interior.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\battle\liberty\room.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\fortune\0.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Content\Data\Scripts\quest\sevault\chansey.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -25596,148 +25597,154 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Content\Data\maps\kolben\assoffices.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\kolben\basement.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Content\Data\Scripts\kolben\chachamaru.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Data\Scripts\kolben\soviet.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Content\Data\maps\kolben\biome\desert.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\kolben\biome\rainforest.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\kolben\biome\savanna.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\kolben\biome\taiga.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\liberty\garden.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\liberty\interior.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\maps\liberty\room.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\ilex\spiky.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\kolben\botoff.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\kolben\boton.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\kolben\maid.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\kolben\omega.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\kolben\omega2.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\kolben\segis.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\liberty\garden.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\liberty\heal.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\liberty\interior.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\liberty\looker.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\liberty\room.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\liberty\victini.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\kolben\Segis.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\kolben\Omega1.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\kolben\omega\OmegaD.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\kolben\omega\OmegaR.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\kolben\omega\OmegaS.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\kolben\omega\OmegaT.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\001.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\001.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\002.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\002.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\003.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\003.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\004.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\004.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\005.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\005.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\006.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\006.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\007.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\007.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\inside\001.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\inside\001.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\inside\002.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\inside\002.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Data\Scripts\trainer\liberty\inside\Petrel.trainer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Pokemon\Data\172_spiky-eared.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="Pokemon\Items\_itemList.txt" />

6
P3D/Pokemon/Items/KeyItems/LibertyPass.vb → P3D/Pokemon/Items/KeyItems/LibertySeaMap.vb
View File

@ -1,11 +1,11 @@
Namespace Items.KeyItems
<Item(500, "Liberty Pass")>
Public Class LibertyPass
<Item(592, "Liberty Sea Map")>
Public Class LibertySeaMap
Inherits KeyItem
Public Overrides ReadOnly Property Description As String = "A special pass to go to Liberty Garden in Unova. It depicts a Lighthouse."
Public Overrides ReadOnly Property Description As String = "A new sea chart that shows the way to Liberty Garden in Unova. It depicts a Lighthouse."
Public Sub New()
_textureRectangle = New Rectangle(408, 288, 24, 24)

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

Binary file not shown.

4
P3D/World/ActionScript/V2/ScriptCommands/DoSound.vb
View File

@ -20,6 +20,10 @@
stopMusic = CBool(argument.GetSplit(1))
End If
If sound = "healing" Then
sound = "pokemon_heal"
End If
SoundManager.PlaySound(sound, stopMusic)
Case "playadvanced"
Dim args() As String = argument.Split(CChar(","))

6
lib/P3D.ContentPipeline/Content/Content.mgcb
View File

@ -1396,3 +1396,9 @@
/processorParam:Quality=Best
/build:Songs/sovietmarch.ogg
#begin Songs/gameintro.ogg
/importer:OggImporter
/processor:SongProcessor
/processorParam:Quality=Best
/build:Songs/gameintro.ogg

BIN
lib/P3D.ContentPipeline/Content/Songs/gameintro.ogg Normal file
View File

Binary file not shown.

BIN
lib/build/Content/Songs/gameintro.xnb Normal file
View File

Binary file not shown.

BIN
lib/build/Pokemon3D.exe
View File

Binary file not shown.