Merge pull request #3619 from jjayers99/master

Adventure updates / bugfixes

forge-gui-mobile/src/forge/adventure/data/RewardData.java

@@ -144,7 +144,13 @@ public class RewardData implements Serializable {
                 case "Union":
                     HashSet<PaperCard> pool = new HashSet<>();
                     for (RewardData r : cardUnion) {
-                        pool.addAll(CardUtil.getPredicateResult(allCards, r));
+                        if( r.cardName != null && !r.cardName.isEmpty() ) {
+                            PaperCard pc = StaticData.instance().getCommonCards().getCard(r.cardName);
+                            if (pc != null)
+                                pool.add(pc);
+                        } else {
+                            pool.addAll(CardUtil.getPredicateResult(allCards, r));
+                        }
                     }
                     ArrayList<PaperCard> finalPool = new ArrayList(pool);
 

forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java

@@ -8,6 +8,8 @@ import com.google.common.collect.Lists;
 import forge.Forge;
 import forge.adventure.data.*;
 import forge.adventure.pointofintrest.PointOfInterestChanges;
+import forge.adventure.scene.AdventureDeckEditor;
+import forge.adventure.scene.DeckEditScene;
 import forge.adventure.util.*;
 import forge.adventure.world.WorldSave;
 import forge.card.ColorSet;
@@ -588,6 +590,9 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
                 newCards.add(reward.getCard());
                 if (reward.isNoSell()) {
                     noSellCards.add(reward.getCard());
+                    AdventureDeckEditor editor = ((AdventureDeckEditor) DeckEditScene.getInstance().getScreen());
+                    if (editor != null)
+                        editor.refresh();
                 }
                 break;
             case Gold:

forge-gui-mobile/src/forge/adventure/scene/UIScene.java

@@ -332,6 +332,14 @@ public class UIScene extends Scene {
 
     public boolean keyPressed(int keycode) {
         Selectable selection = getSelected();
+
+        if (KeyBinding.Use.isPressed(keycode)) {
+            if (selection != null) {
+                selection.onPressDown(this);
+                return true;
+            }
+        }
+
         ui.pressDown(keycode);
         if (stage.getKeyboardFocus() instanceof SelectBox) {
             SelectBox box = (SelectBox) stage.getKeyboardFocus();
@@ -343,10 +351,11 @@ public class UIScene extends Scene {
                 return false;
             }
         }
-        if (KeyBinding.Use.isPressed(keycode)) {
-            if (selection != null)
-                selection.onPressDown(this);
 
+
+        if (KeyBinding.Back.isPressed(keycode) && selection != null) {
+            selection.onDeSelect();
+            stage.setKeyboardFocus(null);
         }
         if (KeyBinding.ScrollUp.isPressed(keycode)) {
             Actor focus = stage.getScrollFocus();

forge-gui-mobile/src/forge/adventure/stage/GameStage.java

@@ -402,8 +402,6 @@ public abstract class GameStage extends Stage {
         Vector2 adjDirY = direction.cpy();
         boolean foundX = false;
         boolean foundY = false;
-        if(isColliding(boundingRect))//if player is already colliding (after flying or teleport) allow to move off collision
-            return direction;
         while (true) {
 
             if (!isColliding(new Rectangle(boundingRect.x + adjDirX.x, boundingRect.y + adjDirX.y, boundingRect.width, boundingRect.height))) {

forge-gui-mobile/src/forge/adventure/stage/MapStage.java

@@ -123,7 +123,7 @@ public class MapStage extends GameStage {
     public PointOfInterestChanges getChanges() {
         return changes;
     }
-    private boolean matchJustEnded = false;
+    private boolean freezeAllEnemyBehaviors = false;
 
     protected MapStage() {
         dialog = Controls.newDialog("");
@@ -866,7 +866,7 @@ public class MapStage extends GameStage {
     @Override
     public void setWinner(boolean playerWins) {
         isLoadingMatch = false;
-        matchJustEnded = true;
+        freezeAllEnemyBehaviors = true;
         if (playerWins) {
             currentMob.clearCollisionHeight();
             Current.player().win();
@@ -1034,12 +1034,14 @@ public class MapStage extends GameStage {
             return;
         Iterator<EnemySprite> it = enemies.iterator();
 
-        if (matchJustEnded){
-            if (!positions.contains(player.pos()))
-                matchJustEnded = false;
+        if (freezeAllEnemyBehaviors) {
+            if (!positions.contains(player.pos())) {
+                freezeAllEnemyBehaviors = false;
+            }
+            else return;
         }
 
-        if (!matchJustEnded) {
+        if (!freezeAllEnemyBehaviors) {
             while (it.hasNext()) {
                 EnemySprite mob = it.next();
                 if (mob.inactive){
@@ -1101,6 +1103,7 @@ public class MapStage extends GameStage {
                     }
                     break;
                 } else if (actor instanceof RewardSprite) {
+                    freezeAllEnemyBehaviors = true;
                     Gdx.input.vibrate(50);
                     if (Controllers.getCurrent() != null && Controllers.getCurrent().canVibrate())
                         Controllers.getCurrent().startVibration(100, 1);
@@ -1171,6 +1174,7 @@ public class MapStage extends GameStage {
         for (int i = 0; i < dialog.getButtonTable().getCells().size; i++) {
             dialogButtonMap.add((TextraButton) dialog.getButtonTable().getCells().get(i).getActor());
         }
+        freezeAllEnemyBehaviors = true;
         dialog.show(dialogStage, Actions.show());
         dialog.setPosition((dialogStage.getWidth() - dialog.getWidth()) / 2, (dialogStage.getHeight() - dialog.getHeight()) / 2);
         dialogOnlyInput = true;

forge-gui-mobile/src/forge/adventure/stage/WorldStage.java

@@ -230,6 +230,13 @@ public class WorldStage extends GameStage implements SaveFileContent {
         return WorldSave.getCurrentSave().getWorld().collidingTile(boundingRect);
     }
 
+    @Override
+    public Vector2 adjustMovement(Vector2 direction, Rectangle boundingRect) {
+        if (isColliding(boundingRect)) //if player is already colliding (after flying or teleport) allow to move off collision
+            return direction;
+        return super.adjustMovement(direction, boundingRect);
+    }
+
     public boolean spawn(String enemy) {
         return spawn(WorldData.getEnemy(enemy));
     }

forge-gui-mobile/src/forge/toolbox/FContainer.java

@@ -94,8 +94,8 @@ public abstract class FContainer extends FDisplayObject {
 
     @Override
     public void setSize(float width, float height) {
-        if (getWidth() == width && getHeight() == height) { return; }
-
+        //called with (0,0) when app minimized, if set then causes errors with layouts loaded before restoring focus
+        if ((getWidth() == width && getHeight() == height) || width == 0f || height == 0f) { return; }
         super.setSize(width, height);
         doLayout(width, height);
     }

forge-gui/res/adventure/common/maps/extensions/rename-waypoints-by-ID.js

@@ -0,0 +1,61 @@
+/// <reference types="@mapeditor/tiled-api" />
+
+/*
+ * rename-waypoints-by-ID.js
+ * Created by TabletopGeneral for Forge Adventure Mode
+ *
+ * This extension adds a 'Rename waypoints by ID' (Ctrl+Shift+R) action to the Map
+ * menu, useful to visually identify points for mob navigation
+ * Based on https://github.com/justdaft/tiled-scripts/blob/main/rename-object-by-type.js
+ * 
+ */
+
+/* global tiled */
+
+function doRenameWaypoints(thing) {
+	let count = 0;
+	for (let i = thing.layerCount - 1; i >= 0; i--) {
+		const layer = thing.layerAt(i);
+
+        if (layer.isGroupLayer) {
+			const obj = doRenameWaypoints(layer, "waypoint");
+			if (obj) {
+				count = count + obj;
+			}
+		} else if (layer.isObjectLayer) {
+			for (const obj of layer.objects) {
+
+				if (obj.name == "waypoint") {
+					obj.name = obj.id;
+					count++;
+				}
+			}
+		}
+	}
+
+	return count;
+}
+
+
+let renameWaypoints = tiled.registerAction("renameWaypoints", function(/* action */) {
+	const map = tiled.activeAsset;
+	if (!map.isTileMap) {
+		tiled.alert("Not a tile map!");
+		return;
+	}
+
+
+	const count = doRenameWaypoints(map);
+
+	tiled.alert("Renamed " + count + " waypoints");
+
+});
+
+
+renameWaypoints.text = "Rename waypoints by ID";
+renameWaypoints.shortcut = "Ctrl+Shift+R";
+
+tiled.extendMenu("Map", [
+	{ separator: true },
+	{ action: "renameWaypoints" },
+]);

forge-gui/res/adventure/common/maps/map/barbariancamp/barbariancamp_bandit.tmx

@@ -57,7 +57,7 @@
   </object>
   <object id="55" template="../../obj/enemy.tx" x="390.398" y="96.5401">
    <properties>
-    <property name="effect" value="{ &quot;startBattleWithCard&quot;: [ &quot;Bedlam&quot; }"/>
+    <property name="effect" value="{ &quot;startBattleWithCard&quot;: [ &quot;Bedlam&quot; ] }"/>
     <property name="enemy" value="Bandit Leader"/>
     <property name="pursueRange" type="int" value="30"/>
     <property name="threatRange" type="int" value="50"/>

forge-gui/res/adventure/common/maps/map/cave/cave_bandit.tmx

@@ -51,7 +51,7 @@
   <object id="66" template="../../obj/waypoint.tx" x="318" y="230.667"/>
   <object id="67" template="../../obj/enemy.tx" x="161" y="78.6667">
    <properties>
-    <property name="effect" value="{ &quot;startBattleWithCard&quot;: [ &quot;Bedlam&quot; }"/>
+    <property name="effect" value="{ &quot;startBattleWithCard&quot;: [ &quot;Bedlam&quot; ] }"/>
     <property name="enemy" value="Bandit Leader"/>
     <property name="threatRange" type="int" value="30"/>
    </properties>

forge-gui/res/adventure/common/maps/obj/enemy.tx

@@ -10,7 +10,9 @@
    <property name="spawn.Easy" type="bool" value="true"/>
    <property name="spawn.Hard" type="bool" value="true"/>
    <property name="spawn.Normal" type="bool" value="true"/>
+   <property name="speedModifier" type="float" value="0"/>
    <property name="threatRange" type="int" value="0"/>
+   <property name="waypoints" value=""/>
   </properties>
  </object>
 </template>

forge-gui/res/adventure/common/maps/obj/entry_down.tx

@@ -5,6 +5,7 @@
   <properties>
    <property name="direction" value="down"/>
    <property name="teleport" value=""/>
+   <property name="teleportObjectId" value=""/>
   </properties>
  </object>
 </template>

forge-gui/res/adventure/common/maps/obj/entry_left.tx

@@ -5,6 +5,7 @@
   <properties>
    <property name="direction" value="left"/>
    <property name="teleport" value=""/>
+   <property name="teleportObjectId" value=""/>
   </properties>
  </object>
 </template>

forge-gui/res/adventure/common/maps/obj/entry_right.tx

@@ -5,6 +5,7 @@
   <properties>
    <property name="direction" value="right"/>
    <property name="teleport" value=""/>
+   <property name="teleportObjectId" value=""/>
   </properties>
  </object>
 </template>

forge-gui/res/adventure/common/maps/obj/entry_up.tx

@@ -5,6 +5,7 @@
   <properties>
    <property name="direction" value="up"/>
    <property name="teleport" value=""/>
+   <property name="teleportObjectId" value=""/>
   </properties>
  </object>
 </template>

forge-gui/res/adventure/common/maps/tileset/dungeon-nocollide.tsx

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.1" name="dungeon-nocollide" tilewidth="16" tileheight="16" tilecount="4480" columns="64">
+ <image source="dungeon.png" width="1024" height="1120"/>
+ <wangsets>
+  <wangset name="Minecart Tracks" type="edge" tile="340">
+   <wangcolor name="" color="#ff0000" tile="340" probability="1"/>
+   <wangcolor name="" color="#00ff00" tile="345" probability="1"/>
+   <wangcolor name="" color="#0000ff" tile="-1" probability="1"/>
+   <wangtile tileid="275" wangid="1,0,1,0,1,0,0,0"/>
+   <wangtile tileid="276" wangid="0,0,0,0,1,0,0,0"/>
+   <wangtile tileid="277" wangid="1,0,0,0,1,0,1,0"/>
+   <wangtile tileid="280" wangid="2,0,2,0,2,0,0,0"/>
+   <wangtile tileid="281" wangid="0,0,0,0,2,0,0,0"/>
+   <wangtile tileid="282" wangid="2,0,0,0,2,0,2,0"/>
+   <wangtile tileid="338" wangid="0,0,1,0,1,0,0,0"/>
+   <wangtile tileid="339" wangid="0,0,1,0,1,0,0,0"/>
+   <wangtile tileid="340" wangid="0,0,1,0,0,0,1,0"/>
+   <wangtile tileid="341" wangid="0,0,0,0,1,0,1,0"/>
+   <wangtile tileid="342" wangid="0,0,1,0,1,0,1,0"/>
+   <wangtile tileid="343" wangid="0,0,2,0,2,0,2,0"/>
+   <wangtile tileid="344" wangid="0,0,2,0,2,0,0,0"/>
+   <wangtile tileid="345" wangid="0,0,2,0,0,0,2,0"/>
+   <wangtile tileid="346" wangid="0,0,0,0,2,0,2,0"/>
+   <wangtile tileid="347" wangid="0,0,2,0,2,0,2,0"/>
+   <wangtile tileid="402" wangid="0,0,1,0,0,0,0,0"/>
+   <wangtile tileid="403" wangid="1,0,0,0,1,0,0,0"/>
+   <wangtile tileid="404" wangid="1,0,1,0,1,0,1,0"/>
+   <wangtile tileid="405" wangid="1,0,0,0,1,0,0,0"/>
+   <wangtile tileid="406" wangid="0,0,0,0,0,0,1,0"/>
+   <wangtile tileid="407" wangid="0,0,2,0,0,0,0,0"/>
+   <wangtile tileid="408" wangid="2,0,0,0,2,0,0,0"/>
+   <wangtile tileid="409" wangid="2,0,2,0,2,0,2,0"/>
+   <wangtile tileid="410" wangid="2,0,0,0,2,0,0,0"/>
+   <wangtile tileid="411" wangid="0,0,0,0,0,0,2,0"/>
+   <wangtile tileid="466" wangid="1,0,1,0,0,0,1,0"/>
+   <wangtile tileid="467" wangid="1,0,1,0,0,0,0,0"/>
+   <wangtile tileid="468" wangid="0,0,1,0,0,0,1,0"/>
+   <wangtile tileid="469" wangid="1,0,0,0,0,0,1,0"/>
+   <wangtile tileid="470" wangid="1,0,1,0,0,0,1,0"/>
+   <wangtile tileid="471" wangid="2,0,2,0,0,0,2,0"/>
+   <wangtile tileid="472" wangid="2,0,2,0,0,0,0,0"/>
+   <wangtile tileid="473" wangid="0,0,2,0,0,0,2,0"/>
+   <wangtile tileid="474" wangid="2,0,0,0,0,0,2,0"/>
+   <wangtile tileid="475" wangid="2,0,2,0,0,0,2,0"/>
+   <wangtile tileid="531" wangid="1,0,1,0,0,0,1,0"/>
+   <wangtile tileid="532" wangid="1,0,0,0,0,0,0,0"/>
+   <wangtile tileid="533" wangid="1,0,0,0,1,0,1,0"/>
+   <wangtile tileid="536" wangid="2,0,2,0,0,0,2,0"/>
+   <wangtile tileid="537" wangid="2,0,0,0,0,0,0,0"/>
+   <wangtile tileid="538" wangid="2,0,0,0,0,0,2,0"/>
+  </wangset>
+  <wangset name="Unnamed Set" type="mixed" tile="-1">
+   <wangcolor name="tracks" color="#ff0000" tile="-1" probability="1"/>
+   <wangcolor name="edges" color="#00ff00" tile="-1" probability="1"/>
+   <wangtile tileid="274" wangid="2,2,2,2,2,2,2,2"/>
+   <wangtile tileid="275" wangid="2,1,1,1,1,1,2,2"/>
+   <wangtile tileid="276" wangid="2,2,2,1,1,1,2,2"/>
+   <wangtile tileid="277" wangid="1,1,2,1,1,1,1,1"/>
+   <wangtile tileid="338" wangid="2,1,1,1,1,1,1,1"/>
+   <wangtile tileid="339" wangid="2,1,1,1,1,1,2,2"/>
+   <wangtile tileid="340" wangid="2,1,1,1,2,1,1,1"/>
+   <wangtile tileid="341" wangid="2,2,2,2,1,1,1,2"/>
+   <wangtile tileid="342" wangid="2,1,1,1,1,1,1,1"/>
+   <wangtile tileid="402" wangid="2,1,1,1,2,2,2,2"/>
+   <wangtile tileid="403" wangid="1,1,2,1,1,1,2,1"/>
+   <wangtile tileid="404" wangid="1,1,1,1,1,1,1,1"/>
+   <wangtile tileid="405" wangid="1,1,2,1,1,1,2,1"/>
+   <wangtile tileid="406" wangid="2,2,2,2,2,1,1,1"/>
+   <wangtile tileid="466" wangid="1,1,1,1,2,1,1,1"/>
+   <wangtile tileid="467" wangid="1,1,1,1,2,2,2,1"/>
+   <wangtile tileid="468" wangid="2,1,1,1,2,1,1,1"/>
+   <wangtile tileid="469" wangid="1,1,2,2,2,1,1,1"/>
+   <wangtile tileid="470" wangid="1,1,1,1,2,1,1,1"/>
+   <wangtile tileid="531" wangid="1,1,1,1,1,1,2,1"/>
+   <wangtile tileid="532" wangid="1,1,2,2,2,2,2,1"/>
+   <wangtile tileid="533" wangid="1,1,2,1,1,1,1,1"/>
+  </wangset>
+  <wangset name="Unnamed Set" type="mixed" tile="-1">
+   <wangcolor name="Track" color="#ff0000" tile="-1" probability="1"/>
+   <wangcolor name="No track" color="#00ff00" tile="-1" probability="1"/>
+   <wangtile tileid="277" wangid="1,1,2,1,1,1,1,1"/>
+   <wangtile tileid="338" wangid="2,1,1,1,1,1,1,1"/>
+   <wangtile tileid="341" wangid="1,2,1,1,1,1,1,1"/>
+   <wangtile tileid="404" wangid="1,1,1,1,1,1,1,1"/>
+   <wangtile tileid="466" wangid="1,1,1,1,2,1,1,1"/>
+   <wangtile tileid="469" wangid="1,1,1,2,1,1,1,1"/>
+  </wangset>
+  <wangset name="Unnamed Set" type="mixed" tile="-1">
+   <wangcolor name="Connected track" color="#ff0000" tile="-1" probability="1"/>
+   <wangcolor name="Connected corners" color="#00ff00" tile="-1" probability="1"/>
+   <wangcolor name="Un" color="#0000ff" tile="-1" probability="1"/>
+   <wangtile tileid="275" wangid="1,2,1,2,1,0,0,0"/>
+   <wangtile tileid="276" wangid="0,0,0,2,1,2,0,0"/>
+   <wangtile tileid="277" wangid="1,0,0,0,1,2,1,2"/>
+   <wangtile tileid="338" wangid="0,0,1,2,1,2,1,0"/>
+   <wangtile tileid="339" wangid="0,2,1,2,1,2,0,0"/>
+   <wangtile tileid="340" wangid="0,0,1,2,0,2,1,0"/>
+   <wangtile tileid="341" wangid="0,0,0,2,1,2,1,2"/>
+   <wangtile tileid="342" wangid="0,0,1,2,1,2,1,0"/>
+   <wangtile tileid="402" wangid="0,2,1,2,0,0,0,0"/>
+   <wangtile tileid="403" wangid="1,2,0,2,1,2,0,2"/>
+   <wangtile tileid="404" wangid="1,2,1,2,1,2,1,2"/>
+   <wangtile tileid="405" wangid="1,2,0,2,1,2,0,2"/>
+   <wangtile tileid="406" wangid="0,0,0,0,0,2,1,2"/>
+   <wangtile tileid="466" wangid="1,2,1,0,0,0,1,2"/>
+   <wangtile tileid="467" wangid="1,2,1,2,0,0,0,2"/>
+   <wangtile tileid="468" wangid="0,2,1,2,0,2,1,2"/>
+   <wangtile tileid="469" wangid="1,2,0,0,0,2,1,2"/>
+   <wangtile tileid="470" wangid="1,2,1,0,0,0,1,2"/>
+   <wangtile tileid="531" wangid="1,2,1,2,1,0,0,0"/>
+   <wangtile tileid="532" wangid="1,2,0,0,0,0,0,2"/>
+   <wangtile tileid="533" wangid="1,0,0,0,1,2,1,2"/>
+  </wangset>
+  <wangset name="Unnamed Set" type="edge" tile="-1">
+   <wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
+   <wangtile tileid="275" wangid="1,0,1,0,1,0,0,0"/>
+   <wangtile tileid="276" wangid="0,0,0,0,1,0,0,0"/>
+   <wangtile tileid="277" wangid="1,0,0,0,1,0,1,0"/>
+   <wangtile tileid="338" wangid="0,0,1,0,1,0,1,0"/>
+   <wangtile tileid="339" wangid="0,0,1,0,1,0,0,0"/>
+   <wangtile tileid="340" wangid="0,0,1,0,0,0,1,0"/>
+   <wangtile tileid="341" wangid="0,0,0,0,1,0,1,0"/>
+   <wangtile tileid="342" wangid="0,0,1,0,1,0,1,0"/>
+   <wangtile tileid="402" wangid="0,0,1,0,0,0,0,0"/>
+   <wangtile tileid="403" wangid="1,0,0,0,1,0,0,0"/>
+   <wangtile tileid="404" wangid="1,0,1,0,1,0,1,0"/>
+   <wangtile tileid="405" wangid="1,0,0,0,1,0,0,0"/>
+   <wangtile tileid="406" wangid="0,0,0,0,0,0,1,0"/>
+   <wangtile tileid="466" wangid="1,0,1,0,0,0,1,0"/>
+   <wangtile tileid="467" wangid="1,0,1,0,0,0,0,0"/>
+   <wangtile tileid="468" wangid="0,0,1,0,0,0,1,0"/>
+   <wangtile tileid="469" wangid="1,0,0,0,0,0,1,0"/>
+   <wangtile tileid="470" wangid="1,0,1,0,0,0,1,0"/>
+   <wangtile tileid="531" wangid="1,0,1,0,0,0,1,0"/>
+   <wangtile tileid="532" wangid="1,0,0,0,0,0,0,0"/>
+   <wangtile tileid="533" wangid="1,0,0,0,1,0,1,0"/>
+  </wangset>
+ </wangsets>
+</tileset>

forge-gui/res/adventure/common/maps/tileset/main.tsx

@@ -104,12 +104,12 @@
  </tile>
  <tile id="122">
   <objectgroup draworder="index" id="2">
-   <object id="1" x="0" y="1" width="16" height="15"/>
+   <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
  <tile id="123">
   <objectgroup draworder="index" id="2">
-   <object id="1" x="0" y="1" width="16" height="15"/>
+   <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
  <tile id="124">
@@ -5488,6 +5488,16 @@
    <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="3232">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="2" width="15" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="3233">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="15" height="14"/>
+  </objectgroup>
+ </tile>
  <tile id="3256">
   <objectgroup draworder="index" id="2">
    <object id="1" x="12" y="0" width="4" height="8"/>
@@ -5763,6 +5773,16 @@
    <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="3390">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="15" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="3391">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="15" height="14"/>
+  </objectgroup>
+ </tile>
  <tile id="3392">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -9036,6 +9056,26 @@
    <object id="1" x="0" y="0" width="7" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="5068">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="5069">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="5070">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="3" width="14" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="5071">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="3" width="12" height="13"/>
+  </objectgroup>
+ </tile>
  <tile id="5076">
   <objectgroup draworder="index" id="2">
    <object id="1" x="3" y="4" width="13" height="12"/>
@@ -9262,6 +9302,26 @@
    <object id="1" x="0" y="0" width="15" height="15"/>
   </objectgroup>
  </tile>
+ <tile id="5226">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="5227">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="5228">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="1" width="14" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="5229">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="3" width="12" height="13"/>
+  </objectgroup>
+ </tile>
  <tile id="5234">
   <objectgroup draworder="index" id="2">
    <object id="1" x="3" y="0" width="13" height="13"/>
@@ -9507,6 +9567,26 @@
    <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="5384">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="5385">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="5386">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="1" width="14" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="5387">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="3" width="12" height="13"/>
+  </objectgroup>
+ </tile>
  <tile id="5396">
   <objectgroup draworder="index" id="2">
    <object id="1" x="3" y="0" width="10" height="16"/>
@@ -9774,6 +9854,26 @@
    <object id="2" x="10" y="8" width="6" height="8"/>
   </objectgroup>
  </tile>
+ <tile id="5542">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="3" width="14" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5543">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="2" width="14" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5544">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="5" width="12" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="5545">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="5" width="12" height="10"/>
+  </objectgroup>
+ </tile>
  <tile id="5634">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -10024,6 +10124,16 @@
    <object id="1" x="10" y="0" width="6" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="5702">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="4" y="4" width="8" height="11"/>
+  </objectgroup>
+ </tile>
+ <tile id="5703">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="4" y="4" width="8" height="11"/>
+  </objectgroup>
+ </tile>
  <tile id="5793">
   <objectgroup draworder="index" id="2">
    <object id="1" x="1" y="0" width="14" height="15"/>
@@ -10146,6 +10256,16 @@
    <object id="2" x="0" y="12" width="10" height="4"/>
   </objectgroup>
  </tile>
+ <tile id="5868">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="4" width="15" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="5869">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="10" width="12" height="6"/>
+  </objectgroup>
+ </tile>
  <tile id="5950">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -10275,6 +10395,73 @@
    <object id="2" x="10" y="0" width="6" height="8"/>
   </objectgroup>
  </tile>
+ <tile id="6016">
+  <objectgroup draworder="index" id="6">
+   <object id="6" x="0" y="0" width="16" height="16"/>
+   <object id="7" x="1" y="1" width="14" height="15"/>
+  </objectgroup>
+  <animation>
+   <frame tileid="6016" duration="100"/>
+   <frame tileid="6017" duration="100"/>
+   <frame tileid="6018" duration="100"/>
+   <frame tileid="6019" duration="100"/>
+  </animation>
+ </tile>
+ <tile id="6017">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+   <object id="2" x="1" y="1" width="14" height="15"/>
+  </objectgroup>
+  <animation>
+   <frame tileid="6017" duration="100"/>
+   <frame tileid="6018" duration="125"/>
+   <frame tileid="6019" duration="100"/>
+   <frame tileid="6016" duration="75"/>
+  </animation>
+ </tile>
+ <tile id="6018">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+   <object id="2" x="1" y="1" width="14" height="15"/>
+  </objectgroup>
+  <animation>
+   <frame tileid="6018" duration="100"/>
+   <frame tileid="6017" duration="100"/>
+   <frame tileid="6016" duration="100"/>
+   <frame tileid="6019" duration="100"/>
+  </animation>
+ </tile>
+ <tile id="6019">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+   <object id="2" x="1" y="0" width="14" height="16"/>
+  </objectgroup>
+  <animation>
+   <frame tileid="6019" duration="125"/>
+   <frame tileid="6016" duration="75"/>
+   <frame tileid="6017" duration="125"/>
+   <frame tileid="6018" duration="75"/>
+   <frame tileid="6019" duration="120"/>
+   <frame tileid="6016" duration="100"/>
+   <frame tileid="6017" duration="100"/>
+   <frame tileid="6018" duration="100"/>
+  </animation>
+ </tile>
+ <tile id="6025">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="6026">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="6027">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="14" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="6108">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -10381,6 +10568,26 @@
    <object id="2" x="10" y="12" width="6" height="4"/>
   </objectgroup>
  </tile>
+ <tile id="6178">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="3" width="10" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="6179">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="2" width="10" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="6181">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="14" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6182">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="14" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="6276">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0"/>
@@ -10456,6 +10663,26 @@
    <object id="2" x="0" y="9" width="11" height="7"/>
   </objectgroup>
  </tile>
+ <tile id="6336">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="2" width="10" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="6337">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="3" width="10" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="6339">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="6340">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="14"/>
+  </objectgroup>
+ </tile>
  <tile id="6451">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0.0625" y="0.25" width="7.8125" height="16"/>
@@ -10486,6 +10713,56 @@
    <object id="1" x="0" y="0" width="5" height="3"/>
   </objectgroup>
  </tile>
+ <tile id="6496">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="10" width="12" height="6"/>
+  </objectgroup>
+ </tile>
+ <tile id="6497">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="12" width="9" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="6498">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="8" width="16" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="6499">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="8" width="16" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="6509">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="9" width="14" height="7"/>
+  </objectgroup>
+ </tile>
+ <tile id="6510">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="9" width="13" height="7"/>
+  </objectgroup>
+ </tile>
+ <tile id="6511">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="8" width="13" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="6512">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="10" width="13" height="6"/>
+  </objectgroup>
+ </tile>
+ <tile id="6513">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="10" width="13" height="6"/>
+  </objectgroup>
+ </tile>
+ <tile id="6514">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="12" width="10" height="4"/>
+  </objectgroup>
+ </tile>
  <tile id="6609">
   <objectgroup draworder="index" id="2">
    <object id="1" x="-0.03125" y="0" width="7.8125" height="16"/>
@@ -10496,6 +10773,71 @@
    <object id="1" x="11.9375" y="0" width="4.0625" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="6653">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="6654">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6655">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6656">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6657">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6665">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="6666">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="6667">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6668">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6669">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6670">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6671">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6672">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="6767">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0.03125" y="-0.1875" width="7.8125" height="16.125"/>
@@ -10523,6 +10865,26 @@
    <object id="2" x="0" y="0" width="11" height="3"/>
   </objectgroup>
  </tile>
+ <tile id="6816">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="6817">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="2" width="13" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="6818">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="2" width="13" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="6819">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="14"/>
+  </objectgroup>
+ </tile>
  <tile id="6919">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -10553,6 +10915,46 @@
    <object id="1" x="11" y="0" width="5" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="6974">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="7" width="14" height="9"/>
+  </objectgroup>
+ </tile>
+ <tile id="6975">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="14" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6976">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="6977">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="6978">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="1" width="15" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="6979">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="7" y="12" width="9" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="6980">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="7067">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="7077">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -10573,6 +10975,16 @@
    <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="7081">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="1" width="15" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="7082">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="15" height="14"/>
+  </objectgroup>
+ </tile>
  <tile id="7110">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="5" height="16"/>
@@ -10590,6 +11002,46 @@
    <object id="2" x="11" y="0" width="5" height="9"/>
   </objectgroup>
  </tile>
+ <tile id="7132">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="15" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7133">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="7134">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7135">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7136">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7137">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="7138">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="7225">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="7235">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -10645,6 +11097,16 @@
    <object id="1" x="0" y="0" width="5" height="3"/>
   </objectgroup>
  </tile>
+ <tile id="7285">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="7" y="0" width="9" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7286">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="14" height="15"/>
+  </objectgroup>
+ </tile>
  <tile id="7393">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="5" height="16"/>
@@ -10691,6 +11153,16 @@
    <object id="1" x="0" y="0" width="5" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="7443">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7444">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="7584">
   <objectgroup draworder="index" id="2">
    <object id="1" x="11" y="0" width="5" height="16"/>
@@ -10741,6 +11213,16 @@
    <object id="1" x="0" y="0" width="5" height="3"/>
   </objectgroup>
  </tile>
+ <tile id="7754">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="3" width="14" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="7755">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="3" width="12" height="10"/>
+  </objectgroup>
+ </tile>
  <tile id="7912">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -11001,6 +11483,41 @@
    <object id="1" x="1" y="1" width="14" height="15"/>
   </objectgroup>
  </tile>
+ <tile id="9249">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9250">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9251">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9252">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9253">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9254">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9255">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="9334">
   <objectgroup draworder="index" id="2">
    <object id="1" x="2" y="0" width="14" height="16"/>
@@ -11011,6 +11528,41 @@
    <object id="1" x="0" y="0" width="14" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="9407">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="9408">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="9409">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="9410">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="9411">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="8"/>
+  </objectgroup>
+ </tile>
+ <tile id="9412">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9413">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="9492">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="10.125" height="16"/>
@@ -11021,6 +11573,152 @@
    <object id="1" x="5.9375" y="0" width="10.0625" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="9567">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="9" width="10" height="7"/>
+  </objectgroup>
+ </tile>
+ <tile id="9569">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="10" width="10" height="6"/>
+  </objectgroup>
+ </tile>
+ <tile id="9570">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="1" width="15" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9571">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9572">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="15" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9723">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9724">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9725">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9726">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9727">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9728">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="14" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9729">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="9" width="14" height="7"/>
+  </objectgroup>
+ </tile>
+ <tile id="9730">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="14" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9731">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9732">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9733">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9885">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="2" width="12" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="9886">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="15" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9887">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9888">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="15" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9889">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="9890">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="1" width="10" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9891">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="1" width="10" height="15"/>
+  </objectgroup>
+ </tile>
+ <tile id="9892">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="10039">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="14"/>
+  </objectgroup>
+  <animation>
+   <frame tileid="10039" duration="125"/>
+   <frame tileid="10040" duration="125"/>
+   <frame tileid="10041" duration="125"/>
+   <frame tileid="10042" duration="125"/>
+  </animation>
+ </tile>
+ <tile id="10040">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="10041">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="14"/>
+  </objectgroup>
+ </tile>
+ <tile id="10042">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="14"/>
+  </objectgroup>
+ </tile>
  <wangsets>
   <wangset name="Walls" type="corner" tile="2531">
    <wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
@@ -11924,20 +12622,81 @@
   </wangset>
   <wangset name="Mountain" type="corner" tile="592">
    <wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
+   <wangcolor name="" color="#00ff00" tile="-1" probability="1"/>
+   <wangtile tileid="119" wangid="0,0,0,2,0,0,0,0"/>
+   <wangtile tileid="120" wangid="0,0,0,2,0,2,0,0"/>
+   <wangtile tileid="121" wangid="0,0,0,0,0,2,0,0"/>
+   <wangtile tileid="122" wangid="0,2,0,2,0,2,0,0"/>
+   <wangtile tileid="123" wangid="0,0,0,2,0,2,0,2"/>
+   <wangtile tileid="124" wangid="0,0,0,2,0,0,0,0"/>
+   <wangtile tileid="125" wangid="0,0,0,2,0,2,0,0"/>
+   <wangtile tileid="126" wangid="0,0,0,0,0,2,0,0"/>
+   <wangtile tileid="127" wangid="0,0,0,2,0,0,0,0"/>
+   <wangtile tileid="128" wangid="0,0,0,2,0,2,0,0"/>
+   <wangtile tileid="129" wangid="0,0,0,0,0,2,0,0"/>
+   <wangtile tileid="275" wangid="0,2,0,0,0,2,0,2"/>
+   <wangtile tileid="276" wangid="0,2,0,2,0,0,0,2"/>
+   <wangtile tileid="277" wangid="0,2,0,2,0,0,0,0"/>
+   <wangtile tileid="278" wangid="0,2,0,2,0,2,0,2"/>
+   <wangtile tileid="279" wangid="0,0,0,0,0,2,0,2"/>
+   <wangtile tileid="280" wangid="0,2,0,2,0,0,0,2"/>
+   <wangtile tileid="281" wangid="0,2,0,0,0,2,0,2"/>
+   <wangtile tileid="282" wangid="0,2,0,2,0,0,0,0"/>
+   <wangtile tileid="283" wangid="0,2,0,2,0,2,0,2"/>
+   <wangtile tileid="284" wangid="0,0,0,0,0,2,0,2"/>
+   <wangtile tileid="285" wangid="0,2,0,2,0,0,0,0"/>
+   <wangtile tileid="286" wangid="0,2,0,2,0,2,0,2"/>
+   <wangtile tileid="287" wangid="0,0,0,0,0,2,0,2"/>
+   <wangtile tileid="433" wangid="0,0,0,2,0,2,0,2"/>
+   <wangtile tileid="434" wangid="0,2,0,2,0,2,0,0"/>
+   <wangtile tileid="435" wangid="0,2,0,0,0,0,0,0"/>
+   <wangtile tileid="436" wangid="0,2,0,0,0,0,0,2"/>
+   <wangtile tileid="437" wangid="0,0,0,0,0,0,0,2"/>
+   <wangtile tileid="438" wangid="0,2,0,0,0,2,0,0"/>
+   <wangtile tileid="439" wangid="0,0,0,2,0,0,0,2"/>
+   <wangtile tileid="440" wangid="0,2,0,0,0,0,0,0"/>
+   <wangtile tileid="441" wangid="0,2,0,0,0,0,0,2"/>
+   <wangtile tileid="442" wangid="0,0,0,0,0,0,0,2"/>
+   <wangtile tileid="443" wangid="0,2,0,0,0,0,0,0"/>
+   <wangtile tileid="444" wangid="0,2,0,0,0,0,0,2"/>
+   <wangtile tileid="445" wangid="0,0,0,0,0,0,0,2"/>
    <wangtile tileid="593" wangid="0,0,0,1,0,0,0,0"/>
    <wangtile tileid="594" wangid="0,0,0,1,0,1,0,0"/>
    <wangtile tileid="595" wangid="0,0,0,0,0,1,0,0"/>
+   <wangtile tileid="596" wangid="0,1,0,1,0,1,0,0"/>
+   <wangtile tileid="597" wangid="0,0,0,1,0,1,0,1"/>
+   <wangtile tileid="598" wangid="0,0,0,1,0,0,0,0"/>
+   <wangtile tileid="599" wangid="0,0,0,1,0,1,0,0"/>
+   <wangtile tileid="600" wangid="0,0,0,0,0,1,0,0"/>
+   <wangtile tileid="601" wangid="0,0,0,1,0,0,0,0"/>
+   <wangtile tileid="602" wangid="0,0,0,1,0,1,0,0"/>
+   <wangtile tileid="603" wangid="0,0,0,0,0,1,0,0"/>
    <wangtile tileid="749" wangid="0,1,0,0,0,1,0,1"/>
    <wangtile tileid="750" wangid="0,1,0,1,0,0,0,1"/>
    <wangtile tileid="751" wangid="0,1,0,1,0,0,0,0"/>
    <wangtile tileid="752" wangid="0,1,0,1,0,1,0,1"/>
    <wangtile tileid="753" wangid="0,0,0,0,0,1,0,1"/>
+   <wangtile tileid="754" wangid="0,1,0,1,0,0,0,1"/>
+   <wangtile tileid="755" wangid="0,1,0,0,0,1,0,1"/>
+   <wangtile tileid="756" wangid="0,1,0,1,0,0,0,0"/>
    <wangtile tileid="757" wangid="0,1,0,1,0,1,0,1"/>
+   <wangtile tileid="758" wangid="0,0,0,0,0,1,0,1"/>
+   <wangtile tileid="759" wangid="0,1,0,1,0,0,0,0"/>
+   <wangtile tileid="760" wangid="0,1,0,1,0,1,0,1"/>
+   <wangtile tileid="761" wangid="0,0,0,0,0,1,0,1"/>
    <wangtile tileid="907" wangid="0,0,0,1,0,1,0,1"/>
    <wangtile tileid="908" wangid="0,1,0,1,0,1,0,0"/>
    <wangtile tileid="909" wangid="0,1,0,0,0,0,0,0"/>
    <wangtile tileid="910" wangid="0,1,0,0,0,0,0,1"/>
    <wangtile tileid="911" wangid="0,0,0,0,0,0,0,1"/>
+   <wangtile tileid="912" wangid="0,1,0,0,0,1,0,0"/>
+   <wangtile tileid="913" wangid="0,0,0,1,0,0,0,1"/>
+   <wangtile tileid="914" wangid="0,1,0,0,0,0,0,0"/>
+   <wangtile tileid="915" wangid="0,1,0,0,0,0,0,1"/>
+   <wangtile tileid="916" wangid="0,0,0,0,0,0,0,1"/>
+   <wangtile tileid="917" wangid="0,1,0,0,0,0,0,0"/>
+   <wangtile tileid="918" wangid="0,1,0,0,0,0,0,1"/>
+   <wangtile tileid="919" wangid="0,0,0,0,0,0,0,1"/>
   </wangset>
   <wangset name="Swamp" type="corner" tile="4100">
    <wangcolor name="" color="#ff0000" tile="-1" probability="1"/>

forge-gui/res/adventure/common/maps/tileset/rivers.tsx

@@ -2521,6 +2521,36 @@
    <object id="4" x="0" y="8" width="1" height="6"/>
   </objectgroup>
  </tile>
+ <tile id="4323">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4324">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4325">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4326">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4327">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4328">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="4329">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="14" width="14" height="2"/>
@@ -2977,6 +3007,46 @@
    <object id="4" x="12" y="7" width="4" height="3"/>
   </objectgroup>
  </tile>
+ <tile id="4501">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4502">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4503">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4504">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4505">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4506">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4507">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4508">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="4509">
   <objectgroup draworder="index" id="2">
    <object id="1" x="14" y="10" width="2" height="3"/>
@@ -3129,6 +3199,198 @@
    <object id="4" x="12" y="7" width="4" height="3"/>
   </objectgroup>
  </tile>
+ <tile id="4680">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4681">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="3" width="13" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="4682">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="13" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="4683">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="4" y="0" width="12" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4684">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="4685">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="11" y="3" width="5" height="13"/>
+   <object id="2" x="8" y="6" width="3" height="10"/>
+   <object id="3" x="4" y="9" width="4" height="7"/>
+   <object id="4" x="3" y="12" width="1" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="4686">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="5" height="13"/>
+   <object id="2" x="5" y="6" width="3" height="10"/>
+   <object id="3" x="8" y="9" width="4" height="7"/>
+   <object id="4" x="12" y="12" width="1" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="4687">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4688">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4860">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4861">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="4862">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="13" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="4863">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="4864">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="12" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4865">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="11" y="0" width="5" height="13"/>
+   <object id="2" x="8" y="0" width="3" height="10"/>
+   <object id="3" x="4" y="0" width="4" height="7"/>
+   <object id="4" x="3" y="0" width="1" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="4866">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="5" height="13"/>
+   <object id="2" x="5" y="0" width="3" height="10"/>
+   <object id="3" x="8" y="0" width="4" height="7"/>
+   <object id="4" x="12" y="0" width="1" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="4867">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="9" y="3" width="7" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4868">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="7" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="5040">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5041">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5042">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5043">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5044">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="3" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5045">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5046">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5047">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="6" width="10" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="5048">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5220">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5221">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5222">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5223">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5224">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="5225">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5226">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5227">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="10" height="7"/>
+  </objectgroup>
+ </tile>
+ <tile id="5228">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="3" width="10" height="10"/>
+  </objectgroup>
+ </tile>
  <tile id="5400">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="14" width="14" height="2"/>

forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate3.atlas

@@ -0,0 +1,68 @@
+pirate3.png
+size: 64,96
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 0, 0
+  size: 16, 16      
+Idle 
+  xy: 0, 16
+  size: 16, 16      
+Idle 
+  xy: 16, 16
+  size: 16, 16 
+Idle 
+  xy: 32, 16
+  size: 16, 16 
+Idle 
+  xy: 48, 16
+  size: 16, 16    
+Walk
+  xy: 0, 32
+  size: 16, 16      
+Walk 
+  xy: 16, 32
+  size: 16, 16 
+Walk 
+  xy: 32, 32
+  size: 16, 16 
+Walk 
+  xy: 48, 32
+  size: 16, 16      
+Attack 
+  xy: 0, 48
+  size: 16, 16      
+Attack 
+  xy: 16, 48
+  size: 16, 16 
+Attack 
+  xy: 32, 48
+  size: 16, 16 
+Attack 
+  xy: 48, 48
+  size: 16, 16          
+Hit 
+  xy: 0, 64
+  size: 16, 16      
+Hit 
+  xy: 16, 64
+  size: 16, 16 
+Hit 
+  xy: 32, 64
+  size: 16, 16 
+Hit 
+  xy: 48, 64
+  size: 16, 16 
+Death 
+  xy: 0, 80
+  size: 16, 16      
+Death 
+  xy: 16, 80
+  size: 16, 16 
+Death 
+  xy: 32, 80
+  size: 16, 16 
+Death 
+  xy: 48, 80
+  size: 16, 16 

forge-gui/res/blockdata/blocks.txt

@@ -124,3 +124,4 @@ Shadows over Innistrad Remastered, 3/6/SIR, SIR
 March of the Machine, 3/6/MOM, MOM
 March of the Machine Jumpstart, -/2/MOM, Meta-Choose(S(MOM Brood 1)Brood 1;S(MOM Brood 2)Brood 2 ;S(MOM Overachiever 1)Overachiever 1;S(MOM Overachiever 2)Overachiever 2;S(MOM Expendable 1)Expendable  1;S(MOM Expendable 2)Expendable 2;S(MOM Reinforcement 1)Reinforcement 1;S(MOM Reinforcement 2)Reinforcement 2;S(MOM Buff  1)Buff 1;S(MOM Buff 2)Buff 2)Themes
 The Lord of the Rings: Tales of Middle-earth, 3/6/LTR, LTR
+The Lord of the Rings: Tales of Middle-earth Jumpstart, -/2/LTR, Meta-Choose(S(LTR Courageous 1)Courageous 1;S(LTR Courageous 2)Courageous 2;S(LTR Tricksy 1)Tricksy 1;S(LTR Tricksy 2)Tricksy 2;S(LTR Mordor 1)Mordor 1;S(LTR Mordor 2)Mordor 1;S(LTR Marauders 1)Marauders 1;S(LTR Marauders 2)Marauders 1;S(LTR Journey 1)Journey 1;S(LTR Journey 2)Journey 2)Themes