Merge branch 'zzorba:master' into master

README.md

@@ -92,6 +92,7 @@ To check and apply formatting to JSON files:
 * **defense_star** - Whether a star appears in the defense field indicating a special ability
 * **double_sided** - Whether the card is a double sided card (incompatible with the **back_link** method)
 * **duplicate_of** - A link to the original card code for duplicate cards in other packs
+* **errata** - A description of the changes applied to the card by the official Rules Reference
 * **escalation_threat** - The acceleration threat to apply to main/side schemes. By default, it is per hero. Possible values:
   * -1: Shows up as X
   * 0+: Shows up as the given number

pack/aoa.json

@@ -844,6 +844,7 @@
     {
         "back_link": "45171b",
         "code": "45171a",
+        "errata": "Added “this phase”. (RRG 1.6)",
         "faction_code": "campaign",
         "name": "Mission Team",
         "octgn_id": "1ab538aa-6ad1-4d9d-83a6-3ebc3a045171",
@@ -852,7 +853,7 @@
         "quantity": 1,
         "resource_wild": 1,
         "set_code": "aoa_basic_campaign",
-        "text": "Mission Team cannot be discarded and the first player gains control of it.\n<b>Action</b>: Exhaust Mission Team \u2192 choose:\n\u2022 Reduce the cost of the next ally played to the mission by 2.\n\u2022 Make a mission attempt.",
+        "text": "Mission Team cannot be discarded and the first player gains control of it.\n<b>Action</b>: Exhaust Mission Team \u2192 choose:\n\u2022 Reduce the cost of the next ally played to the mission this phase by 2.\n\u2022 Make a mission attempt.",
         "traits": "Mission.",
         "type_code": "support"
     },

pack/cap.json

@@ -402,14 +402,15 @@
 		"code": "03025",
 		"cost": 0,
 		"deck_limit": 3,
+		"errata": "Added “Max 1 per character.” (RRG 1.4)",
 		"faction_code": "basic",
 		"name": "Honorary Avenger",
 		"octgn_id": "d6d98813-2703-46ea-b7ab-30010d75af86",
 		"pack_code": "cap",
 		"position": 25,
 		"quantity": 3,
 		"resource_physical": 1,
-		"text": "Play only if your identity has the [[Avenger]] trait.\nAttach to a friendly character.\nAttached character gets +1 hit point and gains the [[Avenger]] trait.",
+		"text": "Play only if your identity has the [[Avenger]] trait.\nMax 1 per character.\nAttach to a friendly character.\nAttached character gets +1 hit point and gains the [[Avenger]] trait.",
 		"traits": "Title.",
 		"type_code": "upgrade"
 	},
@@ -433,14 +434,15 @@
 		"code": "03032",
 		"cost": 1,
 		"deck_limit": 3,
+		"errata": "Changed “Response” to “Interrupt”. (RRG 1.3)",
 		"faction_code": "justice",
 		"name": "Followed",
 		"octgn_id": "0602bedd-bac1-4cea-8ca3-079fa0fdef36",
 		"pack_code": "cap",
 		"position": 32,
 		"quantity": 3,
 		"resource_energy": 1,
-		"text": "Attach to a side scheme. Max 1 per scheme.\n<b>Response</b>: When attached scheme is defeated, deal 4 damage to an enemy.",
+		"text": "Attach to a side scheme. Max 1 per scheme.\n<b>Interrupt</b>: When attached scheme is defeated, deal 4 damage to an enemy.",
 		"type_code": "upgrade"
 	},
 	{

pack/core.json

@@ -563,6 +563,7 @@
 		"code": "01026",
 		"cost": 1,
 		"deck_limit": 1,
+		"errata": "Removed “(thwart)” label. (RRG 1.5)",
 		"faction_code": "hero",
 		"flavor": "\"I'll be sending you a bill. My time is valuable these days.\" — Jennifer Walters",
 		"name": "Superhuman Law Division",
@@ -573,7 +574,7 @@
 		"resource_physical": 1,
 		"set_code": "she_hulk",
 		"set_position": 11,
-		"text": "<b>Alter-Ego Action</b> <i>(thwart)</i>: Exhaust Superhuman Law Division and spend a [mental] resource → remove 2 threat from a scheme.",
+		"text": "<b>Alter-Ego Action</b>: Exhaust Superhuman Law Division and spend a [mental] resource → remove 2 threat from a scheme.",
 		"traits": "Location.",
 		"type_code": "support"
 	},

pack/core_encounter.json

@@ -1644,6 +1644,7 @@
 		"base_threat_fixed": true,
 		"boost": 3,
 		"code": "01183",
