diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/nahiris_armory.txt b/forge-gui/res/adventure/Shandalar/custom_cards/nahiris_armory.txt index 427cf6e821b..5bd92361628 100644 --- a/forge-gui/res/adventure/Shandalar/custom_cards/nahiris_armory.txt +++ b/forge-gui/res/adventure/Shandalar/custom_cards/nahiris_armory.txt @@ -3,6 +3,5 @@ ManaCost:no cost Types:Artifact S:Mode$ ReduceCost | ValidCard$ Card | ValidSpell$ Activated.Equip | Activator$ You | Amount$ 1 | EffectZone$ Command | Description$ Equip costs you pay cost {1} less. T:Mode$ AttackersDeclared | ValidAttackers$ Creature.modified+YouCtrl | TriggerZones$ Command | Execute$ TrigConjure | TriggerDescription$ Whenever a modified creature you control attacks, you may pay {M}{M}, if you do conjure a random card from Nahiri's Armory's Spellbook into your hand. -SVar:TrigConjure:AB$ MakeCard | Cost$ PayShards<2> | Conjure$ True | AtRandom$ True | Zone$ Hand | Spellbook$ -Stoneforge Mystic,Danitha; Benalia's Hope,Ardenn; Intrepid Archaeologist,Open the Armory,Stone Haven Outfitter,Argentum Armor,Sword of the Animist,Masterwork of Ingenuity,Kaldra Compleat,Armored Skyhunter,Lion Sash,Relic Seeker,Esper Sentinel,Forgeborn Phoenix,Foundry Beetle,Inchblade Companion,Komainu Battle Armor,Luxior; Giada's Gift,Mace of Disruption,Nettlecyst,Shadowspear,Seraphic Greatsword,Soulstealer Axe,Sword of Body and Mind,Sword of Fire and Ice,Junkyard Scrapper,Soulstealer Axe,Sword of Feast and Famine,Expedition Supplier,Foundry Beetle,Armory Automaton,Bladegraft Aspirant,Dancing Sword,Jor Kadeen; First Goldwarden,Akiri; Fearless Voyager,Acclaimed Contender,Embercleave,Puresteel Paladin,Champion of the Flame,Tiana; Ship's Caretaker,Reyav; Master Smith,Sigarda's Aid,Armored Skyhunter,Bruenor Battlehammer,Halvar; God of Battle,Wyleth; Soul of Steel,Koll; the Forgemaster,Valduk; Keeper of the Flame,Fervent Champion,Cloudsteel Kirin,Leonin Shikari,Balan; Wandering Knight,Kor Duelist,Leonin Abunas,Zamriel; Seraph of Steel,Auriok Steelshaper +SVar:TrigConjure:AB$ MakeCard | Cost$ PayShards<2> | Conjure$ True | AtRandom$ True | Zone$ Hand | Spellbook$ Stoneforge Mystic,Danitha; Benalia's Hope,Ardenn; Intrepid Archaeologist,Open the Armory,Stone Haven Outfitter,Argentum Armor,Sword of the Animist,Masterwork of Ingenuity,Kaldra Compleat,Armored Skyhunter,Lion Sash,Relic Seeker,Esper Sentinel,Forgeborn Phoenix,Foundry Beetle,Inchblade Companion,Komainu Battle Armor,Luxior; Giada's Gift,Mace of Disruption,Nettlecyst,Shadowspear,Seraphic Greatsword,Soulstealer Axe,Sword of Body and Mind,Sword of Fire and Ice,Junkyard Scrapper,Soulstealer Axe,Sword of Feast and Famine,Expedition Supplier,Foundry Beetle,Armory Automaton,Bladegraft Aspirant,Dancing Sword,Jor Kadeen; First Goldwarden,Akiri; Fearless Voyager,Acclaimed Contender,Embercleave,Puresteel Paladin,Champion of the Flame,Tiana; Ship's Caretaker,Reyav; Master Smith,Sigarda's Aid,Armored Skyhunter,Bruenor Battlehammer,Halvar; God of Battle,Wyleth; Soul of Steel,Koll; the Forgemaster,Valduk; Keeper of the Flame,Fervent Champion,Cloudsteel Kirin,Leonin Shikari,Balan; Wandering Knight,Kor Duelist,Leonin Abunas,Zamriel; Seraph of Steel,Auriok Steelshaper Oracle:Equip costs you pay cost {1} less.\nWhenever a modified creature you control attacks, you may pay {M}{M}, if you do conjure a random card from Nahiri's Armory's Spellbook into your hand. \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx index ce4b99423df..70c639b1c4e 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - eJzVlm0KgzAMhgsqsgPuhycRdgpPJgx2C+8wRmHCiKl50ya1E94fSmqefLWdbiFMmVr7oxAbzja1vkQav5KtNZ/kd/fF8aKxWfNQLqne3H9L2FDO7atov/XnfKlvWr7cXCJ1t6qxRe0pn2UPavpAmgFNLJLik8PH9Yd23msI5fOuL8pHOWv3oSZ/Kbuatbbc67z5ft9ncO6u4I1srfJ5sd2H62P7J75n1zZf6/mjinNnyeixD57x5fpbxrIYKV9LZ7x0p3sEjO9dkCOEj/OtyZUHn+auu695dbYMH5Pp9sA= + eJzN1l0KwjAMB/DCJrKL9QY+7CSCp/BkguAtdgeRgg+jy8c/aVYq5GHSmV+T1G1dUlqd8ZqPgayh1nL3t4Qlr7Y22kflyssxN+VF98ZFNtSK8kn1oPxWH/ebqHP7R1m/zbKP+w6pWd0TSy21meN8nFHyec8J4kNnMAdYpb5pc6edF8lXPh4fNR+Wvkv9bem318ftL3f21U5tDiMt1vpx6/bXVP16+ND7e/r213fw3CG+6HkstkhfZFhsFt/t0m8Pnv6N5ntPY/hG7y/qK+cu0oj+D1rOr+TzvgM/r35fna/4PM/4s/qrvdM9Eub7KjVCjJKPym2pVatP6q2ln58p1vADt87y+w== @@ -17,7 +17,7 @@ - eJzFljtOw0AQhncDeTRAE7CShh4uQMs1OAMVVUiCKGjpkLgAF4iIwb4EUNFwBDqEoER45B1lMt7Zh23EL/2K7F3vfJmdWTvRSiUeP2/afdIpzecPCz8w7wbEiTXGARYquIb7wJaS+NJ8UKqb8/L//aircSSlNebHcA7N+jPHmk/98PgxnD5GYEKjPlpgkeqW7/+eh23O2Gz1A3ohzEdszjyQb6qqjC6+UeGxDuM76yp1KNTYXGB08aJce5wVzvX6/sKzdxueYEJs0M2gOk77N2aPkQ/3eGZiHVtyCPlrqtgapHxo2/NN+DiTjdHHh7n7Lz6pBpFvpFd7K+0B57vaas7ryyGvP9dZxfk6poeuB6Ul5T2Zkb5zXHxjXeXivG3pQtnXpLE4H97P2fVf8Elr8niJYcn0ii0jzPvGOP5Ws95C+CYWPmTCns0jvj9s6jjOdMoinX8+vpA9rNuzPqUt8VG5WHEMeveTfFccEI7LgBjIhz3h0mS7rEGprmME8++LmOfKzYlnSwgfaLyzmoc5qtPj9HshN5xTNgd6Bns1lA9yiEz0l99zrfXaK73olz7trnOil9rPx+sV+PhZYJuLDGjbPdCC1Kbt/ZHr6hktxYzxbXfd7/3yl45zud5vrpz5csrn2WL/mDx9JdWxWD7OEsPm07fABzWztPD9AtvcIY0= + eJzNlr1Ow0AMxy+FtF2ABRqJhR1egJXX4BmYmEpb1IGVDYkX4AUqGmhfAphYeAQ2hGBE1LqccB3b95EM/CUr6p1l/2L7rikyYwqPPW/ydtqxRv13V/ZAbC8gT6y5PMCCBb9hHdhKlF/yB5VZOi/E4977MavnkVQm+Idw4n5B/LES86kXnj+GU2PEfJjtowUWaW5p/weBfDgupxfEfEx8JoF8I1PPF8PHvZ/TeW7MkTBjE4FR43XSeizx3W14kgm5QTf9+j4+vzE95noLdsLUEOrXVLEzKPFxPU7lk3oUMoP/hU+aQY2PMlK+q63mvL4a+vjwHuXrVGfoum9N0rKrM6byjYU4TXUpxMVrGt8y0+vYVFJcui7df4vMMh5Utqj83hLnLYRvyKy3XZ+OcqdzdcLrA6FnsXypZ9ansiU+LI3V7cHZ/UTfFYeIYxqQI4ZxuG1nkPqlvB/4369YL4zOGVvD/Z0/P1ejlB7g74VlxTkiPnBmFswZ1gQ1dEz4Sde0WK9da7OetbN8ndPZPPPz0foCH70LOF/H4IxbA83QbHL/H7672HemJLvN1+29Z594n4rjc3exVjNfTakfl/unqtNXUd+L5aMsMWw+fQt8MDNzhu8XLoopyw== @@ -25,7 +25,7 @@ - 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 @@ -98,12 +98,6 @@ - - - - - - @@ -118,5 +112,27 @@ + + + + + + + + + [{ + "text":"This gate is locked", + "options":[ + { "name":"go away" }, + { + "name":"unlock with Nahiri's Key", + "condition":[{"item":"Nahiri's Key"}], + "text":"The gate is unlocked", + "options":[{"name":"continue", "action":[ {"deleteMapObject":-1},{"removeItem":"Nahiri's Key"}]} ] + } + ] +}] + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx index abf5096206e..970e816652c 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx @@ -1,5 +1,5 @@ - + @@ -12,12 +12,12 @@ - eJxjYKAfCJSlo2WjYBSMglEwAOAcy0C7gDTwjBNCg9xNa7cv56CuHSC3w9xNK7fTymzkcKcmoHV4POXEFFvAjso/xkqamfRIe6NgFIyCUTAKRsEoGAUjGQAAmOwSmQ== + eJzt0sENABAMQFEHB4YwlCltYwvmEBGJq6Stg/8ubu1Pwzk7ORkuA4AHqn9dcKfH9c5u7fYSZHfM9t2t1a41+7y7JO17tCg/0+LvAQAA/GwApHYRJw== - eJztlEEOwjAMBHsAFX7DO3gg5974CUfehKoqwrJMvNs4ViOxkqU2ddaTOOk05WmZtxhNf+5cZXO/T3awOgo3u4ZMboS5NzdbL+JsFBVmyf06f8OrjyqTWXJ7PWX2ukWSuYRmXsdq9eT4/erX3NMjLYtRPpeo7fPzgjOz3LqXMiTfjTwH6zvKizL+6i0yjv6b9p5XtBbKaOWw9RlmdB1ejucfze3Ns3Ie6nttDsPBcrfke+tFvVkG9m60zmfE3r0o3yMyI/5Rnr3Ug9vy7aFI70zuSGnuUTQi9wfig/q9 + eJztlEEKAjEMRWehqLfxHB7QtTtv4tIzSRmKIcTm/2kapuCHwEwn/Xlt2lmWPD1Oa8ymP3eusrnfBztY7YWbXUMmN8I8mputF3E2qiqz5H4dv+HVR5XJLLm9njJ73SPJXEMzl7FWPTl+u/g1t/RIy2KUzzVa+/w848wst+6lDMl3Jc9BeUd5UcZfvUXG0X/T1vOK1kIZrRy2PsOMrsPL8fyjub15Vs5dfW/NYThY7p58b72oN8vA3o3e+YzYuxflu0dmxD/Kc5RGcFu+IxTpnckdKc09i2bb56IPcu77jw== @@ -25,7 +25,7 @@ - eJztl0FuwyAQRamUBUg9TNfZVmot366bXiEKyVlyibS0x2hG8ZeH6RAP1EKK1C+xMDHw+MwMjnP9NATnxtBxwZX0z91Xvbmjd+4g2tHXz9Obe1DWOof6PfTkJq8/L2u9Tc9fIW97f92Dhb2VWztvCzP0rayZpj6w7wtzRv97jrhwXvidGE6bvN1iJu381VeNmYv7Ltmxf8kMT0ZlLyVe8JSUlDmXpMUM+Hg+HBgzcdB+bnlrZYZq43GY1uRjZE5jbTRifrm015Cz8fwh4dmiZIgPKDKv4Dn6njZzk75T+wjzWOnTmjVIy2+evzj7IejnzL3U/Jfc1nq1xFgS+MYwe72b8rTVS8QZzsnCH5U8kf5w7/DOOeQxA/4WL5MYY4kZmvfd5ayleE+MncbIWqCtZ61ZnN2Sb/yMLOeTCv6XuDHGwmJ9j98Lz4/1uSH30JJbVsm7SspaE6USY1/ju1IyI3+0vGtlluyk7cPc/5faXPpWWFtgt+S5RbgfSDV1skU1d/CSODdpjbjoIc59T/9bE+O+B59JP30j6yE= + eJztl0FqwzAQRRXIQoIeputsC63x7brpFUKUnCW7niCt2mM0g/3xeDqKR6oRBPphFnYs6enPjOw4105dcK4PDRdcSf/cbdWaO3rnjiJOvnye1tydstYllO+hJTd5/Xld63W8/grzOPhhDxb2Wm4t3xZm6FtZM433wH7IzBn97zniQr7wOzGct/O4xUza+8FXjZmL+y7ZsX/JDE96ZS85XvDklJQ5l6TVDPh4PxwZM3HQfm55a2WGSuuxG9fkY2RPY20EMT9f4yXM2Xj/kHBtUTLUBxSZV/Ac9x63U0jfKT7CNFb6tOYZpPU371/kvgt6nrmXmv+S23peLTHmBL4+TF7vxz6t9RJ1hjxZ+KPSJ9If7h2euYR5zYC/xsskxlhqhuZ9c3PWXL0nxk5j5FmgrWc9szi7pd94jiz5SRn/c9wYY2GxPsffC08P5b0h91DTW1bJd5WU9UyUSox9je9KyYz+0fqullmyk3ab6f5fzubct8LaArulzy3C+4FUck7WqOQdvCTOTVqjLlqIc9/T/1bK3ftmiHvwmfQDD7zr+w== @@ -74,12 +74,6 @@ - - - - - - @@ -120,5 +114,19 @@ + + + + [ + { + "type": "item", + "probability": 1, + "count": 1, + "itemName": "Nahiri's Key" + } +] + + + diff --git a/forge-gui/res/adventure/Shandalar/world/items.json b/forge-gui/res/adventure/Shandalar/world/items.json index a29e163c6dc..fabb01a8265 100644 --- a/forge-gui/res/adventure/Shandalar/world/items.json +++ b/forge-gui/res/adventure/Shandalar/world/items.json @@ -182,6 +182,11 @@ "iconName": "RedKey", "questItem": true }, + { + "name": "Nahiri's Key", + "iconName": "RedKey", + "questItem": true + }, { "name": "White Key", "iconName": "WhiteKey",