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

Merge pull request #1906 from Northmoc/ticket

Browse Source 
UNF: Tickets initial implementation
This commit is contained in:
Anthony Calosa
2022-11-22 08:50:31 +08:00
committed by GitHub
parent bf905d8234 53d517c910
commit f3966ecfef
14 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java
View File

@@ -79,6 +79,7 @@ public class VField implements IVDoc<CField> {
private final FLabel lblPoison = new FLabel.Builder().fontAlign(SwingConstants.CENTER).fontStyle(Font.BOLD).icon(FSkin.getImage(FSkinProp.IMG_ZONE_POISON)).iconInBackground().build();
private final FLabel lblEnergy = new FLabel.Builder().fontAlign(SwingConstants.CENTER).fontStyle(Font.BOLD).icon(FSkin.getImage(FSkinProp.IMG_ENERGY)).iconInBackground().build();
private final FLabel lblExperience = new FLabel.Builder().fontAlign(SwingConstants.CENTER).fontStyle(Font.BOLD).icon(FSkin.getImage(FSkinProp.IMG_EXPERIENCE)).iconInBackground().build();
private final FLabel lblTicket = new FLabel.Builder().fontAlign(SwingConstants.CENTER).fontStyle(Font.BOLD).icon(FSkin.getImage(FSkinProp.IMG_TICKET)).iconInBackground().build();
private final PhaseIndicator phaseIndicator = new PhaseIndicator();
@@ -113,6 +114,7 @@ public class VField implements IVDoc<CField> {
lblPoison.setFocusable(false);
lblEnergy.setFocusable(false);
lblExperience.setFocusable(false);
lblTicket.setFocusable(false);
avatarArea.setOpaque(false);
avatarArea.setBackground(FSkin.getColor(FSkin.Colors.CLR_HOVER));
@@ -215,12 +217,29 @@ public class VField implements IVDoc<CField> {
detailsPanel.updateZones();
}
private void addLblExperience() {
if (lblExperience.isShowing() || lblEnergy.isShowing()) {
return; // energy takes precedence
private void addLblTicket() {
if (lblTicket.isShowing() || lblExperience.isShowing() || lblEnergy.isShowing() || lblPoison.isShowing()) {
return; // experience, energy, poison take precedence
}
if (lblExperience.isShowing() || lblPoison.isShowing()) {
return; // poison takes precedence
avatarArea.remove(lblLife);
lblLife.setIcon(FSkin.getImage(FSkinProp.ICO_QUEST_LIFE));
avatarArea.add(lblLife, "w 50%!, h 20px!, split 2");
avatarArea.add(lblTicket, "w 50%!, h 20px!, wrap");
}
private void removeLblTicket() {
if (!lblTicket.isShowing()) {
return;
}
avatarArea.remove(lblTicket);
avatarArea.remove(lblLife);
avatarArea.add(lblLife, "w 100%!, h 20px!, wrap");
}
private void addLblExperience() {
if (lblExperience.isShowing() || lblEnergy.isShowing() || lblPoison.isShowing()) {
return; // energy and poison take precedence
}
avatarArea.remove(lblLife);
lblLife.setIcon(FSkin.getImage(FSkinProp.ICO_QUEST_LIFE));
@@ -288,10 +307,12 @@ public class VField implements IVDoc<CField> {
final int poison = player.getCounters(CounterEnumType.POISON);
final int energy = player.getCounters(CounterEnumType.ENERGY);
final int experience = player.getCounters(CounterEnumType.EXPERIENCE);
final int ticket = player.getCounters(CounterEnumType.TICKET);
if (poison > 0) {
removeLblEnergy();
removeLblExperience();
removeLblTicket();
addLblPoison();
lblPoison.setText(String.valueOf(poison));
if (poison < POISON_CRITICAL) {
@@ -305,6 +326,7 @@ public class VField implements IVDoc<CField> {
if (energy > 0) {
removeLblExperience();
removeLblTicket();
if (poison == 0) {
addLblEnergy();
lblEnergy.setText(String.valueOf(energy));
@@ -314,6 +336,7 @@ public class VField implements IVDoc<CField> {
}
if (experience > 0) {
removeLblTicket();
if (poison == 0 && energy == 0) {
addLblExperience();
lblExperience.setText(String.valueOf(experience));
@@ -322,6 +345,15 @@ public class VField implements IVDoc<CField> {
removeLblExperience();
}
if (ticket > 0) {
if (poison == 0 && energy == 0 && experience == 0) {
addLblTicket();
lblTicket.setText(String.valueOf(ticket));
}
} else {
removeLblTicket();
}
final boolean highlighted = isHighlighted();
this.avatarArea.setBorder(highlighted ? borderAvatarHighlighted : borderAvatarSimple );
this.avatarArea.setOpaque(highlighted);

1
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
View File

@@ -99,6 +99,7 @@ public class CardFaceSymbols {
MANA_IMAGES.put("T", FSkin.getImage(FSkinProp.IMG_TAP));
MANA_IMAGES.put("Q", FSkin.getImage(FSkinProp.IMG_UNTAP));
MANA_IMAGES.put("E", FSkin.getImage(FSkinProp.IMG_ENERGY, 40, 40));
MANA_IMAGES.put("TK", FSkin.getImage(FSkinProp.IMG_TICKET, 40, 40));
MANA_IMAGES.put("EXPERIENCE", FSkin.getImage(FSkinProp.IMG_EXPERIENCE, 40, 30));
MANA_IMAGES.put("CHAOS", FSkin.getImage(FSkinProp.IMG_CHAOS));
MANA_IMAGES.put("slash", FSkin.getImage(FSkinProp.IMG_SLASH));

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

@@ -1463,6 +1463,7 @@ public class FSkin {
addEncodingSymbol("S", FSkinProp.IMG_MANA_SNOW);
addEncodingSymbol("T", FSkinProp.IMG_TAP);
addEncodingSymbol("E", FSkinProp.IMG_ENERGY);
addEncodingSymbol("TK", FSkinProp.IMG_TICKET);
addEncodingSymbol("EXPERIENCE", FSkinProp.IMG_EXPERIENCE);
addEncodingSymbol("A-", FSkinProp.IMG_ALCHEMY);