From eeeeb18e94c7aa5f92954d1838ac14bbf50d4df1 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Wed, 22 Jul 2020 22:23:38 -0500 Subject: [PATCH] fixes from Mach IV --- .../Data/Scripts/olivine/steeltutor.dat | Bin 4326 -> 4328 bytes P3D/Content/Data/Scripts/pewter/caraliss.dat | Bin 12886 -> 12888 bytes .../Data/Scripts/pewter/fossilscientist.dat | Bin 21290 -> 21278 bytes .../Data/Scripts/quest/tower/owner.dat | Bin 10886 -> 11342 bytes .../Data/Scripts/quest/tower/rankings.dat | Bin 6236 -> 6240 bytes .../Data/Scripts/quest/tower/unregister.dat | Bin 8430 -> 8518 bytes P3D/Content/Data/Scripts/speedboatscene.dat | Bin 2530 -> 2550 bytes .../Data/Scripts/trainer/league/lance.dat | Bin 5340 -> 5358 bytes .../maps/quest/trainertower/double/1f.dat | 4 ++-- P3D/Content/Data/pokedex.dat | 2 +- P3D/Content/GUI/RenameRival.png | Bin 0 -> 861 bytes P3D/Content/Pokemon/Data/884.dat | Bin 2290 -> 2292 bytes P3D/P3D.vbproj | 3 +++ P3D/Player/Pokedex.vb | 2 +- P3D/Screens/Credits/CreditsScreen.vb | 10 +++++----- .../V2/ScriptCommands/DoPlayer.vb | 2 +- P3D/credits.txt | 11 ++++++----- 17 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 P3D/Content/GUI/RenameRival.png diff --git a/P3D/Content/Data/Scripts/olivine/steeltutor.dat b/P3D/Content/Data/Scripts/olivine/steeltutor.dat index 56ab2e81f29920db4f04bd5d240eab554cba375a..3a2e86f4ba90c4350864fbf023039baf53c9d6ac 100644 GIT binary patch delta 14 VcmaE+_(E}m0TW}!W__mZd;lwM1qA>A delta 12 TcmaE%_)Kww0n=t9rfqxxBOe5w diff --git a/P3D/Content/Data/Scripts/pewter/caraliss.dat b/P3D/Content/Data/Scripts/pewter/caraliss.dat index de5adf6ce55e94fee0430979f46c57f090055526..f6e5c8a446ed24b3b0342d848be5312a94283947 100644 GIT binary patch delta 23 fcmcbXawBEKR0T$($MJX?&92dHwDk~)yQq%={Qlfi)@lc5BtIF~^Wh>y#al_Y%1fp&Or{;M*Dak91=AEx!2%he_^flSiW1(Ft;os4x8KbTMcso4tvM}j$a delta 99 zcmV-p0G$8MScX-Qsgt!C6p_6$0U)vPQ4^DI6&ABs6j%bY9~b%y0U(naBPWwxClHfS zBZ8AfB=P}rlP)JwlkFu8lYJvfliwu_vt1^L0kc^scme?+lhP_J0U(kqi2)#y@Hdme FD~%rBBeDPh diff --git a/P3D/Content/Data/Scripts/quest/tower/rankings.dat b/P3D/Content/Data/Scripts/quest/tower/rankings.dat index 5ef7033280a8e692aa0a6710fd868c34d060e117..b05a8ab4ab44229284dbd6cc7473cc4ffa266974 100644 GIT binary patch delta 155 zcmca(@W5cheI{;4h9ZVUhIAk<-u!{-F{7|QLoP!qSiqejgCU=xn4x6y2PV?wsfR%2(&(X*a07GvhV*mgE diff --git a/P3D/Content/Data/Scripts/quest/tower/unregister.dat b/P3D/Content/Data/Scripts/quest/tower/unregister.dat index 5a0b6d15488a26aee01cc70c84332a187f84f107..9b6aa1f0f7353f41283e1e6f8ffe8f3f8ab2a9ec 100644 GIT binary patch delta 54 zcmaFoc+6=+@nm;KE%gwF5Qcn)a)wlfA_iw5E0>{wAqU7S0pfCo0HA0lLlr~n#+)Vv E0HXm8MF0Q* delta 15 WcmX@+^v-cY@#O20E}Quo%@qJUiv}D3 diff --git a/P3D/Content/Data/Scripts/speedboatscene.dat b/P3D/Content/Data/Scripts/speedboatscene.dat index 984ba08cfd2a26bf1b67f70f98a50073421b8b23..ffb478935e637f115c620e5576cf6dc20e3d8fa3 100644 GIT binary patch delta 48 zcmaDP{7ra+1EYKaLk>eCLnVU-gCB!GLp*~oLnuQqgC~PCgC+wn1J~sDtje477)v++ DAjk^x delta 24 fcmew+{786%10#DeLkUAZL&4;OETWqW7~41iY9I&P diff --git a/P3D/Content/Data/Scripts/trainer/league/lance.dat b/P3D/Content/Data/Scripts/trainer/league/lance.dat index 535a10ca53659c9e76b0e6543ae6f95035fdee5a..49100e5bd906545db0d7567b9aa2923f6e069916 100644 GIT binary patch delta 19 bcmcbk`A&1g7Uqc>a+9Ai%Wb~L{7(P?S=I=b delta 20 bcmaE-c}H`@7H0NDhEj%NhSbexnH2>AR2&BG diff --git a/P3D/Content/Data/maps/quest/trainertower/double/1f.dat b/P3D/Content/Data/maps/quest/trainertower/double/1f.dat index b97dbcd0d..34b69f4e6 100644 --- a/P3D/Content/Data/maps/quest/trainertower/double/1f.dat +++ b/P3D/Content/Data/maps/quest/trainertower/double/1f.dat @@ -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[]}}]}} diff --git a/P3D/Content/Data/pokedex.dat b/P3D/Content/Data/pokedex.dat index c1d991c35..d3f90e3bf 100644 --- a/P3D/Content/Data/pokedex.dat +++ b/P3D/Content/Data/pokedex.dat @@ -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 \ No newline at end of file diff --git a/P3D/Content/GUI/RenameRival.png b/P3D/Content/GUI/RenameRival.png new file mode 100644 index 0000000000000000000000000000000000000000..06c1229d470e9e499644d65ffb2c0194183622b4 GIT binary patch literal 861 zcmV-j1ETziP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0`f^jK~!i%?Uyf* zn?MxCA61b^WF)3dsu~%Iyg79;GO~41ov4ZPOWOo6bPnbOzd{Gtf4r z{{xm~=~O$E>TA-#;ME|0{rj&1$TurXd93xXW2zY{O$7Y48*yH!}e7?7|ChbkWh!Er^Znz)sLc(kxVRPCPmlI*Sb@y!=S@iA98ye`RcJJX@^POR zcn;a7%6@1xgpvpAR5kGcZP1pHV_ZWmFS5LNJ}&b};dRl-n|Su+L7BiMMf2?ESHXl@ z_5j1eM*dirr1)>Ys=ItUGp2jM^c0E{6C_PcqAi8Xna*W#CqCiCVgp({lI?8bgv^5> zXtmlVA(VdmNKl5lGy9`(hRQHmfz0efJYwJW=Hxg%It1#BKhhg|6h#NxujeYHWWSE=$z(#)j z`$L|e?18C&A{=F?LmME>8|?uVV@1~!i2Lq19*?K!q^@_~OLcJ`b!emWl{lwKUUhuT z0SKeM^Y|mPi$a?34=O#kdna|fP_0nu;AQ%1dlR!jh?|5#MzE{{vd$D^0|=2MG*o)C zS*ZKcJ^e3WxDEQ~@G`>400eya_({#U7G~+tI17gj+M*Bonwl^&@Ok}h6<6VYEV0wM8PK z@ByXzYC44&Wx#dxA6Jxqw8^|MP>GwJLQGz4dS#8&Nh2!&ax;CYyp)@-0OFtbfaFrS nDRr*^-~sa;FO?TktdHnFPm%~!h$ne;00000NkvXXu0mjfoRyAO literal 0 HcmV?d00001 diff --git a/P3D/Content/Pokemon/Data/884.dat b/P3D/Content/Pokemon/Data/884.dat index d1284fc4d23bafc07a974a2e648d5cb1b6fbf781..53d3908cc655cf47b36ded65ddefb3bb0063fc56 100644 GIT binary patch delta 18 Zcmew)_(gC-AQP(*g9(Gt<`AZNYydl11y%q6 delta 16 Xcmew&_(^a>AQN*1L&fGWrg>}tHvt8% diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 809692910..20a838657 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -27304,6 +27304,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/P3D/Player/Pokedex.vb b/P3D/Player/Pokedex.vb index e88a9942c..3f1a709ab 100644 --- a/P3D/Player/Pokedex.vb +++ b/P3D/Player/Pokedex.vb @@ -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" diff --git a/P3D/Screens/Credits/CreditsScreen.vb b/P3D/Screens/Credits/CreditsScreen.vb index fd580f944..f560711cb 100644 --- a/P3D/Screens/Credits/CreditsScreen.vb +++ b/P3D/Screens/Credits/CreditsScreen.vb @@ -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())) diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb index e48cd1366..feb70296f 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb @@ -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" diff --git a/P3D/credits.txt b/P3D/credits.txt index 919f3eb10..f36b7b613 100644 --- a/P3D/credits.txt +++ b/P3D/credits.txt @@ -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