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

v1.3.0: adjusted internal setting for quick swapper, made it default on

Browse Source
This commit is contained in:
Evan Debenham
2022-06-13 12:16:49 -04:00
parent 921a2d3b8f
commit 62bd0a617e
4 changed files with 11 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
+3 -3
View File
@@ -121,7 +121,7 @@ public class SPDSettings extends GameSettings {
public static final String KEY_UI_SIZE = "full_ui"; public static final String KEY_UI_SIZE = "full_ui";
public static final String KEY_SCALE = "scale"; public static final String KEY_SCALE = "scale";
public static final String KEY_QUICKSLOTS = "quickslots"; public static final String KEY_QUICK_SWAP = "quickslot_swapper";
public static final String KEY_FLIPTOOLBAR = "flipped_ui"; public static final String KEY_FLIPTOOLBAR = "flipped_ui";
public static final String KEY_FLIPTAGS = "flip_tags"; public static final String KEY_FLIPTAGS = "flip_tags";
public static final String KEY_BARMODE = "toolbar_mode"; public static final String KEY_BARMODE = "toolbar_mode";
@@ -152,9 +152,9 @@ public class SPDSettings extends GameSettings {
return getInt( KEY_SCALE, 0 ); return getInt( KEY_SCALE, 0 );
} }
public static void quickSlots( boolean value ){ put( KEY_QUICKSLOTS, value ); } public static void quickSwapper(boolean value ){ put( KEY_QUICK_SWAP, value ); }
public static boolean quickSlots(){ return getBoolean( KEY_QUICKSLOTS, false); } public static boolean quickSwapper(){ return getBoolean( KEY_QUICK_SWAP, true); }
public static void flipToolbar( boolean value) { public static void flipToolbar( boolean value) {
put(KEY_FLIPTOOLBAR, value ); put(KEY_FLIPTOOLBAR, value );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
+5
View File
@@ -239,6 +239,11 @@ public class WelcomeScene extends PixelScene {
} }
} }
//defaults to false for older users
if (previousVersion <= ShatteredPixelDungeon.v1_2_3){
SPDSettings.quickSwapper(false);
}
SPDSettings.version(ShatteredPixelDungeon.versionCode); SPDSettings.version(ShatteredPixelDungeon.versionCode);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
+1 -1
View File
@@ -231,7 +231,7 @@ public class Toolbar extends Component {
if (PixelScene.uiCamera.width > 170) quickslotsToShow ++; if (PixelScene.uiCamera.width > 170) quickslotsToShow ++;
int startingSlot; int startingSlot;
if (SPDSettings.quickSlots() && quickslotsToShow < 6){ if (SPDSettings.quickSwapper() && quickslotsToShow < 6){
quickslotsToShow = 3; quickslotsToShow = 3;
startingSlot = swappedQuickslots ? 3 : 0; startingSlot = swappedQuickslots ? 3 : 0;
btnSwap.visible = true; btnSwap.visible = true;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
+2 -2
View File
@@ -520,11 +520,11 @@ public class WndSettings extends WndTabbed {
@Override @Override
protected void onClick() { protected void onClick() {
super.onClick(); super.onClick();
SPDSettings.quickSlots(checked()); SPDSettings.quickSwapper(checked());
Toolbar.updateLayout(); Toolbar.updateLayout();
} }
}; };
chkQuickSwapper.checked(SPDSettings.quickSlots()); chkQuickSwapper.checked(SPDSettings.quickSwapper());
add(chkQuickSwapper); add(chkQuickSwapper);
swapperDesc = PixelScene.renderTextBlock(Messages.get(WndSettings.UITab.this, "swapper_desc"), 5); swapperDesc = PixelScene.renderTextBlock(Messages.get(WndSettings.UITab.this, "swapper_desc"), 5);