LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.4b: adjusted the UI for font selection, added a bunch of character support to pixel font

Browse Source
This commit is contained in:
Evan Debenham 2016-02-21 04:24:29 -05:00 committed by Evan Debenham
parent 295fb19fb6
commit b7a7df1296
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/pixelfont.ttf
View File

Binary file not shown.

10
src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -339,6 +339,10 @@ public class ShatteredPixelDungeon extends Game {
public static void language(Languages lang) { public static void language(Languages lang) {
Preferences.INSTANCE.put( Preferences.KEY_LANG, lang.code()); 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() { public static Languages language() {
@ -363,7 +367,11 @@ public class ShatteredPixelDungeon extends Game {
} }
public static boolean classicFont(){ 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 ) { public static void lastClass( int value ) {

2
src/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties
View File

@ -112,7 +112,7 @@ windows.wndsettings$uitab.center=Center
windows.wndsettings$uitab.flip_toolbar=Flip Toolbar windows.wndsettings$uitab.flip_toolbar=Flip Toolbar
windows.wndsettings$uitab.flip_indicators=Flip Indicators windows.wndsettings$uitab.flip_indicators=Flip Indicators
windows.wndsettings$uitab.quickslots=Quickslots 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_vol=Music Volume
windows.wndsettings$audiotab.music_mute=Mute Music windows.wndsettings$audiotab.music_mute=Mute Music
windows.wndsettings$audiotab.sfx_vol=SFX Volume windows.wndsettings$audiotab.sfx_vol=SFX Volume

11
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
View File

@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; 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); slots.setRect(0, chkFlipTags.bottom() + GAP_TINY, WIDTH, SLIDER_HEIGHT);
add(slots); add(slots);
CheckBox chkFont = new CheckBox(Messages.get(this, "classic_font")){ CheckBox chkFont = new CheckBox(Messages.get(this, "smooth_font")){
@Override @Override
protected void onClick() { protected void onClick() {
super.onClick(); super.onClick();
ShatteredPixelDungeon.classicFont(checked()); ShatteredPixelDungeon.classicFont(!checked());
PixelScene.windowOnCreate = WndSettings.class; PixelScene.windowOnCreate = WndSettings.class;
ShatteredPixelDungeon.switchNoFade((Class<? extends PixelScene>) ShatteredPixelDungeon.scene().getClass()); ShatteredPixelDungeon.switchNoFade((Class<? extends PixelScene>) ShatteredPixelDungeon.scene().getClass());
} }
}; };
chkFont.setRect(0, slots.bottom() + GAP_SML, WIDTH, BTN_HEIGHT); chkFont.setRect(0, slots.bottom() + GAP_SML, WIDTH, BTN_HEIGHT);
chkFont.checked(ShatteredPixelDungeon.classicFont()); chkFont.checked(!ShatteredPixelDungeon.classicFont());
add(chkFont); Languages lang = ShatteredPixelDungeon.language();
if (lang != Languages.RUSSIAN && lang != Languages.CHINESE && lang != Languages.KOREAN)
add(chkFont);
} }
} }