Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new card images. 

Splitted core and generated cards into two card definition files.
master
ubeefx 2011-03-10 21:09:58 +00:00
parent 7d29fc94ae
commit bb2043c79a
10 changed files with 4152 additions and 4104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launch4j/Readme.txt
View File

@ -24,12 +24,17 @@ Recommended difficulty level for the best balance of AI speed and strength is th
Have fun!
Release 1.8 (March 11, 2011)
Release 1.8 (March, 2011)
===========
- ubeefx cube (530 cards)
- singularita cube (850 cards)
- improved deck generator
- added option to play with monocolored generated decks
- changed function of Life+ slider in difficulty setting so that it gives extra life to computer for added difficulty
- fixed must attack if able when power is 0 or lower
- fixed apostrophes in Keywords screen
Release 1.7 (January 14, 2011)

4079
resources/magic/data/cards.txt
View File

File diff suppressed because it is too large Load Diff

4051
resources/magic/data/cards2.txt Normal file
View File

File diff suppressed because it is too large Load Diff

44
resources/magic/data/images.txt
View File

@ -839,7 +839,6 @@ Scuzzback Scrapper.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multivers
Sea Eagle.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=47786&type=card
Sentinels of Glen Elendra.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=139426&type=card
Serra Angel.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=196999&type=card
Serra Sphinx.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=125873&type=card
Severed Legion.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=129693&type=card
Sewn-Eye Drake.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=179594&type=card
Shanodin Dryads.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=11494&type=card
@ -920,6 +919,27 @@ Zendikar Farguide.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverse
Zodiac Monkey.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=83237&type=card
Zombie Goliath.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=190545&type=card
Zombie Outlander.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=185138&type=card
Sacred Wolf.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=205023&type=card
Loxodon Partisan.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213761&type=card
Koth's Courier.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213766&type=card
Glissa's Courier.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213783&type=card
Goblin Wardriver.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213782&type=card
Victory's Herald.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=214030&type=card
Black Sun's Zenith.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=214061&type=card
Massacre Wurm.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=214044&type=card
Thrun, the Last Troll.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=214050&type=card
Viridian Claw.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213784&type=card
Strandwalker.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213790&type=card
Turn the Tide.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213821&type=card
Captive Flame.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=88810&type=card
Smite.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=193595&type=card
Neurok Invisimancer.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=194109&type=card
Vedalken Mastermind.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=130834&type=card
Gelectrode.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=96891&type=card
Recoil.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=23154&type=card
Ezuri's Archers.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=194092&type=card
Gratuitous Violence.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=39666&type=card
Rally the Forces.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213767&type=card
>hqcards
Absorb.jpg;http://magiccards.info/scans/en/in/226.jpg
Accorder Paladin.jpg;http://magiccards.info/scans/en/mbs/1.jpg
@ -1676,7 +1696,6 @@ Scuzzback Scrapper.jpg;http://magiccards.info/scans/en/shm/217.jpg
Sea Eagle.jpg;http://magiccards.info/scans/en/8eb/4.jpg
Sentinels of Glen Elendra.jpg;http://magiccards.info/scans/en/lw/84.jpg
Serra Angel.jpg;http://magiccards.info/scans/en/dvd/10.jpg
Serra Sphinx.jpg;http://magiccards.info/scans/en/pc/62.jpg
Severed Legion.jpg;http://magiccards.info/scans/en/dpa/33.jpg
Sewn-Eye Drake.jpg;http://magiccards.info/scans/en/arb/135.jpg
Shanodin Dryads.jpg;http://magiccards.info/scans/en/7e/269.jpg
@ -1757,3 +1776,24 @@ Zendikar Farguide.jpg;http://magiccards.info/scans/en/zen/194.jpg
Zodiac Monkey.jpg;http://magiccards.info/scans/en/9e/285.jpg
Zombie Goliath.jpg;http://magiccards.info/scans/en/m10/123.jpg
Zombie Outlander.jpg;http://magiccards.info/scans/en/cfx/133.jpg
Sacred Wolf.jpg;http://magiccards.info/scans/en/m11/196.jpg
Loxodon Partisan.jpg;http://magiccards.info/scans/en/mbs/12.jpg
Koth's Courier.jpg;http://magiccards.info/scans/en/mbs/68.jpg
Glissa's Courier.jpg;http://magiccards.info/scans/en/mbs/80.jpg
Goblin Wardriver.jpg;http://magiccards.info/scans/en/mbs/64.jpg
Victory's Herald.jpg;http://magiccards.info/scans/en/mbs/18.jpg
Black Sun's Zenith.jpg;http://magiccards.info/scans/en/mbs/39.jpg
Massacre Wurm.jpg;http://magiccards.info/scans/en/mbs/46.jpg
Thrun, the Last Troll.jpg;http://magiccards.info/scans/en/mbs/92.jpg
Viridian Claw.jpg;http://magiccards.info/scans/en/mbs/143.jpg
Strandwalker.jpg;http://magiccards.info/scans/en/mbs/137.jpg
Turn the Tide.jpg;http://magiccards.info/scans/en/mbs/35.jpg
Captive Flame.jpg;http://magiccards.info/scans/en/sok/96.jpg
Smite.jpg;http://magiccards.info/scans/en/roe/43.jpg
Neurok Invisimancer.jpg;http://magiccards.info/scans/en/som/37.jpg
Vedalken Mastermind.jpg;http://magiccards.info/scans/en/10e/123.jpg
Gelectrode.jpg;http://magiccards.info/scans/en/gp/113.jpg
Recoil.jpg;http://magiccards.info/scans/en/in/264.jpg
Ezuri's Archers.jpg;http://magiccards.info/scans/en/som/120.jpg
Gratuitous Violence.jpg;http://magiccards.info/scans/en/on/212.jpg
Rally the Forces.jpg;http://magiccards.info/scans/en/mbs/73.jpg

