Changeset 37786

Show
Ignore:
Timestamp:
06/02/10 16:46:14 (3 years ago)
Author:
isaisstillalive
Message:
  • Trash/Discardを利用するように修正
Location:
lang/csharp/DominionEngine
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • lang/csharp/DominionEngine/DominionEngine.CardInfo.Alchemy/Apprentice.cs

    r37782 r37786  
    1515 
    1616            //Trash a card from your hand. 
    17             var trashedCard = Player.Choose(new AnyPlayer.ChooseOneOptions(CardPosition.Hand)); 
    18             trashedCard.Trash(); 
     17            var trashedCard = Trash(new AnyPlayer.ChooseOneOptions(CardPosition.Hand)); 
     18            if (trashedCard == null) return; 
    1919 
    2020            //Plus 1 Card per Coin it costs. 

  • lang/csharp/DominionEngine/DominionEngine.CardInfo.Alchemy/Transmute.cs

    r37782 r37786  
    1313        { 
    1414            // Trash a card from your hand. 
    15             var trashedCard = Player.Choose(new AnyPlayer.ChooseOneOptions(CardPosition.Hand)); 
    16             trashedCard.Trash(); 
     15            var trashedCard = Trash(new AnyPlayer.ChooseOneOptions(CardPosition.Hand)); 
    1716 
    1817            // If it is an... 
    … …  
    2625            else if (trashedCard.CardInfo is IVictory) 
    2726                Player.Gain<Gold>(); 
    28              
    2927        } 
    3028    } 

  • lang/csharp/DominionEngine/DominionEngine.CardInfo.Base/Mine.cs

    r37782 r37786  
    1313        { 
    1414            // Trash a Treasure card from your hand. 
    15             var trashCard = Player.Choose(new AnyPlayer.ChooseOneOptions<ITreasure>(CardPosition.Hand)); 
     15            var trashCard = Trash(new AnyPlayer.ChooseOneOptions<ITreasure>(CardPosition.Hand)); 
    1616            if (trashCard == null) return; 
    17             trashCard.Trash(); 
    1817             
    1918            // Gain a Treasure card costing up to (3) more; put it into your hand. 

  • lang/csharp/DominionEngine/DominionEngine.CardInfo.Base/Moneylender.cs

    r37782 r37786  
    1313        { 
    1414            // Trash a Copper from your hand. 
    15             var trashCard = Player.Choose(new AnyPlayer.ChooseOneOptions<Copper>(CardPosition.Hand)); 
     15            var trashCard = Trash(new AnyPlayer.ChooseOneOptions<Copper>(CardPosition.Hand)); 
    1616            if (trashCard == null) return; 
    17             trashCard.Trash(); 
    1817 
    1918            // If you do, +3 Coin. 

  • lang/csharp/DominionEngine/DominionEngine.CardInfo.Intrigue/Baron.cs

    r37782 r37786  
    1515 
    1616            // You may discard an Estate card. 
    17             var discardCard = Player.Choose(new AnyPlayer.ChooseOneOptions<Estate>(CardPosition.Hand)); 
    18             discardCard.Discard(); 
     17            var discardCard = Discard(new AnyPlayer.ChooseOneOptions<Estate>(CardPosition.Hand)); 
    1918 
    2019            // If you do, +4. Otherwise, gain an Estate card. 

  • lang/csharp/DominionEngine/DominionEngine.CardInfo.Intrigue/Upgrade.cs

    r37782 r37786  
    1616 
    1717            // Trash a card from your hand. 
    18             var trashedCard = Player.Choose(new AnyPlayer.ChooseOneOptions(CardPosition.Hand)); 
    19             trashedCard.Trash(); 
     18            var trashedCard = Trash(new AnyPlayer.ChooseOneOptions(CardPosition.Hand)); 
     19            if (trashedCard == null) return; 
    2020 
    2121            // Gain a card costing exactly (1) more than it.