Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

new feature: Emblem Cards #10498

Merged
merged 21 commits into from
Sep 27, 2023
Merged

new feature: Emblem Cards #10498

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5e39e13
new feature: Emblem Cards
artemiswkearney Jun 20, 2023
a842dc8
fixes
artemiswkearney Jun 20, 2023
bd71a12
defaults for emblem cards in match options (fixes quick game buttons)
artemiswkearney Jun 20, 2023
3267967
merge master; move emblem cards to CustomOptions
artemiswkearney Aug 9, 2023
0022814
minor fixes
artemiswkearney Aug 9, 2023
08d7426
use DeckCardInfo instead of Card for emblem cards options
artemiswkearney Aug 12, 2023
303327b
restore accessible parent properties
artemiswkearney Aug 12, 2023
03f72c8
fix images for card emblems
artemiswkearney Aug 12, 2023
ff65b26
look up cards in a way that preserves which art
artemiswkearney Aug 12, 2023
ca8236f
Merge branch 'master' into CustomEmblems
artemiswkearney Aug 12, 2023
583850e
fix typos; make Emblem.sourceObject protected
artemiswkearney Aug 12, 2023
090c662
add descriptions to planechase and emblem cards
artemiswkearney Aug 12, 2023
2b63615
Merge branch 'master' into CustomEmblems
artemiswkearney Aug 29, 2023
ad605eb
fixes
artemiswkearney Sep 18, 2023
2a35d9c
Merge branch 'master' into CustomEmblems
artemiswkearney Sep 20, 2023
10aa6e8
add some unit tests for known working cards
artemiswkearney Sep 20, 2023
21f02bc
fix author name
artemiswkearney Sep 20, 2023
3b41d12
add explanation comment
artemiswkearney Sep 20, 2023
5048ec8
fix up tests
artemiswkearney Sep 20, 2023
5c2ee31
copyWithZone: no longer modifies zone for singleton abilities
artemiswkearney Sep 20, 2023
8e38bb7
directly check for MageSingleton
artemiswkearney Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
88 changes: 82 additions & 6 deletions Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Component id="lblSettings" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -110,7 +110,7 @@
<Component id="btnCancel" min="-2" pref="100" max="-2" attributes="0"/>
</Group>
<Component id="jSeparator2" alignment="1" max="32767" attributes="0"/>
<Component id="player1Panel" alignment="0" pref="863" max="32767" attributes="0"/>
<Component id="player1Panel" alignment="0" pref="940" max="32767" attributes="0"/>
<Component id="pnlOtherPlayers" alignment="1" max="32767" attributes="0"/>
<Component id="jSeparator1" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
Expand Down Expand Up @@ -208,13 +208,28 @@
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="chkEmblemCards" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="lblEmblemCardsPerPlayer" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="txtEmblemCardsPerPlayer" max="32767" attributes="2"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="btnEmblemCardsPerPlayer" min="-2" pref="24" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblEmblemCardsStartingPlayer" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="txtEmblemCardsStartingPlayer" max="32767" attributes="2"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="btnEmblemCardsStartingPlayer" min="-2" pref="24" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
<Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jSeparator3" pref="863" max="32767" attributes="0"/>
<Component id="jSeparator3" pref="940" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
Expand Down Expand Up @@ -296,6 +311,16 @@
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="txtEmblemCardsStartingPlayer" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btnEmblemCardsStartingPlayer" alignment="3" min="-2" pref="21" max="-2" attributes="0"/>
<Component id="lblEmblemCardsStartingPlayer" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="txtEmblemCardsPerPlayer" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btnEmblemCardsPerPlayer" alignment="3" min="-2" pref="21" max="-2" attributes="0"/>
<Component id="lblEmblemCardsPerPlayer" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="chkEmblemCards" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
<Component id="jSeparator2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -305,7 +330,7 @@
<EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="pnlOtherPlayers" pref="94" max="32767" attributes="0"/>
<Component id="pnlOtherPlayers" pref="41" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="9" max="-2" attributes="0"/>
<Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -322,7 +347,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="201" max="-2" attributes="0"/>
<Component id="jSeparator3" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="180" max="32767" attributes="0"/>
<EmptySpace pref="184" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
Expand Down Expand Up @@ -476,6 +501,57 @@
</Component>
<Component class="javax.swing.JSpinner" name="spnNumWins">
</Component>
<Component class="javax.swing.JCheckBox" name="chkEmblemCards">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="11" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Emblem Cards - "/>
<Property name="toolTipText" type="java.lang.String" value="If enabled, select cards to give players emblem copies of"/>
<Property name="actionCommand" type="java.lang.String" value="Emblem Cards - "/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkEmblemCardsActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="lblEmblemCardsPerPlayer">
<Properties>
<Property name="text" type="java.lang.String" value="Per-Player File"/>
<Property name="toolTipText" type="java.lang.String" value="An emblem of each card in this file is given to each player"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="txtEmblemCardsPerPlayer">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtEmblemCardsPerPlayerActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="btnEmblemCardsPerPlayer">
<Properties>
<Property name="text" type="java.lang.String" value="..."/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnEmblemCardsPerPlayerActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="lblEmblemCardsStartingPlayer">
<Properties>
<Property name="text" type="java.lang.String" value="Starting Player File"/>
<Property name="toolTipText" type="java.lang.String" value="An emblem of every card in this file is given to the starting player (useful for symmetric effects)"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="txtEmblemCardsStartingPlayer">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtEmblemCardsStartingPlayerActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="btnEmblemCardsStartingPlayer">
<Properties>
<Property name="text" type="java.lang.String" value="..."/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnEmblemCardsStartingPlayerActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JSeparator" name="jSeparator2">
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
Expand Down