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

Merge branch 'master' into 'master'

Browse Source 
Prepare for release

See merge request core-developers/forge!4130
This commit is contained in:
Michael Kamensky
2021-03-07 04:48:09 +00:00
parent 8cff34e488 4ca125e0b6
commit 668e2834bc
3 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
View File

@@ -1550,7 +1550,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
} else {
if (!sa.hasParam("Mandatory") && origin.contains(ZoneType.Battlefield) && sa.hasParam("ChangeNum")) {
// exclude tokens, they won't come back, and enchanted stuff, since auras will go away
fetchList = prefilterListForBounceAnyNum(fetchList, decider);
fetchList = prefilterOwnListForBounceAnyNum(fetchList, decider);
if (fetchList.isEmpty()) {
return null;
}
@@ -1624,7 +1624,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
return c;
}
private static CardCollection prefilterListForBounceAnyNum(CardCollection fetchList, Player decider) {
private static CardCollection prefilterOwnListForBounceAnyNum(CardCollection fetchList, Player decider) {
fetchList = CardLists.filter(fetchList, new Predicate<Card>() {
@Override
public boolean apply(final Card card) {

36
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
View File

@@ -1,24 +1,5 @@
package forge.itemmanager.views;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseWheelEvent;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JViewport;
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingUtilities;
import forge.ImageCache;
import forge.assets.FSkinProp;
import forge.card.ColorSet;
@@ -29,12 +10,7 @@ import forge.gui.framework.ILocalRepaint;
import forge.item.IPaperCard;
import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.itemmanager.ColumnDef;
import forge.itemmanager.GroupDef;
import forge.itemmanager.ItemManager;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.ItemManagerModel;
import forge.itemmanager.SItemManagerUtil;
import forge.itemmanager.*;
import forge.model.FModel;
import forge.properties.ForgePreferences;
import forge.screens.deckeditor.CDeckEditorUI;
@@ -48,7 +24,15 @@ import forge.util.ImageUtil;
import forge.util.Localizer;
import forge.view.arcane.CardPanel;
import static forge.ImageCache.getCroppedArt;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
public class ImageView<T extends InventoryItem> extends ItemView<T> {
private static final int PADDING = 5;

2
forge-gui/release-files/ANNOUNCEMENTS.txt
View File

@@ -3,7 +3,7 @@ Get in the discord if you aren't yet.
The game is now translated into Japanese (not all the messages are translated yet).
Mutate is now fully implemented.
The game now supports an assortment of silver-bordered cards from Unhinged, Unglued, Unstable, and other similar sets.
There are new Net Deck categories - the Standard, Modern, and Pioneer archives.
There are new Net Deck categories - the Standard, Modern, Pioneer, Legacy, and Vintage archives.
Draft cubes have been updated to account for the newly supported cards, MTGO Vintage December 2020 cube was added.
New Possibility Storm puzzles were added to the Puzzle Mode (IKO/M21/ZNR/KHM), including puzzles that utilize Mutate.
Planar Conquest now has a new plane accessible - Eldraine.