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

Fix CostSacrifice OriginalHost

Browse Source
This commit is contained in:
tool4EvEr
2021-07-26 20:37:59 +02:00
parent 5de3bab789
commit 7eec98db61
3 changed files with 7 additions and 8 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

@@ -484,7 +484,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
return PaymentDecision.card(source);
}
if (cost.getType().equals("OriginalHost")) {
return PaymentDecision.card(ability.getHostCard());
return PaymentDecision.card(ability.getOriginalHost());
}
if (cost.getAmount().equals("All")) {
// Does the AI want to use Sacrifice All?
@@ -600,7 +600,6 @@ public class AiCostDecision extends CostDecisionMakerBase {
// currently if amount is bigger than one,
// it tries to remove all counters from one source and type at once
int toRemove = 0;
final GameEntityCounterTable table = new GameEntityCounterTable();

10
forge-game/src/main/java/forge/game/card/CardLists.java
View File

@@ -122,7 +122,7 @@ public class CardLists {
*/
public static void sortByCmcDesc(final List<Card> list) {
Collections.sort(list, CmcComparatorInv);
} // sortByCmcDesc
}
/**
* <p>
@@ -133,7 +133,7 @@ public class CardLists {
*/
public static void sortByToughnessAsc(final List<Card> list) {
Collections.sort(list, ToughnessComparator);
} // sortByToughnessAsc()
}
/**
* <p>
@@ -144,7 +144,7 @@ public class CardLists {
*/
public static void sortByToughnessDesc(final List<Card> list) {
Collections.sort(list, ToughnessComparatorInv);
} // sortByToughnessDesc()
}
/**
* <p>
@@ -155,7 +155,7 @@ public class CardLists {
*/
public static void sortByPowerAsc(final List<Card> list) {
Collections.sort(list, PowerComparator);
} // sortAttackLowFirst()
}
// the higher the attack the better
/**
@@ -167,7 +167,7 @@ public class CardLists {
*/
public static void sortByPowerDesc(final List<Card> list) {
Collections.sort(list, Collections.reverseOrder(PowerComparator));
} // sortAttack()
}
/**

2
forge-gui/res/cardsfolder/t/tricksters_talisman.txt
View File

@@ -4,6 +4,6 @@ Types:Artifact Equipment
K:Equip:2
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ AttackTrigger | Description$ Invoke Duplicity — Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice CARDNAME. If you do, create a token that's a copy of this creature."
SVar:AttackTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature.
SVar:TrigCopy:AB$ CopyPermanent | Cost$ Sac<1/OriginalHost/Trickster's Talisman> | Defined$ Self | NumCopies$ 1 | AILogic$ DuplicatePerms
SVar:TrigCopy:AB$ CopyPermanent | Cost$ Sac<1/OriginalHost/Trickster's Talisman> | Defined$ Self | NumCopies$ 1
DeckHas:Ability$Token
Oracle:Invoke Duplicity — Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature."\nEquip {2}