Conflict free branches of Fulgur14 (#5429)

* Squashed commit of the following:

commit ef30be2d55
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu Jun 13 19:48:00 2024 +0200

    Add files via upload

* Squashed commit of the following:

commit 299ad40c2e
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Mon Jun 10 13:32:28 2024 +0200

    Add files via upload

commit 95d9b59232
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Mon Jun 10 12:13:25 2024 +0200

    Add files via upload

commit ce05867493
Merge: c04c76d3c2 9b327cf3d2
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Mon Jun 10 09:00:21 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit c04c76d3c2
Merge: bb62d8fd8d f865496d23
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu May 30 23:11:34 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit bb62d8fd8d
Merge: d0083a77b0 a61ea36c95
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu May 30 14:44:13 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit d0083a77b0
Merge: 7ed0eb3cc3 2ddcaab59d
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu May 30 08:31:13 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit 7ed0eb3cc3
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Wed May 29 18:45:31 2024 +0200

    Update architect_of_the_untamed.txt

* Delete forge-gui/res/cardsfolder/upcoming/the_capitoline_triad.txt

* Update khod_etlan_shiis_envoy.txt

* Update TypeLists.txt
This commit is contained in:
Simisays
2024-06-18 06:56:25 +02:00
committed by GitHub
parent 1a5595dba1
commit c6c5d6476e
32 changed files with 34 additions and 35 deletions

View File

@@ -1,7 +1,7 @@
Name:Aboshan, Cephalid Emperor
ManaCost:4 U U
Types:Legendary Creature Cephalid Noble
Types:Legendary Creature Octopus Noble
PT:3/3
A:AB$ Tap | Cost$ tapXType<1/Cephalid> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
A:AB$ Tap | Cost$ tapXType<1/Octopus> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
A:AB$ TapAll | Cost$ U U U | ValidCards$ Creature.withoutFlying | SpellDescription$ Tap all creatures without flying.
Oracle:Tap an untapped Cephalid you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
Oracle:Tap an untapped Octopus you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.

View File

@@ -1,6 +1,6 @@
Name:Backstreet Bruiser
ManaCost:1 U
Types:Creature Cephalid Rogue
Types:Creature Octopus Rogue
PT:3/3
K:Defender
S:Mode$ CanAttackDefender | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE2 | Description$ As long as there are two or more counters among creatures you control, CARDNAME can attack as though it didn't have defender.

View File

@@ -1,6 +1,6 @@
Name:Callous Oppressor
ManaCost:1 U U
Types:Creature Cephalid
Types:Creature Octopus
PT:1/2
K:You may choose not to untap CARDNAME during your untap step.
K:ETBReplacement:Other:DBChooseOpp

View File

@@ -1,6 +1,6 @@
Name:Cephalid Aristocrat
ManaCost:4 U
Types:Creature Cephalid Noble
Types:Creature Octopus Noble
PT:3/3
T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability, mill two cards.
SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You

View File

@@ -1,6 +1,6 @@
Name:Cephalid Broker
ManaCost:3 U
Types:Creature Cephalid
Types:Creature Octopus
PT:2/2
A:AB$ Draw | Cost$ T | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws two cards, then discards two cards. | SubAbility$ DBDiscard
SVar:DBDiscard:DB$ Discard | Defined$ Targeted | NumCards$ 2 | Mode$ TgtChoose

View File

@@ -1,6 +1,6 @@
Name:Cephalid Constable
ManaCost:1 U U
Types:Creature Cephalid Wizard
Types:Creature Octopus Wizard
PT:1/1
T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigBounce | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, return up to that many target permanents that player controls to their owner's hand.
SVar:TrigBounce:DB$ ChangeZone | ValidTgts$ Permanent.ControlledBy TriggeredTarget | TgtPrompt$ Select target permanent | TargetMin$ 0 | TargetMax$ X | Origin$ Battlefield | Destination$ Hand

View File

@@ -1,6 +1,6 @@
Name:Cephalid Facetaker
ManaCost:2 U
Types:Creature Cephalid Rogue
Types:Creature Octopus Rogue
PT:1/4
S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigClone | TriggerDescription$ At the beginning of combat on your turn, you may have CARDNAME become a copy of another target creature until end of turn, except it's 1/4 and has "This creature can't be blocked."

View File

@@ -1,6 +1,6 @@
Name:Cephalid Illusionist
ManaCost:1 U
Types:Creature Cephalid Wizard
Types:Creature Octopus Wizard
PT:1/1
T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability, mill three cards.
SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You

View File

@@ -1,6 +1,6 @@
Name:Cephalid Inkshrouder
ManaCost:2 U
Types:Creature Cephalid
Types:Creature Octopus
PT:2/1
A:AB$ Pump | Cost$ Discard<1/Card> | KW$ Shroud | SubAbility$ DBUnblockable | StackDescription$ CARDNAME gains shroud until end of turn and can't be blocked this turn. | SpellDescription$ CARDNAME gains shroud until end of turn and can't be blocked this turn. (A creature with shroud can't be the target of spells or abilities.)
SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable

View File

@@ -1,6 +1,6 @@
Name:Cephalid Looter
ManaCost:2 U
Types:Creature Cephalid Rogue
Types:Creature Octopus Rogue
PT:2/1
A:AB$ Draw | Cost$ T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws a card, then discards a card. | SubAbility$ DBDiscard
SVar:DBDiscard:DB$ Discard | Defined$ Targeted | NumCards$ 1 | Mode$ TgtChoose

View File

@@ -1,6 +1,6 @@
Name:Cephalid Pathmage
ManaCost:2 U
Types:Creature Cephalid Wizard
Types:Creature Octopus Wizard
PT:1/2
S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
A:AB$ Effect | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | RememberObjects$ Targeted | StaticAbilities$ STUnblockable | SpellDescription$ Target creature can't be blocked this turn.

View File

@@ -1,6 +1,6 @@
Name:Cephalid Retainer
ManaCost:2 U U
Types:Creature Cephalid
Types:Creature Octopus
PT:2/3
A:AB$ Tap | Cost$ U U | ValidTgts$ Creature.withoutFlying | TgtPrompt$ Select target creature without flying | SpellDescription$ Tap target creature without flying.
Oracle:{U}{U}: Tap target creature without flying.

View File

@@ -1,6 +1,6 @@
Name:Cephalid Sage
ManaCost:3 U
Types:Creature Cephalid
Types:Creature Octopus
PT:2/3
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | Threshold$ True | TriggerDescription$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters the battlefield, draw three cards, then discard two cards."
SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 3 | SubAbility$ DBDiscard

View File

@@ -1,6 +1,6 @@
Name:Cephalid Scout
ManaCost:1 U
Types:Creature Cephalid Wizard Scout
Types:Creature Octopus Wizard Scout
PT:1/1
K:Flying
A:AB$ Draw | Cost$ 2 U Sac<1/Land> | NumCards$ 1 | SpellDescription$ Draw a card.

View File

@@ -1,6 +1,6 @@
Name:Cephalid Snitch
ManaCost:1 U
Types:Creature Cephalid Wizard
Types:Creature Octopus Wizard
PT:1/1
A:AB$ Debuff | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Protection from black | SpellDescription$ Target creature loses protection from black until end of turn.
AI:RemoveDeck:Random

View File

@@ -1,6 +1,6 @@
Name:Cephalid Vandal
ManaCost:1 U
Types:Creature Cephalid Rogue
Types:Creature Octopus Rogue
PT:1/1
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a shred counter on CARDNAME. Then mill a card for each shred counter on CARDNAME.
SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SHRED | CounterNum$ 1 | SubAbility$ DBMill

View File

@@ -1,6 +1,6 @@
Name:Diviner of Fates
ManaCost:W U B
Types:Creature Cephalid Wizard
Types:Creature Octopus Wizard
PT:2/1
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
SVar:TrigConnive:DB$ Connive

View File

@@ -1,6 +1,6 @@
Name:Freejam Regent
ManaCost:4 R R
Types:Creature Dragon
Types:Creature Cat Dragon
PT:4/4
K:Improvise
K:Flying

View File

@@ -1,6 +1,6 @@
Name:Kamiz, Obscura Oculus
ManaCost:1 W U B
Types:Legendary Creature Cephalid Rogue
Types:Legendary Creature Octopus Rogue
PT:2/4
T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target attacking creature can't be blocked this turn. It connives. Then choose another attacking creature with lesser power. That creature gains double strike until end of turn. (To have a creature connive, draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
SVar:TrigPump:DB$ Effect | RememberObjects$ Targeted | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | StaticAbilities$ Unblockable | SubAbility$ DBConnive

View File

@@ -3,5 +3,5 @@ ManaCost:2 U
Types:Legendary Creature Homarid Warrior
PT:2/3
S:Mode$ Continuous | Affected$ Land | AddType$ Island | Description$ All lands are Islands in addition to their other types.
S:Mode$ Continuous | Affected$ Homarid.Other+YouCtrl,Camarid.Other+YouCtrl,Cephalid.Other+YouCtrl,Nautilid.Other+YouCtrl,Merfolk.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Homarids, Camarids, Cephalids, Nautilids, and Merfolk you control get +1/+1.
Oracle:All lands are Islands in addition to their other types.\nOther Homarids, Camarids, Cephalids, Nautilids, and Merfolk you control get +1/+1.
S:Mode$ Continuous | Affected$ Homarid.Other+YouCtrl,Camarid.Other+YouCtrl,Octopus.Other+YouCtrl,Nautilid.Other+YouCtrl,Merfolk.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Homarids, Camarids, Octopuses, Nautilids, and Merfolk you control get +1/+1.
Oracle:All lands are Islands in addition to their other types.\nOther Homarids, Camarids, Octopuses, Nautilids, and Merfolk you control get +1/+1.

View File

@@ -1,6 +1,6 @@
Name:Llawan, Cephalid Empress
ManaCost:3 U
Types:Legendary Creature Cephalid Noble
Types:Legendary Creature Octopus Noble
PT:2/3
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return all blue creatures your opponents control to their owners' hands.
SVar:TrigChange:DB$ ChangeZoneAll | ChangeType$ Creature.Blue+OppCtrl | Origin$ Battlefield | Destination$ Hand

View File

@@ -1,6 +1,6 @@
Name:Obscura Interceptor
ManaCost:1 W U B
Types:Creature Cephalid Wizard
Types:Creature Octopus Wizard
PT:3/1
K:Flash
K:Lifelink

View File

@@ -1,6 +1,6 @@
Name:Obscura Polymorphist
ManaCost:1 W U
Types:Creature Cephalid Wizard
Types:Creature Octopus Wizard
PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target creature. Its controller seeks a creature card.
SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBSeek

View File

@@ -1,6 +1,6 @@
Name:Omen Hawker
ManaCost:U
Types:Creature Cephalid Advisor
Types:Creature Octopus Advisor
PT:1/1
A:AB$ Mana | Cost$ T | Produced$ C U | RestrictValid$ Activated | SpellDescription$ Add {C}{U}. Spend this mana only to activate abilities.
Oracle:{T}: Add {C}{U}. Spend this mana only to activate abilities.

View File

@@ -1,6 +1,6 @@
Name:Psychic Pickpocket
ManaCost:4 U
Types:Creature Cephalid Rogue
Types:Creature Octopus Rogue
PT:3/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. When it connives this way, return up to one target nonland permanent to its owner's hand. (To have a creature connive, draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
SVar:TrigConnive:DB$ Connive | SubAbility$ DBImmediateTrigger

View File

@@ -1,6 +1,6 @@
Name:Queza, Augur of Agonies
ManaCost:1 W U B
Types:Legendary Creature Cephalid Advisor
Types:Legendary Creature Octopus Advisor
PT:3/4
T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you draw a card, target opponent loses 1 life and you gain 1 life.
SVar:TrigDrain:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife

View File

@@ -1,6 +1,6 @@
Name:Revel Ruiner
ManaCost:3 B
Types:Creature Cephalid Rogue
Types:Creature Octopus Rogue
PT:3/1
K:Menace
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)

View File

@@ -1,6 +1,6 @@
Name:A-Queza, Augur of Agonies
ManaCost:1 W U B
Types:Legendary Creature Cephalid Advisor
Types:Legendary Creature Octopus Advisor
PT:3/4
K:Vigilance
T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you draw a card, target opponent loses 1 life and you gain 1 life.

View File

@@ -1,6 +1,6 @@
Name:A-Revel Ruiner
ManaCost:3 B
Types:Creature Cephalid Rogue
Types:Creature Octopus Rogue
PT:3/2
K:Menace
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives.

View File

@@ -1,6 +1,6 @@
Name:Shield Broker
ManaCost:3 U U
Types:Creature Cephalid Advisor
Types:Creature Octopus Advisor
PT:3/4
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a shield counter on target noncommander creature you don't control. You gain control of that creature for as long as it has a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.IsNotCommander+YouDontCtrl | TgtPrompt$ Select target noncommander creature you don't control | CounterType$ SHIELD | SubAbility$ DBEffect

View File

@@ -1,6 +1,6 @@
Name:Skyship Stalker
ManaCost:2 R R
Types:Creature Dragon
Types:Creature Cat Dragon
PT:3/3
K:Flying
A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.

View File

@@ -59,7 +59,6 @@ Caribou:Caribous
Carrier:Carriers
Cat:Cats
Centaur:Centaurs
Cephalid:Cephalids
Chimera:Chimeras
Citizen:Citizens
Clamfolk:Clamfolk