44
resources/magic/data/singularita_cube.txt
View File

@ -62,6 +62,7 @@ Berserkers of Blood Ridge
Bestial Menace
Birds of Paradise
Black Knight
Black Sun's Zenith
Blackcleave Cliffs
Blade of the Sixth Pride
Bladed Pinions
@ -102,6 +103,7 @@ Canopy Spider
Canyon Minotaur
Canyon Wildcat
Captain of the Watch
Captive Flame
Caravan Hurda
Carnifex Demon
Celestial Colonnade
@ -198,7 +200,6 @@ Echo Mage
Eel Umbra
Eldrazi Monument
Elephant Guide
Elite Vanguard
Elvish Archers
Elvish Warrior
Ember Hauler
@ -214,6 +215,7 @@ Ethercaste Knight
Ethersworn Adjudicator
Evacuation
Exhaustion
Ezuri's Archers
Fallen Angel
Fangren Hunter
Femeref Archers
@ -251,6 +253,7 @@ Galina's Knight
Galvanic Arc
Game-Trail Changeling
Garruk's Companion
Gelectrode
Ghost Council of Orzhova
Ghostway
Giant Cockroach
@ -265,6 +268,7 @@ Glacial Wall
Glass Golem
Glen Elendra Archmage
Glen Elendra Liege
Glissa's Courier
Gloomhunter
Gloomwidow
Glorious Anthem
@ -292,6 +296,7 @@ Goblin Sky Raider
Goblin Spelunkers
Goblin Striker
Goblin War Paint
Goblin Wardriver
Godhead of Awe
Godless Shrine
Godsire
@ -300,6 +305,7 @@ Goliath Spider
Gorgon Flail
Grappler Spider
Grasp of Darkness
Gratuitous Violence
Grave Titan
Gravelgill Axeshark
Graypelt Refuge
@ -385,6 +391,7 @@ Knight Errant
Knight of Meadowgrain
Kodama of the North Tree
Kokusho, the Evening Star
Koth's Courier
Kraken Hatchling
Kulrath Knight
Lagac Lizard
@ -414,6 +421,7 @@ Lord of Extinction
Lord of Shatterskull Pass
Lotus Petal
Loxodon Hierarch
Loxodon Partisan
Loxodon Warhammer
Loxodon Wayfarer
Lumengrid Warden
@ -432,6 +440,7 @@ Martial Coup
Mask of Memory
Mask of Riddles
Mass of Ghouls
Massacre Wurm
Meglonoth
Memnite
Merfolk Seastalkers
@ -475,6 +484,7 @@ Nema Siltlurker
Nemesis of Reason
Nessian Courser
Nether Horror
Neurok Invisimancer
Nezumi Cutthroat
Nightguard Patrol
Nightshade Stinger
@ -541,6 +551,7 @@ Raging Kavu
Raging Ravine
Rakdos Guildmage
Raking Canopy
Rally the Forces
Rampaging Baloths
Rancor
Ravenous Baloth
@ -550,6 +561,7 @@ Razorjaw Oni
Razortooth Rats
Razorverge Thicket
Reanimate
Recoil
Recover
Redwood Treefolk
Remand
@ -582,6 +594,7 @@ Ruthless Cullblade
Sabertooth Nishoba
Sabretooth Tiger
Sacred Foundry
Sacred Wolf
Safe Passage
Safehold Elite
Savage Lands
@ -604,7 +617,6 @@ Sejiri Refuge
Sentinels of Glen Elendra
Serendib Efreet
Serra Angel
Serra Sphinx
Serra's Embrace
Serrated Arrows
Severed Legion
@ -642,6 +654,7 @@ Slave of Bolas
Sleep
Slinking Serpent
Smash to Smithereens
Smite
Smoldering Butcher
Smother
Snake Umbra
@ -684,6 +697,7 @@ Stonebrow, Krosan Hero
Stonework Puma
Storm Crow
Stormfront Pegasus
Strandwalker
Stratozeppelid
Streetbreaker Wurm
Strider Harness
@ -714,6 +728,7 @@ Terra Stomper
Thieving Magpie
Thornweald Archer
Thoughtweft Gambit
Thrun, the Last Troll
Thunder Strike
Thundering Giant
Thundersong Trumpeter
@ -741,6 +756,7 @@ Trusty Machete
Trygon Predator
Tuktuk the Explorer
Tundra Wolves
Turn the Tide
Turn to Mist
Twinblade Slasher
Twincast
@ -756,6 +772,7 @@ Vampire Hexmage
Vampire Nighthawk
Vastwood Gorger
Vault Skyward
Vedalken Mastermind
Vedalken Outlander
Venser's Sliver
Venser, Shaper Savant
@ -763,9 +780,11 @@ Veteran Armorer
Veteran Cavalier
Veteran's Reflexes
Viashino Spearhunter
Victory's Herald
Vigor
Vine Trellis
Vines of Vastwood
Viridian Claw
Vivid Crag
Vivid Creek
Vivid Grove
@ -828,23 +847,4 @@ Zephyr Sprite
Zodiac Monkey
Zombie Goliath
Zombie Outlander
Zombify
Black Sun's Zenith
Goblin Wardriver
Massacre Wurm
Strandwalker
Thrun, the Last Troll
Turn the Tide
Victory's Herald
Viridian Claw
Captive Flame
Smite
Neurok Commando
Neurok Invisimancer
Vedalken Mastermind
Gelectrode
Recoil
Ezuri's Archers
Eland Umbra
Abyssal Specter
Gratuitous Violence
Zombify

