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

Fix scripts (#3627)

Browse Source 
Co-authored-by: TRT <>
This commit is contained in:
tool4ever
2023-08-14 08:20:46 +02:00
committed by GitHub
parent 7bff8666b3
commit 07e90c94eb
8 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -2252,7 +2252,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
} else if (keyword.startsWith("Modular") || keyword.startsWith("Bloodthirst") || keyword.startsWith("Dredge")
|| keyword.startsWith("Fabricate") || keyword.startsWith("Soulshift") || keyword.startsWith("Bushido")
|| keyword.startsWith("Crew") || keyword.startsWith("Tribute") || keyword.startsWith("Absorb")
|| keyword.startsWith("Graft") || keyword.startsWith("Fading") || keyword.startsWith("Vanishing")
|| keyword.startsWith("Graft") || keyword.startsWith("Fading") || keyword.startsWith("Vanishing:")
|| keyword.startsWith("Afterlife") || keyword.startsWith("Hideaway") || keyword.startsWith("Toxic")
|| keyword.startsWith("Afflict") || keyword.startsWith ("Poisonous") || keyword.startsWith("Rampage")
|| keyword.startsWith("Renown") || keyword.startsWith("Annihilator") || keyword.startsWith("Devour")) {

2
forge-game/src/main/java/forge/game/keyword/KeywordWithAmount.java
View File

@@ -17,7 +17,7 @@ public class KeywordWithAmount extends KeywordInstance<KeywordWithAmount> {
if (details.contains(":")) {
extra = details.split(":")[1];
}
} else {
} else if (!details.isEmpty()) {
amount = details.contains(":") ? Integer.parseInt(details.split(":")[0]) : Integer.parseInt(details);
}
}

1
forge-game/src/main/java/forge/game/trigger/TriggerRingTemptsYou.java
View File

@@ -15,7 +15,6 @@ public class TriggerRingTemptsYou extends Trigger {
@Override
public boolean performTest(Map<AbilityKey, Object> runParams) {
if (!matchesValidParam("ValidPlayer", runParams.get(AbilityKey.Player))) {
return false;
}

7
forge-gui/res/cardsfolder/f/friendly_rivalry.txt
View File

@@ -1,8 +1,7 @@
Name:Friendly Rivalry
ManaCost:R G
Types:Instant
A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBPump | RememberTargets$ True | SpellDescription$ Target creature you control and up to one other target legendary creature you control each deal damage equal to their power to target creature you don't control.
SVar:DBPump:DB$ Pump | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select up to one target legendary creature you control | RememberTargets$ True | TargetMin$ 0 | TargetMax$ 1 | TargetUnique$ True | SubAbility$ DBEachDamage
SVar:DBEachDamage:DB$ EachDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | DefinedDamagers$ Remembered | NumDmg$ Count$CardPower | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBPump | SpellDescription$ Target creature you control and up to one other target legendary creature you control each deal damage equal to their power to target creature you don't control.
SVar:DBPump:DB$ Pump | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select up to one target legendary creature you control | TargetMin$ 0 | TargetMax$ 1 | TargetUnique$ True | SubAbility$ DBEachDamage
SVar:DBEachDamage:DB$ EachDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | DefinedDamagers$ Targeted.YouCtrl | NumDmg$ Count$CardPower
Oracle:Target creature you control and up to one other target legendary creature you control each deal damage equal to their power to target creature you don't control.

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

@@ -6,6 +6,6 @@ T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl | Origin$ Battlefield |
SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ DBDraw | FalseSubAbility$ DBDamage
SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
SVar:DBDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 1
SVar:X:TriggeredCard$Valid Creature.attacking
SVar:X:TriggeredCard$Valid Creature.attackingLKI
DeckHas:Ability$Sacrifice
Oracle:Whenever another creature you control dies, draw a card if it was attacking. Otherwise, Garna, Bloodfist of Keld deals 1 damage to each opponent.

2
forge-gui/res/cardsfolder/m/maelstrom_djinn.txt
View File

@@ -6,5 +6,5 @@ K:Flying
K:Morph:2 U
T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigDjinnVanishing | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, put two time counters on it and it gains vanishing.
SVar:TrigDjinnVanishing:DB$ PutCounter | CounterType$ TIME | CounterNum$ 2 | SubAbility$ DBPump
SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Vanishing:2 | Duration$ Permanent
SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Vanishing | Duration$ Permanent
Oracle:Flying\nMorph {2}{U} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Maelstrom Djinn is turned face up, put two time counters on it and it gains vanishing. (At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)

2
forge-gui/res/cardsfolder/o/out_of_time.txt
View File

@@ -11,5 +11,5 @@ SVar:DBExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined
SVar:DBPutCounter:DB$ PutCounter | CounterType$ TIME | CounterNum$ X | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Count$RememberedSize
K:Vanishing:0
K:Vanishing
Oracle:When Out of Time enters the battlefield, untap all creatures, then phase them out until Out of Time leaves the battlefield. Put a time counter on Out of Time for each creature phased out this way.\nVanishing (At the beginning of your upkeep, remove a time counter from this enchantment. When the last is removed, sacrifice it.)

5
forge-gui/res/cardsfolder/t/tidewalker.txt
View File

@@ -3,11 +3,8 @@ ManaCost:2 U
Types:Creature Elemental
PT:*/*
K:etbCounter:TIME:X:no Condition:Tidewalker enters the battlefield with a time counter on it for each Island you control.
K:Vanishing
S:Mode$ Continuous | EffectZone$ Battlefield | CharacteristicDefining$ True | SetPower$ Y | SetToughness$ Y | Description$ CARDNAME's power and toughness are each equal to the number of time counters on it.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Card.Self+counters_GE1_TIME | Execute$ TrigUpkeepVanishing | TriggerDescription$ Vanishing (At the beginning of your upkeep, remove a time counter from this creature. When the last is removed, sacrifice it.)
T:Mode$ CounterRemoved | TriggerZones$ Battlefield | ValidCard$ Card.Self | NewCounterAmount$ 0 | Secondary$ True | CounterType$ TIME | Execute$ TrigVanishingSac | Secondary$ True | TriggerDescription$ Vanishing (At the beginning of your upkeep, remove a time counter from this creature. When the last is removed, sacrifice it.)
SVar:TrigUpkeepVanishing:DB$ RemoveCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 1
SVar:TrigVanishingSac:DB$ Sacrifice | SacValid$ Self
SVar:X:Count$Valid Island.YouCtrl
SVar:Y:Count$CardCounters.TIME
SVar:NeedsToPlayVar:X GE3