github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
fireshoes 2015-07-28 12:42:19 -05:00
commit 2eb7369c3a
5 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/HistoricalStandard.java
View file

@ -18,7 +18,7 @@ import java.util.Map;
*
* This class was originally made to work with the historical standard ruleset.
* Data taken from http://thattournament.website/historic-tournament.php
* (site changed, originally thtp://mtgt.nfshost.com/historic-tournament.php)
* (site changed, originally http://mtgt.nfshost.com/historic-tournament.php)
*
* If there are any questions or corrections, feel free to contact me.
*
@ -111,9 +111,6 @@ public class HistoricalStandard extends Constructed {
// banned cards
banned.add("Balance");
// Not banned in the format, but it is either this or Misty, and most
// people choose Misty.
banned.add("Batterskull");
banned.add("Memory Jar");
banned.add("Mind Over Matter");
banned.add("Mind Twist");
@ -135,6 +132,17 @@ public class HistoricalStandard extends Constructed {
boolean valid = false;
// first, check whether misty and batterskull are in the same deck.
Map<String, Integer> counts = new HashMap<>();
countCards(counts, deck.getCards());
countCards(counts, deck.getSideboard());
if( counts.containsKey("Stoneforge Mystic")
&& counts.containsKey("Batterskull")){
// if both, then skip all following tests by returning
return false;
}
// up to Lorwyn/Alara, standards will have to be hard-coded.
// iterate through the array of standards.
for (String[] sets : standards) {

17
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/SuperStandard.java
View file

@ -76,10 +76,8 @@ public class SuperStandard extends Constructed {
super("Constructed - All Standards");
banned.add("Ancient Den");
banned.add("Arcbound Ravager");
banned.add("Disciple of the Vault");
banned.add("Great Furnace");
banned.add("Jace, the Mind Sculptor");
banned.add("Seat of the Synod");
banned.add("Skullclamp");
banned.add("Tree of Tales");
@ -99,6 +97,17 @@ public class SuperStandard extends Constructed {
boolean valid = false;
// first, check whether misty and batterskull are in the same deck.
Map<String, Integer> counts = new HashMap<>();
countCards(counts, deck.getCards());
countCards(counts, deck.getSideboard());
if( counts.containsKey("Stoneforge Mystic")
&& counts.containsKey("Batterskull")){
// if both, then skip all following tests by returning
return false;
}
// up to Lorwyn/Alara, standards will have to be hard-coded.
// iterate through the array of standards.
for (String[] sets : standards) {
@ -113,10 +122,8 @@ public class SuperStandard extends Constructed {
// misty and darksteel citadel
if( setCodes.contains("MRD") || setCodes.contains("SOM")){
banned.add("Darksteel Citadel");
banned.add("Stoneforge Mystic");
}else{
banned.remove("Darksteel Citadel");
banned.remove("Stoneforge Mystic");
}
// validate it. If it validates, clear the invalid cards and break.
@ -174,10 +181,8 @@ public class SuperStandard extends Constructed {
// misty and darksteel citadel
if( setCodes.contains("MRD") || setCodes.contains("SOM")){
banned.add("Darksteel Citadel");
banned.add("Stoneforge Mystic");
}else{
banned.remove("Darksteel Citadel");
banned.remove("Stoneforge Mystic");
}
// validate it. If it validates, clear the invalid cards and break.

2
Mage.Server/config/config.xml
View file

@ -87,7 +87,9 @@
<deckType name="Constructed - Pauper" jar="mage-deck-constructed.jar" className="mage.deck.Pauper"/>
<deckType name="Variant Magic - Commander" jar="mage-deck-constructed.jar" className="mage.deck.Commander"/>
<deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar" className="mage.deck.DuelCommander"/>
<deckType name="Variant Magic - Historical Standard" jar="mage-deck-constructed.jar" className="mage.deck.HistoricalStandard"/>
<deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar" className="mage.deck.TinyLeaders"/>
<deckType name="Variant Magic - Super Standard" jar="mage-deck-constructed.jar" className="mage.deck.SuperStandard"/>
<deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.InnistradBlock"/>
<deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed.jar" className="mage.deck.KamigawaBlock"/>
<deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed.jar" className="mage.deck.KhansOfTarkirBlock"/>

2
Mage.Server/release/config/config.xml
View file

@ -66,7 +66,9 @@
<deckType name="Constructed - Pauper" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Pauper"/>
<deckType name="Variant Magic - Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Commander"/>
<deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.DuelCommander"/>
<deckType name="Variant Magic - Historical Standard" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.HistoricalStandard"/>
<deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.TinyLeaders"/>
<deckType name="Variant Magic - Super Standard" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.SuperStandard"/>
<deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.InnistradBlock"/>
<deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.KamigawaBlock"/>
<deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.KhansOfTarkirBlock"/>

15
Mage/src/mage/game/GameState.java
View file

@ -41,6 +41,7 @@ import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
import mage.abilities.DelayedTriggeredAbilities;
import mage.abilities.DelayedTriggeredAbility;
import mage.abilities.MageSingleton;
import mage.abilities.Mode;
import mage.abilities.SpecialActions;
import mage.abilities.StaticAbility;
@ -856,13 +857,19 @@ public class GameState implements Serializable, Copyable<GameState> {
* @param ability
*/
public void addOtherAbility(Card attachedTo, Ability ability) {
ability.setSourceId(attachedTo.getId());
ability.setControllerId(attachedTo.getOwnerId());
Ability newAbility;
if (ability instanceof MageSingleton) {
newAbility = ability;
} else {
newAbility = ability.copy();
}
newAbility.setSourceId(attachedTo.getId());
newAbility.setControllerId(attachedTo.getOwnerId());
if (!cardState.containsKey(attachedTo.getId())) {
cardState.put(attachedTo.getId(), new CardState());
}
cardState.get(attachedTo.getId()).addAbility(ability);
addAbility(ability, attachedTo.getId(), attachedTo);
cardState.get(attachedTo.getId()).addAbility(newAbility);
addAbility(newAbility, attachedTo.getId(), attachedTo);
}
/**