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

Move RemoveDeck parsing to new form

Browse Source
This commit is contained in:
Chris H
2018-10-16 23:04:21 -04:00
parent 1304227020
commit 6b6f85c289
6 changed files with 33 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-core/src/main/java/forge/card/CardRules.java
View File

@@ -352,9 +352,18 @@ public final class CardRules implements ICardCharacteristics {
switch(key.charAt(0)) {
case 'A':
if ("A".equals(key))
if ("A".equals(key)) {
this.faces[curFace].addAbility(value);
else if ("AlternateMode".equals(key)) {
} else if ("AI".equals(key)) {
colonPos = value.indexOf(':');
String variable = colonPos > 0 ? value.substring(0, colonPos) : value;
value = colonPos > 0 ? value.substring(1+colonPos) : null;
if ( "RemoveDeck".equals(variable) ) {
this.removedFromAIDecks = "All".equalsIgnoreCase(value);
this.removedFromRandomDecks = "Random".equalsIgnoreCase(value);
}
} else if ("AlternateMode".equals(key)) {
//System.out.println(faces[curFace].getName());
this.altMode = CardSplitType.smartValueOf(value);
} else if ("ALTERNATE".equals(key)) {
@@ -447,11 +456,7 @@ public final class CardRules implements ICardCharacteristics {
String variable = colonPos > 0 ? value.substring(0, colonPos) : value;
value = colonPos > 0 ? value.substring(1+colonPos) : null;
if ( "RemAIDeck".equals(variable) ) {
this.removedFromAIDecks = "True".equalsIgnoreCase(value);
} else if ( "RemRandomDeck".equals(variable) ) {
this.removedFromRandomDecks = "True".equalsIgnoreCase(value);
} else if ( "Picture".equals(variable) ) {
if ( "Picture".equals(variable) ) {
this.pictureUrl[this.curFace] = value;
} else
this.faces[curFace].addSVar(variable, value);

58
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -1,39 +1,11 @@
package forge.screens.home;
import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Vector;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.ListSelectionModel;
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingConstants;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import net.miginfocom.swing.MigLayout;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.UiCommand;
import forge.ai.AIOption;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckProxy;
import forge.deck.DeckSection;
import forge.deck.DeckType;
import forge.deck.DeckgenUtil;
import forge.deck.RandomDeckGenerator;
import forge.deck.*;
import forge.deckchooser.FDeckChooser;
import forge.game.GameType;
import forge.game.card.CardView;
@@ -48,20 +20,24 @@ import forge.model.FModel;
import forge.net.event.UpdateLobbyPlayerEvent;
import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref;
import forge.toolbox.FCheckBox;
import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FPanel;
import forge.toolbox.FScrollPane;
import forge.toolbox.FScrollPanel;
import forge.toolbox.FSkin;
import forge.toolbox.*;
import forge.toolbox.FSkin.SkinImage;
import forge.toolbox.FTextField;
import forge.util.Aggregates;
import forge.util.Lang;
import forge.util.NameGenerator;
import forge.util.gui.SOptionPane;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.*;
import java.util.List;
/**
* Lobby view. View of a number of players at the deck selection stage.
@@ -1009,17 +985,17 @@ public class VLobby implements ILobbyView {
return vgdAllAvatars;
}
/** Return the Vanguard avatars not flagged RemAIDeck. */
/** Return the Vanguard avatars not flagged RemoveDeck:All. */
public List<PaperCard> getAllAiAvatars() {
return vgdAllAiAvatars;
}
/** Return the Vanguard avatars not flagged RemRandomDeck. */
/** Return the Vanguard avatars not flagged RemoveDeck:Random. */
public List<PaperCard> getNonRandomHumanAvatars() {
return nonRandomHumanAvatars;
}
/** Return the Vanguard avatars not flagged RemAIDeck or RemRandomDeck. */
/** Return the Vanguard avatars not flagged RemoveDeck:All or RemoveDeck:Random. */
public List<PaperCard> getNonRandomAiAvatars() {
return nonRandomAiAvatars;
}

2
forge-gui/tools/DeckConversionTools/mtgdecksnet_convert.py
View File

@@ -55,7 +55,7 @@ for root, dirs, files in os.walk(CARDSFOLDER):
if line.lower().find("name:") != -1:
cardnames.extend([line.split('\n')[0].split(':')[1]])
cardname = " // ".join(cardnames)
if cardtext.lower().find("remaideck") != -1:
if cardtext.lower().find("removedeck:all") != -1:
cardlist[cardname] = 0
else:
cardlist[cardname] = 1

2
forge-gui/tools/DeckConversionTools/mtgdecksnet_decksort.py
View File

@@ -59,7 +59,7 @@ for root, dirs, files in os.walk(CARDSFOLDER):
if line.lower().find("name:") != -1:
cardnames.extend([line.split('\n')[0].split(':')[1]])
cardname = " // ".join(cardnames)
if cardtext.lower().find("remaideck") != -1:
if cardtext.lower().find("removedeck:all") != -1:
cardlist[cardname] = 0
else:
cardlist[cardname] = 1

2
forge-gui/tools/DeckConversionTools/mtgdecksnet_decksort_EDH.py
View File

@@ -59,7 +59,7 @@ for root, dirs, files in os.walk(CARDSFOLDER):
if line.lower().find("name:") != -1:
cardnames.extend([line.split('\n')[0].split(':')[1]])
cardname = " // ".join(cardnames)
if cardtext.lower().find("remaideck") != -1:
if cardtext.lower().find("removedeck:all") != -1:
cardlist[cardname] = 0
else:
cardlist[cardname] = 1

2
forge-gui/tools/deckAiCompat.py
View File

@@ -46,7 +46,7 @@ for root, dirs, files in os.walk("cardsfolder"):
if line.lower().find("name:") != -1:
cardnames.extend([line.split('\n')[0].split(':')[1]])
cardname = " // ".join(cardnames)
if cardtext.lower().find("remaideck") != -1:
if cardtext.lower().find("removedeck:all") != -1:
cardlist[cardname] = 0
else:
cardlist[cardname] = 1