external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12: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

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,