diff --git a/P3D/Content/GUI/Menus/MainMenu.png b/P3D/Content/GUI/Menus/MainMenu.png index 9f082d139..4e206196d 100644 Binary files a/P3D/Content/GUI/Menus/MainMenu.png and b/P3D/Content/GUI/Menus/MainMenu.png differ diff --git a/P3D/Content/GUI/Menus/Options.png b/P3D/Content/GUI/Menus/Options.png index 2ac93a84e..dda3ef89f 100644 Binary files a/P3D/Content/GUI/Menus/Options.png and b/P3D/Content/GUI/Menus/Options.png differ 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 5020e200b..6b2db20b3 100644 Binary files a/P3D/Content/Localization/Tokens_id.dat and b/P3D/Content/Localization/Tokens_id.dat differ diff --git a/P3D/Content/Textures/UI/OptionsMenu.png b/P3D/Content/Textures/UI/OptionsMenu.png new file mode 100644 index 000000000..c5f2281dd Binary files /dev/null and b/P3D/Content/Textures/UI/OptionsMenu.png differ 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 f665a09cb..60ead4b52 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 @@ +