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

Merge branch 'master' into newmaster2

Browse Source
This commit is contained in:
Anthony Calosa
2023-03-26 02:56:21 +08:00
parent c02c20851a 927e066179
commit dbbd0e21cc
32 changed files with 140 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-core/src/main/java/forge/card/DeckHints.java
View File

@@ -201,7 +201,11 @@ public class DeckHints {
Predicate<CardRules> op;
if (t.contains(".")) {
String[] typeParts = t.split("\\.");
if (CardType.isASupertype(typeParts[0])) {
op = Predicates.and(CardRulesPredicates.superType(true, typeParts[0]), CardRulesPredicates.coreType(true, typeParts[1]));
} else {
op = Predicates.and(CardRulesPredicates.coreType(true, typeParts[0]), CardRulesPredicates.subType(typeParts[1]));
}
} else {
op = CardRulesPredicates.joinedType(StringOp.CONTAINS_IC, t);
}

5
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -566,7 +566,10 @@ public class AbilityUtils {
} else if (calcX[0].equals("LastStateBattlefield") && ability instanceof SpellAbility) {
Card c = ((SpellAbility) ability).getLastStateBattlefield().get(card);
val = c == null ? 0 : xCount(c, calcX[1], ability);
} else if (calcX[0].startsWith("Remembered")) {
} else if (calcX[0].startsWith("ExiledWith")) {
val = handlePaid(card.getExiledCards(), calcX[1], card, ability);
}
else if (calcX[0].startsWith("Remembered")) {
// Add whole Remembered list to handlePaid
final CardCollection list = new CardCollection();
Card newCard = card;

5
forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
View File

@@ -7,7 +7,6 @@ import com.google.common.collect.Sets;
import forge.game.player.DelayedReveal;
import forge.game.player.PlayerView;
import forge.util.CardTranslation;
import org.apache.commons.lang3.StringUtils;
import forge.card.CardType;
import forge.game.Game;
@@ -86,9 +85,7 @@ public class ChooseCardEffect extends SpellAbilityEffect {
final String amountValue = sa.getParamOrDefault("Amount", "1");
int validAmount;
if (StringUtils.isNumeric(amountValue)) {
validAmount = Integer.parseInt(amountValue);
} else if (amountValue.equals("Random")) {
if (amountValue.equals("Random")) {
validAmount = Aggregates.randomInt(0, choices.size());
} else {
validAmount = AbilityUtils.calculateAmount(host, amountValue, sa);

5
forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java
View File

@@ -2,8 +2,6 @@ package forge.game.ability.effects;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import forge.game.Game;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
@@ -125,8 +123,7 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
return;
}
final String numericAmount = sa.getParamOrDefault("Amount", "1");
final int validAmount = StringUtils.isNumeric(numericAmount) ? Integer.parseInt(numericAmount) : AbilityUtils.calculateAmount(host, numericAmount, sa);
final int validAmount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Amount", "1"), sa);
for (final Player p : tgtPlayers) {
if (!p.isInGame()) {

8
forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
View File

@@ -18,7 +18,6 @@ import forge.game.zone.ZoneType;
import forge.util.Lang;
import forge.util.Localizer;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
import java.util.Map;
@@ -63,11 +62,8 @@ public class SetStateEffect extends SpellAbilityEffect {
CardCollectionView choices = game.getCardsIn(ZoneType.Battlefield);
choices = CardLists.getValidCards(choices, sa.getParam("Choices"), p, host, sa);
final String numericAmount = sa.getParamOrDefault("Amount", "1");
final int validAmount = StringUtils.isNumeric(numericAmount) ? Integer.parseInt(numericAmount) :
AbilityUtils.calculateAmount(host, numericAmount, sa);
final int minAmount = sa.hasParam("MinAmount") ? Integer.parseInt(sa.getParam("MinAmount")) :
validAmount;
final int validAmount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Amount", "1"), sa);
final int minAmount = sa.hasParam("MinAmount") ? Integer.parseInt(sa.getParam("MinAmount")) : validAmount;
if (validAmount <= 0) {
return;

5
forge-game/src/main/java/forge/game/cost/CostExile.java
View File

@@ -123,11 +123,6 @@ public class CostExile extends CostPartWithList {
return String.format ("Exile any number of %s from your %s", desc, origin);
}
//for very specific situations like Timothar
if (desc.startsWith("the")) {
return String.format("Exile %s from your %s", desc, origin);
}
return String.format("Exile %s from your %s", Cost.convertAmountTypeToWords(i, this.getAmount(), desc), origin);
}

10
forge-gui/res/adventure/Shandalar/custom_cards/tibalt_boss_effect.txt
View File

@@ -5,15 +5,17 @@ Types:Enchantment
T:Mode$ LifeGained | TriggerZones$ Command | ValidPlayer$ Opponent | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent gains life, put a Flame counter on Tibalt
SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ FLAME | CounterNum$ 1
T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Command | ValidPlayer$ You | Execute$ TrigRollDice| TriggerDescription$ Roll a D20, then add the amount of Flame counters on Tibalt's Boss Effect to the roll.
SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-5:DBConjureSmall,6-10:DBRandomLoot:,11-15:DBDamage,16:DBCast,17-18:DBWheel,Else:DBConjureBig | Modifier$ X | SpellDescription$ Roll a D20
SVar:TrigRollDice:DB$ RollDice | Modifier$ X | Sides$ 20 | ResultSubAbilities$ 1-5:DBConjureSmall,6-10:DBRandomLoot:,11-15:DBDamage,16:DBCast,17-18:DBWheel,19-20:DBConjureBig | SpellDescription$ Roll a D20
SVar:DBConjureSmall:DB$ MakeCard | Conjure$ True | AtRandom$ True | Spellbook$ Chained Brute,Big Spender,Devilish Valet,Gibbering Fiend,Hobblefiend,Footlight Fiend,Forge Devil,Festival Crasher,Hulking Devil,Mayhem Devil,Spiteful Prankster,Vexing Devil,Wildfire Devil | Zone$ Battlefield | SpellDescription$ Conjure a random Devil unto the battlefield.
SVar:DBRandomLoot:DB$ Draw | Defined$ Player | NumCards$ 3 | SubAbility$ DBDiscard3 | SpellDescription$ Each player draws three cards, then discards three cards at random.
SVar:DBDiscard3:DB$ Discard | Defined$ Player | Mode$ Random | NumCards$ 3
SVar:DBDamage:DB$ DealDamage | NumDmg$ 7 | ValidTgts$ Creature,Player,Planeswalker | TargetsAtRandom$ True | SubAbility$ DBChangeZone | SpellDescription$ Tibalt deals seven damage to a creature chosen at random. Then Tibalt returns a random creature card to the battlefield
SVar:DBChangeZone:DB$ ChangeZone | ChangeType$ Creature | ChangeNum$ 1 | GainControl$ True | Hidden$ True | Origin$ Graveyard | AtRandom$ True | Destination$ Battlefield
SVar:DBDamage:DB$ ChooseCard | AtRandom$ True | Choices$ Creature | SubAbility$ DBDamageBis | SpellDescription$ Tibalt deals seven damage to a creature chosen at random. Then Tibalt returns a random creature card to the battlefield
SVar:DBDamageBis:DB$ DealDamage | NumDmg$ 7 | Defined$ ChosenCard | SubAbility$ DBChangeZone
SVar:DBChangeZone:DB$ ChangeZone | ChangeType$ Creature | ChangeNum$ 1 | GainControl$ True | Hidden$ True | Origin$ Graveyard | AtRandom$ True | Destination$ Battlefield | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
SVar:DBCast:DB$ Play | AnySupportedCard$ Names:Hellion Eruption,Insurrection,Warp World,Shahrazad,Possibility Storm,Scrambleverse | RandomCopied$ True | CopyCard$ True | WithoutManaCost$ True | SpellDescription$ Cast a copy of one of the following cards chosen at random—Hellion Eruption, Insurrection, Warp World, Shahrazad, Possibility Storm, Scrambleverse.
SVar:DBWheel:DB$ Discard | Mode$ Hand | Defined$ Player | SubAbility$ DBEachDraw | SpellDescription$ Each player discards their hand, then draws seven cards.
SVar:DBEachDraw:DB$ Draw | Defined$ Player | NumCards$ 7
SVar:DBConjureBig:DB$ MakeCard | Conjure$ True | AtRandom$ True | SpellBook$ Kardur; Doomscourge,Harvester of Souls,Archfiend of Depravity,Bloodgift Demon,Ob Nixilis, Unshackled,Nightmare Shepherd,Archfiend of Despair,Lord of the Void,Sire of Insanity, Reaper from the Abyss,Archfiend of Spite,Abyssal Persecutor | Zone$ Battlefield | SpellDescription$ Conjure a random Demon unto the battlefield.
SVar:DBConjureBig:DB$ MakeCard | Conjure$ True | AtRandom$ True | Spellbook$ GriselbrandHarvester of Souls,Archfiend of Depravity,Bloodgift Demon,Ob Nixilis, Unshackled,Nightmare Shepherd,Archfiend of Despair,Lord of the Void,Sire of Insanity, Reaper from the Abyss,Archfiend of Spite,Abyssal Persecutor | Zone$ Battlefield | SpellDescription$ Conjure a random Demon unto the battlefield.
SVar:X:Count$CardCounters.FLAME
Oracle:Whenever an opponent gains life, put a Flame counter on Tibalt\nAt the beginning of your upkeep roll a D20, Then add the amount of Flame counters on Tibalt's Boss Effect to the roll. \n1—5 |Conjure a random Devil unto the battlefield. \n6—10 |Each player draws three cards, then discards three cards at random.\n11—15 |Tibalt deals seven damage to a creature chosen at random.\n16 |Cast a copy of one of the following cards chosen at random—Hellion Eruption, Insurrection, Warp World,Shahrazad,Possibility Storm,Scrambleverse.\n17—18 |Each player discards their hand, then draws seven cards.\n19—20 |Conjure a random Demon unto the battlefield.

38
forge-gui/res/adventure/Shandalar/maps/main.tiled-session
View File

@@ -51,7 +51,7 @@
"scale": 2,
"selectedLayer": 4,
"viewCenter": {
"x": 239.75,
"x": 239.5,
"y": 136.25
}
},
@@ -62,7 +62,7 @@
"scale": 2,
"selectedLayer": 4,
"viewCenter": {
"x": 399.75,
"x": 399.5,
"y": 319.75
}
},
@@ -2469,14 +2469,14 @@
},
"map/main_story/templeofchandra.tmx": {
"expandedObjectLayers": [
7,
2
2,
7
],
"scale": 1.5,
"scale": 2,
"selectedLayer": 5,
"viewCenter": {
"x": 465.3333333333333,
"y": 405.66666666666663
"x": 849,
"y": 624.75
}
},
"map/main_story/templeofliliana.tmx": {
@@ -3096,7 +3096,7 @@
"scale": 2,
"selectedLayer": 5,
"viewCenter": {
"x": 353,
"x": 225,
"y": 192.75
}
},
@@ -3107,8 +3107,8 @@
"scale": 3,
"selectedLayer": 5,
"viewCenter": {
"x": 367.66666666666663,
"y": 150.83333333333334
"x": 518.6666666666666,
"y": 69.16666666666667
}
},
"map/tibalt_f2.tmx": {
@@ -3118,8 +3118,8 @@
"scale": 3,
"selectedLayer": 4,
"viewCenter": {
"x": 176,
"y": 167.83333333333334
"x": 174.33333333333331,
"y": 162.5
}
},
"map/tileset/buildings.tsx": {
@@ -3279,18 +3279,18 @@
"project": "main.tiled-project",
"property.type": "string",
"recentFiles": [
"map/magetower_1.tmx",
"map/castle_plains_1.tmx",
"map/castle_plains_2.tmx",
"map/aerie_1B.tmx",
"map/aerie_1C.tmx",
"map/cave_6.tmx",
"map/cave_5.tmx",
"map/cave_4.tmx",
"map/cave_3.tmx",
"map/cave_2.tmx",
"map/castle_plains_3.tmx",
"map/cave_3.tmx",
"map/magetower_2.tmx",
"map/magetower_14.tmx",
"map/magetower_13.tmx"
"map/castle_plains_2.tmx",
"map/castle_plains_1.tmx",
"map/tibalt.tmx",
"map/magetower_1.tmx"
],
"resizeMap.removeObjects": true,
"textEdit.monospace": true

16
forge-gui/res/adventure/Shandalar/maps/map/tibalt.tmx
View File

@@ -7,7 +7,7 @@
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<layer id="15" name="Collision" width="31" height="22">
<data encoding="base64" compression="zlib">
eJxjYMAEbpwQDGMTAqs5EBjGHylgFdCvu3gQ/HhB+tgHwv5iCHEQfw0Nwx1k724eVDE/JPt3EmH/cyLSEgwgpztZoNlPgXxGBgh+zIlp105omNwQRYhxCBBn13Uc7gLZCfIzI5SPbD8hQKzdtAC0spuRsBKcdoPCGIbpDZDtRrafHm5Bt5ecMNgkSlgNIfuxsbHl2Y1odh0VJs9eWpZFxNqPXt4MRNojKhyEBth+GgKY/dwDWB6OgqEPACg9MIk=
eJxjYMAEbpwQDGMTAqs5EBjGHylgFdCvu3gQ/HhB+tgHwv5iCHEQfw0Nwx1k724e3PI7ibD/ORFpCQaQ050s0OynQD4jAwTjsh8UBjdEEWIcAsTZdR2Hu0B2gvwMsxOf/eiAWLtpAWhlNzF+x2U3KIxhmN4A2W5k++nhFnR7yQmDTaKE1RCyHxsbBNDz7EY0u44Kk2cvLcsiYu1HL28GIu0RFQ5CA2w/DQHMfu4BLA9HwdAHAHu4LNQ=
</data>
</layer>
<layer id="20" name="Background" width="31" height="22">
@@ -30,7 +30,7 @@
<property name="spriteLayer" type="bool" value="true"/>
</properties>
<data encoding="base64" compression="zlib">
eJydlrtuE0EUhscTb6zVAmFNbMEbQEGRgksDvEEkEuQyQJAIUCIKBO8QLg3gUIB4gVDBO4TSQTR+AhrboVhgucyvmZ85O9mLxZF+ebM7e775z5mZzShWaitS/yJz19sL1TrQVt+M3vaUeiOEv+WYOl3VRXZVSPYzp+dGl/pKXTZ6Z5ja6ErfjnniVMdGzMOeai/OYSNV6rrTmdhfU4jJf/ie6vJ7TwVTde39m469aX53un78H8efx3fW4H+mLRfMX6llgvXa6Iup97Br+e97Rf6NtNgHCB4Qdw3zU7ueS3aeWi702/kClwJ/JxD4y+bZmrZr5ED7usKvrPvDY7YXVHLc1edENRvP+BsqF2ORa1v4Zt0fGWZvSan+kr23Ens2hDy7Pc9mP2XIGnAukj1qKbXvhNzgoe5n217sweCIUqcSz5Y13QzYLeX9S/ZQrIn7hvfdsH5Glo0YG4+j2F4/Pup7AO/gn0yKc4AQWFdUyGe9GPT8YlGpV4u2/+tG17RnsweIr20rxIekWH9E6B21DdkUPV/sWDb6jjWHNQzv3Gdkc72VsclncL/VseH5pfPNs2omzpJxXPRdxib/dHxYnBfGsM6fW9VsrPnlBTtmHHxfVuJqdp4We07f5IKHWj7QvtdkD7Tfa7c6lo8x4TkL75LNyEW/cc6BzT3E/v4QyiPPnonzhfw9U+d7kZ3Hatt7JxuxQaY4vxEhj6xQki1jS8xD8j8mfsywe/g9eJY9rVOZb7KzgD9vgH3OvHPe6EKn+hr5yZb7vOyM4/Mm4f29mu9SFnlN3DsTt94HJblQh/AbWCWuW+ReC/KE0ZQTuW67+sta3BG1qfI3cTx6mjbMZd5o+j8rc7Uiu0x/AckTJ+A=
eJyllr1uE0EUha8n3lirBYJNbMEbQEGRgp8G8gZIBOQyQJAIUCIKBO8QfhqIQ0HEC0AF7xBKg2j8BDS2Q2HA/MzRzGHuTnbXFhzpyBt7dr45987Opp+KbCbyVxN/vbVQ7n3j/NV6ty3yShl/6zFVvmzy7DJp9lPvZ9YXOiIXrV9bprFe7bgxj72r2NA87JEJ5hrWmyLXvE+l4ZqGhv+Qe2SKv3uimNJy39/w7A37udMK4397/v/mhsbGccH82XRMsF5af7b17rUc/207z7/ezPcBRgbojmV/qM/HnjYdF/7lc4FLg78TGfxl+9uacXtk34S6Ym/r7A+OuF7Q2VFfn2PlbPzGz9hTNRZzbancrPtDy2wviXSW3HcraWDDmOdNO7DZTy1dA65Fs/s1kY/emBs81P10PZg96B4SOZEFtq7pRsSuSciv2T21J+5Z3jfL+pE4NjSwGfupu350OPQA2cE/nuXXAEPYV3TMZ70oZn6+KLK96Pp/xfqqCWz2APpSd4beZfn6Q3F21DZm08x8vuHY6Dv2HPYwsvNMJZv7rYhNPsXnrYqNzC98bp5VY3WWDNJ87iI2+SfTg+a6MIZ1/lQrZ2PPLy+4MYPo/bKSlrOnzXzPmZtc8FDL+yb0muyuCc/azYbjY0x81iG7ZlNT1W+cc2DzGWJ/vytPk8Aeq/OF/D1b57uJW8eleshONrROpjq/oZhHVmzN1tpU69D891kY02sdvA+ZdU+rXJSb7EnEn1dgn7H3nLU+1yi/xvxk6+e86Izj77OM+/cq3kuTJHjo7xn6/d4tmAt1iN+BZea+xdxr0TyxZs2JuW75+uta3Fa1Kcs39DxmGs1Yy7ya9f/GxNeK7CL/ATakJuM=
</data>
</layer>
<objectgroup id="12" name="Kopie van Objects" opacity="0.9" offsetx="3.15789" offsety="7.89474">
@@ -53,18 +53,18 @@
<properties>
<property name="enemy" value="Phoenix"/>
<property name="spawn.Hard" type="bool" value="true"/>
<property name="threatRange" type="int" value="20"/>
<property name="threatRange" type="int" value="30"/>
<property name="waypoints" value="179,180,198,171,176,174,191"/>
</properties>
</object>
<object id="122" template="../obj/enemy.tx" x="94.542" y="168.271">
<object id="122" template="../obj/enemy.tx" x="101.042" y="176.271">
<properties>
<property name="enemy" value="Red Wiz1"/>
<property name="threatRange" type="int" value="20"/>
<property name="waypoints" value="183,184"/>
</properties>
</object>
<object id="137" template="../obj/enemy.tx" x="22.763" y="50.2299">
<object id="137" template="../obj/enemy.tx" x="42.263" y="48.2299">
<properties>
<property name="enemy" value="Bandit"/>
<property name="threatRange" type="int" value="20"/>
@@ -122,8 +122,8 @@
</object>
<object id="179" template="../obj/waypoint.tx" x="180.342" y="117.105"/>
<object id="180" template="../obj/waypoint.tx" x="199.842" y="162.105"/>
<object id="181" template="../obj/waypoint.tx" x="13.3421" y="10.1053"/>
<object id="183" template="../obj/waypoint.tx" x="95.8421" y="139.605"/>
<object id="181" template="../obj/waypoint.tx" x="32.3421" y="14.1053"/>
<object id="183" template="../obj/waypoint.tx" x="105.842" y="139.605"/>
<object id="184" template="../obj/waypoint.tx" x="105.342" y="221.105"/>
<object id="185" template="../obj/manashards.tx" x="402.887" y="196.423"/>
<object id="186" template="../obj/manashards.tx" x="66.2966" y="27.7871"/>
@@ -131,7 +131,7 @@
<object id="189" template="../obj/waypoint.tx" x="359.842" y="117.605"/>
<object id="190" template="../obj/waypoint.tx" x="379.342" y="183.605"/>
<object id="191" template="../obj/waypoint.tx" x="325.842" y="135.105"/>
<object id="192" template="../obj/waypoint.tx" x="30.8421" y="89.6053"/>
<object id="192" template="../obj/waypoint.tx" x="20.3421" y="77.1053"/>
<object id="193" template="../obj/collision.tx" x="-14.9079" y="-24.3947" width="524.5" height="16"/>
<object id="194" template="../obj/collision.tx" x="-16.4079" y="346.105" width="527.5" height="16"/>
<object id="195" template="../obj/collision.tx" x="492.342" y="-22.9362" width="16" height="387.083"/>

31
forge-gui/res/adventure/Shandalar/maps/map/tibalt_f1.tmx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="46" height="28" tilewidth="16" tileheight="16" infinite="0" nextlayerid="19" nextobjectid="197">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="46" height="28" tilewidth="16" tileheight="16" infinite="0" nextlayerid="19" nextobjectid="200">
<editorsettings>
<export format="tmx"/>
</editorsettings>
@@ -7,7 +7,7 @@
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<layer id="17" name="Collision" width="46" height="28">
<data encoding="base64" compression="zlib">
eJzVlVEOwjAIhhvffFlM1Jt4Bu/hYb3PjmDIJKkEKKwFOxKyWij7JH9ZKePseS7ldNcdciyO9bT4SG4rE+Z7z0Zxv26/zuVway97Bnf9W+OWamZyw3q5bI77lNX6/kxuZAYHOwo3stZrLv+x6B6hE64e1bd2R4FLs39wW2w2bs/5NYDb+y3wzlzgyua2mna2vn8ccy83NU0L2D+pNt2XuDE2itvbc5pr5R7Rb/D31a9lLb5+41H9hvrc3emdRTWbtN/ibvUlktvLQ/OkmhZuWkd6Su8Aq/XS6nUPN+hd4m7t16bN79n7Tec4PkdwU/49+vbMo159lzLuXmZze2MzcLfORjB5uC1sWr/3/vce7j3W6nckcyR3hk6OyP0BqjbOBA==
eJzVllEOwjAIhhvffFlM1Jt4Bu/hYb3PjmDIJKkEKKxQOxKyWij7/EPRUuLseS7ldNcdciyO9bR4JLeVCfO9Z7O4X7df53K4tZd9BHf9WeOWao7khvVy2Rz3Kav1/SO5kRkc7CjcyFqvufzHontGn3D1aH9rdxS4NPsHt8Vm4/acXxO4vb8F3pkLXKO5raadre8fx9zLTU3rBdRPqk33JW6MRXF7Nae5Vu4IvcHfV38va/H1G8/SG+pzd6d3FtVs0n6Lu6VLJreXh+ZJNS3ctI70lN4BVvdLS+sebuh3iRv/S1m4tfk9u950juMzgpvy7+lvzzzq7e9S4u7laG5vbAbu1tkMJg+3hU3Te+937+HeYy29M5kzuUf0yRG5P3f9ziI=
</data>
</layer>
<layer id="18" name="Tilelaag 5" width="46" height="28">
@@ -43,10 +43,10 @@
<object id="117" template="../obj/enemy.tx" x="159.319" y="212.121">
<properties>
<property name="enemy" value="Devil "/>
<property name="threatRange" type="int" value="20"/>
<property name="threatRange" type="int" value="30"/>
</properties>
</object>
<object id="119" template="../obj/enemy.tx" x="348.198" y="185.94">
<object id="119" template="../obj/enemy.tx" x="349.865" y="189.94">
<properties>
<property name="enemy" value="Torturer"/>
<property name="reward">[
@@ -59,7 +59,7 @@
]
</property>
<property name="spawn.Hard" type="bool" value="true"/>
<property name="threatRange" type="int" value="60"/>
<property name="threatRange" type="int" value="20"/>
</properties>
</object>
<object id="136" template="../obj/enemy.tx" x="434.191" y="249.907">
@@ -85,7 +85,7 @@
<property name="spawn.Hard" type="bool" value="false"/>
</properties>
</object>
<object id="150" template="../obj/enemy.tx" x="372.676" y="109.772">
<object id="150" template="../obj/enemy.tx" x="373.676" y="136.772">
<properties>
<property name="enemy" value="Necromancer"/>
<property name="spawn.Hard" type="bool" value="true"/>
@@ -93,11 +93,6 @@
<property name="waypoints" value="183,181,182,181"/>
</properties>
</object>
<object id="161" template="../obj/entry_up.tx" x="460.679" y="88.9027" width="31.6667" height="16">
<properties>
<property name="teleport" value="maps/map/tibalt_f2.tmx"/>
</properties>
</object>
<object id="166" template="../obj/enemy.tx" x="56.8421" y="320.605">
<properties>
<property name="enemy" value="Demon"/>
@@ -151,10 +146,10 @@
</property>
</properties>
</object>
<object id="181" template="../obj/waypoint.tx" x="423.342" y="49.4386"/>
<object id="182" template="../obj/waypoint.tx" x="338.342" y="49.4386"/>
<object id="181" template="../obj/waypoint.tx" x="423.009" y="57.1053"/>
<object id="182" template="../obj/waypoint.tx" x="347.342" y="45.1053"/>
<object id="183" template="../obj/waypoint.tx" x="421.008" y="138.105"/>
<object id="184" template="../obj/gate.tx" x="574.009" y="280.439" width="15.3333" height="13.3333">
<object id="184" template="../obj/gate.tx" x="577.342" y="285.439" width="11.6666" height="22">
<properties>
<property name="dialog">[{
&quot;text&quot;:&quot;This door is locked&quot;,
@@ -182,5 +177,13 @@
<object id="194" template="../obj/waypoint.tx" x="202.009" y="355.105"/>
<object id="195" template="../obj/waypoint.tx" x="130.009" y="360.105"/>
<object id="196" template="../obj/waypoint.tx" x="344.342" y="253.772"/>
<object id="197" template="../obj/waypoint.tx" x="470.342" y="121.439"/>
<object id="198" template="../obj/door_up.tx" x="460.684" y="69.2103" width="24.0134" height="23.6704" rotation="359.74">
<properties>
<property name="direction" value="left"/>
<property name="teleport" value="maps/map/tibalt_f2.tmx"/>
<property name="teleportObjectId" value="114"/>
</properties>
</object>
</objectgroup>
</map>

19
forge-gui/res/adventure/Shandalar/maps/map/tibalt_f2.tmx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="22" height="21" tilewidth="16" tileheight="16" infinite="0" nextlayerid="17" nextobjectid="169">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="22" height="21" tilewidth="16" tileheight="16" infinite="0" nextlayerid="17" nextobjectid="174">
<editorsettings>
<export format="tmx"/>
</editorsettings>
@@ -7,7 +7,7 @@
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
<layer id="16" name="Collision" width="22" height="21">
<data encoding="base64" compression="zlib">
eJxjYBhY4MaJwJTqJ4RJNdeEjzAmx1xK/EWpuaTqHWhzsakjZC6yPIyNLkZO+OJSR0k6QzcHn93UNpeQHDnm0jIcCMkNBnOR/U6Nsg2fHdQ2FxufEnPx2UMNcylNZ+h2kJKPAc8THhk=
eJxjYBhY4MaJwJTqJ4RJNdeEjzAmx1xK/EWpuaTqHWhzsakjZC6yPIyNLkZO+OJSR0k6QzcHn93UNpeQHDnm0jIcCMkNBnOR/U6Nsg2fHdQ2FxufEnPx2UMNc6mRzsitLwAC3x8G
</data>
</layer>
<layer id="15" name="Tilelaag 3" width="22" height="21">
@@ -63,12 +63,6 @@
<property name="spawn.Hard" type="bool" value="true"/>
</properties>
</object>
<object id="165" template="../obj/entry_up.tx" x="136.342" y="288.605">
<properties>
<property name="teleport" value="maps/map/tibalt_f1.tmx"/>
<property name="teleportObjectId" value="161"/>
</properties>
</object>
<object id="166" template="../obj/manashards.tx" x="275.818" y="86.5449"/>
<object id="167" template="../obj/booster.tx" x="242.398" y="116.332">
<properties>
@@ -95,7 +89,7 @@
</property>
</properties>
</object>
<object id="168" template="../obj/gate.tx" gid="4125" x="218.842" y="114.772" width="4" height="22.3333" rotation="0">
<object id="168" template="../obj/gate.tx" gid="3221229597" x="226.93" y="108.325" width="9.99747" height="21.9971" rotation="90.4687">
<properties>
<property name="dialog">[{
&quot;text&quot;:&quot;This door is locked&quot;,
@@ -111,5 +105,12 @@
}]</property>
</properties>
</object>
<object id="170" template="../obj/door_down.tx" x="124.811" y="303.18" width="32.3503" height="30.8105" rotation="0.284412">
<properties>
<property name="direction" value="up"/>
<property name="teleport" value="maps/map/tibalt_f1.tmx"/>
<property name="teleportObjectId" value="199"/>
</properties>
</object>
</objectgroup>
</map>

2
forge-gui/res/adventure/Shandalar/world/enemies.json
View File

@@ -10029,7 +10029,7 @@
"decks/torturer.dck"
],
"ai": "",
"flying": false,
"flying": true,
"spawnRate": 1,
"scale":0.5,
"difficulty": 0.1,

5
forge-gui/res/cardsfolder/a/academy_rector.txt
View File

@@ -2,9 +2,8 @@ Name:Academy Rector
ManaCost:3 W
Types:Creature Human Cleric
PT:1/2
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, search your library for an enchantment card and put that card onto the battlefield, then shuffle.
SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBReturn
SVar:DBReturn:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Enchantment.YouOwn | ChangeNum$ 1
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, search your library for an enchantment card and put that card onto the battlefield, then shuffle.
SVar:TrigReturn:AB$ ChangeZone | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | Origin$ Library | Destination$ Battlefield | ChangeType$ Enchantment.YouOwn | ChangeNum$ 1
SVar:SacMe:4
AI:RemoveDeck:Random
DeckNeeds:Type$Enchantment

5
forge-gui/res/cardsfolder/a/arena_rector.txt
View File

@@ -2,9 +2,8 @@ Name:Arena Rector
ManaCost:3 W
Types:Creature Human Cleric
PT:1/2
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle.
SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBReturn
SVar:DBReturn:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Planeswalker.YouOwn | ChangeNum$ 1
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle.
SVar:TrigExile:AB$ ChangeZone | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | Origin$ Library | Destination$ Battlefield | ChangeType$ Planeswalker.YouOwn | ChangeNum$ 1
SVar:SacMe:4
AI:RemoveDeck:Random
DeckNeeds:Type$Planeswalker

5
forge-gui/res/cardsfolder/c/cavalier_of_thorns.txt
View File

@@ -5,7 +5,6 @@ PT:5/6
K:Reach
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, reveal the top five cards of your library. Put a land card from among them onto the battlefield and the rest into your graveyard.
SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | ChangeValid$ Land | Optional$ True | DestinationZone$ Battlefield | DestinationZone2$ Graveyard
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, put another target card from your graveyard on top of your library.
SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBChange
SVar:DBChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | ValidTgts$ Card.YouOwn+Other | TgtPrompt$ Select another target card from your graveyard | AITgts$ Card.Other | ChangeNum$ 1
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile| TriggerDescription$ When CARDNAME dies, you may exile it. If you do, put another target card from your graveyard on top of your library.
SVar:TrigExile:AB$ ChangeZone | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | Origin$ Graveyard | Destination$ Library | ValidTgts$ Card.YouOwn+Other | TgtPrompt$ Select another target card from your graveyard | AITgts$ Card.Other | ChangeNum$ 1
Oracle:Reach\nWhen Cavalier of Thorns enters the battlefield, reveal the top five cards of your library. Put a land card from among them onto the battlefield and the rest into your graveyard.\nWhen Cavalier of Thorns dies, you may exile it. If you do, put another target card from your graveyard on top of your library.

7
forge-gui/res/cardsfolder/c/colfenors_urn.txt
View File

@@ -2,9 +2,8 @@ Name:Colfenor's Urn
ManaCost:3
Types:Artifact
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.toughnessGE4+YouOwn | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Whenever a creature with toughness 4 or greater is put into your graveyard from the battlefield, you may exile it.
SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | RememberChanged$ True
SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy
T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturnAll | TriggerDescription$ At the beginning of the end step, if three or more cards have been exiled with CARDNAME, sacrifice it. If you do, return those cards to the battlefield under their owner's control.
SVar:TrigReturnAll:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBSacSelf
SVar:DBSacSelf:DB$ Sacrifice
SVar:X:Remembered$Amount
SVar:TrigReturnAll:AB$ ChangeZone | Cost$ Mandatory Sac<1/CARDNAME> | Defined$ ExiledWith | Origin$ Exile | Destination$ Battlefield
SVar:X:ExiledWith$Amount
Oracle:Whenever a creature with toughness 4 or greater is put into your graveyard from the battlefield, you may exile it.\nAt the beginning of the end step, if three or more cards have been exiled with Colfenor's Urn, sacrifice it. If you do, return those cards to the battlefield under their owner's control.

3
forge-gui/res/cardsfolder/c/creeping_chill.txt
View File

@@ -3,7 +3,6 @@ ManaCost:3 B
Types:Sorcery
A:SP$ DamageAll | StackDescription$ CARDNAME deals 3 damage to each opponent and | Cost$ 3 B | ValidPlayers$ Player.Opponent | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 3 damage to each opponent and you gain 3 life.
T:Mode$ ChangesZone | Origin$ Library | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME is put into your graveyard from your library, you may exile it. If you do, CARDNAME deals 3 damage to each opponent and you gain 3 life.
SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredCardLKICopy | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBDamage
SVar:DBDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 3 | SubAbility$ DBGainLife
SVar:TrigExile:AB$ DealDamage | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | Defined$ Player.Opponent | NumDmg$ 3 | SubAbility$ DBGainLife
SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
Oracle:Creeping Chill deals 3 damage to each opponent and you gain 3 life.\nWhen Creeping Chill is put into your graveyard from your library, you may exile it. If you do, Creeping Chill deals 3 damage to each opponent and you gain 3 life.

5
forge-gui/res/cardsfolder/g/gamekeeper.txt
View File

@@ -2,7 +2,6 @@ Name:Gamekeeper
ManaCost:3 G
Types:Creature Elf
PT:2/2
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBDigUntil
SVar:DBDigUntil:DB$ DigUntil | Valid$ Creature | ValidDescription$ Creature | FoundDestination$ Battlefield | RevealedDestination$ Graveyard
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
SVar:TrigExile:AB$ DigUntil | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | Valid$ Creature | ValidDescription$ Creature | FoundDestination$ Battlefield | RevealedDestination$ Graveyard
Oracle:When Gamekeeper dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.

2
forge-gui/res/cardsfolder/g/greenbelt_rampager.txt
View File

@@ -2,7 +2,7 @@ Name:Greenbelt Rampager
ManaCost:G
Types:Creature Elephant
PT:3/4
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ PaymentCheck | TriggerDescription$ When CARDNAME enters the battlefield, pay {E}{E} (two energy counters). If you can't, return Greenbelt Rampager to its owner's hand and you get {E}.
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ PaymentCheck | TriggerDescription$ When CARDNAME enters the battlefield, pay {E}{E} (two energy counters). If you can't, return CARDNAME to its owner's hand and you get {E}.
SVar:PaymentCheck:DB$ Pump | UnlessCost$ Mandatory PayEnergy<2> | UnlessPayer$ You | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBReturnToHand
SVar:DBReturnToHand:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SubAbility$ GetEnergy
SVar:GetEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1

5
forge-gui/res/cardsfolder/g/greenwarden_of_murasa.txt
View File

@@ -4,7 +4,6 @@ Types:Creature Elemental
PT:5/4
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target card from your graveyard to your hand.
SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouCtrl
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return target card from your graveyard to your hand.
SVar:TrigExile:DB$ ChangeZone | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBReturn
SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouCtrl
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return target card from your graveyard to your hand.
SVar:TrigExile:AB$ ChangeZone | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouCtrl
Oracle:When Greenwarden of Murasa enters the battlefield, you may return target card from your graveyard to your hand.\nWhen Greenwarden of Murasa dies, you may exile it. If you do, return target card from your graveyard to your hand.

3
forge-gui/res/cardsfolder/i/iname_as_one.txt
View File

@@ -5,6 +5,5 @@ PT:8/8
T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromYourHandByYou+Self | Destination$ Battlefield | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, you may search your library for a Spirit permanent card, put it onto the battlefield, then shuffle.
SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Spirit.YouCtrl | ChangeNum$ 1 | ShuffleNonMandatory$ True
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield.
SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBReturn
SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Hidden$ True | ChangeType$ Spirit.YouCtrl | ChangeNum$ 1
SVar:TrigExile:AB$ ChangeZone | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Spirit.YouCtrl
Oracle:When Iname as One enters the battlefield, if you cast it from your hand, you may search your library for a Spirit permanent card, put it onto the battlefield, then shuffle.\nWhen Iname as One dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield.

2
forge-gui/res/cardsfolder/k/kinzu_of_the_bleak_coven.txt
View File

@@ -4,6 +4,6 @@ Types:Legendary Creature Phyrexian Vampire
PT:5/4
K:Flying
T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control dies, you may pay 2 life and exile it. If you do, create a token that's a copy of that creature, except it's 1/1 and has toxic 1. (Players dealt combat damage by it also get a poison counter.)
SVar:TrigExile:AB$ CopyPermanent | Cost$ PayLife<2> ExileAnyGrave<1/Card.TriggeredCard/Exile nontoken creature that just died> | AddKeywords$ Toxic:1 | Defined$ TriggeredCardLKICopy | SetPower$ 1 | SetToughness$ 1
SVar:TrigExile:AB$ CopyPermanent | Cost$ PayLife<2> ExileAnyGrave<1/Card.TriggeredNewCard> | AddKeywords$ Toxic:1 | Defined$ TriggeredCardLKICopy | SetPower$ 1 | SetToughness$ 1
DeckHas:Ability$Token
Oracle:Flying\nWhenever another nontoken creature you control dies, you may pay 2 life and exile it. If you do, create a token that's a copy of that creature, except it's 1/1 and has toxic 1. (Players dealt combat damage by it also get a poison counter.)

2
forge-gui/res/cardsfolder/k/kozileks_return.txt
View File

@@ -4,5 +4,5 @@ Types:Instant
K:Devoid
A:SP$ DamageAll | Cost$ 2 R | NumDmg$ 2 | ValidCards$ Creature | ValidDescription$ each creature. | SpellDescription$ CARDNAME deals 2 damage to each creature.
T:Mode$ SpellCast | ValidCard$ Creature.Eldrazi+cmcGE7+YouCtrl | TriggerZones$ Graveyard | Execute$ DBDamageAll | TriggerDescription$ Whenever you cast an Eldrazi creature spell with mana value 7 or greater, you may exile CARDNAME from your graveyard. If you do, CARDNAME deals 5 damage to each creature.
SVar:DBDamageAll:AB$ DamageAll | Cost$ ExileFromGrave<1/Card.Self> | ValidCards$ Creature | NumDmg$ 5 | ValidDescription$ each creature.
SVar:DBDamageAll:AB$ DamageAll | Cost$ ExileFromGrave<1/CARDNAME> | ValidCards$ Creature | NumDmg$ 5 | ValidDescription$ each creature.
Oracle:Devoid (This card has no color.)\nKozilek's Return deals 2 damage to each creature.\nWhenever you cast an Eldrazi creature spell with mana value 7 or greater, you may exile Kozilek's Return from your graveyard. If you do, Kozilek's Return deals 5 damage to each creature.

3
forge-gui/res/cardsfolder/r/rooting_kavu.txt
View File

@@ -3,6 +3,5 @@ ManaCost:2 G G
Types:Creature Kavu
PT:4/3
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, shuffle all creature cards from your graveyard into your library.
SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBShuffle
SVar:DBShuffle:DB$ ChangeZoneAll | ChangeType$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | Shuffle$ True
SVar:TrigExile:AB$ ChangeZoneAll | Cost$ ExileAnyGrave<1/Card.TriggeredNewCard> | ChangeType$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | Shuffle$ True
Oracle:When Rooting Kavu dies, you may exile it. If you do, shuffle all creature cards from your graveyard into your library.

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

@@ -4,7 +4,7 @@ Types:Legendary Creature Vampire Noble
PT:4/4
K:Ward:Discard<1/Card>
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Vampire.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken Vampire you control dies, you may pay {1} and exile it. If you do, create a 1/1 black Bat creature token with flying. It gains "When this creature deals combat damage to a player, sacrifice it and return the exiled card to the battlefield tapped."
SVar:TrigToken:AB$ Token | Cost$ 1 ExileAnyGrave<1/Card.TriggeredNewCard/the Vampire card> | TokenRemembered$ ExiledCards | TokenScript$ b_1_1_bat_flying | ImprintTokens$ True | SubAbility$ DBAnimate
SVar:TrigToken:AB$ Token | Cost$ 1 ExileAnyGrave<1/Card.TriggeredNewCard> | TokenRemembered$ ExiledCards | TokenScript$ b_1_1_bat_flying | ImprintTokens$ True | SubAbility$ DBAnimate
SVar:DBAnimate:DB$ Animate | Defined$ Imprinted | Duration$ Permanent | Triggers$ CDTrigger
SVar:CDTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ When this creature deals combat damage to a player, sacrifice it and return the exiled card to the battlefield tapped.
SVar:TrigSac:DB$ Sacrifice | SubAbility$ DBReturn

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

@@ -5,7 +5,7 @@ PT:3/4
K:Reach
T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigLifegain | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, you gain 2 life.
SVar:TrigLifegain:DB$ GainLife | LifeAmount$ 2
T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | SVarCompare$ GE4 | IsPresent$ Card.Self+YouOwn | IsPresent2$ Land.YouCtrl+YouOwn+namedArgoth; Sanctum of Nature | ValidPlayer$ You | Execute$ Meld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if you both own and control CARDNAME and a land named Argoth, Sanctum of Nature, exile them, then meld them into Titania, Gaea Incarnate.
T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | SVarCompare$ GE4 | IsPresent$ Card.Self+YouOwn | IsPresent2$ Land.YouCtrl+YouOwn+namedArgoth; Sanctum of Nature | ValidPlayer$ You | Execute$ Meld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if there are four or more land cards in your graveyard and you both own and control CARDNAME and a land named Argoth, Sanctum of Nature, exile them, then meld them into Titania, Gaea Incarnate.
SVar:Meld:DB$ Meld | Name$ Titania, Gaea Incarnate | Primary$ Titania, Voice of Gaea | Secondary$ Argoth, Sanctum of Nature | SecondaryType$ Land
DeckHints:Name$Argoth, Sanctum of Nature
MeldPair:Argoth, Sanctum of Nature

9
forge-gui/res/cardsfolder/upcoming/mount_doom.txt Normal file
View File

@@ -0,0 +1,9 @@
Name:Mount Doom
ManaCost:no cost
Types:Legendary Land
A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Combo B R | SpellDescription$ Add {B} or {R}.
A:AB$ DealDamage | Cost$ 1 B R T | Defined$ Opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to each opponent.
A:AB$ ChooseCard | Cost$ 5 B R T Sac<1/CARDNAME> Sac<1/Artifact.Legendary/legendary artifact> | Defined$ You | Amount$ 2 | Choices$ Creature | ChoiceTitle$ Choose up to two creatures | SorcerySpeed$ True | AILogic$ Duneblast | SubAbility$ DBDestroyAll | StackDescription$ {p:You} chooses up to two creatures. Destroy the rest. | SpellDescription$ Choose up to two creatures, then destroy the rest. Activate only as a sorcery.
SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.nonChosenCard | StackDescription$ None
DeckNeeds:Type$Legendary.Artifact
Oracle:{T}, Pay 1 life: Add {B} or {R}.\n{1}{B}{R}, {T}: Mount Doom deals 1 damage to each opponent.\n{5}{B}{R}, {T}, Sacrifice Mount Doom and a legendary artifact: Choose up to two creatures, then destroy the rest. Activate only as a sorcery.

6
forge-gui/res/cardsfolder/upcoming/reprieve.txt Normal file
View File

@@ -0,0 +1,6 @@
Name:Reprieve
ManaCost:1 W
Types:Instant
A:SP$ ChangeZone | ValidTgts$ Card.inZoneStack | TgtZone$ Stack | Origin$ Stack | Fizzle$ True | Destination$ Hand | SubAbility$ DBDraw | SpellDescription$ Return target spell to its owner's hand.
SVar:DBDraw:DB$ Draw | NumCards$ 1
Oracle:Return target spell to its owner's hand.\nDraw a card.

6
forge-gui/res/cardsfolder/upcoming/you_cannot_pass!.txt Normal file
View File

@@ -0,0 +1,6 @@
Name:You Cannot Pass!
ManaCost:W
Types:Instant
A:SP$ Destroy | ValidTgts$ Creature.blockedValidThisTurn Creature.Legendary,Creature.blockedByValidThisTurn Creature.Legendary | TgtPrompt$ Select target creature that blocked or was blocked by a legendary creature this turn | SpellDescription$ Destroy target creature that blocked or was blocked by a legendary creature this turn.
DeckNeeds:Type$Legendary.Creature
Oracle:Destroy target creature that blocked or was blocked by a legendary creature this turn.

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

@@ -269,9 +269,9 @@ public class HumanCostDecision extends CostDecisionMakerBase {
return inp.hasCancelled() ? null : PaymentDecision.card(inp.getSelected());
}
if (cost.from == ZoneType.Library) { return exileFromTop(cost, ability, player, c); }
if (fromTopGrave) { return exileFromTopGraveType(ability, c, list); }
if (cost.zoneRestriction != 0) { return exileFromMiscZone(cost, ability, c, list); }
if (cost.from == ZoneType.Library) { return exileFromTop(cost, c); }
if (fromTopGrave) { return exileFromTopGraveType(c, list); }
if (cost.zoneRestriction != 0) { return exileFromMiscZone(cost, c, list); }
final FCollectionView<Player> players = game.getPlayers();
final List<Player> payableZone = new ArrayList<>();
@@ -363,22 +363,27 @@ public class HumanCostDecision extends CostDecisionMakerBase {
return PaymentDecision.spellabilities(exiled);
}
private PaymentDecision exileFromTop(final CostExile cost, final SpellAbility sa, final Player player, final int nNeeded) {
private PaymentDecision exileFromTop(final CostExile cost, final int nNeeded) {
final CardCollectionView list = player.getCardsIn(ZoneType.Library, nNeeded);
if (list.size() > nNeeded || !confirmAction(cost, Localizer.getInstance().getMessage("lblExileNCardFromYourTopLibraryConfirm"))) {
if (!confirmAction(cost, Localizer.getInstance().getMessage("lblExileNCardFromYourTopLibraryConfirm"))) {
return null;
}
return PaymentDecision.card(list);
}
private PaymentDecision exileFromMiscZone(final CostExile cost, final SpellAbility sa, final int nNeeded, final CardCollection typeList) {
if (typeList.size() < nNeeded) { return null; }
private PaymentDecision exileFromMiscZone(final CostExile cost, final int nNeeded, final CardCollection typeList) {
// when it's always a single triggered card getting exiled don't act like it might be different by offering the zone for choice
if (cost.zoneRestriction == -1 && ability.isTrigger() && nNeeded == 1 && typeList.size() == 1) {
if (confirmAction(cost, Localizer.getInstance().getMessage("lblExileConfirm", CardTranslation.getTranslatedName(typeList.getFirst().getName())))) {
return PaymentDecision.card(typeList.getFirst());
}
return null;
}
final List<ZoneType> origin = Lists.newArrayList(cost.from);
final CardCollection exiled = new CardCollection();
final List<Card> chosen = controller.chooseCardsForZoneChange(ZoneType.Exile, origin, sa, typeList, mandatory ? nNeeded : 0,
final List<Card> chosen = controller.chooseCardsForZoneChange(ZoneType.Exile, origin, ability, typeList, mandatory ? nNeeded : 0,
nNeeded, null, cost.toString(), null);
exiled.addAll(chosen);
@@ -388,9 +393,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
return PaymentDecision.card(exiled);
}
private PaymentDecision exileFromTopGraveType(final SpellAbility sa, final int nNeeded, final CardCollection typeList) {
if (typeList.size() < nNeeded) { return null; }
private PaymentDecision exileFromTopGraveType(final int nNeeded, final CardCollection typeList) {
Collections.reverse(typeList);
return PaymentDecision.card(Iterables.limit(typeList, nNeeded));
}

83
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -1,13 +1,10 @@
package forge.player;
import java.util.ArrayList;
import java.util.List;
import forge.ImageKeys;
import forge.game.cost.*;
import forge.game.spellability.SpellAbilityStackInstance;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Iterables;
@@ -198,24 +195,6 @@ public class HumanPlay {
req.playAbility(!useOldTargets, false, true);
}
private static int getAmountFromPart(CostPart part, Card source, SpellAbility sourceAbility) {
String amountString = part.getAmount();
return StringUtils.isNumeric(amountString) ? Integer.parseInt(amountString) : AbilityUtils.calculateAmount(source, amountString, sourceAbility);
}
/**
* TODO: Write javadoc for this method.
* @param part
* @param source
* @param sourceAbility
* @return
*/
private static int getAmountFromPartX(CostPart part, Card source, SpellAbility sourceAbility) {
String amountString = part.getAmount();
// Probably should just be -
return AbilityUtils.calculateAmount(source, amountString, sourceAbility);
}
/**
* <p>
* payCostDuringAbilityResolve.
@@ -282,6 +261,7 @@ public class HumanPlay {
|| part instanceof CostRollDice
|| part instanceof CostDamage
|| part instanceof CostEnlist
|| part instanceof CostExileFromStack
|| part instanceof CostPutCounter
|| part instanceof CostRemoveCounter
|| part instanceof CostRemoveAnyCounter
@@ -327,7 +307,7 @@ public class HumanPlay {
list = new CardCollection(p.getCardsIn(from));
}
list = CardLists.getValidCards(list, part.getType().split(";"), p, source, sourceAbility);
final int nNeeded = getAmountFromPart(part, source, sourceAbility);
final int nNeeded = part.getAbilityAmount(sourceAbility);
if (list.size() < nNeeded) {
return false;
}
@@ -357,53 +337,6 @@ public class HumanPlay {
}
}
}
else if (part instanceof CostExileFromStack) {
CostExileFromStack costExile = (CostExileFromStack) part;
final List<SpellAbility> saList = new ArrayList<>();
final List<String> descList = new ArrayList<>();
for (final SpellAbilityStackInstance si : p.getGame().getStack()) {
final Card stC = si.getSourceCard();
final SpellAbility stSA = si.getSpellAbility(true).getRootAbility();
if (stC.isValid(part.getType().split(";"), p, source, sourceAbility) && stSA.isSpell()) {
saList.add(stSA);
if (stC.isCopiedSpell()) {
descList.add(stSA.getStackDescription() + " (Copied Spell)");
} else {
descList.add(stSA.getStackDescription());
}
}
}
List<SpellAbility> payList = new ArrayList<>();
if (part.getType().equals("All")) {
payList.addAll(saList);
} else {
final int c = getAmountFromPart(part, source, sourceAbility);
if (saList.size() < c) {
return false;
}
for (int i = 0; i < c; i++) {
//Have to use the stack descriptions here because some copied spells have no description otherwise
final String o = controller.getGui().oneOrNone(Localizer.getInstance().getMessage("lblExileFromStack"), descList);
if (o == null) {
return false;
}
final SpellAbility toExile = saList.get(descList.indexOf(o));
saList.remove(toExile);
descList.remove(o);
payList.add(toExile);
}
}
costExile.payAsDecided(p, PaymentDecision.spellabilities(payList), sourceAbility, hcd.isEffect());
}
else if (part instanceof CostPutCardToLib) {
int amount = Integer.parseInt(part.getAmount());
final ZoneType from = ((CostPutCardToLib) part).getFrom();
@@ -466,12 +399,12 @@ public class HumanPlay {
}
else if (part instanceof CostReturn) {
CardCollectionView list = CardLists.getValidCards(p.getCardsIn(ZoneType.Battlefield), part.getType(), p, source, sourceAbility);
int amount = getAmountFromPartX(part, source, sourceAbility);
int amount = part.getAbilityAmount(sourceAbility);
boolean hasPaid = payCostPart(controller, p, sourceAbility, hcd.isEffect(), (CostPartWithList)part, amount, list, Localizer.getInstance().getMessage("lblReturnToHand") + orString);
if (!hasPaid) { return false; }
}
else if (part instanceof CostDiscard) {
int amount = getAmountFromPartX(part, source, sourceAbility);
int amount = part.getAbilityAmount(sourceAbility);
if ("Hand".equals(part.getType())) {
if (!p.getController().confirmPayment(part, Localizer.getInstance().getMessage("lblDoYouWantDiscardYourHand"), sourceAbility)) {
return false;
@@ -493,14 +426,14 @@ public class HumanPlay {
else if (part instanceof CostReveal) {
CostReveal costReveal = (CostReveal) part;
CardCollectionView list = CardLists.getValidCards(p.getCardsIn(costReveal.getRevealFrom()), part.getType(), p, source, sourceAbility);
int amount = getAmountFromPartX(part, source, sourceAbility);
int amount = part.getAbilityAmount(sourceAbility);
boolean hasPaid = payCostPart(controller, p, sourceAbility, hcd.isEffect(), (CostPartWithList)part, amount, list, Localizer.getInstance().getMessage("lblReveal") + orString);
if (!hasPaid) { return false; }
}
else if (part instanceof CostTapType) {
CardCollectionView list = CardLists.getValidCards(p.getCardsIn(ZoneType.Battlefield), part.getType(), p, source, sourceAbility);
list = CardLists.filter(list, Presets.UNTAPPED);
int amount = getAmountFromPartX(part, source, sourceAbility);
int amount = part.getAbilityAmount(sourceAbility);
boolean hasPaid = payCostPart(controller, p, sourceAbility, hcd.isEffect(), (CostPartWithList)part, amount, list, Localizer.getInstance().getMessage("lblTap") + orString);
if (!hasPaid) { return false; }
}
@@ -511,7 +444,7 @@ public class HumanPlay {
}
else if (part instanceof CostPayEnergy) {
CounterType counterType = CounterType.get(CounterEnumType.ENERGY);
int amount = getAmountFromPartX(part, source, sourceAbility);
int amount = part.getAbilityAmount(sourceAbility);
if (!mandatory && !p.getController().confirmPayment(part, Localizer.getInstance().getMessage("lblDoYouWantSpendNTargetTypeCounter", String.valueOf(amount), counterType.getName()), sourceAbility)) {
return false;
@@ -525,7 +458,7 @@ public class HumanPlay {
else if (part instanceof CostPayShards) {
CounterType counterType = CounterType.get(CounterEnumType.MANASHARDS);
int amount = getAmountFromPartX(part, source, sourceAbility);
int amount = part.getAbilityAmount(sourceAbility);
if (!mandatory && !p.getController().confirmPayment(part, Localizer.getInstance().getMessage("lblDoYouWantSpendNTargetTypeCounter", String.valueOf(amount), counterType.getName()), sourceAbility)) {
return false;

3
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1850,8 +1850,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
}
@Override
public ReplacementEffect chooseSingleReplacementEffect(final String prompt,
final List<ReplacementEffect> possibleReplacers) {
public ReplacementEffect chooseSingleReplacementEffect(final String prompt, final List<ReplacementEffect> possibleReplacers) {
final ReplacementEffect first = possibleReplacers.get(0);
if (possibleReplacers.size() == 1) {
return first;