konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1.2: added an option to override silent mode on iOS

Browse Source
This commit is contained in:
Evan Debenham
2022-01-06 12:38:57 -05:00
parent cc221bc089
commit b7119acd3e
5 changed files with 91 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/SPDSettings.java
+10
View File
@@ -201,6 +201,7 @@ public class SPDSettings extends GameSettings {
public static final String KEY_MUSIC_VOL = "music_vol";
public static final String KEY_SOUND_FX = "soundfx";
public static final String KEY_SFX_VOL = "sfx_vol";
public static final String KEY_IGNORE_SILENT= "ignore_silent";
public static void music( boolean value ) {
Music.INSTANCE.enable( value );
@@ -237,6 +238,15 @@ public class SPDSettings extends GameSettings {
public static int SFXVol() {
return getInt( KEY_SFX_VOL, 10, 0, 10 );
}
public static void ignoreSilentMode( boolean value ){
put( KEY_IGNORE_SILENT, value);
Game.platform.setHonorSilentSwitch(!value);
}
public static boolean ignoreSilentMode(){
return getBoolean( KEY_IGNORE_SILENT, false);
}
//Languages and Font
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
+45 -6
View File
@@ -634,6 +634,8 @@ public class WndSettings extends WndTabbed {
ColorBlock sep2;
OptionSlider optSFX;
CheckBox chkMuteSFX;
ColorBlock sep3;
CheckBox chkIgnoreSilent;
@Override
protected void createChildren() {
@@ -695,6 +697,23 @@ public class WndSettings extends WndTabbed {
};
chkMuteSFX.checked(!SPDSettings.soundFx());
add( chkMuteSFX );
//TODO translate for v1.2.0!
if (DeviceCompat.isiOS() && Messages.lang() == Languages.ENGLISH){
sep3 = new ColorBlock(1, 1, 0xFF000000);
add(sep3);
chkIgnoreSilent = new CheckBox( "Ignore Silent Mode" ){
@Override
protected void onClick() {
super.onClick();
SPDSettings.ignoreSilentMode(checked());
}
};
chkIgnoreSilent.checked(SPDSettings.ignoreSilentMode());
add(chkIgnoreSilent);
}
}
@Override
@@ -703,16 +722,36 @@ public class WndSettings extends WndTabbed {
sep1.size(width, 1);
sep1.y = title.bottom() + 2*GAP;
optMusic.setRect(0, sep1.y + 1 + GAP, width, SLIDER_HEIGHT);
chkMusicMute.setRect(0, optMusic.bottom() + GAP, width, BTN_HEIGHT);
if (width > 200) {
optMusic.setRect(0, sep1.y + 1 + GAP, width/2-1, SLIDER_HEIGHT);
chkMusicMute.setRect(0, optMusic.bottom() + GAP, width/2-1, BTN_HEIGHT);
sep2.size(width, 1);
sep2.y = chkMusicMute.bottom() + GAP;
sep2.size(width, 1);
sep2.y = sep1.y; //just have them overlap
optSFX.setRect(0, sep2.y + 1 + GAP, width, SLIDER_HEIGHT);
chkMuteSFX.setRect(0, optSFX.bottom() + GAP, width, BTN_HEIGHT);
optSFX.setRect(optMusic.right()+2, sep2.y + 1 + GAP, width/2-1, SLIDER_HEIGHT);
chkMuteSFX.setRect(chkMusicMute.right()+2, optSFX.bottom() + GAP, width/2-1, BTN_HEIGHT);
} else {
optMusic.setRect(0, sep1.y + 1 + GAP, width, SLIDER_HEIGHT);
chkMusicMute.setRect(0, optMusic.bottom() + GAP, width, BTN_HEIGHT);
sep2.size(width, 1);
sep2.y = chkMusicMute.bottom() + GAP;
optSFX.setRect(0, sep2.y + 1 + GAP, width, SLIDER_HEIGHT);
chkMuteSFX.setRect(0, optSFX.bottom() + GAP, width, BTN_HEIGHT);
}
height = chkMuteSFX.bottom();
if (chkIgnoreSilent != null){
sep3.size(width, 1);
sep3.y = chkMuteSFX.bottom() + GAP;
chkIgnoreSilent.setRect(0, sep3.y + 1 + GAP, width, BTN_HEIGHT);
height = chkIgnoreSilent.bottom();
}
}
}