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

Merge branch 'Card-Forge:master' into XIRAA

Browse Source
This commit is contained in:
Simisays
2023-03-14 20:35:35 +01:00
committed by GitHub
parent 087b699bed 50e46a176b
commit 4f02e2e18e
61 changed files with 368 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
View File

@@ -65,7 +65,8 @@ public class DamageDealAi extends DamageAiBase {
return SpecialCardAi.SarkhanTheMad.considerDig(ai, sa);
}
if (damage.equals("X") && sa.getSVar(damage).equals("Count$ChosenNumber")) {
if (damage.equals("X")) {
if (sa.getSVar(damage).equals("Count$ChosenNumber")) {
int energy = ai.getCounters(CounterEnumType.ENERGY);
for (SpellAbility s : source.getSpellAbilities()) {
if ("PayEnergy".equals(s.getParam("AILogic"))) {
@@ -85,7 +86,6 @@ public class DamageDealAi extends DamageAiBase {
}
return false;
}
if (damage.equals("X")) {
if (sa.getSVar(damage).equals("Count$xPaid")) {
// Life Drain
if ("XLifeDrain".equals(logic)) {
@@ -111,7 +111,7 @@ public class DamageDealAi extends DamageAiBase {
final String damage = sa.getParam("NumDmg");
int dmg = AbilityUtils.calculateAmount(source, damage, sa);
if (damage.equals("X")) {
if (damage.equals("X") || sourceName.equals("Crater's Claws")) {
if (sa.getSVar(damage).equals("Count$xPaid") || sourceName.equals("Crater's Claws")) {
dmg = ComputerUtilCost.getMaxXValue(sa, ai, sa.isTrigger());
@@ -542,13 +542,6 @@ public class DamageDealAi extends DamageAiBase {
sa.getTargets().add(enemy);
}
return true;
} else if ("DamageAfterPutCounter".equals(logic)
&& sa.getParent() != null
&& "P1P1".equals(sa.getParent().getParam("CounterType"))) {
// assuming the SA parent is of PutCounter type. Perhaps it's possible to predict counter multipliers here somehow?
final String amountStr = sa.getParent().getParamOrDefault("CounterNum", "1");
final int amount = AbilityUtils.calculateAmount(source, amountStr, sa);
dmg += amount;
}
// AssumeAtLeastOneTarget is used for cards with funky targeting implementation like Fight with Fire which would
@@ -557,11 +550,7 @@ public class DamageDealAi extends DamageAiBase {
return false;
}
immediately = immediately || ComputerUtil.playImmediately(ai, sa);
if (!(sa.getParent() != null && sa.getParent().isTargetNumberValid())) {
sa.resetTargets();
}
// target loop
TargetChoices tcs = sa.getTargets();
@@ -622,6 +611,8 @@ public class DamageDealAi extends DamageAiBase {
}
}
immediately = immediately || ComputerUtil.playImmediately(ai, sa);
int totalTargetedSoFar = -1;
while (sa.canAddMoreTarget()) {
if (totalTargetedSoFar == tcs.size()) {

2
forge-game/src/main/java/forge/game/card/CounterEnumType.java
View File

@@ -61,6 +61,8 @@ public enum CounterEnumType {
BRICK("BRICK", 226, 192, 164),
BURDEN("BURDEN", 135, 62, 35),
CAGE("CAGE", 155, 155, 155),
CARRION("CRRON", 255, 163, 222),

5
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -208,7 +208,10 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
for (SpellAbility sa : sas) {
// reset in case a trigger stopped it on a previous activation
sa.setUndoable(true);
undoStack.remove(undoStack.lastIndexOf(sa));
int idx = undoStack.lastIndexOf(sa);
if (idx != -1) {
undoStack.remove(idx);
}
}
if (undoStack.isEmpty()) {
undoStackOwner = null;

24
forge-gui-mobile/src/forge/adventure/stage/MapStage.java
View File

@@ -42,6 +42,7 @@ import forge.adventure.world.WorldSave;
import forge.assets.FImageComplex;
import forge.assets.FSkinImage;
import forge.card.CardRenderer;
import forge.card.ColorSet;
import forge.deck.Deck;
import forge.deck.DeckProxy;
import forge.game.GameType;
@@ -280,28 +281,29 @@ public class MapStage extends GameStage {
FImageComplex cardArt = CardRenderer.getCardArt(dp.getHighestCMCCard());
if (cardArt != null) {
Image art = new Image(cardArt.getTextureRegion());
art.setWidth(50);
art.setHeight(40);
art.setPosition(8, 40);
art.setWidth(58);
art.setHeight(46);
art.setPosition(25, 43);
Image image = new Image(FSkinImage.ADV_DECKBOX.getTextureRegion());
image.setWidth(59);
image.setWidth(60);
image.setHeight(80);
image.setPosition(4, 7);
TypingLabel deckColors = Controls.newTypingLabel(Controls.colorIdToTypingString(DeckProxy.getColorIdentity(deck), true).toUpperCase());
image.setPosition(24, 10);
ColorSet colorSet = DeckProxy.getColorIdentity(deck);
TypingLabel deckColors = Controls.newTypingLabel(Controls.colorIdToTypingString(colorSet, true).toUpperCase());
deckColors.skipToTheEnd();
deckColors.setAlignment(Align.left);
deckColors.setPosition(58, 40);
deckColors.setAlignment(Align.center);
deckColors.setPosition(14, 44);
TextraLabel deckname = Controls.newTextraLabel(deck.getName());
deckname.setAlignment(Align.center);
deckname.setWrap(true);
deckname.setWidth(70);
deckname.setPosition(0, 30);
deckname.setWidth(80);
deckname.setPosition(14, 28);
Group group = new Group();
group.addActor(art);
group.addActor(image);
group.addActor(deckColors);
group.addActor(deckname);
dialog.getContentTable().add(group).height(100).width(65).center();
dialog.getContentTable().add(group).height(100).width(100).center();
dialog.getContentTable().add().row();
} else {
TypingLabel label = Controls.newTypingLabel("[%125]"+Controls.colorIdToTypingString(DeckProxy.getColorIdentity(deck)).toUpperCase()+"\n[%]"+deck.getName());

157
forge-gui-mobile/src/forge/adventure/util/MapDialog.java
View File

@@ -1,5 +1,8 @@
package forge.adventure.util;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
@@ -16,8 +19,9 @@ import forge.adventure.stage.MapStage;
import forge.card.ColorSet;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
import forge.sound.AudioClip;
import forge.sound.SoundSystem;
import forge.util.Localizer;
import org.apache.commons.lang3.tuple.Pair;
/**
* MapDialog
@@ -45,8 +49,7 @@ public class MapDialog {
public MapDialog(String S, MapStage stage, int parentID) {
this.stage = stage;
this.parentID = parentID;
try
{
try {
if (S.isEmpty()) {
System.err.print("Dialog error. Dialog property is empty.\n");
@@ -54,31 +57,80 @@ public class MapDialog {
return;
}
this.data = JSONStringLoader.parse(Array.class, DialogData.class, S, defaultJSON);
}
catch (Exception exception)
{
} catch (Exception exception) {
exception.printStackTrace();
}
}
static AudioClip audio=null;
Pair<FileHandle, Music> audio = null;
float fade = 1f;
void unload() {
if (audio != null) {
audio.getRight().setOnCompletionListener(null);
audio.getRight().stop();
Forge.getAssets().manager().unload(audio.getLeft().path());
audio = null;
}
}
void disposeAudio() {
disposeAudio(false);
}
void disposeAudio(boolean fadeout) {
if (fadeout) {
final float[] v = {1f};
for (int i = 10; i > 1; i--) {
float delay = i * 0.1f;
float j = i;
Timer.schedule(new Timer.Task() {
@Override
public void run() {
v[0] -= 0.1f;
if (v[0] < 0.1f)
v[0] = 0.1f;
if (audio != null && j == 2) {
unload();
} else if (audio != null && j == 10) {
audio.getRight().setVolume(v[0]);
}
}
}, delay);
}
} else {
unload();
}
}
private void loadDialog(DialogData dialog) { //Displays a dialog with dialogue and possible choices.
setEffects(dialog.action);
Dialog D = stage.getDialog();
Localizer L = Forge.getLocalizer();
D.getContentTable().clear(); D.getButtonTable().clear(); //Clear tables to start fresh.
D.getContentTable().clear();
D.getButtonTable().clear(); //Clear tables to start fresh.
D.clearListeners();
String text; //Check for localized string (locname), otherwise print text.
if (dialog.loctext != null && !dialog.loctext.isEmpty()) text = L.getMessage(dialog.loctext);
else text = dialog.text;
if(audio!=null)
audio.stop();
if(dialog.voiceFile!=null)
{
audio = AudioClip.createClip(Config.instance().getFilePath(dialog.voiceFile));
if(audio!=null)
audio.play(FModel.getPreferences().getPrefInt(ForgePreferences.FPref.UI_VOL_SOUNDS)/100f);
disposeAudio();
if (dialog.voiceFile != null) {
FileHandle file = Gdx.files.absolute(Config.instance().getFilePath(dialog.voiceFile));
if (file.exists()) {
audio = Pair.of(file, Forge.getAssets().getMusic(file));
}
if (audio != null) {
int vol = FModel.getPreferences().getPrefInt(ForgePreferences.FPref.UI_VOL_MUSIC);
if (vol > 0) {
fadeOut();
audio.getRight().play();
}
} else {
fadeIn();
}
} else {
fadeIn();
}
TypingLabel A = Controls.newTypingLabel(text);
A.setWrap(true);
@@ -127,12 +179,44 @@ public class MapDialog {
stage.hideDialog();
else
stage.showDialog();
}
else {
} else {
stage.hideDialog();
}
}
void fadeIn() {
disposeAudio(true);
if (fade >= 1f)
return;
for (int i = 10; i > 1; i--) {
float delay = i * 0.1f;
Timer.schedule(new Timer.Task() {
@Override
public void run() {
fade += 0.1f;
if (fade > 1f)
fade = 1f;
SoundSystem.instance.fadeModifier(fade);
}
}, delay);
}
}
void fadeOut() {
for (int i = 10; i > 1; i--) {
float delay = i * 0.1f;
Timer.schedule(new Timer.Task() {
@Override
public void run() {
fade -= 0.1f;
if (fade < 0.1f)
fade = 0.1f;
SoundSystem.instance.fadeModifier(fade);
}
}, delay);
}
}
public void activate() { //Method for actors to show their dialogues.
for (DialogData dialog : data) {
if (isConditionOk(dialog.condition)) {
@@ -211,8 +295,7 @@ public class MapDialog {
} else if (condition.not) return false;
}
if (condition.colorIdentity != null && !condition.colorIdentity.isEmpty()) { //Check for player's color ID.
if(player.getColorIdentity().hasAllColors(ColorSet.fromNames(condition.colorIdentity.toCharArray()).getColor()))
{
if (player.getColorIdentity().hasAllColors(ColorSet.fromNames(condition.colorIdentity.toCharArray()).getColor())) {
if (!condition.not) return false;
} else if (condition.not) return false;
}
@@ -242,8 +325,11 @@ public class MapDialog {
int val = condition.getQuestFlag.val;
int QF = player.getQuestFlag(key);
if (!player.checkQuestFlag(key)) return false; //If the quest is not ongoing, stop.
if(!checkFlagCondition(QF, cond, val)) { if(!condition.not) return false; }
else { if(condition.not) return false; }
if (!checkFlagCondition(QF, cond, val)) {
if (!condition.not) return false;
} else {
if (condition.not) return false;
}
}
if (condition.checkQuestFlag != null && !condition.checkQuestFlag.isEmpty()) {
if (!player.checkQuestFlag(condition.checkQuestFlag)) {
@@ -256,8 +342,11 @@ public class MapDialog {
int val = condition.getMapFlag.val;
int QF = stage.getQuestFlag(key);
if (!stage.checkQuestFlag(key)) return false; //If the quest is not ongoing, stop.
if(!checkFlagCondition(QF, cond, val)) { if(!condition.not) return false; }
else { if(condition.not) return false; }
if (!checkFlagCondition(QF, cond, val)) {
if (!condition.not) return false;
} else {
if (condition.not) return false;
}
}
if (condition.checkMapFlag != null && !condition.checkMapFlag.isEmpty()) {
if (!stage.checkQuestFlag(condition.checkMapFlag)) {
@@ -267,14 +356,26 @@ public class MapDialog {
}
return true;
}
private boolean checkFlagCondition(int flag, String condition, int value) {
switch (condition.toUpperCase()) {
default: case "EQUALS": case"EQUAL": case "=":
default:
case "EQUALS":
case "EQUAL":
case "=":
if (flag == value) return true;
case "LESSTHAN": case "<": if(flag < value) return true;
case "MORETHAN": case ">": if(flag > value) return true;
case "LE_THAN": case "<=": if(flag <= value) return true;
case "ME_THAN": case ">=": if(flag >= value) return true;
case "LESSTHAN":
case "<":
if (flag < value) return true;
case "MORETHAN":
case ">":
if (flag > value) return true;
case "LE_THAN":
case "<=":
if (flag <= value) return true;
case "ME_THAN":
case ">=":
if (flag >= value) return true;
}
return false;
}

4
forge-gui-mobile/src/forge/assets/FSkin.java
View File

@@ -35,7 +35,7 @@ public class FSkin {
public static Texture getLogo() {
if (Forge.isMobileAdventureMode)
return Forge.getAssets().getTexture(getDefaultSkinFile("adv_logo.png"));
return Forge.getAssets().getTexture(getSkinFile("hd_logo.png"));
return Forge.getAssets().getTexture(getSkinFile("hd_logo.png"), false);
}
public static void changeSkin(final String skinName) {
@@ -150,7 +150,7 @@ public class FSkin {
Forge.getAssets().loadTexture(f2);
splashScreen.setSplashTexture(new TextureRegion(Forge.getAssets().getTexture(f2)));
} else {
splashScreen.setSplashTexture(new TextureRegion(Forge.getAssets().getTexture(f2), 0, 0, w, h - 100));
splashScreen.setSplashTexture(new TextureRegion(Forge.getAssets().getTexture(f), 0, 0, w, h - 100));
}
}
Pixmap pxSplash = new Pixmap(f);

4
forge-gui-mobile/src/forge/assets/FSkinTexture.java
View File

@@ -202,7 +202,8 @@ public enum FSkinTexture implements FImage {
FileHandle preferredFile = isPlanechaseBG ? FSkin.getCachePlanechaseFile(filename) : FSkin.getSkinFile(filename);
if (preferredFile.exists()) {
try {
texture = Forge.getAssets().getTexture(preferredFile);
texture = Forge.getAssets().getTexture(preferredFile, false);
if (texture != null)
isloaded = true;
}
catch (final Exception e) {
@@ -242,6 +243,7 @@ public enum FSkinTexture implements FImage {
}
}
if (repeat) {
if (texture != null)
texture.setWrap(TextureWrap.Repeat, TextureWrap.Repeat);
}
}

4
forge-gui/res/cardsfolder/d/domris_ambush.txt
View File

@@ -1,8 +1,8 @@
Name:Domri's Ambush
ManaCost:R G
Types:Sorcery
A:SP$ PutCounter | Cost$ R G | ValidTgts$ Creature.YouCtrl | CounterType$ P1P1 | TgtPrompt$ Select target creature you control to put a +1/+1 counter | SubAbility$ DBDamage | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature deals damage equal to its power to target creature or planeswalker you don't control.
SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | TgtPrompt$ Select target creature or planeswalker you don't control | NumDmg$ X | DamageSource$ ParentTarget | AILogic$ DamageAfterPutCounter
A:SP$ PutCounter | Cost$ R G | ValidTgts$ Creature.YouCtrl | CounterType$ P1P1 | TgtPrompt$ Select target creature you control to put a +1/+1 counter | SubAbility$ DBDamage | AILogic$ PowerDmg | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature deals damage equal to its power to target creature or planeswalker you don't control.
SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | TgtPrompt$ Select target creature or planeswalker you don't control | NumDmg$ X | DamageSource$ ParentTarget | AILogic$ PowerDmg
SVar:X:ParentTargeted$CardPower
DeckHas:Ability$Counters
Oracle:Put a +1/+1 counter on target creature you control. Then that creature deals damage equal to its power to target creature or planeswalker you don't control.

2
forge-gui/res/cardsfolder/t/tawnoss_tinkering.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 G
Types:Instant
A:SP$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | ValidTgts$ Artifact.YouCtrl,Creature.YouCtrl,Land.YouCtrl | TgtPrompt$ Select target artifact, creature, or land you control | SubAbility$ DBUntap | SpellDescription$ Put two +1/+1 counters on target artifact, creature, or land you control.
SVar:DBUntap:DB$ Untap | Defined$ Targeted | SubAbility$ DBAnimate | SpellDescription$ Untap that permanent.
SVar:DBAnimate:DB$ Animate | Defined$ Targeted | ConditionDefined$ Targeted | ConditionPresent$ Card.nonCreature | Power$ 0 | Toughness$ 0 | Types$ Creature | StackDescription$ SpellDescription | SpellDescription$ If it isn't a creature, it becomes a 0/0 creature in addition to its other types.
SVar:DBAnimate:DB$ Animate | Defined$ Targeted | ConditionDefined$ Targeted | ConditionPresent$ Card.nonCreature | Power$ 0 | Toughness$ 0 | Types$ Creature | Duration$ Permanent | StackDescription$ SpellDescription | SpellDescription$ If it isn't a creature, it becomes a 0/0 creature in addition to its other types.
DeckHas:Ability$Counters
DeckHints:Type$Artifact
Oracle:Put two +1/+1 counters on target artifact, creature, or land you control. Untap that permanent. If it isn't a creature, it becomes a 0/0 creature in addition to its other types.

12
forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Gandalf the Grey
ManaCost:3 U R
Types:Legendary Creature Avatar Wizard
PT:3/4
T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCharm | TriggerDescription$ Whenever you cast an instant or sorcery spell, ABILITY
SVar:TrigCharm:DB$ Charm | Choices$ DBTapUntap,DBDamage,DBCopy,DBChangeZone | ChoiceRestriction$ ThisGame | CharmNum$ 1
SVar:DBTapUntap:DB$ TapOrUntap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap or untap | SpellDescription$ You may tap or untap target permanent.
SVar:DBDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to each opponent.
SVar:DBCopy:DB$ CopySpellAbility | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TgtPrompt$ Select target instant or sorcery spell you control | MayChooseTarget$ True | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy.
SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put NICKNAME on top of its owner's library.
DeckNeeds:Type$Instant|Sorcery
Oracle:Whenever you cast an instant or sorcery spell, choose one that hasn't been chosen —\n• You may tap or untap target permanent.\n• Gandalf the Grey deals 3 damage to each opponent.\n• Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n• Put Gandalf on top of its owner's library.

12
forge-gui/res/cardsfolder/upcoming/the_one_ring.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:The One Ring
ManaCost:4
Types:Legendary Artifact
K:Indestructible
T:Mode$ ChangesZone | ValidCard$ Card.wasCastByYou+Self | Destination$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, you gain protection from everything until your next turn.
SVar:TrigPump:DB$ Pump | Defined$ You | Duration$ UntilYourNextTurn | KW$ Protection from everything
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you lose 1 life for each burden counter on CARDNAME.
SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ X
A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ BURDEN | CounterNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Put a burden counter on CARDNAME, then draw a card for each burden counter on CARDNAME.
SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
SVar:X:Count$CardCounters.BURDEN
Oracle:Indestructible\nWhen The One Ring enters the battlefield, if you cast it, you gain protection from everything until your next turn.\nAt the beginning of your upkeep, you lose 1 life for each burden counter on The One Ring.\n{T}: Put a burden coutner on The One Ring, then draw a card for each burden counter on The One Ring.

16
forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt Normal file
View File

@@ -0,0 +1,16 @@
[metadata]
Code=LTR
Date=2023-06-23
Name=The Lord of the Rings: Tales of Middle-earth
Type=Draft
ScryfallCode=LTR
[cards]
207 R Gandalf the Grey @Aaron Miller
246 M The One Ring @Veli Nystrom
273 L Plains @Deven Rue
275 L Island @Deven Rue
277 L Swamp @Deven Rue
279 L Mountain @Deven Rue
281 L Forest @Deven Rue
322 R Gandalf the Grey @Anato Finnstark

2
forge-gui/res/formats/Archived/Arena Standard/2017-09-07.txt
View File

@@ -1,6 +1,6 @@
[format]
Name:Arena Standard (2017-09-07)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2017-09-07
Sets:XLN

2
forge-gui/res/formats/Archived/Arena Standard/2018-01-18.txt
View File

@@ -1,6 +1,6 @@
[format]
Name:Arena Standard (RIX)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2018-01-18
Sets:XLN, RIX

2
forge-gui/res/formats/Archived/Arena Standard/2018-03-22.txt
View File

@@ -1,6 +1,6 @@
[format]
Name:Arena Standard (AKH/HOU)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2018-03-22
Sets:XLN, RIX, AKH, HOU

2
forge-gui/res/formats/Archived/Arena Standard/2018-04-26.txt
View File

@@ -1,6 +1,6 @@
[format]
Name:Arena Standard (DOM)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2018-04-26
Sets:XLN, RIX, AKH, HOU, DOM

2
forge-gui/res/formats/Archived/Arena Standard/2018-06-07.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (KLD/AER)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2018-06-07
Sets:XLN, RIX, AKH, HOU, DOM, KLD, AER, W17
Banned:Aetherworks Marvel; Attune with Aether; Felidar Guardian; Rampaging Ferocidon; Ramunap Ruins; Rogue Refiner; Smuggler's Copter

2
forge-gui/res/formats/Archived/Arena Standard/2018-07-12.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (M19)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2018-07-12
Sets:XLN, RIX, AKH, HOU, DOM, KLD, AER, W17, M19, ANA, PANA
Banned:Aetherworks Marvel; Attune with Aether; Felidar Guardian; Rampaging Ferocidon; Ramunap Ruins; Rogue Refiner; Smuggler's Copter

2
forge-gui/res/formats/Archived/Arena Standard/2018-09-27.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (GRN)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2018-09-27
Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN
Banned:Rampaging Ferocidon

2
forge-gui/res/formats/Archived/Arena Standard/2018-11-15.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (G18)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2018-11-15
Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18
Banned:Rampaging Ferocidon

2
forge-gui/res/formats/Archived/Arena Standard/2019-01-17.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (RNA)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2019-01-17
Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA
Banned:Rampaging Ferocidon

2
forge-gui/res/formats/Archived/Arena Standard/2019-02-14.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2019-02-14)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2019-02-14
Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA
Banned:Nexus of Fate; Rampaging Ferocidon

2
forge-gui/res/formats/Archived/Arena Standard/2019-04-25.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (WAR)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2019-04-25
Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR
Banned:Nexus of Fate; Rampaging Ferocidon

2
forge-gui/res/formats/Archived/Arena Standard/2019-07-02.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (M20)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2019-07-02
Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20
Banned:Nexus of Fate; Rampaging Ferocidon

2
forge-gui/res/formats/Archived/Arena Standard/2019-09-26.txt
View File

@@ -1,6 +1,6 @@
[format]
Name:Arena Standard (ELD)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2019-09-26
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD

2
forge-gui/res/formats/Archived/Arena Standard/2019-10-24.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2019-10-24)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2019-10-24
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
Banned:Field of the Dead

2
forge-gui/res/formats/Archived/Arena Standard/2019-11-18.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2019-11-18)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2019-11-18
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
Banned:Field of the Dead; Oko, Thief of Crowns; Once Upon a Time; Veil of Summer

2
forge-gui/res/formats/Archived/Arena Standard/2020-01-16.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (THB)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-01-16
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB
Banned:Field of the Dead; Oko, Thief of Crowns; Once Upon a Time; Veil of Summer

2
forge-gui/res/formats/Archived/Arena Standard/2020-04-16.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (IKO)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-04-16
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO
Banned:Field of the Dead; Oko, Thief of Crowns; Once Upon a Time; Veil of Summer

2
forge-gui/res/formats/Archived/Arena Standard/2020-06-04.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2020-06-04)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-06-04
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO
Banned:Agent of Treachery; Field of the Dead; Fires of Invention; Oko, Thief of Crowns; Once Upon a Time; Veil of Summer

2
forge-gui/res/formats/Archived/Arena Standard/2020-06-25.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (M21)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-06-25
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21
Banned:Agent of Treachery; Field of the Dead; Fires of Invention; Oko, Thief of Crowns; Once Upon a Time; Veil of Summer

2
forge-gui/res/formats/Archived/Arena Standard/2020-08-03.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2020-08-03)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-08-03
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21
Banned:Agent of Treachery; Cauldron Familiar; Field of the Dead; Fires of Invention; Growth Spiral; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Veil of Summer; Wilderness Reclamation

2
forge-gui/res/formats/Archived/Arena Standard/2020-08-12.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (ANB)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-08-12
Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21, ANB
Banned:Agent of Treachery; Cauldron Familiar; Field of the Dead; Fires of Invention; Growth Spiral; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Veil of Summer; Wilderness Reclamation

2
forge-gui/res/formats/Archived/Arena Standard/2020-09-17.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (ZNR)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-09-17
Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
Banned:Cauldron Familiar; Fires of Invention; Oko, Thief of Crowns; Once Upon a Time

2
forge-gui/res/formats/Archived/Arena Standard/2020-09-28.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2020-09-28)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-09-28
Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
Banned:Cauldron Familiar; Fires of Invention; Oko, Thief of Crowns; Once Upon a Time; Uro, Titan of Nature's Wrath

2
forge-gui/res/formats/Archived/Arena Standard/2020-10-12.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2020-10-12)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2020-10-12
Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
Banned:Cauldron Familiar; Escape to the Wilds; Fires of Invention; Lucky Clover; Oko, Thief of Crowns; Omnath, Locus of Creation; Once Upon a Time; Uro, Titan of Nature's Wrath

2
forge-gui/res/formats/Archived/Arena Standard/2021-01-28.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (KHM)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2021-01-28
Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM
Banned:Cauldron Familiar; Escape to the Wilds; Fires of Invention; Lucky Clover; Oko, Thief of Crowns; Omnath, Locus of Creation; Once Upon a Time; Uro, Titan of Nature's Wrath

2
forge-gui/res/formats/Archived/Arena Standard/2021-04-15.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (STX)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2021-04-15
Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM, STX
Banned:Cauldron Familiar; Escape to the Wilds; Fires of Invention; Lucky Clover; Oko, Thief of Crowns; Omnath, Locus of Creation; Once Upon a Time; Uro, Titan of Nature's Wrath

2
forge-gui/res/formats/Archived/Arena Standard/2021-07-08.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (AFR)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2021-07-08
Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM, STX, AFR
Banned:Cauldron Familiar; Escape to the Wilds; Fires of Invention; Lucky Clover; Oko, Thief of Crowns; Omnath, Locus of Creation; Once Upon a Time; Uro, Titan of Nature's Wrath

2
forge-gui/res/formats/Archived/Arena Standard/2021-09-16.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (MID)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2021-09-16
Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID
Banned:Omnath, Locus of Creation

2
forge-gui/res/formats/Archived/Arena Standard/2021-11-17.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (VOW)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2021-11-17
Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW
Banned:Omnath, Locus of Creation

2
forge-gui/res/formats/Archived/Arena Standard/2022-01-27.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2022-01-27)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2022-01-27
Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW
Banned:Alrund's Epiphany; Divide by Zero; Faceless Haven; Omnath, Locus of Creation

2
forge-gui/res/formats/Archived/Arena Standard/2022-02-10.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (NEO)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2022-02-10
Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, NEO
Banned:Alrund's Epiphany; Divide by Zero; Faceless Haven; Omnath, Locus of Creation

2
forge-gui/res/formats/Archived/Arena Standard/2022-03-17.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2022-03-17)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2022-03-17
Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO
Banned:Alrund's Epiphany; Divide by Zero; Faceless Haven; Omnath, Locus of Creation

2
forge-gui/res/formats/Archived/Arena Standard/2022-04-28.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (SNC)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2022-04-28
Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
Banned:Alrund's Epiphany; Divide by Zero; Faceless Haven; Omnath, Locus of Creation

2
forge-gui/res/formats/Archived/Arena Standard/2022-09-01.txt
View File

@@ -1,6 +1,6 @@
[format]
Name:Arena Standard (DMU)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2022-09-01
Sets:MID, VOW, NEO, SNC, DMU

2
forge-gui/res/formats/Archived/Arena Standard/2022-10-13.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (2022-10-13)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2022-10-13
Sets:MID, VOW, NEO, SNC, DMU
Banned:The Meathook Massacre

2
forge-gui/res/formats/Archived/Arena Standard/2022-11-15.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (BRO)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2022-11-15
Sets:MID, VOW, NEO, SNC, DMU, BRO
Banned:The Meathook Massacre

2
forge-gui/res/formats/Archived/Arena Standard/2023-02-07.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Arena Standard (ONE)
Type:Archived
Subtype:Arena
Subtype:Standard
Effective:2023-02-07
Sets:MID, VOW, NEO, SNC, DMU, BRO, ONE
Banned:The Meathook Massacre

2
forge-gui/res/formats/Archived/Explorer/2022-04-28.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (2022-04-28)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-04-28
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
Banned:Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation

2
forge-gui/res/formats/Archived/Explorer/2022-05-12.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (2022-05-12)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-05-12
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
Banned:Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

2
forge-gui/res/formats/Archived/Explorer/2022-06-09.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (2022-06-09)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-06-09
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

2
forge-gui/res/formats/Archived/Explorer/2022-07-07.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (2022-07-07)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-07-07
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

2
forge-gui/res/formats/Archived/Explorer/2022-07-28.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (EA1)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-07-28
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC, EA1
Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

2
forge-gui/res/formats/Archived/Explorer/2022-09-01.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (DMU)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-09-01
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC, EA1, DMU
Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

2
forge-gui/res/formats/Archived/Explorer/2022-11-15.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (BRO)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-11-15
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC, EA1, DMU, BRO
Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

2
forge-gui/res/formats/Archived/Explorer/2022-12-13.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (EA2)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2022-12-13
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC, EA1, DMU, BRO, EA2
Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

2
forge-gui/res/formats/Archived/Explorer/2023-02-07.txt
View File

@@ -1,7 +1,7 @@
[format]
Name:Explorer (ONE)
Type:Archived
Subtype:Arena
Subtype:Pioneer
Effective:2023-02-07
Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC, EA1, DMU, BRO, EA2, ONE
Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces

BIN
forge-gui/res/skins/default/sprite_adventure.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 71 KiB

21
forge-gui/src/main/java/forge/gamemodes/match/input/InputLondonMulligan.java
View File

@@ -60,7 +60,7 @@ public class InputLondonMulligan extends InputSyncronizedBase {
StringBuilder sb = new StringBuilder();
getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOk"), "", cardsLeft == 0, false, true);
getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOk"), localizer.getMessage("lblAuto"), cardsLeft == 0, cardsLeft != 0, true);
sb.append(String.format(localizer.getMessage("lblReturnForLondon"), cardsLeft));
@@ -79,6 +79,25 @@ public class InputLondonMulligan extends InputSyncronizedBase {
done();
}
@Override
protected final void onCancel() {
int cardsLeft = toReturn - selected.size();
int count = 0;
for(Card c : player.getZone(ZoneType.Hand).getCards()) {
if (selected.contains(c)) { continue; }
selected.add(c);
setCardHighlight(c, selected.contains(c));
count++;
if (cardsLeft == count) {
break;
}
}
onOk();
}
private void done() {
resetCardHighlights();
getController().getGame().getView().updateIsMulligan(false);

2
forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
View File

@@ -270,7 +270,7 @@ public enum FSkinProp {
//adventure icons
ICO_MANASHARD (new int[] {2, 304, 100, 100}, PropType.ADVENTURE),
ICO_ADVLOGO (new int[] {2, 2, 300, 300}, PropType.ADVENTURE),
ICO_ADVDECKBOX (new int[] {108, 356, 189, 242}, PropType.ADVENTURE),
ICO_ADVDECKBOX (new int[] {111, 365, 192, 240}, PropType.ADVENTURE),
//menu icon
ICO_MENU_GALAXY (new int[] {0, 1520, 80, 80}, PropType.ICON),