4
resources/magic/data/ubeefx_cube.txt
View File

@ -526,5 +526,5 @@ Gelectrode
Recoil
Ezuri's Archers
Eland Umbra
Abyssal Specter
Gratuitous Violence
Gratuitous Violence
Rally the Forces

11
src/magic/data/CardDefinitions.java
View File

@ -23,6 +23,7 @@ public class CardDefinitions {
private static final CardDefinitions INSTANCE=new CardDefinitions();
private static final String CARDS_FILENAME="cards.txt";
private static final String EXTRA_CARDS_FILENAME="cards2.txt";
private final List<MagicCardDefinition> cards;
private final List<MagicCardDefinition> landCards;
@ -125,10 +126,10 @@ public class CardDefinitions {
}
}
public void loadCardDefinitions() throws IOException {
private void loadCardDefinitions(final String filename) throws IOException {
// Cards.
final InputStream stream=this.getClass().getResourceAsStream(CARDS_FILENAME);
final InputStream stream=this.getClass().getResourceAsStream(filename);
final BufferedReader reader=new BufferedReader(new InputStreamReader(stream));
MagicCardDefinition cardDefinition=null;
String line;
@ -152,6 +153,12 @@ public class CardDefinitions {
}
checkCard(cardDefinition);
reader.close();
}
public void loadCardDefinitions() throws IOException {
loadCardDefinitions(CARDS_FILENAME);
loadCardDefinitions(EXTRA_CARDS_FILENAME);
filterCards();
printStatistics();

5
src/magic/data/PermanentActivationDefinitions.java
View File

@ -1650,7 +1650,9 @@ public class PermanentActivationDefinitions {
}
}
};
private static final MagicPermanentActivation THRUN_THE_LAST_TROLL=new MagicRegenerationActivation("Thrun, the Last Troll",MagicManaCost.ONE_GREEN);
private static final MagicPermanentActivation THUNDERSONG_TRUMPETER=new MagicPermanentActivation(
"Thundersong Trumpeter",new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION},new MagicActivationHints(MagicTiming.Tapping)) {
@ -2519,6 +2521,7 @@ public class PermanentActivationDefinitions {
STUDENT_OF_WARFARE,
STUFFY_DOLL,
STUN_SNIPER,
THRUN_THE_LAST_TROLL,
THUNDERSONG_TRUMPETER,
TOLSIMIR_WOLFBLOOD,
TROLL_ASCETIC,

3
src/magic/data/TriggerDefinitions.java
View File

@ -2665,6 +2665,8 @@ public class TriggerDefinitions {
}
};
private static final MagicTrigger STRANDWALKER=new MagicLivingWeaponTrigger("Strandwalker");
private static final MagicTrigger SWORD_OF_BODY_AND_MIND=new MagicTrigger(MagicTriggerType.WhenDamageIsDealt,"Sword of Body and Mind") {
@Override
@ -3647,6 +3649,7 @@ public class TriggerDefinitions {
SHIELD_OF_THE_RIGHTEOUS,
SKULLCLAMP,
SPECTERS_SHROUD,
STRANDWALKER,
SWORD_OF_BODY_AND_MIND,
SWORD_OF_FIRE_AND_ICE,
SWORD_OF_LIGHT_AND_SHADOW,

8
src/magic/test/TestGameBuilder.java
View File

@ -118,13 +118,9 @@ public class TestGameBuilder {
addToGraveyard(player,"Mogg Fanatic",2);
addToGraveyard(opponent,"Island",2);
addToHand(player,"Black Sun's Zenith",1);
addToHand(player,"Goblin Wardriver",1);
addToHand(player,"Massacre Wurm",1);
addToHand(player,"Strandwalker",1);
addToHand(player,"Thrun, the Last Troll",1);
addToHand(player,"Turn the Tide",1);
addToHand(player,"Victory's Herald",1);
addToHand(player,"Viridian Claw",1);
addToHand(player,"Captive Flame",1);
addToHand(player,"Smite",1);
addToHand(player,"Neurok Invisimancer",1);
@ -132,10 +128,8 @@ public class TestGameBuilder {
addToHand(player,"Gelectrode",1);
addToHand(player,"Recoil",1);
addToHand(player,"Ezuri's Archers",1);
addToHand(player,"Eland Umbra",1);
addToHand(player,"Abyssal Specter",1);
addToHand(player,"Gratuitous Violence",1);
addToHand(player,"Neurok Commando",1);
addToHand(player,"Rally the Forces",1);
createPermanent(game,player,"Watchwolf",false,1);
createPermanent(game,player,"Rupture Spire",false,8);