From 9b8df67916d249527b2faa5e7a37581d54f21aa0 Mon Sep 17 00:00:00 2001 From: "Jasper \"JappaWakka\" Speelman" <66885565+JappaWakkaP3D@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:46:39 +0200 Subject: [PATCH] Fixes and main menu preparations For some reason ttf2bmp.exe was not added to the references, so I added that. Added some variations of the Options and MainMenu button textures. Added some english localization tokens and fixed the Indonesian language from displaying as "Indonesia" Tweaked the colors of the main menu Added an option main menu icon Fixed a bug where the game would crash when loading a gamemode without a Moves folder. Set offsetmap quality (update frequency) to max by default. --- P3D/Content/GUI/Menus/MainMenu.png | Bin 2800 -> 1378 bytes P3D/Content/GUI/Menus/Options.png | Bin 727 -> 1035 bytes P3D/Content/Localization/Tokens_en.dat | 94 +++++++++++++++++- P3D/Content/Localization/Tokens_id.dat | Bin 49472 -> 49474 bytes P3D/Content/Textures/UI/OptionsMenu.png | Bin 0 -> 534 bytes P3D/Core/GameOptions.vb | 4 +- P3D/Input/UI/ColorProvider.vb | 6 +- P3D/P3D.vbproj | 3 + P3D/Pokemon/Attacks/GameModeAttackLoader.vb | 8 +- .../P3D.ContentPipeline.csproj | 1 + 10 files changed, 106 insertions(+), 10 deletions(-) create mode 100644 P3D/Content/Textures/UI/OptionsMenu.png diff --git a/P3D/Content/GUI/Menus/MainMenu.png b/P3D/Content/GUI/Menus/MainMenu.png index 9f082d13922d160654b86e9adff8591d75b53f70..4e206196dcb986f36ec156de23f2166e217a00b0 100644 GIT binary patch delta 1351 zcmV-N1-Sa~72*nzEPulQ01m?e$8V@)0000RbVXQnQ*UN;cVTj607GSLb9r+hQ*?D? zX>TA@Z*OeDr{R1600iwxL_t(|+U?p~Y!p=-$MNqy7FBEiElE zo!{dExBxDIVFI&fOgFsY)Y)^60%T`r8;*B&cDevAfD7O*f-Zmy-~zY+E`ST*0>l9z z5U_WCS<~}?oqxavMHJc?g>e{91;A1QTO9?EHC+JefZ4z)z^{mc?sW0ByD}>QO3HgG z?IKtPkTrclu=sm!`tg|{!f_{yulgVhfG0L}*+#GgAZz*(paz%`;_z8uwIT|QP8HwV zl>|UW)_`pU(*UxjF9Y@fcSd+ycM#!_Q^gMsy9lNLWPeRx4pajfCjMqGuvQU;15Onm z3qn)?S<`*M_rMej^SuZ>riem=Q^ngwhzKBSdMWT7kZNPzmx0F>QP}HL@pcfx0?3-a z2KWX@j$!`&K$#*6)lL;}6(J;mtm*53-N2+C889IZcd>tg=M_=-+^OQtAPfP>n!XYE7`P*j``17aL+zAk!`YIkK;?%aB}qbJ@_@i!&qJ%5$9p9cU8oL=PvNSamCK!T1~0qTPQ z(rpJ2?7kX&DJ9LSQExARQ>*HMqTow4X?9|!z!t!@zYN_U9MZ%&iI)PK0Hrr~e{iT1 z=j@fnJ;1d;OG9=4{}kN2R~^>?SN{mv{h<_0x-YR(UYK5uop+f5cjloHzDUU=HA48mP^IDI6fR^I0_x+7;oZ!o< zGXOljekPy3;|;qnNcHZM5)RWuf&H3Yl%;^%5)A-S{5F{%@DDcwSnxTGS~I)=Og^ z;KDDGnNNJ2y)eMs<@*6>JFtT3>3^o4=S%5}>eaCg&@7qx#AkP?>G{@D;3&X_<|0$w zk8w!p`KoFcAg+tx`KBV%-OpHJ{9j1#QJ?7)OkJ!>V-Dc_QET1LC>RFN=(Ci9sY}eI zz%hW{#v)7CerBN&py!As05zk)TnZck=sjZn+Rt1%4B)WO@>-Bl7(E3J0YLcTx$=ik zL1BY5>Hyt8uXJMN51WF_r48!n0vuX78r>gCLFPk|QxI=}{{Yt^X8Vk5oX`LO002ov JPDHLkV1hdOh@b!f literal 2800 zcmbVO2~-o;8csr3%oAi6mDV8wPtYVYNeIc*uq9}s1|tSRMPZl>VT5F25+p1wizaaEit zPB9lo2`w8@6G<4`tksif3S~y9S&yKpm-}Z1BO3L(wae?3`a|64%;GU zVrGiTq=z}2jEoF+29He`G#p4I5^+E-hs$M=2$nHZXF|*@opH(tgA_BO23&8#2_0Z% zM3RVflbA^=9dbddAEnh9hr>h$jAKUh9Ec5CT^aOhyt5 zjbimFgo!Yw5bvNK-Ts{cGPDZCsExO3(P~Fc7)_BYNjHWA@>aA_m8r)#(U_4)H=tPL zN>b(&t2cUBV!#j+VNel7+DM|5Ba#6wmkk0_V{x6D$S?-HaR8GdCQQt7hhnWIpM1(IK(3JQk#JeVu`9h58?HDW^k60AnyWWu0DNQZGP zqQN+NorVdFh7pz!X@r3^OseC(xh|JTlm;RhPa`*s(X%1|d89-Di39=`mkkZdRVZM& z&S*k(C?=PRnPhO-IIf11QGrl^2!$*x8AMn-HDAOMih`0^A_z(fQiE!UAIu*)FD1}) zYYB{;SCi+3B8UeCi9{?>vIu1f`TQW3h$n(rd{m7H)O=J3LEMq^^9(q71(CFW%wxTn z*4lw(xRK0i=J3^7fUOuFrQyI}xxff&y#`_?YRx~UW)3goZ;8O)^I(WJBLyQ#|D-O4 zU`8U@lz|wqa19x)zpOjXyTlujm47b%?(Tn6HlgDqt6FAE5AEr^3Tad-s3r8mz*LraN<8Z6oSk z>?2{O#63q^Tt8c?IjiYzY@NFCR&w)+>=RWL6;)N)4dqYqqbGVV$!UW*SMZ>4J%%Sc7B#uX(OAIX;~Fpc=P!r`#Q$Hwb!mKy85!E zWnpQLxR)XH2YM(MXWsDs={{tMyok1cs#!*Dr0;z%?E28w_Yf7gFA^BKiOY%)6YR=p zlWE)cZ_asgH()_*o?m)h(&F$NGi7dAC#M7^6As#pa!T)cj++7`@3?8nMMpU#+V zXXkx2;HumsKRww$+$#~+VmB8r4Z%B>?Dv)Ku!*`fcjfiooW+%oD-Ly+p*qtwSUgW zDr9zn6V;>BK5=eE6BKi@bkb@&*q``r^=gpjnPhQ7iDZf|u<@{sQ&fajCQZN73Z(H_2ee2xo*4&Osjp5ui2^RL<@V17*_eS8Kk@{#WVw z$9@}rpv%^F6`j1=A7xwYAZ%qkc)5k)bgX|4Idk~sW731{f10Pv_Y5XwXlRB`yw>|xo<4y#47Tg_Kf-2})jG~LnCq3xF zYFow!I{0-yZaaRgy~H)jeM9`LsImQu!ds8qM8)byZDG~4S~OwN0rS)PYL&OsVozRq z!3O$_n%f-%(Ghr7bxavw>|N=*ZdS%OhYOk*W+rQ=?8PCK$yqtQZ_E5GxChstW`5cLF>82&n-oN?q=0No6AMdzO z&m7o&q~~k1{)6p-k7DyWYAjHfVE(ZJOu7|9yI?-gSdbjAtk8`0yn=(06j;ug9-0KPBjViC dTl(W4xzE{4^eLCR^Q`|#<&ja+vWUcj{{yX|B+vi= diff --git a/P3D/Content/GUI/Menus/Options.png b/P3D/Content/GUI/Menus/Options.png index 2ac93a84eeaafc99cf5b4e34279554741a65d347..dda3ef89f1461f436dfa1bbb5543bde3f5546392 100644 GIT binary patch literal 1035 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9F5he4R}c>anMprCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{I10n5TKVIEGZ*dVAM4BREi^ z;h}zTGsjWQd#{s@F3ekN|D(Non%+SLv6UQ6e0o6zfsR&X0$aMjJX+A)q*1oQS+PV= z_6S?%RjZc@uacY`1RR&#F14BzGyBGsYRc^Y<2CzsYoNt|cpjJVQ&O#O^y43>7R6*`FDK9>`$6a0lo@2;g8~ zVR$6rk;U+A{?t&hf;Sg57`8A9>WH4X9D^L=g5Pfv67Wad<3H%HaEZ4t1pR3={DBurdD=DROm!@+ksGLz|@Z`{Y^ftkp z;nTqg9i>fi)$?v=81MesevKiaEkHuxC8L9#MECZ0H3f^tU}m%7?@=8OjXW!uBAo3jRVX>B~+ z>(6Asyz+SeJ7x!S2DWYUJGS$_&-!(E{``F>ethXs=`Xu}`o5XVf~`N5ly>s_t5{C5 ztK7xWw2q;t$Amc|dh*AYGyl8o*0Zg8uG;XVJ!oCrP9BDEgtr&`5_rMPAjc%y-*}6` zf=w%)+QSitI delta 684 zcmeC?xXwC3MT)UF$lZxy-8q?;3=9k`>5jgR3=A9lx&I`xPE-`HXUg$(aSW-5dwXkl zR!E=-+XI`{N4)b7vJ1F4y3BCeAow=NMMtNWDgHqEhK+(ctlX|if+CJ8y-Ng}IGQ4E zx?bDRr}B{H@SBfsZf@Ss|4+$tqj~n<3C7cTfp&pF!{ZsYH}A~Ws#IB>5OHez{Qc_Q za=y92`gI<1{=QqM$=9FM4w%eTvgX+* zpVbUtSDjy!^w9j>9s3DCVs*ZJ5dI#hx?<}ekGMwHqnqSys%jLR8Tt0VUdE8UVhe-m zborCn8#Gv7%wa0gn-=>?U2Gyi zIHxJJS$xZ#Ew%_`bn^YJ*_vJf3T@`!a&J#t#J~!Tk{2;N`EL%cTB_l&P~yQ2?=@mc zKfMK4-wKPnMGHuYC%dbk%Q~loCIH41 BAkhE- diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index a41ffcf1d..a134becbc 100644 --- a/P3D/Content/Localization/Tokens_en.dat +++ b/P3D/Content/Localization/Tokens_en.dat @@ -1,5 +1,95 @@ language_name,English --- +--- +--- +Global: +global_join,Join +global_play,Play +global_refresh,Refresh +global_new,New +global_add,Add +global_edit,Edit +global_remove,Remove +global_back,Back +global_please_wait,Please wait +global_loading,Loading +global_game,Game +global_login,Log in +global_male,Male +global_female,Female +global_yes,Yes +global_no,No +global_accept,Accept +global_cancel,Cancel +global_gamemode,GameMode +global_clear,Clear +global_save,Save +global_close,Close +global_on,On +global_off,Off +global_enabled,Enabled +global_disabled,Disabled +global_player_name,Player name +global_badges,Badges +global_play_time,Play Time +global_location,Location +global_money,Money +global_points,Points +global_name,Name +global_order,Order +global_filter,Filter +global_reset,Reset +global_pokemon_type_normal,Normal +global_pokemon_type_fire,Fire +global_pokemon_type_flying,Flying +global_pokemon_type_fighting,Fighting +global_pokemon_type_water,Water +global_pokemon_type_grass,Grass +global_pokemon_type_poison,Poison +global_pokemon_type_ground,Ground +global_pokemon_type_electric,Electric +global_pokemon_type_psychic,Psychic +global_pokemon_type_rock,Rock +global_pokemon_type_ice,Ice +global_pokemon_type_bug,Bug +global_pokemon_type_dragon,Dragon +global_pokemon_type_ghost,Ghost +global_pokemon_type_dark,Dark +global_pokemon_type_steel,Steel +global_pokemon_type_fairy,Fairy +global_pokemon_type_blank,Blank +global_true,True +global_false,False +global_select,Select +global_summary,Summary +global_item,Item +global_use,Use +global_give,Give +global_take,Take +global_toss,Toss +global_switch,Switch +global_pokemon_move_fly,Fly +global_pokemon_move_rocksmash,Rock Smash +global_pokemon_move_ride,Ride +global_pokemon_move_flash,Flash +global_pokemon_move_cut,Cut +global_pokemon_move_teleport,Teleport +global_pokemon_move_dig,Dig +global_used,Used +global_apply,Apply +global_eggs_cannot_hold,Eggs cannot hold items. +--- +General: +HP,HP +PP,PP +Lv.,Lv. +Level,Level +Attack,Attack +Defense,Defense +Special_Attack,Special Attack +Special_Defense,Special Defense +Speed,Speed +--- MainMenuScreen: main_menu_continue,Continue main_menu_load_game,Load Game @@ -24,8 +114,8 @@ language_menu_back,Back PacksScreen: pack_menu_up,Up pack_menu_down,Down -pack_menu_toggle_on,Enable -pack_menu_toggle_off,Disable +pack_menu_toggle_on,Enabled +pack_menu_toggle_off,Disabled pack_menu_information,Information pack_menu_enabled,Enabled pack_menu_apply,Apply diff --git a/P3D/Content/Localization/Tokens_id.dat b/P3D/Content/Localization/Tokens_id.dat index 5020e200b650c048d51ffcb96304bfa949742864..6b2db20b3f9bd87e0027d28322bddb6db04ba56d 100644 GIT binary patch delta 14 VcmX@m#C)iUd4d6B-bQ`Fg8(Z51#SQU delta 12 TcmX@q#C)KMd4j=4BY}eeB1i=R diff --git a/P3D/Content/Textures/UI/OptionsMenu.png b/P3D/Content/Textures/UI/OptionsMenu.png new file mode 100644 index 0000000000000000000000000000000000000000..c5f2281dd68e558221fdd8a95706f9547fe71790 GIT binary patch literal 534 zcmV+x0_pvUP)YAX9X8WNB|8RBvx=!KdMT0004@ zNkl!HNN?(ObjWZ&ho3J)ryhrm6D+F>VcrKLw?_@<1QbH`1p7Z4JX?zV@a3 zR3KG2<(C3dlXo^?-#OgpbdmGDKe`^qkyAG Y4@YB6*>mLfTL1t607*qoM6N<$g6tXRH~;_u literal 0 HcmV?d00001 diff --git a/P3D/Core/GameOptions.vb b/P3D/Core/GameOptions.vb index a64c29a3d..e9499e75f 100644 --- a/P3D/Core/GameOptions.vb +++ b/P3D/Core/GameOptions.vb @@ -4,7 +4,7 @@ Public ShowDebug As Integer = 0 Public ShowGUI As Boolean = True Public GraphicStyle As Integer = 1 - Public LoadOffsetMaps As Integer = 10 + Public LoadOffsetMaps As Integer = 1 Public ContentPackNames() As String = {} Public ViewBobbing As Boolean = True Public LightingEnabled As Boolean = True @@ -172,7 +172,7 @@ "ShowDebugConsole|0" & Environment.NewLine & "ShowGUI|1" & Environment.NewLine & "GraphicStyle|1" & Environment.NewLine & - "LoadOffsetMaps|10" & Environment.NewLine & + "LoadOffsetMaps|1" & Environment.NewLine & "Language|en" & Environment.NewLine & "ViewBobbing|1" & Environment.NewLine & "GamePadEnabled|1" & Environment.NewLine & diff --git a/P3D/Input/UI/ColorProvider.vb b/P3D/Input/UI/ColorProvider.vb index a407f9b36..880286c65 100644 --- a/P3D/Input/UI/ColorProvider.vb +++ b/P3D/Input/UI/ColorProvider.vb @@ -14,7 +14,7 @@ End Get End Property - Private Shared ReadOnly _gradientColor As Color = New Color(42, 167, 198) + Private Shared ReadOnly _gradientColor As Color = New Color(99, 204, 255) Private Shared ReadOnly _gameJolt_gradientColor As Color = New Color(45, 45, 45) Public Shared ReadOnly Property GradientColor() As Color @@ -72,7 +72,7 @@ End Get End Property - Private Shared ReadOnly _lightColor As Color = New Color(125, 204, 216) + Private Shared ReadOnly _lightColor As Color = New Color(111, 249, 255) Private Shared ReadOnly _gameJolt_lightColor As Color = New Color(70, 70, 70) Public Shared ReadOnly Property LightColor() As Color @@ -101,7 +101,7 @@ End Get End Property - Private Shared ReadOnly _accentColor As Color = New Color(30, 139, 227) + Private Shared ReadOnly _accentColor As Color = New Color(3, 155, 229) Private Shared ReadOnly _gameJolt_accentColor As Color = New Color(204, 255, 0) Public Shared ReadOnly Property AccentColor() As Color diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 930850bae..a84e724cb 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -27391,6 +27391,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/P3D/Pokemon/Attacks/GameModeAttackLoader.vb b/P3D/Pokemon/Attacks/GameModeAttackLoader.vb index 1cdb95b73..26be3a96c 100644 --- a/P3D/Pokemon/Attacks/GameModeAttackLoader.vb +++ b/P3D/Pokemon/Attacks/GameModeAttackLoader.vb @@ -19,9 +19,11 @@ LoadedMoves.Clear() If GameModeManager.ActiveGameMode.IsDefaultGamemode = False Then - For Each file As String In System.IO.Directory.GetFiles(GameController.GamePath & "\" & GameModeManager.ActiveGameMode.ContentPath & "\" & PATH, "*.dat") - LoadMove(file) - Next + If System.IO.Directory.Exists(GameController.GamePath & "\" & GameModeManager.ActiveGameMode.ContentPath & "\" & PATH) = True Then + For Each file As String In System.IO.Directory.GetFiles(GameController.GamePath & "\" & GameModeManager.ActiveGameMode.ContentPath & "\" & PATH, "*.dat") + LoadMove(file) + Next + End If End If If LoadedMoves.Count > 0 Then diff --git a/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj b/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj index 91b7db04b..d4dd5f2a1 100644 --- a/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj +++ b/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj @@ -95,6 +95,7 @@ +