external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- A better, theme-oriented planeswalker attacker targeting arrows with the default orange-ish color.

Browse Source 
- Removed the unused "darker PW arrows" option.
This commit is contained in:
Agetian
2017-08-25 19:26:13 +00:00
parent 1e23b0a17e
commit 42558f2bd4
10 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
View File

@@ -106,7 +106,6 @@ public enum CSubmenuPreferences implements ICDoc {
lstControls.add(Pair.of(view.getCbAltSoundSystem(), FPref.UI_ALT_SOUND_SYSTEM));
lstControls.add(Pair.of(view.getCbUiForTouchScreen(), FPref.UI_FOR_TOUCHSCREN));
lstControls.add(Pair.of(view.getCbTimedTargOverlay(), FPref.UI_TIMED_TARGETING_OVERLAY_UPDATES));
lstControls.add(Pair.of(view.getCbTargOverlayDarkArrows(), FPref.UI_TARGETING_DARKER_PW_ARROWS));
lstControls.add(Pair.of(view.getCbCompactMainMenu(), FPref.UI_COMPACT_MAIN_MENU));
lstControls.add(Pair.of(view.getCbPromptFreeBlocks(), FPref.MATCHPREF_PROMPT_FREE_BLOCKS));
lstControls.add(Pair.of(view.getCbPauseWhileMinimized(), FPref.UI_PAUSE_WHILE_MINIMIZED));

9
forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
View File

@@ -80,7 +80,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
private final JCheckBox cbAltSoundSystem = new OptionsCheckBox("Use Alternate Sound System");
private final JCheckBox cbUiForTouchScreen = new OptionsCheckBox("Enhance UI for Touchscreens");
private final JCheckBox cbTimedTargOverlay = new OptionsCheckBox("Enable Targeting Overlay Optimization");
private final JCheckBox cbTargOverlayDarkArrows = new OptionsCheckBox("Darker Arrows for Planeswalker Attackers");
private final JCheckBox cbCompactMainMenu = new OptionsCheckBox("Use Compact Main Sidebar Menu");
private final JCheckBox cbDetailedPaymentDesc = new OptionsCheckBox("Spell Description in Payment Prompt");
private final JCheckBox cbPromptFreeBlocks = new OptionsCheckBox("Free Block Handling");
@@ -279,9 +278,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
pnlPrefs.add(cbTimedTargOverlay, titleConstraints);
pnlPrefs.add(new NoteLabel("Enables throttling-based optimization of targeting overlay to reduce CPU use (only disable if you experience choppiness on older hardware, requires starting a new match)."), descriptionConstraints);
pnlPrefs.add(cbTargOverlayDarkArrows, titleConstraints);
pnlPrefs.add(new NoteLabel("Makes the targeting overlay arrows darker for creatures attacking planeswalkers, to make those arrows easier to distinguish from the blocker arrows (requires a restart)."), descriptionConstraints);
pnlPrefs.add(cbpCounterDisplayType, comboBoxConstraints);
pnlPrefs.add(new NoteLabel("Selects the style of the in-game counter display for cards. Text-based is a new tab-like display on the cards. Image-based is the old counter image. Hybrid displays both at once."), descriptionConstraints);
@@ -644,11 +640,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
return cbTimedTargOverlay;
}
/** @return {@link javax.swing.JCheckBox} */
public JCheckBox getCbTargOverlayDarkArrows() {
return cbTargOverlayDarkArrows;
}
public final JCheckBox getCbUiForTouchScreen() {
return cbUiForTouchScreen;
}

7
forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
View File

