diff --git a/assets/pixelfont.ttf b/assets/pixelfont.ttf index 0878d543b..552c0384d 100644 Binary files a/assets/pixelfont.ttf and b/assets/pixelfont.ttf differ 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); } }