From b7a7df1296623ef4360bd885c1116d4ab04c0007 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 21 Feb 2016 04:24:29 -0500 Subject: [PATCH] v0.3.4b: adjusted the UI for font selection, added a bunch of character support to pixel font --- assets/pixelfont.ttf | Bin 104224 -> 103132 bytes .../ShatteredPixelDungeon.java | 10 +++++++++- .../messages/windows/windows.properties | 2 +- .../windows/WndSettings.java | 11 +++++++---- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/assets/pixelfont.ttf b/assets/pixelfont.ttf index 0878d543b345a19e6706a9ea0586c19664280d38..552c0384d6540e521ccfea5273408a298b3011c6 100644 GIT binary patch delta 8033 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 Gulzrk?+Ks) delta 8967 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 diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index 41d69d3a7..03e8496b2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -339,6 +339,10 @@ public class ShatteredPixelDungeon extends Game { public static void language(Languages lang) { Preferences.INSTANCE.put( Preferences.KEY_LANG, lang.code()); + if (lang == Languages.RUSSIAN || lang == Languages.CHINESE || lang == Languages.KOREAN) + RenderedText.setFont("font.ttf"); + else if (classicFont()) + RenderedText.setFont("pixelfont.ttf"); } public static Languages language() { @@ -363,7 +367,11 @@ public class ShatteredPixelDungeon extends Game { } public static boolean classicFont(){ - return Preferences.INSTANCE.getBoolean(Preferences.KEY_CLASSICFONT, true); + Languages lang = ShatteredPixelDungeon.language(); + if (lang == Languages.RUSSIAN || lang == Languages.CHINESE || lang == Languages.KOREAN) + return false; + else + return Preferences.INSTANCE.getBoolean(Preferences.KEY_CLASSICFONT, true); } public static void lastClass( int value ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties index d4f1b5fe8..a9c0f1161 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties @@ -112,7 +112,7 @@ windows.wndsettings$uitab.center=Center windows.wndsettings$uitab.flip_toolbar=Flip Toolbar windows.wndsettings$uitab.flip_indicators=Flip Indicators windows.wndsettings$uitab.quickslots=Quickslots -windows.wndsettings$uitab.classic_font=Classic Font +windows.wndsettings$uitab.smooth_font=Smooth Font windows.wndsettings$audiotab.music_vol=Music Volume windows.wndsettings$audiotab.music_mute=Mute Music windows.wndsettings$audiotab.sfx_vol=SFX Volume diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java index 8f6596d2c..273ee64f1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.windows; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.messages.Languages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; @@ -237,18 +238,20 @@ public class WndSettings extends WndTabbed { slots.setRect(0, chkFlipTags.bottom() + GAP_TINY, WIDTH, SLIDER_HEIGHT); add(slots); - CheckBox chkFont = new CheckBox(Messages.get(this, "classic_font")){ + CheckBox chkFont = new CheckBox(Messages.get(this, "smooth_font")){ @Override protected void onClick() { super.onClick(); - ShatteredPixelDungeon.classicFont(checked()); + ShatteredPixelDungeon.classicFont(!checked()); PixelScene.windowOnCreate = WndSettings.class; ShatteredPixelDungeon.switchNoFade((Class) ShatteredPixelDungeon.scene().getClass()); } }; chkFont.setRect(0, slots.bottom() + GAP_SML, WIDTH, BTN_HEIGHT); - chkFont.checked(ShatteredPixelDungeon.classicFont()); - add(chkFont); + chkFont.checked(!ShatteredPixelDungeon.classicFont()); + Languages lang = ShatteredPixelDungeon.language(); + if (lang != Languages.RUSSIAN && lang != Languages.CHINESE && lang != Languages.KOREAN) + add(chkFont); } }