@@ -573,7 +573,6 @@ public class TargetingOverlay {
super.paintComponent(g);
final ArcState overlaystate = matchUI.getCDock().getArcState();
final boolean darkerPWArrows = FModel.getPreferences().getPrefBoolean(FPref.UI_TARGETING_DARKER_PW_ARROWS);
// Arcs are off
if (overlaystate == ArcState.OFF) { return; }
@@ -611,8 +610,10 @@ public class TargetingOverlay {
if (colorCombat.getAlpha() == 0) {
colorCombat = new Color(255, 0, 0, 153);
}
// For planeswalker attackers, use a somewhat darker shade if the player opts in
Color colorCombatAtk = darkerPWArrows ? colorCombat.darker() : colorCombat;
Color colorCombatAtk = FSkin.getColor(FSkin.Colors.CLR_PWATTK_TARGETING_ARROW).getColor();
if (colorCombatAtk.getAlpha() == 0) {
colorCombatAtk = new Color(255,138,1,153);
}
drawArcs(g2d, colorOther, arcsFriend);
drawArcs(g2d, colorCombatAtk, arcsFoeAtk);

3
forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
View File

@@ -357,7 +357,8 @@ public class FSkin {
CLR_THEME2(FSkinProp.CLR_THEME2),
CLR_OVERLAY(FSkinProp.CLR_OVERLAY),
CLR_COMBAT_TARGETING_ARROW(FSkinProp.CLR_COMBAT_TARGETING_ARROW),
CLR_NORMAL_TARGETING_ARROW(FSkinProp.CLR_NORMAL_TARGETING_ARROW);
CLR_NORMAL_TARGETING_ARROW(FSkinProp.CLR_NORMAL_TARGETING_ARROW),
CLR_PWATTK_TARGETING_ARROW(FSkinProp.CLR_PWATTK_TARGETING_ARROW);
private Color color;
private final FSkinProp skinProp;

3
forge-gui-mobile/src/forge/assets/FSkinColor.java
View File

@@ -22,7 +22,8 @@ public class FSkinColor {
CLR_THEME2 (FSkinProp.CLR_THEME2),
CLR_OVERLAY (FSkinProp.CLR_OVERLAY),
CLR_COMBAT_TARGETING_ARROW (FSkinProp.CLR_COMBAT_TARGETING_ARROW),
CLR_NORMAL_TARGETING_ARROW (FSkinProp.CLR_NORMAL_TARGETING_ARROW);
CLR_NORMAL_TARGETING_ARROW (FSkinProp.CLR_NORMAL_TARGETING_ARROW),
CLR_PWATTK_TARGETING_ARROW (FSkinProp.CLR_PWATTK_TARGETING_ARROW);
private Color color;
private final int x, y;

7
forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java
View File

@@ -46,8 +46,6 @@ public class TargetingOverlay {
}
public static void updateColors() {
final boolean darkerPWArrows = FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_TARGETING_DARKER_PW_ARROWS);
friendColor = FSkinColor.get(Colors.CLR_NORMAL_TARGETING_ARROW);
if (friendColor.getAlpha() == 0) {
friendColor = FSkinColor.get(Colors.CLR_ACTIVE).alphaColor(153f / 255f);
@@ -58,7 +56,10 @@ public class TargetingOverlay {
foeDefColor = FSkinColor.getStandardColor(new Color(1, 0, 0, 153 / 255f));
}
foeAtkColor = darkerPWArrows ? foeDefColor.darker().stepColor(-60) : foeDefColor;
foeAtkColor = FSkinColor.get(Colors.CLR_PWATTK_TARGETING_ARROW);
if (foeAtkColor.getAlpha() == 0) {
foeAtkColor = FSkinColor.getStandardColor(new Color(255 / 255f, 138 / 255f, 1 / 255f, 153 / 255f));
}
}
private TargetingOverlay() {

4
forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
View File

@@ -139,10 +139,6 @@ public class SettingsPage extends TabPage<SettingsScreen> {
"Use Escape Key To End Turn",
"Allows to use Esc keyboard shortcut to end turn prematurely"),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_TARGETING_DARKER_PW_ARROWS,
"Darker Arrows for Planeswalker Attackers",
"Makes targeting arrows darker for creatures attacking planeswalkers (requires restart)."),
1);
//Random Deck Generation
lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_NOSMALL,

BIN
forge-gui/res/skins/default/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 685 KiB

After

Width:  |  Height:  |  Size: 642 KiB

1
forge-gui/src/main/java/forge/assets/FSkinProp.java
View File

@@ -44,6 +44,7 @@ public enum FSkinProp {
CLR_OVERLAY (new int[] {70, 250}, PropType.COLOR),
CLR_COMBAT_TARGETING_ARROW (new int[] {70, 270}, PropType.COLOR),
CLR_NORMAL_TARGETING_ARROW (new int[] {70, 290}, PropType.COLOR),
CLR_PWATTK_TARGETING_ARROW (new int[] {70, 310}, PropType.COLOR),
//zone images
IMG_ZONE_HAND (new int[] {280, 40, 40, 40}, PropType.IMAGE),

1
forge-gui/src/main/java/forge/properties/ForgePreferences.java
View File

@@ -72,7 +72,6 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
UI_PREFERRED_AVATARS_ONLY ("false"),
UI_TARGETING_OVERLAY ("0"),
UI_TIMED_TARGETING_OVERLAY_UPDATES ("true"),
UI_TARGETING_DARKER_PW_ARROWS ("true"),
UI_ENABLE_SOUNDS ("true"),
UI_ENABLE_MUSIC ("true"),
UI_ALT_SOUND_SYSTEM ("false"),