Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

link PhaseStepViewer to MagicPhaseType (UN vs UT inconsistency); remove redundant text from MagicPhaseType.

master
lodici 2017-02-21 18:39:04 +00:00
parent 271aa32afc
commit 7499c377fd
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/magic/model/phase/MagicPhaseType.java
View File

@ -2,32 +2,26 @@ package magic.model.phase;
public enum MagicPhaseType {
Mulligan("Mulligan", "MU"),
Untap("Untap", "UT"),
Upkeep("Upkeep", "UP"),
Draw("Draw", "DR"),
FirstMain("First Main", "M1"),
BeginOfCombat("Begin of Combat", "BC"),
DeclareAttackers("Declare Attackers", "DA"),
DeclareBlockers("Declare Blockers", "DB"),
CombatDamage("Combat Damage", "CD"),
EndOfCombat("End of Combat", "EC"),
SecondMain("Second Main", "M2"),
EndOfTurn("End of Turn", "ET"),
Cleanup("Cleanup", "CU");
Mulligan("MU"),
Untap("UT"),
Upkeep("UP"),
Draw("DR"),
FirstMain("M1"),
BeginOfCombat("BC"),
DeclareAttackers("DA"),
DeclareBlockers("DB"),
CombatDamage("CD"),
EndOfCombat("EC"),
SecondMain("M2"),
EndOfTurn("ET"),
Cleanup("CU");
private final String name;
private final String abbreviation;
private MagicPhaseType(final String name, final String abbreviation) {
this.name = name;
private MagicPhaseType(final String abbreviation) {
this.abbreviation = abbreviation;
}
public String getName() {
return name;
}
public boolean isMain() {
return this == FirstMain ||
this == SecondMain;

34
src/magic/ui/widget/duel/viewer/PhaseStepViewer.java
View File

@ -2,6 +2,8 @@ package magic.ui.widget.duel.viewer;
import java.awt.Color;
import java.awt.Font;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
@ -27,6 +29,23 @@ public class PhaseStepViewer extends JPanel {
private static final String _S11 = "Ending Phase : End of Turn Step";
private static final String _S12 = "Ending Phase : Clean Up Step";
// use a LinkedHashMap to retain insertion order.
private static final Map<MagicPhaseType, String> phasesMap = new LinkedHashMap<>();
static {
phasesMap.put(MagicPhaseType.Untap, _S1);
phasesMap.put(MagicPhaseType.Upkeep, _S2);
phasesMap.put(MagicPhaseType.Draw, _S3);
phasesMap.put(MagicPhaseType.FirstMain, _S4);
phasesMap.put(MagicPhaseType.BeginOfCombat, _S5);
phasesMap.put(MagicPhaseType.DeclareAttackers, _S6);
phasesMap.put(MagicPhaseType.DeclareBlockers, _S7);
phasesMap.put(MagicPhaseType.CombatDamage, _S8);
phasesMap.put(MagicPhaseType.EndOfCombat, _S9);
phasesMap.put(MagicPhaseType.SecondMain, _S10);
phasesMap.put(MagicPhaseType.EndOfTurn, _S11);
phasesMap.put(MagicPhaseType.Cleanup, _S12);
}
private static final Color COLOR_ON = MagicStyle.getRolloverColor();
private static final Color COLOR_OFF = Color.LIGHT_GRAY;
private static final Font FONT_ON = new Font("dialog", Font.BOLD, 12);
@ -41,18 +60,9 @@ public class PhaseStepViewer extends JPanel {
private void setMyLayout() {
setLayout(new MigLayout("insets 1 5 0 5, gap 0"));
setPhaseStepIndicator("UN", MText.get(_S1));
setPhaseStepIndicator("UP", MText.get(_S2));
setPhaseStepIndicator("DR", MText.get(_S3));
setPhaseStepIndicator("M1", MText.get(_S4));
setPhaseStepIndicator("BC", MText.get(_S5));
setPhaseStepIndicator("DA", MText.get(_S6));
setPhaseStepIndicator("DB", MText.get(_S7));
setPhaseStepIndicator("CD", MText.get(_S8));
setPhaseStepIndicator("EC", MText.get(_S9));
setPhaseStepIndicator("M2", MText.get(_S10));
setPhaseStepIndicator("ET", MText.get(_S11));
setPhaseStepIndicator("CU", MText.get(_S12));
for (MagicPhaseType phase : phasesMap.keySet()) {
setPhaseStepIndicator(phase.getAbbreviation(), MText.get(phasesMap.get(phase)));
}
}
private void setPhaseStep(int index) {