+		"errata": "Added periods to “M.O.D.O.K.” (RRG 1.6)",
 		"faction_code": "encounter",
 		"name": "The Doomsday Chair",
 		"octgn_id": "272b5a87-d602-454a-8fe1-2afc9a21c677",
@@ -1653,18 +1654,19 @@
 		"scheme_acceleration": 1,
 		"set_code": "the_doomsday_chair",
 		"set_position": 1,
-		"text": "<b>When Revealed</b>: If MODOK is not in play, search the encounter deck and discard pile for MODOK and put him into play engaged with you, then shuffle the encounter deck.",
+		"text": "<b>When Revealed</b>: If M.O.D.O.K. is not in play, search the encounter deck and discard pile for M.O.D.O.K. and put him into play engaged with you, then shuffle the encounter deck.",
 		"type_code": "side_scheme"
 	},
 	{
 		"attack": 2,
 		"boost": 2,
 		"code": "01184",
+		"errata": "Added periods to card title. (RRG 1.5)",
 		"faction_code": "encounter",
 		"flavor": "\"You should have stayed hidden under the rock you crawled out from!\"",
 		"health": 8,
 		"is_unique": true,
-		"name": "MODOK",
+		"name": "M.O.D.O.K.",
 		"octgn_id": "420f27a2-85a3-40be-9a72-e8f326723485",
 		"pack_code": "core",
 		"position": 184,

pack/deadpool_encounter.json

@@ -160,6 +160,7 @@
     {
         "boost": 2,
         "code": "44041",
+        "errata": "Added “Attached ally engages its controller.” (RRG 1.6)",
         "faction_code": "encounter",
         "illustrator": "Andrea Di Vito & Laura Villari",
         "name": "'Pool-ized",
@@ -169,7 +170,7 @@
         "quantity": 2,
         "set_code": "dreadpool",
         "set_position": 5,
-        "text": "Treat attached ally as a [['POOL]] minion with a blank text box. Attached minion's SCH is equal to its printed THW and it does not take consequential damage.\n<b>When Revealed</b>: Attach to the ally with the highest cost without 'Pool-ized attached. Otherwise, this card gains surge.",
+        "text": "Treat attached ally as a [['POOL]] minion with a blank text box. Attached minion's SCH is equal to its printed THW and it does not take consequential damage.\n<b>When Revealed</b>: Attach to the ally with the highest cost without 'Pool-ized attached. Attached ally engages its controller. Otherwise, this card gains surge.",
         "type_code": "attachment"
     },
     {

pack/drs.json

@@ -283,6 +283,7 @@
 		"code": "09014",
 		"cost": 4,
 		"deck_limit": 1,
+		"errata": "Changed “Response” to “Interrupt”. (RRG 1.4)",
 		"faction_code": "protection",
 		"health": 3,
 		"is_unique": true,
@@ -293,7 +294,7 @@
 		"quantity": 1,
 		"resource_physical": 1,
 		"subname": "Danny Rand",
-		"text": "Iron First enters play with 2 mystic counters on him.\n<b>Response</b>: When Iron Fist attacks an enemy, remove 1 mystic counter from him → stun that enemy and deal 1 damage to it.",
+		"text": "Iron Fist enters play with 2 mystic counters on him.\n<b>Interrupt</b>: When Iron Fist attacks an enemy, remove 1 mystic counter from him → stun that enemy and deal 1 damage to it.",
 		"thwart": 1,
 		"thwart_cost": 1,
 		"traits": "Defender.",
@@ -379,6 +380,7 @@
 		"code": "09021",
 		"cost": 0,
 		"deck_limit": 3,
+		"errata": "Removed “(defense)” and the Defense trait. (RRG 1.4)",
 		"faction_code": "basic",
 		"flavor": "\"Incoming!\" — Iron Man",
 		"name": "Warning",
@@ -387,8 +389,7 @@
 		"position": 21,
 		"quantity": 3,
 		"resource_physical": 1,
-		"text": "<b>Interrupt</b> <i>(defense)</i>: When a hero would take any amount of damage, reduce that amount by 1.",
-		"traits": "Defense.",
+		"text": "<b>Interrupt</b>: When a hero would take any amount of damage, reduce that amount by 1.",
 		"type_code": "event"
 	},
 	{

pack/gambit_encounter.json

@@ -130,6 +130,7 @@
    {
       "attack": 1,
       "code": "37034",
+      "errata": "Removed “and put it back into play”. (RRG 1.6)",
       "pack_code": "gambit",
       "faction_code": "encounter",
       "set_code": "exodus",
@@ -142,7 +143,7 @@
       "traits": "Psionic.",
       "boost": 2,
       "octgn_id": "f3ee0950-3220-468c-9735-3b1dcb037034",
-      "text": "Attach to a minion. Otherwise, Psionic Shield gains surge.\n<b>Forced Interrupt</b>: When attached minion would leave play, instead heal all damage from that minion and put it back into play. Then, discard this attachment."
+      "text": "Attach to a minion. Otherwise, Psionic Shield gains surge.\n<b>Forced Interrupt</b>: When attached minion would leave play, instead heal all damage from that minion. Then, discard this attachment."
    },
    {
       "boost_star": true,

pack/gmw_encounter.json

@@ -1533,6 +1533,7 @@
 	{
 		"boost": 2,
 		"code": "16123",
+		"errata": "Changed reminder text to rules text. (RRG 1.6)",
 		"faction_code": "encounter",
 		"is_unique": true,
 		"name": "Obedience Potion",
@@ -1542,7 +1543,7 @@
 		"quantity": 1,
 		"set_code": "galactic_artifacts",
 		"set_position": 2,
-		"text": "Attach to your identity.\nAttached character gets -1 THW, -1 ATK, and -1 DEF.\n<b>Hero Action:</b> Take 1 damage and spend [mental][mental] resources → discard this card. <i>(Any player can do this.)</i>",
+		"text": "Attach to your identity.\nAttached character gets -1 THW, -1 ATK, and -1 DEF.\n<b>Hero Action:</b> Take 1 damage and spend [mental][mental] resources → discard this card. Any player can do this.",
 		"traits": "Artifact.",
 		"type_code": "attachment"
 	},
@@ -1566,6 +1567,7 @@
 	{
 		"boost": 2,
 		"code": "16125",
+		"errata": "Changed reminder text to rules text. (RRG 1.6)",
 		"faction_code": "encounter",
 		"flavor": "<b><i>The deadliest toxin in the galaxy.</i></b>",
 		"is_unique": true,
@@ -1576,7 +1578,7 @@
 		"quantity": 1,
 		"set_code": "galactic_artifacts",
 		"set_position": 4,
-		"text": "Attach to your identity.\n<b>Forced Interrupt:</b> When your turn begins, place 1 poison counter here, the take 1 damage for each poison counter here.\n<b>Hero Action:</b> Spend 3 resources of different types → discard this card. <i>(Any player can do this.)</i>",
+		"text": "Attach to your identity.\n<b>Forced Interrupt:</b> When your turn begins, place 1 poison counter here, the take 1 damage for each poison counter here.\n<b>Hero Action:</b> Spend 3 resources of different types → discard this card. Any player can do this.",
 		"traits": "Artifact.",
 		"type_code": "attachment"
 	},

pack/hlk_encounter.json

@@ -2,6 +2,7 @@
 	{
 		"boost": 3,
 		"code": "10025",
+		"errata": "Removed “Then:”. (RRG 1.4)",
 		"faction_code": "encounter",
 		"illustrator": "Patrick McEvoy",
 		"name": "Inner Demons",
@@ -10,7 +11,7 @@
 		"position": 25,
 		"quantity": 1,
 		"set_code": "hulk",
-		"text": "<b><i>Give to the Bruce Banner player.</i></b>\nChange form <i>(flip your identity)</i>. Then:\n\u2022 If you are Bruce Banner, discard 2 cards from your hand. Discard this obligation.\n\u2022 If you are Hulk, exhaust your hero. Discard this obligation.",
+		"text": "<b><i>Give to the Bruce Banner player.</i></b>\nChange form <i>(flip your identity)</i>.\n\u2022 If you are Bruce Banner, discard 2 cards from your hand. Discard this obligation.\n\u2022 If you are Hulk, exhaust your hero. Discard this obligation.",
 		"type_code": "obligation"
 	},
 	{

pack/ironheart.json

@@ -495,14 +495,15 @@
 		"code": "29025",
 		"cost": 3,
 		"deck_limit": 1,
+		"errata": "Added “Remove ‘Go for Champions!’ from the game →”. (RRG 1.5)",
 		"faction_code": "basic",
 		"name": "\"Go for Champions!\"",
 		"octgn_id": "9d1ed258-ee76-47e7-8f1d-b9dd590fd293",
 		"pack_code": "ironheart",
 		"position": 25,
 		"quantity": 1,
 		"resource_wild": 1,
-		"text": "Max 1 per deck.\nPlay only if your identity has the [[Champion]] trait.\n<b>Hero Action</b>: Each [[champion]] character in play cannot take damage until the end of the round.",
+		"text": "Max 1 per deck.\nPlay only if your identity has the [[Champion]] trait.\n<b>Hero Action</b>: Remove \"Go for Champions!\" from the game → Each [[champion]] character in play cannot take damage until the end of the round.",
 		"type_code": "event"
 	},
 	{

pack/mojo_encounter.json

@@ -444,6 +444,7 @@
 	{
 		"base_threat": 3,
 		"code": "39016",
+		"errata": "Added cost arrow. (RRG 1.5)",
 		"faction_code": "encounter",
 		"flavor": "Spiral is hiding in one of the numerous television programs Mojo is producing.",
 		"illustrator": "Allison Preswick",
@@ -454,7 +455,7 @@
 		"quantity": 1,
 		"set_code": "spiral",
 		"set_position": 5,
-		"text": "Permanent.\n<b>Forced Interrupt</b>: After the last threat is removed from here, the player who removed that threat reveals the top card of the show deck and places 3 [per_hero] threat here.\n<b>Hero Action</b>: Take 2 damage. Remove 3 threat from here.",
+		"text": "Permanent.\n<b>Forced Interrupt</b>: After the last threat is removed from here, the player who removed that threat reveals the top card of the show deck and places 3[per_hero] threat here.\n<b>Hero Action</b>: Take 2 damage → remove 3 threat from here.",
 		"type_code": "side_scheme"
 	},
 	{
@@ -973,6 +974,7 @@
 		"base_threat": 6,
 		"boost_star": true,
 		"code": "39045",
+		"errata": "Replaced “for free” with “ignoring its resource cost”. (RRG 1.5)",
 		"faction_code": "encounter",
 		"flavor": "\"Bring me a shrubbery!\" — Sir Mojo",
 		"name": "Fetch Quest",
@@ -982,7 +984,7 @@
 		"quantity": 1,
 		"set_code": "fantasy",
 		"set_position": 5,
-		"text": "Surge.\n<b>When Defeated</b>: In player order, each player may search their deck for a card and play that card for free. <i>(Shuffle.)</i>\n<hr />\n[star] <b>Boost</b>: Put this card into play.",
+		"text": "Surge.\n<b>When Defeated</b>: In player order, each player may search their deck for a card and play that card, ignoring its resource cost. <i>(Shuffle.)</i>\n<hr />\n[star] <b>Boost</b>: Put this card into play.",
 		"type_code": "side_scheme"
 	},
 	{

pack/mts_encounter.json

@@ -1018,7 +1018,7 @@
 		"set_code": "thanos",
 		"set_position": 4,
 		"stage": 1,
-		"text": "<b>When Revealed:</b> Put the top card of the [[infinity stone]] deck into play. Search the encounter deck for the Sanctuary side scheme and reveal it. <i>(Shuffle the encounter deck.)</i>",		
+		"text": "<b>When Revealed:</b> Put the top card of the [[infinity stone]] deck into play. Search the encounter deck for the Sanctuary side scheme and reveal it. <i>(Shuffle the encounter deck.)</i>",
 		"threat": 12,
 		"type_code": "main_scheme"
 	},
@@ -1060,6 +1060,7 @@
 		"base_threat_fixed": true,
 		"boost": 3,
 		"code": "21116",
+		"errata": "Added “from player cards”. (RRG 1.6)",
 		"faction_code": "encounter",
 		"name": "Sanctuary",
 		"octgn_id": "a8e9ed1b-e91b-4546-bdbe-fb7150aad9a8",
@@ -1068,7 +1069,7 @@
 		"quantity": 1,
 		"set_code": "thanos",
 		"set_position": 6,
-		"text": "Hinder 1[per_hero]. Victory 1.\nThanos cannot take damage.<b> When Defeated:</b> Each player may spend up to 3 [physical] resources from their hand. Deal 2 damage to Thanos for each [physical] resource spent this way. This damage ignores the tough status card.",
+		"text": "Hinder 1[per_hero]. Victory 1.\nThanos cannot take damage from player cards.\n<b>When Defeated:</b> Each player may spend up to 3 [physical] resources from their hand. Deal 2 damage to Thanos for each [physical] resource spent this way. This damage ignores the tough status card.",
 		"type_code": "side_scheme"
 	},
 	{
@@ -1272,6 +1273,7 @@
 		"attack": 1,
 		"attack_star": true,
 		"code": "21129",
+		"errata": "Added “against you”. (RRG 1.5)",
 		"faction_code": "encounter",
 		"is_unique": true,
 		"name": "Infinity Gauntlet",
@@ -1283,7 +1285,7 @@
 		"scheme_star": true,
 		"set_code": "infinity_gauntlet",
 		"set_position": 1,
-		"text": "Permanent. setup\n[star] <b>Forced Response</b>: After attached villain activates, resolve the <b> Special </b> ability of each [[infinity stone]] in play. Otherwise, put the top card of the [[infinity stone]] deck into play.",
+		"text": "Permanent. Setup\n[star] <b>Forced Response</b>: After attached villain activates against you, resolve the <b>Special</b> ability of each [[infinity stone]] in play. Otherwise, put the top card of the [[infinity stone]] deck into play.",
 		"traits": "Artifact. Weapon.",
 		"type_code": "attachment"
 	},

pack/mut_gen.json

@@ -160,6 +160,7 @@
 		"code": "32008",
 		"cost": 2,
 		"deck_limit": 3,
+		"errata": "Replaced cost arrow with “to”. (RRG 1.5)",
 		"faction_code": "hero",
 		"name": "Steel Fist",
 		"octgn_id": "47d34c5d-5319-45a9-a2d6-1fb975032008",
@@ -169,7 +170,7 @@
 		"resource_physical": 1,
 		"set_code": "colossus",
 		"set_position": 9,
-		"text": "<b>Hero Action</b>: Deal 5 damage to an enemy. You may discard a tough status card from your hero → stun and confuse that enemy.",
+		"text": "<b>Hero Action</b>: Deal 5 damage to an enemy. You may discard a tough status card from your hero to stun and confuse that enemy.",
 		"traits": "Attack. Superpower.",
 		"type_code": "event"
 	},
@@ -194,6 +195,7 @@
 		"code": "32010",
 		"cost": 0,
 		"deck_limit": 2,
+		"errata": "Added “would”. (RRG 1.5)",
 		"faction_code": "hero",
 		"name": "Armor Up",
 		"octgn_id": "47d34c5d-5319-45a9-a2d6-1fb975032010",
@@ -203,7 +205,7 @@
 		"resource_physical": 1,
 		"set_code": "colossus",
 		"set_position": 14,
-		"text": "<b>Alter-Ego Interrupt</b>: When the villain activates, change to hero form.",
+		"text": "<b>Alter-Ego Interrupt</b>: When the villain would activate, change to hero form.",
 		"traits": "Superpower.",
 		"type_code": "event"
 	},

pack/nebu_encounter.json

@@ -69,6 +69,7 @@
 	{
 		"boost": 1,
 		"code": "22031",
+		"errata": "Changed reminder text to rules text to function with the updated rules on referential abilities. (RRG 1.6)",
 		"faction_code": "encounter",
 		"flavor": "<b><i>\"This was a mistake.\" — Gamora</i></b>",
 		"name": "Old Rivals",
@@ -78,7 +79,7 @@
 		"quantity": 2,
 		"set_code": "nebu_nemesis",
 		"set_position": 4,
-		"text": "<b>When Revealed:</b> Gamora attacks you. If no attack was made this way, this card gains surge. <i>(If the Gamora hero or ally is in play, she resolves her ATK against you without exhausting.)</i>",
+		"text": "<b>When Revealed:</b> Gamora attacks you. If the Gamora hero or ally is in play, she attacks you <i>(resolve her ATK against you without exhausting her)</i>. If no attack was made this way, this card gains surge.",
 		"type_code": "treachery"
 	}
 ]

pack/next_evol_encounter.json

@@ -824,6 +824,7 @@
         "attack": -1,
         "boost": 1,
         "code": "40092",
+        "errata": "Changed reminder text to rules text. (RRG 1.6)",
         "faction_code": "encounter",
         "name": "Inhibitor Collar",
         "octgn_id": "104e1218-df9b-43f7-93e0-ca2ef9040092",
@@ -832,7 +833,7 @@
         "quantity": 2,
         "set_code": "military_grade",
         "set_position": 3,
-        "text": "Attach to your identity.\nTreat your identity's printed text box as if it were blank <i>(except for traits)</i>.\n<b>Action</b>: Choose to either exhaust a character you control or take 3 damage \u2192 discard this card. <i>(Any player can do this.)</i>",
+        "text": "Attach to your identity.\nTreat your identity's printed text box as if it were blank <i>(except for traits)</i>.\n<b>Action</b>: Choose to either exhaust a character you control or take 3 damage \u2192 discard this card. Any player can do this.",
         "traits": "Tech.",
         "type_code": "attachment"
     },