fixes from Mach IV
This commit is contained in:
parent
f0fe3a53b4
commit
eeeeb18e94
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.
|
@ -47,5 +47,5 @@ Stairs:
|
|||
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"TexturePath"{str[rocketbase]}}{"Textures"{recArr[[16,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Position"{sngArr[4,-1.001,1]}}]}}
|
||||
|
||||
NPCs:
|
||||
{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[41]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
|
||||
{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[41]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
|
||||
{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[littlegirl]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
|
||||
{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[littlegirl]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Johto Pokédex|0|152-160,16-18,21,22,163,164,19,20,161,162,10-15,165-168,175,176,468,174,39,40,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74-76,41,42,169,92,93,94,206,23,24,179,180,181,231,232,216,217,50,51,27,28,187-189,191,192,69-71,43-45,182,46-49,102,103,193,469,204,205,123,212,127,214,190,424,438,185,96,97,63-65,177,178,213,327,235,201,360,202,132,442,203,234,29-34,52,53,83,37,38,58,59,209,210,241,128-130,98,99,72,73,120,121,211,222,90,91,170,171,458,226,116,117,230,109,110,81,82,462,56,57,66-68,95,208,200,429,108,463,440,113,242,228,229,207,472,227,225,215,461,238,124,220,221,473,86,87,131,636,637,133-136,196,197,470,471,700,243-245,147-149,249-251|0
|
||||
Kanto Pokédex|pokedex_kanto|1-9,16-18,21,22,163,164,19,20,161,162,172,25,26,10-15,173,35,36,174,39,40,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-526,41,42,169,92-94,23,24,231,232,216,217,50,51,27,28,104,105,187-189,191,192,69-71,43-45,182,114,465,46-49,708,709,96,97,63-65,439,122,280-282,475,605,606,177,178,360,202,442,29-34,52,53,84,85,77,78,37,38,58,59,209,210,129,130,98,99,72,73,211,222,120,121,170,171,116,117,230,88,89,100,101,239,125,466,599-601,81,82,462,436,437,374-376,236,106,107,237,447,448,56,57,296,297,307,308,66-68,218,219,299,476,703,337,338,95,208,111,112,464,304-306,707,200,429,622,623,562,563,679-681,115,440,113,242,198,430,228,229,215,461,238,124,86,87,613,614,582-584,132,138-142,714,715,446,143-146,246-248,150,385|0
|
||||
Sevii Pokédex|pokedex_sevii|16-18,21,22,19,20,161,162,172,25,26,10-15,165-168,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-528,41,42,169,92-94,618,231,232,50,51,187-189,69-71,43-45,182,48,49,102,103,114,465,193,469,588,589,616,617,214,96,97,177,178,201,360,202,52,53,77,78,198,430,129,130,456,457,318,319,692,693,98,99,690,691,223,224,72,73,592,593,120,121,211,222,688,689,90,91,366-370,320,321,458,226,278,279,116,117,230,88,89,66-68,218,219,324,104,105,240,126,467,95,208,200,429,227,225,215,461,238,124,37,38,27,28,220,221,473,86,87,131,137,233,474,246-248,721,489,490,151|0
|
||||
Sevii Pokédex|pokedex_sevii|16-18,21,22,19,20,161,162,172,25,26,10-15,165-168,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-528,41,42,169,92-94,618,231,232,50,51,187-189,69-71,43-45,182,48,49,102,103,114,465,193,469,588,589,616,617,214,96,97,177,178,201,360,202,52,53,77,78,198,430,129,130,456,457,318,319,692,693,98,99,690,691,223,224,72,73,592,593,120,121,211,222,688,689,90,91,366-370,320,321,458,226,278,279,116,117,230,88,89,66-68,218,219,324,104,105,240,126,467,95,208,200,429,227,225,215,461,238,124,37,38,27,28,220,221,473,86,87,131,137,233,474,246-248,885-887,721,489,490,151|0
|
||||
National Pokédex|pokedex_national|1-[MAX]|1
|
Binary file not shown.
After Width: | Height: | Size: 861 B |
Binary file not shown.
|
@ -27304,6 +27304,9 @@
|
|||
<Content Include="Content\Textures\UI\GameJolt\x.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\GUI\RenameRival.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\UI\TrainerCard\Back.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
'3 = shiny + caught + seen
|
||||
|
||||
Public Shared AutoDetect As Boolean = True
|
||||
Public Const POKEMONCOUNT As Integer = 721
|
||||
Public Const POKEMONCOUNT As Integer = 893
|
||||
|
||||
#Region "PlayerData"
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ Public Class CreditsScreen
|
|||
|
||||
Inherits Screen
|
||||
|
||||
Private Const COPYRIGHTYEAR As String = "2019"
|
||||
Private Const COPYRIGHTYEAR As String = "2020"
|
||||
|
||||
Dim CreditsPages As New List(Of CreditsPage)
|
||||
Dim CurrentPageIndex As Integer = 0
|
||||
|
@ -56,18 +56,18 @@ Public Class CreditsScreen
|
|||
Else
|
||||
CreditsPages.Add(New CreditsPage("Pokémon 3D", Color.White, Color.Black, {"Trademark (TM) 2012 - " & COPYRIGHTYEAR, "made by Kolben Games", "", "GameMode made by", GameModeManager.ActiveGameMode.Author}.ToList()))
|
||||
End If
|
||||
CreditsPages.Add(New CreditsPage("Team Kolben", Color.White, Color.Black, {"Nils Drescher", "Andrew Leach", "Marc Boisvert-Dupras", "Grant Garrett", "Jason Houston", "Daniel Billing", "Benjamin Smith", "Hunter Graves"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Team Kolben", Color.White, Color.Black, {"Nils Drescher", "Andrew Leach", "Marc Boisvert-Dupras", "Grant Garrett", "Jason Houston", "Daniel S. Billing", "Benjamin Smith", "Hunter Graves"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Director", Color.White, Color.Black, {"Nils Drescher"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Open Source Development Team", Color.White, Color.Black, {"Benjamin Smith", """Aragas""", """oXFantaXo""", "Jorge Luis Espinoza", "Conner Joseph Brewster", """The Omega Ghost"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "William Lang", "Benjamin Smith", "Yong Jian Ming", "Jorge Luis Espinoza", """Aragas"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "William Lang", "Benjamin Smith", "Yong Jian Ming", "Jorge Luis Espinoza", """Aragas""", "Jasper Speelman"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Graphic Design", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", """Godeken""", "Caleb Coleman", "Robert Nobbmann", "Manuel Lampe", "Miguel Nunez", "Grant Garrett", """Anvil555""", """The Omega Ghost""", """princess-phoenix"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Map Design", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", "Hunter Graves", "Manuel Lampe", "Robert Nobbmann", "Maximilian Schröder", "Jan Mika Eine", "Jason Houston", """oXFantaXo"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Actionscript", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", "Hunter Graves", "Andrew Leach", "Jason Houston", "Yong Jian Ming", """Aragas"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Script System Development", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", "Hunter Graves", "Yong Jian Ming", """Aragas"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("KolbenWindowWidget Development & LUA Implementation", Color.White, Color.Black, {"Jason Houston"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Launcher Programming", Color.White, Color.Black, {"Nils Drescher", "Daniel Billing", """ThuxCommix""", """Aragas"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Launcher Programming", Color.White, Color.Black, {"Nils Drescher", "Daniel S. Billing", """ThuxCommix""", """Aragas"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Pokéditor Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "Hunter Graves"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Website Host/Server Maintenance", Color.White, Color.Black, {"Daniel Billing", "Daniel Laube"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Website Host/Server Maintenance", Color.White, Color.Black, {"Daniel S. Billing", "Daniel Laube"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("GameJolt Service/API Programming", Color.White, Color.Black, {"David DeCarmine", "Nils Drescher"}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Debug Testing", Color.White, Color.Black, {"Jan Mika Eine", "Tim Drescher", "Daniel Steinborn", "Andrew Leach", "Marc Boisvert-Dupras", "Matt Chambers", "Hunter Graves", "Benjamin Smith", "William Hunn", "Torben Carrington", """oXFantaXo""", "Conner Joseph Brewster", """Sanio"""}.ToList()))
|
||||
CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"""MunchingOrange""", """TheFlamingSpade""", """SlyFoxHound""", """ArsenioDev""", """TrUShade""", """Isaaking6"""}.ToList()))
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
Core.Player.HasPokegear = True
|
||||
IsReady = True
|
||||
Case "renamerival"
|
||||
Core.SetScreen(New NameObjectScreen(Core.CurrentScreen, TextureManager.GetTexture("NPC\4", New Rectangle(0, 64, 32, 32)), False, False, "rival", "Silver", AddressOf Script.NameRival))
|
||||
Core.SetScreen(New NameObjectScreen(Core.CurrentScreen, TextureManager.GetTexture("GUI\RenameRival"), False, False, "rival", "Silver", AddressOf Script.NameRival))
|
||||
IsReady = True
|
||||
CanContinue = False
|
||||
Case "wearskin"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Pokémon created by Nintendo, Game Freak and The Pokémon Company / Creatures Inc.
|
||||
Pokémon made by Nintendo, Game Freak and The Pokémon Company / Creatures Inc.
|
||||
|
||||
Pokémon 3D is not affiliated with Nintendo, Creatures Inc. or GAME FREAK Inc.
|
||||
|
||||
|
@ -13,7 +13,7 @@ Pokémon 3D
|
|||
Marc Boisvert-Dupras
|
||||
Grant Garrett
|
||||
Jason Houston
|
||||
Daniel "RTRD" Billing
|
||||
Daniel S. Billing
|
||||
Benjamin Smith
|
||||
Hunter Graves
|
||||
|
||||
|
@ -31,11 +31,12 @@ Pokémon 3D
|
|||
Programming
|
||||
Nils Drescher
|
||||
Jason Houston
|
||||
Benjamin Smith
|
||||
William Lang
|
||||
Benjamin Smith
|
||||
Yong Jian Ming
|
||||
Jorge Luis Espinoza
|
||||
"Aragas"
|
||||
Jasper Speelman
|
||||
|
||||
Graphic Design
|
||||
Nils Drescher
|
||||
|
@ -97,7 +98,7 @@ Pokémon 3D
|
|||
|
||||
Launcher Programming
|
||||
Nils Drescher
|
||||
Daniel "RTRD" Billing
|
||||
Daniel S. Billing
|
||||
"ThuxCommix"
|
||||
"Aragas"
|
||||
|
||||
|
@ -110,7 +111,7 @@ Pokémon 3D
|
|||
Nils Drescher
|
||||
|
||||
Website Host/Server Maintenance
|
||||
Daniel "RTRD" Billing
|
||||
Daniel S. Billing
|
||||
Daniel Laube
|
||||
|
||||
GameJolt Service/API Programming
|
||||
|
|
Loading…
Reference in New Issue