External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[TPR] Added Dracoplasm.

Browse source
This commit is contained in:
LevelX2 2015-04-09 18:09:05 +02:00
parent d0900ebf6f
commit 7292a1625c
7 changed files with 251 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -64,7 +64,6 @@ public class FeedbackPanel extends javax.swing.JPanel {
INFORM, QUESTION, CONFIRM, CANCEL, SELECT, END
}
private boolean selected = false;
private UUID gameId;
private Session session;
private FeedbackMode mode;
@ -96,7 +95,6 @@ public class FeedbackPanel extends javax.swing.JPanel {
this.lblMessage.setText(message);
this.helper.setMessage(message);
this.selected = false;
this.mode = mode;
switch (this.mode) {
case INFORM:
@ -270,7 +268,6 @@ public class FeedbackPanel extends javax.swing.JPanel {
}
private void btnRightActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRightActionPerformed
this.selected = true;
if (connectedDialog != null) {
connectedDialog.removeDialog();
connectedDialog = null;
@ -289,7 +286,6 @@ public class FeedbackPanel extends javax.swing.JPanel {
}//GEN-LAST:event_btnRightActionPerformed
private void btnLeftActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLeftActionPerformed
this.selected = true;
session.sendPlayerBoolean(gameId, true);
AudioManager.playButtonCancel();
}//GEN-LAST:event_btnLeftActionPerformed

48
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -602,8 +602,8 @@ public final class GamePanel extends javax.swing.JPanel {
if (game.getStep() != null) {
updatePhases(game.getStep());
this.txtStep.setText(game.getStep().toString());
}
else {
} else {
logger.debug("Step is empty");
this.txtStep.setText("");
}
if (game.getSpellsCastCurrentTurn() > 0 && PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_SHOW_STORM_COUNTER, "true").equals("true")) {
@ -749,18 +749,40 @@ public final class GamePanel extends javax.swing.JPanel {
currentStep.setLocation(prevPoint);
}
switch (step) {
case UNTAP: updateButton("Untap"); break;
case UPKEEP: updateButton("Upkeep"); break;
case DRAW: updateButton("Draw"); break;
case PRECOMBAT_MAIN: updateButton("Main1"); break;
case BEGIN_COMBAT: updateButton("Combat_Start"); break;
case DECLARE_ATTACKERS: updateButton("Combat_Attack"); break;
case DECLARE_BLOCKERS: updateButton("Combat_Block"); break;
case UNTAP:
updateButton("Untap");
break;
case UPKEEP:
updateButton("Upkeep");
break;
case DRAW:
updateButton("Draw");
break;
case PRECOMBAT_MAIN:
updateButton("Main1");
break;
case BEGIN_COMBAT:
updateButton("Combat_Start");
break;
case DECLARE_ATTACKERS:
updateButton("Combat_Attack");
break;
case DECLARE_BLOCKERS:
updateButton("Combat_Block");
break;
case FIRST_COMBAT_DAMAGE:
case COMBAT_DAMAGE: updateButton("Combat_Damage"); break;
case END_COMBAT: updateButton("Combat_End"); break;
case POSTCOMBAT_MAIN: updateButton("Main2"); break;
case END_TURN: updateButton("Cleanup"); break;
case COMBAT_DAMAGE:
updateButton("Combat_Damage");
break;
case END_COMBAT:
updateButton("Combat_End");
break;
case POSTCOMBAT_MAIN:
updateButton("Main2");
break;
case END_TURN:
updateButton("Cleanup");
break;
}
}