diff --git a/forge-gui/res/adventure/Shandalar/world/quests.json b/forge-gui/res/adventure/Shandalar/world/quests.json index d10c1d8de05..d888e22a560 100644 --- a/forge-gui/res/adventure/Shandalar/world/quests.json +++ b/forge-gui/res/adventure/Shandalar/world/quests.json @@ -6728,7 +6728,7 @@ { "id": 1, "name": "Clear", - "description": "Travel to the $(poi_1) and defeat all enemies inside. The target location is in the Waste biome.", + "description": "Travel to Slobad's Factory' and defeat all enemies inside. The target location is in the Waste biome.", "mapFlag": "", "mapFlagValue": 1, "POITags": [ @@ -6746,9 +6746,6 @@ "mapFlag": "", "mapFlagValue": 1, "here": true, - "POITags": [ - "Slobad" - ], "objective": "Travel", "prologue": {}, "epilogue": {}, @@ -6938,7 +6935,7 @@ { "id": 1, "name": "Clear", - "description": "Travel to the $(poi_1) and defeat all enemies inside. The target location is in the Swamp biome.", + "description": "Travel to Slimefoot's Lair and defeat him and his fungal minions'. The target location is in the Swamp biome.", "mapFlag": "", "mapFlagValue": 1, "POITags": [ @@ -6952,13 +6949,10 @@ { "id": 2, "name": "Travel", - "description": "Return to town and report your success in clearing the $(poi_1).", + "description": "Return to town and report your success in clearing Slimefoots Lair.", "mapFlag": "", "mapFlagValue": 1, "here": true, - "POITags": [ - "Slimefoot" - ], "objective": "Travel", "prologue": {}, "epilogue": {}, @@ -7155,7 +7149,7 @@ { "id": 1, "name": "Clear", - "description": "Travel to the $(poi_1) and defeat all enemies inside. The target location is in the waste biome.", + "description": "Travel to the Old Sewers and defeat all enemies inside. The target location is in the waste biome.", "mapFlag": "", "mapFlagValue": 1, "POITags": [ @@ -7173,9 +7167,6 @@ "mapFlag": "", "mapFlagValue": 1, "here": true, - "POITags": [ - "SlimeCave" - ], "objective": "Travel", "prologue": {}, "epilogue": {}, @@ -7849,7 +7840,7 @@ ] }, { - "name": " Kiora? What's she up to now, Elder?", + "name": "Kiora? What's she up to now, Elder?", "text": "(Grimaces) She seeks to summon ancient sea titans that slumber beneath the waves, creatures that could engulf our lands in a cataclysmic flood. It's a threat that endangers Shandalar's very existence.", "options": [ { @@ -7871,7 +7862,7 @@ { "key": "" }, - "issueQuest": "27", + "issueQuest": "35", "POIReference": "" } ], @@ -7914,7 +7905,7 @@ "prologue": {}, "epilogue": { - "text": "As you enter the village, the local towspeople rush towards you to thank you for your deeds (+3 reputation in $(poi_1))", + "text": "As you enter the village, the local towspeople rush towards you to thank you for defeating Kiora. (+3 reputation in $(poi_1))", "options": [ { "action": [ @@ -8012,13 +8003,10 @@ { "id": 2, "name": "Travel", - "description": "Return to town and report your success in clearing the $(poi_1).", + "description": "Return to town and report your success in clearing Kiora's Hideout'", "mapFlag": "", "mapFlagValue": 1, "here": true, - "POITags": [ - "Kiora" - ], "objective": "Travel", "prologue": {}, "epilogue": {}, @@ -8092,7 +8080,7 @@ { "key": "" }, - "issueQuest": "27", + "issueQuest": "36", "POIReference": "" } ], @@ -8135,7 +8123,7 @@ "prologue": {}, "epilogue": { - "text": "As you enter the village, the local towspeople rush towards you to thank you for your deeds (+3 reputation in $(poi_1))", + "text": "As you enter the village, the local towspeople rush towards you to thank you for your deeds. (+3 reputation in $(poi_1))", "options": [ { "action": [ @@ -8196,7 +8184,7 @@ "POIReference": "$(poi_2)" } ], - "text": "After some reflection, you decide that the rewards promised to you are not worth the effort of clearing out the current occupants of the sewers. (-2 Local Reputation)", + "text": "After some reflection, you decide that the rewards promised to you are not worth the effort of defeating Teferi. (-2 Local Reputation)", "options": [ { "name": "(Quest Failed)" @@ -8237,9 +8225,6 @@ "mapFlag": "", "mapFlagValue": 1, "here": true, - "POITags": [ - "Teferi" - ], "objective": "Travel", "prologue": {}, "epilogue": {}, @@ -8295,7 +8280,7 @@ "text": "These...hiccup... metal freaks! They ain't from around here, I swear. Saw 'em with me own eyes. They got them twisted, mechanical...things! Up to somethin' bad, they are!", "options": [ { - "name": "You've had quite a few drinks, Tim. Are you sure you're not imagining things?", + "name": "You've had quite a few drinks, Tim. Are you sure you're not imagining things? Phyrexians haven't been seen in these parts for thousands of years", "text": "Nonsense! Me eyes don't lie, friend. Them Phyrexians are real trouble, I'm tellin' ya. You gotta go, see for yourself. Kick 'em outta Shandalar!", "options": [ { @@ -8313,7 +8298,7 @@ { "key": "" }, - "issueQuest": "27", + "issueQuest": "37", "POIReference": "" } ], @@ -8416,7 +8401,7 @@ "POIReference": "$(poi_2)" } ], - "text": "After some reflection, you decide that the rewards promised to you are not worth the effort of clearing out the current occupants of the sewers. (-2 Local Reputation)", + "text": "After some reflection, you decide that the rewards promised to you are not worth the effort of dealing with the phyrexians. (-2 Local Reputation)", "options": [ { "name": "(Quest Failed)" @@ -8438,7 +8423,7 @@ { "id": 1, "name": "Clear", - "description": "The Phyrexian camp and defeat all enemies present.", + "description": "Find the Phyrexian camp and defeat all enemies present.", "mapFlag": "", "mapFlagValue": 1, "POITags": [ @@ -8457,9 +8442,6 @@ "mapFlag": "", "mapFlagValue": 1, "here": true, - "POITags": [ - "Phyrexian" - ], "objective": "Travel", "prologue": {}, "epilogue": {}, diff --git a/forge-gui/res/adventure/common/custom_cards/kioras_bident.txt b/forge-gui/res/adventure/common/custom_cards/kioras_bident.txt index 40dc9cbb560..b602aec9bb3 100644 --- a/forge-gui/res/adventure/common/custom_cards/kioras_bident.txt +++ b/forge-gui/res/adventure/common/custom_cards/kioras_bident.txt @@ -2,6 +2,6 @@ Name:Kiora's Bident ManaCost:no cost Types:Artifact Equipment S:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Crab.YouCtrl,Kraken.YouCtrl,Serpent.YouCtrl,Leviathan.YouCtrl,Octopus.YouCtrl | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Kraken, Leviathan, Octopus, Crab and Serpent spells you cast cost {1} less. -A:AB$ MakeCard | Cost$ U G PayShards<2> | Conjure$ True | ActivationLimit$ 1 | Zone$ Hand | ActivationZone$ Command | AtRandom$ True | SubAbility$ Eject | Spellbook$ Kiora; Behemoth Beckoner,Kiora;Master of the Depths,Kiora; the Crashing Wave,Kiora; the Tide's Fury | SpellDescription$ Conjure a random Kiora planeswalker card into your hand. Exile Kiora's Bident. +A:AB$ MakeCard | Cost$ U G PayShards<2> | Conjure$ True | ActivationLimit$ 1 | Zone$ Hand | ActivationZone$ Command | AtRandom$ True | SubAbility$ Eject | Spellbook$ Kiora; Behemoth Beckoner,Kiora; Master of the Depths,Kiora; the Crashing Wave,Kiora; the Tide's Fury | SpellDescription$ Conjure a random Kiora planeswalker card into your hand. Exile Kiora's Bident. SVar:Eject:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile Oracle:Kraken, Leviathan, Octopus, Crab and Serpent spells you cast cost {1} less.\n {M}{M}, {U}{G}:Conjure a random Kiora planeswalker card into your hand. Exile Kiora's Bident \ No newline at end of file diff --git a/forge-gui/res/adventure/common/decks/standard/rat_poisonrat.dck b/forge-gui/res/adventure/common/decks/standard/rat_poisonrat.dck new file mode 100644 index 00000000000..fe54306094b --- /dev/null +++ b/forge-gui/res/adventure/common/decks/standard/rat_poisonrat.dck @@ -0,0 +1,28 @@ +[metadata] +Name=rat_poisonrat +[Avatar] + +[Main] +4 Blightbelly Rat|ONE|1 +1 Drainpipe Vermin|JMP|1 +4 Drown in Ichor|ONE|1 +2 Grim Affliction|MB1|1 +2 Gulping Scraptrap|ONE|1 +4 Ichor Rats|ONC|1 +3 Karumonix, the Rat King|ONE|1 +4 Ravenous Rats|10E|1 +4 Septic Rats|MBS|1 +2 Spread the Sickness|MBS|1 +24 Swamp|10E|4 +4 Typhoid Rats|J21|1 +2 Vat Emergence|ONE|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/common/maps/map/fort/fort_white_4_farm.tmx b/forge-gui/res/adventure/common/maps/map/fort/fort_white_4_farm.tmx index d053fae2533..c742e9fc4ca 100644 --- a/forge-gui/res/adventure/common/maps/map/fort/fort_white_4_farm.tmx +++ b/forge-gui/res/adventure/common/maps/map/fort/fort_white_4_farm.tmx @@ -1,5 +1,5 @@ - + @@ -273,5 +273,6 @@ + diff --git a/forge-gui/res/adventure/common/maps/map/minibosses/slime_hive.tmx b/forge-gui/res/adventure/common/maps/map/minibosses/slime_hive.tmx index 42d5ed742bb..de622bf1dbe 100644 --- a/forge-gui/res/adventure/common/maps/map/minibosses/slime_hive.tmx +++ b/forge-gui/res/adventure/common/maps/map/minibosses/slime_hive.tmx @@ -9,12 +9,12 @@ - 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 @@ -48,6 +48,7 @@ + @@ -55,6 +56,7 @@ + diff --git a/forge-gui/res/adventure/common/sprites/enemy/beast/wildratpoison.atlas b/forge-gui/res/adventure/common/sprites/enemy/beast/wildratpoison.atlas new file mode 100644 index 00000000000..52222cc5404 --- /dev/null +++ b/forge-gui/res/adventure/common/sprites/enemy/beast/wildratpoison.atlas @@ -0,0 +1,65 @@ +wildratpoison.png +size: 160,128 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 40, 48 + size: 16, 16 +Idle + xy: 0, 10 + size: 32, 22 +Idle + xy: 32, 10 + size: 32, 22 +Idle + xy: 64, 10 + size: 32, 22 +Idle + xy: 96, 10 + size: 32, 22 +Walk + xy: 0, 42 + size: 32, 22 +Walk + xy: 32, 42 + size: 32, 22 +Walk + xy: 64, 44 + size: 32, 22 +Walk + xy: 96, 42 + size: 32, 22 +Walk + xy: 128, 42 + size: 32, 22 +Attack + xy: 0, 76 + size: 32, 20 +Attack + xy: 32, 76 + size: 32, 20 +Attack + xy: 64, 76 + size: 32, 20 +Attack + xy: 96, 76 + size: 32, 20 +Attack + xy: 128, 76 + size: 32, 20 +Death + xy: 00, 108 + size: 32, 20 +Death + xy: 32, 108 + size: 32, 20 +Death + xy: 64, 108 + size: 32, 20 +Death + xy: 96,108 + size: 32, 20 +Death + xy: 128, 108 + size: 32, 20 \ No newline at end of file diff --git a/forge-gui/res/adventure/common/sprites/enemy/beast/wildratpoison.png b/forge-gui/res/adventure/common/sprites/enemy/beast/wildratpoison.png new file mode 100644 index 00000000000..d292518d48e Binary files /dev/null and b/forge-gui/res/adventure/common/sprites/enemy/beast/wildratpoison.png differ diff --git a/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.atlas b/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.atlas index 5abeda5f1d5..5777df24c97 100644 --- a/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.atlas +++ b/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.atlas @@ -80,16 +80,16 @@ Attack size: 63, 46 Attack xy: 128, 129 - size: 63, 46 + size: 55, 46 Attack xy: 184, 129 size: 63, 46 Attack - xy: 248, 131 - size: 63, 46 + xy: 250, 131 + size: 60, 46 Attack - xy: 312, 131 - size: 63, 46 + xy: 314, 131 + size: 60, 46 Attack xy: 376, 131 size: 63, 46 diff --git a/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.png b/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.png index acce5419b08..4f3c75a0f6f 100644 Binary files a/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.png and b/forge-gui/res/adventure/common/sprites/enemy/dragon/dragonlarge.png differ diff --git a/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.atlas b/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.atlas index d1bcbab648e..758ae387b13 100644 --- a/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.atlas +++ b/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.atlas @@ -4,8 +4,8 @@ format: RGBA8888 filter: Nearest,Nearest repeat: none Avatar - xy: 170, 1 - size: 12, 12 + xy: 390, 39 + size: 25, 31 Idle xy: 8, 1 size: 16, 18 @@ -18,12 +18,6 @@ Idle Idle xy: 104, 1 size: 16, 18 -Idle - xy: 136, 1 - size: 16, 18 -Idle - xy: 168, 1 - size: 16, 18 Walk xy: 12, 31 size: 16, 18 diff --git a/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.png b/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.png index c2d6f2b54f7..51195bf6e42 100644 Binary files a/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.png and b/forge-gui/res/adventure/common/sprites/enemy/giant/wanderinggiant.png differ diff --git a/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.atlas b/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.atlas index 89f570c99e0..b20ba4fc280 100644 --- a/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.atlas +++ b/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.atlas @@ -4,8 +4,8 @@ format: RGBA8888 filter: Nearest,Nearest repeat: none Avatar - xy: 24,161 - size: 31, 31 + xy: 603,264 + size: 23, 22 Idle xy: 0,56 size: 64, 40 diff --git a/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.png b/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.png index 9b43d9c642b..39e98b19e2b 100644 Binary files a/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.png and b/forge-gui/res/adventure/common/sprites/enemy/ooze/giant_slime.png differ diff --git a/forge-gui/res/adventure/common/sprites/enemy/ooze/ooze.png b/forge-gui/res/adventure/common/sprites/enemy/ooze/ooze.png index d5c2614f42c..2e592c78c0b 100644 Binary files a/forge-gui/res/adventure/common/sprites/enemy/ooze/ooze.png and b/forge-gui/res/adventure/common/sprites/enemy/ooze/ooze.png differ diff --git a/forge-gui/res/adventure/common/world/enemies.json b/forge-gui/res/adventure/common/world/enemies.json index a9c4ff21687..12b7d865925 100644 --- a/forge-gui/res/adventure/common/world/enemies.json +++ b/forge-gui/res/adventure/common/world/enemies.json @@ -3981,8 +3981,8 @@ { "type": "deckCard", "probability": 1, - "count": 4, - "addMaxCount": 6, + "count": 2, + "addMaxCount": 2, "rarity": [ "Common", "Rare", @@ -8961,7 +8961,6 @@ "decks/standard/eldrazi.dck" ], "ai": "", - "flying": true, "spawnRate": 0.5, "difficulty": 0.1, "speed": 15, @@ -15115,9 +15114,9 @@ }, { "type": "gold", - "probability": 0.7, + "probability": 1, "count": 10, - "addMaxCount": 90 + "addMaxCount": 30 }, { "type": "card", @@ -22311,7 +22310,7 @@ "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4 + "addMaxCount": 1 }, { "type": "card", @@ -26029,7 +26028,7 @@ "type": "card", "probability": 1, "count": 2, - "addMaxCount": 4, + "addMaxCount": 1, "colors": [ "Red" ], @@ -26042,7 +26041,7 @@ "type": "card", "probability": 0.5, "count": 2, - "addMaxCount": 3, + "addMaxCount": 1, "colors": [ "Red" ], @@ -26278,9 +26277,9 @@ }, { "name": "Plague Rat Swarm", - "sprite": "sprites/enemy/beast/wildrat.atlas", + "sprite": "sprites/enemy/beast/wildratpoison.atlas", "deck": [ - "decks/standard/rat_realmagic.dck" + "decks/standard/rat_poisonrat.dck" ], "ai": "", "randomizeDeck": true, @@ -26347,8 +26346,7 @@ "deck": [ "decks/standard/infectrat.dck", "decks/standard/rat.json", - "decks/standard/ratswarm.dck", - "decks/standard/rat_realmagic.dck" + "decks/standard/ratswarm.dck" ], "ai": "", "randomizeDeck": true,