diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/slobads_boss_effect.txt b/forge-gui/res/adventure/Shandalar/custom_cards/slobads_boss_effect.txt
index 7dfdad0571b..538ff479cff 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/slobads_boss_effect.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/slobads_boss_effect.txt
@@ -1,6 +1,12 @@
-Name:Slobads Boss Effect
+Name:Slobad's Boss Effect
ManaCost:no cost
Types:Enchantment
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, create a 1/1 white Kor Soldier creature token
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ scrap
-Oracle:
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+Artifact | AddToughness$ 2 | EffectZone$ Command | Description$ Artifact Creatures you control get +0/+2
+T:Mode$ DamageDoneOnce | ValidTarget$ You | TriggerZones$ Command | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Whenever Slobad is dealt damage, create X scrap tokens, where X is the amount of damage dealt.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ scrap
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | IsPresent$ Permanent.namedScrap | PresentCompare$ GE5 | TriggerZones$ Command | Execute$ TrigSacrifice | TriggerDescription$ At the beginning of his end step, Slobad creates a 0/0 colorless Construct artifact creature token with "This creature gets +1/+1 for each artifact you control." if he has five or more scrap tokens. Then sacrifice five scrap tokens
+SVar:TrigSacrifice:DB$ Sacrifice | SacValid$ Permanent.namedScrap | Defined$ You | Amount$ 5 | RememberSacrificed$ True | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | ConditionDefined$ Remembered | ConditionPresent Card | ConditionCompare$ GE5 | TokenScript$ c_0_0_a_construct_total_artifacts | TokenOwner$ You | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:TriggerCount$DamageAmount
+Oracle:Artifact Creatures you control get +0/+2.\nWhenever Slobad is dealt damage, create X scrap tokens, where X is the amount of damage dealt. \nAt the beginning of your end step, Slobad creates a 0/0 colorless Construct artifact creature token with "This creature gets +1/+1 for each artifact you control." if he has five or more scrap tokens. Then sacrifice five scrap tokens
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/decks/construct.json b/forge-gui/res/adventure/Shandalar/decks/construct.json
new file mode 100644
index 00000000000..332a5842932
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/construct.json
@@ -0,0 +1,11 @@
+{
+"name":"Construct",
+ "template":
+ {
+ "count":80,
+ "colors":[],
+ "tribe":"Construct",
+ "tribeCards":0.8,
+ "rares":0.1
+ }
+}
diff --git a/forge-gui/res/adventure/Shandalar/decks/goblin_artificer.dck b/forge-gui/res/adventure/Shandalar/decks/goblin_artificer.dck
new file mode 100644
index 00000000000..8b24c98908c
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/goblin_artificer.dck
@@ -0,0 +1,18 @@
+[metadata]
+Name=goblin_artificer
+[Main]
+3 Boompile|C16|1
+2 Coat of Arms|MB1|1
+4 Door of Destinies|C17|1
+4 Goblin Influx Array|YDMU|1
+4 Goblin Kaboomist|M15|1
+4 Howling Mine|SLD|1
+2 Junkyard Scrapper|YNEO|1
+6 Mountain|C19|1
+7 Mountain|C19|2
+10 Mountain|C19|3
+2 Relic Robber|ZNR|1
+4 Sardian Avenger|BRC|1
+4 Shock|M21|1
+2 Treasure Nabber|C18|1
+2 Tuktuk the Explorer|PLIST|1
diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index 47696ff2779..920e56dff99 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
@@ -3,13 +3,13 @@
"height": 4300,
"width": 2
},
- "activeFile": "map/nahiri.tmx",
+ "activeFile": "map/tibalt.tmx",
"automapping.whileDrawing": false,
"expandedProjectPaths": [
+ "tileset",
"obj",
- "map/main_story",
"map",
- "tileset"
+ "map/main_story"
],
"file.lastUsedOpenFilter": "All Files (*)",
"fileStates": {
@@ -40,7 +40,7 @@
"scale": 3,
"selectedLayer": 4,
"viewCenter": {
- "x": 239.5,
+ "x": 239.33333333333331,
"y": 136.16666666666663
}
},
@@ -417,8 +417,8 @@
"scale": 1.5,
"selectedLayer": 5,
"viewCenter": {
- "x": 479.99999999999994,
- "y": 320
+ "x": 359,
+ "y": 562.3333333333333
}
},
"map/cave_2.tmx": {
@@ -1556,35 +1556,47 @@
}
},
"map/factory_1.tmx": {
- "scale": 1.5,
- "selectedLayer": 0,
+ "expandedObjectLayers": [
+ 4
+ ],
+ "scale": 2,
+ "selectedLayer": 6,
"viewCenter": {
- "x": 100.66666666666664,
- "y": 114.33333333333334
+ "x": 241,
+ "y": 136.25
}
},
"map/factory_2.tmx": {
+ "expandedObjectLayers": [
+ 4
+ ],
"scale": 2,
- "selectedLayer": 0,
+ "selectedLayer": 6,
"viewCenter": {
- "x": 344,
+ "x": 295.5,
"y": 152.75
}
},
"map/factory_3.tmx": {
- "scale": 1,
+ "expandedObjectLayers": [
+ 4
+ ],
+ "scale": 2,
"selectedLayer": 6,
"viewCenter": {
- "x": 201.5,
- "y": 144.5
+ "x": 240.5,
+ "y": 136.25
}
},
"map/factory_4.tmx": {
- "scale": 0.5,
- "selectedLayer": 0,
+ "expandedObjectLayers": [
+ 4
+ ],
+ "scale": 1.5,
+ "selectedLayer": 4,
"viewCenter": {
- "x": 695,
- "y": 385
+ "x": 479.33333333333337,
+ "y": 319.6666666666667
}
},
"map/forest_town.tmx": {
@@ -2015,7 +2027,7 @@
"scale": 2,
"selectedLayer": 4,
"viewCenter": {
- "x": 330.75,
+ "x": 307.75,
"y": 123.25
}
},
@@ -2080,8 +2092,8 @@
"scale": 4,
"selectedLayer": 2,
"viewCenter": {
- "x": 218.75,
- "y": 153.5
+ "x": 218.375,
+ "y": 153.125
}
},
"map/magetower_10.tmx": {
@@ -2121,8 +2133,8 @@
"scale": 2,
"selectedLayer": 5,
"viewCenter": {
- "x": 240.5,
- "y": 369.5
+ "x": 344.75,
+ "y": 385.25
}
},
"map/magetower_14.tmx": {
@@ -2228,8 +2240,8 @@
"scale": 2,
"selectedLayer": 5,
"viewCenter": {
- "x": 383.25,
- "y": 499.75
+ "x": 487.5,
+ "y": 515.75
}
},
"map/main_story/black_castle_f1.tmx": {
@@ -2240,7 +2252,7 @@
"selectedLayer": 4,
"viewCenter": {
"x": 240.33535165346996,
- "y": 239.4969725197951
+ "y": 238.93805309734518
}
},
"map/main_story/blue_castle.tmx": {
@@ -2423,14 +2435,22 @@
},
"map/main_story/templeofchandra.tmx": {
"expandedObjectLayers": [
- 7,
- 2
+ 2,
+ 7
],
"scale": 1.5,
"selectedLayer": 5,
"viewCenter": {
- "x": 509.66666666666663,
- "y": -50.333333333333314
+ "x": 596,
+ "y": 181
+ }
+ },
+ "map/main_story/templeofliliana.tmx": {
+ "scale": 0.8331967213114754,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 480.07870142646334,
+ "y": 489.08017707820954
}
},
"map/main_story/unbenannt.tmx": {
@@ -2629,9 +2649,9 @@
4
],
"scale": 2,
- "selectedLayer": 0,
+ "selectedLayer": 4,
"viewCenter": {
- "x": 315.75,
+ "x": 446.25,
"y": 203.75
}
},
@@ -2969,8 +2989,8 @@
"scale": 3,
"selectedLayer": 4,
"viewCenter": {
- "x": 399.83333333333326,
- "y": 215.83333333333331
+ "x": 399.66666666666663,
+ "y": 154.83333333333334
}
},
"map/snowabbey_1.tmx": {
@@ -3031,11 +3051,11 @@
"expandedObjectLayers": [
12
],
- "scale": 2,
+ "scale": 5.5,
"selectedLayer": 5,
"viewCenter": {
- "x": 248.25,
- "y": 176.25
+ "x": 317.8181818181818,
+ "y": 128.45454545454547
}
},
"map/tibalt_f1.tmx": {
@@ -3043,10 +3063,10 @@
12
],
"scale": 3,
- "selectedLayer": 4,
+ "selectedLayer": 5,
"viewCenter": {
- "x": 367.83333333333326,
- "y": 223.83333333333331
+ "x": 515,
+ "y": 264.8333333333333
}
},
"map/tibalt_f2.tmx": {
@@ -3054,9 +3074,9 @@
12
],
"scale": 1.3764204545454546,
- "selectedLayer": 3,
+ "selectedLayer": 0,
"viewCenter": {
- "x": 176.1816305469556,
+ "x": 176.54489164086687,
"y": 168.18988648090817
}
},
@@ -3170,6 +3190,9 @@
"y": 271.75
}
},
+ "tileset/buildings-nocollide.tsx": {
+ "scaleInDock": 1
+ },
"tileset/buildings.tsx": {
"scaleInDock": 1.5,
"scaleInEditor": 1.5
@@ -3194,24 +3217,25 @@
"map/tibalt.tmx",
"map/tibalt_f1.tmx",
"map/tibalt_f2.tmx",
- "map/slobad_factory.tmx",
- "map/nahiri.tmx"
+ "map/aerie_1.tmx",
+ "map/main_story/black_castle_f1.tmx",
+ "map/main_story/black_castle.tmx"
],
"project": "main.tiled-project",
"property.type": "string",
"recentFiles": [
"map/main_story/templeofchandra.tmx",
- "map/tibalt.tmx",
- "map/tibalt_f1.tmx",
- "map/tibalt_f2.tmx",
- "map/slobad_factory.tmx",
- "map/nahiri.tmx",
- "map/teferi.tmx",
+ "map/main_story/black_castle.tmx",
+ "map/main_story/black_castle_f1.tmx",
"map/aerie_1.tmx",
- "map/garruk.tmx",
+ "map/tibalt_f2.tmx",
+ "map/tibalt_f1.tmx",
+ "map/tibalt.tmx",
+ "map/main_story/templeofliliana.tmx",
"map/factory_4.tmx",
- "map/factory_1.tmx",
- "map/factory_2.tmx"
+ "map/factory_3.tmx",
+ "map/factory_2.tmx",
+ "map/factory_1.tmx"
],
"resizeMap.removeObjects": true,
"textEdit.monospace": true
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cursed_swamp.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cursed_swamp.tmx
new file mode 100644
index 00000000000..9a31a576657
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cursed_swamp.tmx
@@ -0,0 +1,52 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx
index 4882f924f3d..ceca9d7423a 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx
@@ -1,13 +1,13 @@
-