diff --git a/projects/mtg/bin/Res/graphics/wallpapers.txt b/projects/mtg/bin/Res/graphics/wallpapers.txt index e42562f02..c356449c8 100644 --- a/projects/mtg/bin/Res/graphics/wallpapers.txt +++ b/projects/mtg/bin/Res/graphics/wallpapers.txt @@ -7,3 +7,4 @@ wallpapers/kaioshin_jace.jpg graphics/shop.jpg themes/Classic/backdrop.jpg themes/Jade/backdrop.jpg +wallpapers/kaioshin_ravager.jpg diff --git a/projects/mtg/bin/Res/graphics/wallpapers/kaioshin_ravager.jpg b/projects/mtg/bin/Res/graphics/wallpapers/kaioshin_ravager.jpg new file mode 100644 index 000000000..7d4a9b613 Binary files /dev/null and b/projects/mtg/bin/Res/graphics/wallpapers/kaioshin_ravager.jpg differ diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index 096f55603..40fb8d03b 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -4855,8 +4855,7 @@ type=Artifact name=Black Market auto=@movedTo(creature|graveyard) from(battlefield):counter(0/0,1,Charge) auto=@each my firstmain:thisforeach(counter{0/0.1.Charge}) add{B} controller -text=Whenever a creature -, put a charge counter on Black Market. -- At the beginning of your precombat main phase, add Black to your mana pool for each charge counter on Black Market. +text=Whenever a creature is put into a graveyard from the battlefield, put a charge counter on Black Market. -- At the beginning of your precombat main phase, add Black to your mana pool for each charge counter on Black Market. mana={3}{B}{B} type=Enchantment [/card] diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index d32e5cd3e..52d1a35e7 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -212,7 +212,6 @@ drain_life.txt dream_fracture_i142.txt drift_of_the_dead.txt dromad_purebred.txt -dross_golem.txt dross_harvester.txt duskwalker.txt dust_corona.txt @@ -312,7 +311,6 @@ juniper_order_ranger.txt karns_touch_i233.txt keldon_warlord.txt keldon_warlord2.txt -khalni_hydra.txt kird_ape.txt kjeldoran_frostbeast1.txt kjeldoran_frostbeast2_i167.txt @@ -349,7 +347,6 @@ maze_of_ith.txt meekstone.txt memnarch.txt memory_erosion.txt -mephidross_vampire.txt millstone.txt mirri_the_cursed.txt mirri_the_cursed2_i284.txt @@ -396,7 +393,6 @@ rampant_growth.txt rancor.txt ray_of_command.txt ray_of_command_i176.txt -razor_golem.txt reclusive_wight.txt reclusive_wight2.txt recover.txt diff --git a/projects/mtg/src/GuiHand.cpp b/projects/mtg/src/GuiHand.cpp index 3fd8b92e1..2323fcbfe 100644 --- a/projects/mtg/src/GuiHand.cpp +++ b/projects/mtg/src/GuiHand.cpp @@ -201,19 +201,25 @@ float GuiHandSelf::LeftBoundary() int GuiHandSelf::receiveEventPlus(WEvent* e) { - if (WEventZoneChange* event = dynamic_cast(e)) - if (hand == event->to) + if (WEventZoneChange* ev = dynamic_cast(e)) + if (hand == ev->to) { - CardView* card; - if (event->card->view) - card = NEW CardView(CardSelector::handZone, event->card, *(event->card->view)); - else - card = NEW CardView(CardSelector::handZone, event->card, ClosedRowX, 0); - card->t = 6*M_PI; - cards.push_back(card); - cs->Add(card); - Repos(); - return 1; + CardView* card; + if (ev->card->view) { + + //fix for http://code.google.com/p/wagic/issues/detail?id=462. + // We don't want a card in the hand to have an alpha of 0 + ev->card->view->alpha = 255; + + card = NEW CardView(CardSelector::handZone, ev->card, *(ev->card->view)); + } + else + card = NEW CardView(CardSelector::handZone, ev->card, ClosedRowX, 0); + card->t = 6*M_PI; + cards.push_back(card); + cs->Add(card); + Repos(); + return 1; } return 0; } diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index 0d70e2e91..305014af7 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -226,8 +226,13 @@ int GuiPlay::receiveEventPlus(WEvent * e) (game->players[1]->inPlay() == event->to)) { CardView * card; - if (event->card->view) + if (event->card->view){ + //fix for http://code.google.com/p/wagic/issues/detail?id=462. + // We don't want a card in the hand to have an alpha of 0 + event->card->view->alpha = 255; + card = NEW CardView(CardSelector::playZone, event->card, *(event->card->view)); + } else card = NEW CardView(CardSelector::playZone, event->card, 0, 0); cards.push_back(card);