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

Fix Blazing Torch ability

Browse Source
This commit is contained in:
tool4EvEr
2021-03-20 21:16:13 +01:00
parent 1dc21055f7
commit db451886ad
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/AiCostDecision.java
View File

@@ -510,6 +510,9 @@ public class AiCostDecision extends CostDecisionMakerBase {
if (cost.payCostFromSource()) { if (cost.payCostFromSource()) {
return PaymentDecision.card(source); return PaymentDecision.card(source);
} }
if (cost.getType().equals("OriginalHost")) {
return PaymentDecision.card(ability.getHostCard());
}
if (cost.getAmount().equals("All")) { if (cost.getAmount().equals("All")) {
// Does the AI want to use Sacrifice All? // Does the AI want to use Sacrifice All?
return null; return null;

7
forge-game/src/main/java/forge/game/cost/CostSacrifice.java
View File

@@ -97,8 +97,11 @@ public class CostSacrifice extends CostPartWithList {
public final boolean canPay(final SpellAbility ability, final Player activator) { public final boolean canPay(final SpellAbility ability, final Player activator) {
final Card source = ability.getHostCard(); final Card source = ability.getHostCard();
// You can always sac all if (getType().equals("OriginalHost")) {
if (!payCostFromSource()) { Card originalEquipment = ability.getOriginalHost();
return originalEquipment.isEquipping();
}
else if (!payCostFromSource()) { // You can always sac all
if ("All".equalsIgnoreCase(getAmount())) { if ("All".equalsIgnoreCase(getAmount())) {
CardCollectionView typeList = activator.getCardsIn(ZoneType.Battlefield); CardCollectionView typeList = activator.getCardsIn(ZoneType.Battlefield);
typeList = CardLists.getValidCards(typeList, getType().split(";"), activator, source, ability); typeList = CardLists.getValidCards(typeList, getType().split(";"), activator, source, ability);

10
forge-gui/src/main/java/forge/player/HumanCostDecision.java
View File

@@ -1051,6 +1051,16 @@ public class HumanCostDecision extends CostDecisionMakerBase {
} }
} }
if (type.equals("OriginalHost")) {
Card host = ability.getOriginalHost();
if (host.getController() == ability.getActivatingPlayer() && host.isInPlay()) {
return player.getController().confirmPayment(cost, Localizer.getInstance().getMessage("lblSacrificeCardConfirm", CardTranslation.getTranslatedName(host.getName())), ability) ? PaymentDecision.card(host) : null;
}
else {
return null;
}
}
if (amount.equals("All")) { if (amount.equals("All")) {
return PaymentDecision.card(list); return PaymentDecision.card(list);
} }