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

[LTR] Add Goldberry, River-Daughter (#10524)

Browse source 
* Added Goldberry

* Slight optimizaztion

* Happy Path Test

* More unhappy tests

* Sanity check for Goldberry's counter choices

* Updated player.getMultiAmount to support individual constraints

* Some cleanup

Also modified ResourcefulDefense to use new multi amount api

* Updated logging

* Added hint for number of counters

* Fixed issue with Resourceful Defense

* Improvements to defaults

Default list will properly make sure to stay within individual maximums
If a player is asked for a choice that isn't actually a choice because each choice's min and max are equal, instead the default response is immediately returned. This helps with situations like moving a counter off of Goldberry when she only has one counter on her.

* -1/-1 Counter test

* Fixed issue with -1/-1 counters

* Adjusted dialog to properly enforce constraints
This commit is contained in:
Alexander Novotny 2023-07-28 21:29:40 -04:00 • committed by GitHub
parent fe1efef25b
commit a36a7d9b7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 678 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage.Client/src/main/java/mage/client/dialog/PickMultiNumberDialog.java
View file

@ -1,6 +1,8 @@
package mage.client.dialog;
import mage.constants.ColoredManaSymbol;
import mage.util.MultiAmountMessage;
import org.mage.card.arcane.ManaSymbols;
import javax.swing.*;
@ -25,7 +27,7 @@ public class PickMultiNumberDialog extends MageDialog {
this.setModal(true);
}
public void showDialog(List<String> messages, int min, int max, Map<String, Serializable> options) {
public void showDialog(List<MultiAmountMessage> messages, int min, int max, Map<String, Serializable> options) {
this.header.setText((String) options.get("header"));
this.header.setHorizontalAlignment(SwingConstants.CENTER);
this.setTitle((String) options.get("title"));
@ -51,7 +53,7 @@ public class PickMultiNumberDialog extends MageDialog {
// mana mode
String manaText = null;
String input = messages.get(i);
String input = messages.get(i).message;
switch (input) {
case "W":
manaText = ColoredManaSymbol.W.getColorHtmlName();
@ -87,13 +89,13 @@ public class PickMultiNumberDialog extends MageDialog {
labelList.add(label);
JSpinner spinner = new JSpinner();
spinner.setModel(new SpinnerNumberModel(0, 0, max, 1));
spinner.setModel(new SpinnerNumberModel(0, messages.get(i).min, messages.get(i).max, 1));
spinnerC.weightx = 0.5;
spinnerC.gridx = 1;
spinnerC.gridy = i;
spinnerC.ipadx = 20;
spinner.addChangeListener(e -> {
updateControls(min, max);
updateControls(min, max, messages);
});
jPanel1.add(spinner, spinnerC);
spinnerList.add(spinner);
@ -101,20 +103,28 @@ public class PickMultiNumberDialog extends MageDialog {
this.counterText.setText("0 out of 0");
this.counterText.setHorizontalAlignment(SwingConstants.CENTER);
updateControls(min, max);
updateControls(min, max, messages);
this.pack();
this.makeWindowCentered();
this.setVisible(true);
}
private void updateControls(int min, int max) {
private void updateControls(int min, int max, List<MultiAmountMessage> messages) {
int totalChosenAmount = 0;
for (JSpinner jSpinner : spinnerList) {
totalChosenAmount += ((Number) jSpinner.getValue()).intValue();
boolean chooseEnabled = true;
for (int i = 0; i < spinnerList.size(); i++) {
JSpinner jSpinner = spinnerList.get(i);
int value = ((Number) jSpinner.getValue()).intValue();
totalChosenAmount += value;
chooseEnabled &= value >= messages.get(i).min && value <= messages.get(i).max;
}
counterText.setText(totalChosenAmount + " out of " + max);
chooseButton.setEnabled(totalChosenAmount >= min && totalChosenAmount <= max);
chooseEnabled &= totalChosenAmount >= min && totalChosenAmount <= max;
chooseButton.setEnabled(chooseEnabled);
}
public String getMultiAmount() {

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

@ -28,6 +28,7 @@ import mage.constants.*;
import mage.game.events.PlayerQueryEvent;
import mage.players.PlayableObjectStats;
import mage.players.PlayableObjectsList;
import mage.util.MultiAmountMessage;
import mage.view.*;
import org.apache.log4j.Logger;
import org.mage.plugins.card.utils.impl.ImageManagerImpl;
@ -1774,7 +1775,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
}
public void getMultiAmount(List<String> messages, GameView gameView, Map<String, Serializable> options, int min, int max) {
public void getMultiAmount(List<MultiAmountMessage> messages, GameView gameView, Map<String, Serializable> options,
int min, int max) {
updateGame(gameView, false, options, null);
hideAll();
DialogManager.getManager(gameId).fadeOut();