From 1ec920c7e797d8eaa81381ce27b97e918ba35dc6 Mon Sep 17 00:00:00 2001
From: Justin DuJardin <justin@dujardinconsulting.com>
Date: Mon, 24 Oct 2022 22:37:27 -0700
Subject: [PATCH] feat(combat): add ocean specific combat zones

 - add new ocean 1-4 combat zones to wilderness map
 - update combat encounters to take into account boardedShip state
 - when on the ship, new water encounters are available
---
 src/app/behaviors/base-player.behavior.ts     |   4 +-
 src/app/models/combat/combat.model.ts         |  13 +-
 src/app/models/game-data/random-encounters.ts |   5 +
 .../models/game-state/game-state.service.ts   |   7 +-
 .../behaviors/combat-encounter.behavior.ts    |  83 ++++++++-----
 .../map/features/combat-feature.component.ts  |   7 +-
 .../map/features/ship-feature.component.ts    |   7 +-
 src/app/scene/tile-map.ts                     |  18 ++-
 src/assets/maps/castle.tmx                    |  10 +-
 src/assets/maps/combat.tmx                    | 112 ++++++++++++++++--
 src/assets/maps/crypt.tmx                     |  22 ++--
 src/assets/maps/keep.tmx                      |   8 +-
 src/assets/maps/port.tmx                      |  24 ++--
 src/assets/maps/ruins.tmx                     |   2 +-
 src/assets/maps/sewer.tmx                     |  10 +-
 src/assets/maps/tiles/environment.tsx         |  13 +-
 src/assets/maps/town.tmx                      |  16 +--
 src/assets/maps/wilderness.tmx                |  26 +++-
 18 files changed, 260 insertions(+), 127 deletions(-)

diff --git a/src/app/behaviors/base-player.behavior.ts b/src/app/behaviors/base-player.behavior.ts
index f808e26f..68cacb59 100644
--- a/src/app/behaviors/base-player.behavior.ts
+++ b/src/app/behaviors/base-player.behavior.ts
@@ -108,7 +108,7 @@ export class BasePlayerComponent extends MovableBehavior {
    * @returns {boolean} True if the passable attribute was found and set to false.
    */
   collideWithMap(at: Point, passableAttribute: string): boolean {
-    let map = <TileMap>this.host.scene.objectByType(TileMap);
+    let map = <TileMap>this.host.scene?.objectByType(TileMap);
     if (map) {
       const layers: ITiledLayer[] = map.getLayers();
       for (let i = 0; i < layers.length; i++) {
@@ -116,7 +116,7 @@ export class BasePlayerComponent extends MovableBehavior {
         if (!terrain) {
           continue;
         }
-        if (terrain[passableAttribute] === false) {
+        if (terrain.properties && terrain.properties[passableAttribute] === false) {
           return true;
         }
       }
diff --git a/src/app/models/combat/combat.model.ts b/src/app/models/combat/combat.model.ts
index 542f468c..7ad0bd94 100644
--- a/src/app/models/combat/combat.model.ts
+++ b/src/app/models/combat/combat.model.ts
@@ -1,10 +1,19 @@
 import * as Immutable from 'immutable';
 import { IPoint } from '../../../app/core/point';
+import { Rect } from '../../core';
 import { CombatantTypes, IEnemy, IPartyMember } from '../base-entity';
 
 /** Valid combat types */
 export type CombatType = 'none' | 'fixed' | 'random';
 
+export interface IZoneTarget {
+  /** The zone name */
+  name: string;
+  /** Is ship zone */
+  water: boolean;
+  bounds: Rect;
+}
+
 /**
  * Describe a set of combat zones for a given point on a map.
  */
@@ -14,9 +23,9 @@ export interface IZoneMatch {
    */
   map: string;
   /**
-   * The zone name for the target location on the map
+   * The zone names for the target location on the map
    */
-  target: string;
+  targets: IZoneTarget[];
   /**
    * The point that target refers to.
    */
diff --git a/src/app/models/game-data/random-encounters.ts b/src/app/models/game-data/random-encounters.ts
index 14a14eba..f9d8949d 100644
--- a/src/app/models/game-data/random-encounters.ts
+++ b/src/app/models/game-data/random-encounters.ts
@@ -22,6 +22,11 @@ export const RANDOM_ENCOUNTERS_DATA: ITemplateRandomEncounter[] = [
     zones: ['zone-sewer'],
     enemies: ['huge-spider', 'kobold', 'kobold'],
   },
+  {
+    id: 'world-ocean-1-1',
+    zones: ['world-ocean-1'],
+    enemies: ['kobold', 'kobold', 'kobold-shaman'],
+  },
   {
     id: 'world-forest-single',
     zones: ['world-forest'],
diff --git a/src/app/models/game-state/game-state.service.ts b/src/app/models/game-state/game-state.service.ts
index 564b44e4..8775414f 100644
--- a/src/app/models/game-state/game-state.service.ts
+++ b/src/app/models/game-state/game-state.service.ts
@@ -61,7 +61,12 @@ export class GameStateService {
     return this.store.pipe(
       first(),
       map((state: AppState) => {
-        const jsonData: string = JSON.stringify(state);
+        const most = {
+          ...state,
+          sprites: {},
+        };
+        const jsonData: string = JSON.stringify(most);
+
         localStorage.setItem(GameStateService.STATE_KEY, jsonData);
         return state;
       })
diff --git a/src/app/routes/world/behaviors/combat-encounter.behavior.ts b/src/app/routes/world/behaviors/combat-encounter.behavior.ts
index b41188fb..9b65883c 100644
--- a/src/app/routes/world/behaviors/combat-encounter.behavior.ts
+++ b/src/app/routes/world/behaviors/combat-encounter.behavior.ts
@@ -5,17 +5,25 @@ import { RANDOM_ENCOUNTERS_DATA } from 'app/models/game-data/random-encounters';
 import * as Immutable from 'immutable';
 import { List } from 'immutable';
 import { Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { take, withLatestFrom } from 'rxjs/operators';
 import { IEnemy } from '../../../../app/models/base-entity';
 import { AppState } from '../../../app.model';
 import { IMoveDescription } from '../../../behaviors/movable-behavior';
 import { SceneObjectBehavior } from '../../../behaviors/scene-object-behavior';
 import { CombatEncounterAction } from '../../../models/combat/combat.actions';
-import { CombatEncounter, IZoneMatch } from '../../../models/combat/combat.model';
+import {
+  CombatEncounter,
+  IZoneMatch,
+  IZoneTarget,
+} from '../../../models/combat/combat.model';
 import { Entity } from '../../../models/entity/entity.model';
 import { instantiateEntity } from '../../../models/game-data/game-data.model';
 import { GameStateSetBattleCounterAction } from '../../../models/game-state/game-state.actions';
-import { getGameBattleCounter, getGameParty } from '../../../models/selectors';
+import {
+  getGameBattleCounter,
+  getGameBoardedShip,
+  getGameParty,
+} from '../../../models/selectors';
 import { GameEntityObject } from '../../../scene/objects/game-entity-object';
 import { Scene } from '../../../scene/scene';
 import { TileMap } from '../../../scene/tile-map';
@@ -93,37 +101,48 @@ export class CombatEncounterBehaviorComponent extends SceneObjectBehavior {
     this.store
       .select(getGameParty)
       .pipe(
-        map((party: Immutable.List<Entity>) => {
-          const viableEncounters = RANDOM_ENCOUNTERS_DATA.filter((enc: any) => {
-            return (
-              enc.zones.indexOf(zone.map) !== -1 ||
-              enc.zones.indexOf(zone.target) !== -1
-            );
-          });
-          if (viableEncounters.length === 0) {
-            throw new Error('no valid encounters for this zone');
-          }
-          const max = viableEncounters.length - 1;
-          const min = 0;
-          const encounter =
-            viableEncounters[Math.floor(Math.random() * (max - min + 1)) + min];
-          const toCombatant = (id: string): IEnemy => {
-            const itemTemplate: IEnemy = getEnemyById(id) as any;
-            return instantiateEntity<IEnemy>(itemTemplate, {
-              maxhp: itemTemplate.hp,
+        withLatestFrom(
+          this.store.select(getGameBoardedShip),
+          (party: Immutable.List<Entity>, onShip: boolean) => {
+            const zoneTarget = zone.targets.find((zoneTarget: IZoneTarget) => {
+              if (onShip) {
+                return zoneTarget.water;
+              } else {
+                return !zoneTarget.water;
+              }
+            });
+
+            const viableEncounters = RANDOM_ENCOUNTERS_DATA.filter((enc: any) => {
+              return (
+                enc.zones.indexOf(zone.map) !== -1 ||
+                enc.zones.indexOf(zoneTarget.name) !== -1
+              );
             });
-          };
+            if (viableEncounters.length === 0) {
+              throw new Error(`no valid encounters for zone: ${zoneTarget.name}`);
+            }
+            const max = viableEncounters.length - 1;
+            const min = 0;
+            const encounter =
+              viableEncounters[Math.floor(Math.random() * (max - min + 1)) + min];
+            const toCombatant = (id: string): IEnemy => {
+              const itemTemplate: IEnemy = getEnemyById(id) as any;
+              return instantiateEntity<IEnemy>(itemTemplate, {
+                maxhp: itemTemplate.hp,
+              });
+            };
 
-          const payload: CombatEncounter = {
-            type: 'random',
-            id: encounter.id,
-            enemies: List<IEnemy>(encounter.enemies.map(toCombatant)),
-            zone: zone.target || zone.map,
-            message: List<string>(encounter.message),
-            party: List<Entity>(party),
-          };
-          this.store.dispatch(new CombatEncounterAction(payload));
-        }),
+            const payload: CombatEncounter = {
+              type: 'random',
+              id: encounter.id,
+              enemies: List<IEnemy>(encounter.enemies.map(toCombatant)),
+              zone: zoneTarget?.name || zone.map,
+              message: List<string>(encounter.message),
+              party: List<Entity>(party),
+            };
+            this.store.dispatch(new CombatEncounterAction(payload));
+          }
+        ),
         take(1)
       )
       .subscribe();
diff --git a/src/app/routes/world/map/features/combat-feature.component.ts b/src/app/routes/world/map/features/combat-feature.component.ts
index 64c2bfce..db341170 100644
--- a/src/app/routes/world/map/features/combat-feature.component.ts
+++ b/src/app/routes/world/map/features/combat-feature.component.ts
@@ -22,6 +22,7 @@ import { List } from 'immutable';
 import { map, take } from 'rxjs/operators';
 import { IEnemy } from '../../../../../app/models/base-entity';
 import { AppState } from '../../../../app.model';
+import { Point } from '../../../../core';
 import { CombatEncounterAction } from '../../../../models/combat/combat.actions';
 import { CombatEncounter, IZoneMatch } from '../../../../models/combat/combat.model';
 import { Entity } from '../../../../models/entity/entity.model';
@@ -76,7 +77,9 @@ export class CombatFeatureComponent extends TiledFeatureComponent {
     object.setPoint(object.point);
 
     // Find the combat zone and launch a fixed encounter.
-    const zone: IZoneMatch = this.party.map.getCombatZones(this.party.host.point);
+    const zone: IZoneMatch = this.party.map.getCombatZones(
+      new Point(this.party.host.point)
+    );
 
     this.store
       .select(getGameParty)
@@ -95,7 +98,7 @@ export class CombatFeatureComponent extends TiledFeatureComponent {
             type: 'fixed',
             id: encounter.id,
             enemies: List<IEnemy>(encounter.enemies.map(toCombatant)),
-            zone: zone.target || zone.map,
+            zone: zone.targets[0].name || zone.map,
             message: List<string>(encounter.message),
             party: List<Entity>(party),
           };
diff --git a/src/app/routes/world/map/features/ship-feature.component.ts b/src/app/routes/world/map/features/ship-feature.component.ts
index 26bc0304..4d8abc68 100644
--- a/src/app/routes/world/map/features/ship-feature.component.ts
+++ b/src/app/routes/world/map/features/ship-feature.component.ts
@@ -94,7 +94,6 @@ export class ShipFeatureComponent
       .subscribe((p: PointRecord) => {
         this.host.setPoint({ x: p.x, y: p.y });
       });
-
     return true;
   }
 
@@ -129,10 +128,8 @@ export class ShipFeatureComponent
     this.host.enabled = false;
     object.setSprite(this.host.icon, 0);
     this._tickInterval = setInterval(() => {
-      if (
-        Point.equal(this.partyObject.point, this.party.targetPoint) &&
-        !this.party.heading.isZero()
-      ) {
+      const partyTarget = Point.equal(this.partyObject.point, this.party.targetPoint);
+      if (partyTarget && !this.party.heading.isZero()) {
         const from: Point = new Point(this.partyObject.point);
         const to: Point = from.clone().add(this.party.heading);
         if (
diff --git a/src/app/scene/tile-map.ts b/src/app/scene/tile-map.ts
index c7683f7a..f3d31b1f 100644
--- a/src/app/scene/tile-map.ts
+++ b/src/app/scene/tile-map.ts
@@ -16,9 +16,8 @@
 // TODO: TileMap isn't getting added to Spatial DB properly.  Can't query for it!
 // Scene assuming something about the spatial properties on objects?
 import * as _ from 'underscore';
-import { ITiledLayer } from '../../app/core/resources/tiled/tiled.model';
+import { ITiledLayer, ITiledObject } from '../../app/core/resources/tiled/tiled.model';
 import {
-  IPoint,
   ITileInstanceMeta,
   Point,
   Rect,
@@ -26,7 +25,7 @@ import {
   TiledTSXResource,
   TilesetTile,
 } from '../core';
-import { IZoneMatch } from '../models/combat/combat.model';
+import { IZoneMatch, IZoneTarget } from '../models/combat/combat.model';
 import { GameWorld } from '../services/game-world';
 import { Scene } from './scene';
 import { SceneObject } from './scene-object';
@@ -162,10 +161,10 @@ export class TileMap extends SceneObject {
    * @param at The position to check for a sub-zone in the map
    * @returns {IZoneMatch} The map and target zones that are null if they don't exist
    */
-  getCombatZones(at: IPoint): IZoneMatch {
+  getCombatZones(at: Point): IZoneMatch {
     const result: IZoneMatch = {
       map: null,
-      target: null,
+      targets: [],
       targetPoint: at,
     };
     if (this.map?.properties) {
@@ -175,7 +174,7 @@ export class TileMap extends SceneObject {
     }
     // Determine which zone and combat type
     const invTileSize = 1 / this.map.tilewidth;
-    const zones: any[] = _.map(this.zones?.objects, (z: any) => {
+    const zones: IZoneTarget[] = _.map(this.zones?.objects, (z: ITiledObject) => {
       const x = z.x * invTileSize;
       const y = z.y * invTileSize;
       const w = z.width * invTileSize;
@@ -183,15 +182,12 @@ export class TileMap extends SceneObject {
       return {
         bounds: new Rect(x, y, w, h),
         name: z.name,
+        water: z.properties?.water || false,
       };
     });
-    // TODO: This will always get the first zone.  What about overlapping zones?
-    const zone = _.find(zones, (z: any) => {
+    result.targets = zones.filter((z: IZoneTarget) => {
       return z.bounds.pointInRect(at) && z.name;
     });
-    if (zone) {
-      result.target = zone.name;
-    }
     return result;
   }
 
diff --git a/src/assets/maps/castle.tmx b/src/assets/maps/castle.tmx
index 892c2ffc..5374b424 100644
--- a/src/assets/maps/castle.tmx
+++ b/src/assets/maps/castle.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="33" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="23">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="33" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="23">
  <tileset firstgid="1" source="tiles/environment.tsx"/>
  <tileset firstgid="72" source="tiles/creatures.tsx"/>
  <tileset firstgid="157" source="tiles/objects.tsx"/>
@@ -7,13 +7,13 @@
   <data encoding="csv">
 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
 9,61,61,61,39,61,61,61,9,9,33,33,33,9,30,33,33,33,30,9,33,33,33,9,9,39,39,39,39,39,39,39,9,
-9,61,61,39,39,39,61,61,9,33,33,33,33,6,33,33,33,33,33,6,33,33,33,33,9,39,39,39,39,39,39,39,9,
+9,61,61,39,39,39,61,61,9,33,33,33,33,163,33,33,33,33,33,163,33,33,33,33,9,39,39,39,39,39,39,39,9,
 9,61,39,39,33,39,39,61,9,9,33,33,33,9,17,33,33,33,17,9,33,33,33,9,9,39,39,39,33,39,39,39,9,
-9,61,61,61,33,61,61,61,61,9,9,9,6,9,9,17,33,17,9,9,6,9,9,9,39,39,39,33,33,33,39,39,9,
+9,61,61,61,33,61,61,61,61,9,9,9,163,9,9,17,33,17,9,9,163,9,9,9,39,39,39,33,33,33,39,39,9,
 9,61,61,39,33,39,61,61,61,9,9,33,33,33,9,33,33,33,9,33,33,33,9,9,39,39,39,39,33,39,39,39,9,
-9,61,61,39,33,39,39,39,61,61,9,9,33,33,9,9,24,9,9,33,33,9,9,39,39,39,39,39,33,39,39,39,9,
+9,61,61,39,33,39,39,39,61,61,9,9,33,33,9,9,33,9,9,33,33,9,9,39,39,39,39,39,33,39,39,39,9,
 9,61,61,33,33,33,39,61,61,39,61,9,9,9,9,9,33,9,9,9,9,9,39,61,39,61,39,33,33,33,39,39,9,
-9,61,61,33,33,33,33,33,33,33,33,6,33,33,33,33,33,33,33,33,33,6,33,33,33,33,33,33,33,33,39,61,9,
+9,61,61,33,33,33,33,33,33,33,33,163,33,33,33,33,33,33,33,33,33,163,33,33,33,33,33,33,33,33,39,61,9,
 9,61,61,33,33,33,39,61,61,39,61,9,9,9,9,9,33,9,9,9,9,9,39,61,39,61,39,33,33,33,39,39,9,
 9,61,61,61,61,61,39,39,39,39,39,9,9,9,9,30,33,30,9,9,9,9,39,39,39,39,39,39,39,39,39,39,9,
 9,61,61,61,39,61,61,61,61,61,39,9,9,9,9,9,24,9,9,9,9,9,39,39,39,39,39,39,61,39,39,61,9,
diff --git a/src/assets/maps/combat.tmx b/src/assets/maps/combat.tmx
index 2fa1bdaf..3c3ec976 100644
--- a/src/assets/maps/combat.tmx
+++ b/src/assets/maps/combat.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="12" nextobjectid="8">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="19" nextobjectid="8">
  <properties>
   <property name="music" value="assets/music/CombatTheme"/>
  </properties>
@@ -197,13 +197,13 @@
 </data>
  </layer>
  <objectgroup id="9" name="Features">
-  <object id="1" name="p2" class="combatant" x="304" y="64" width="16" height="16"/>
-  <object id="2" name="e4" class="combatant" x="208" y="80" width="16" height="16"/>
-  <object id="3" name="e1" class="combatant" x="176" y="48" width="16" height="16"/>
-  <object id="4" name="e2" class="combatant" x="176" y="80" width="16" height="16"/>
-  <object id="5" name="e3" class="combatant" x="208" y="48" width="16" height="16"/>
-  <object id="6" name="p3" class="combatant" x="304" y="96" width="16" height="16"/>
-  <object id="7" name="p1" class="combatant" x="304" y="32" width="16" height="16"/>
+  <object id="1" name="p2" class="combatant" x="304" y="80" width="16" height="16"/>
+  <object id="2" name="e4" class="combatant" x="208" y="96" width="16" height="16"/>
+  <object id="3" name="e1" class="combatant" x="176" y="64" width="16" height="16"/>
+  <object id="4" name="e2" class="combatant" x="176" y="96" width="16" height="16"/>
+  <object id="5" name="e3" class="combatant" x="208" y="64" width="16" height="16"/>
+  <object id="6" name="p3" class="combatant" x="304" y="112" width="16" height="16"/>
+  <object id="7" name="p1" class="combatant" x="304" y="48" width="16" height="16"/>
  </objectgroup>
  <layer id="10" name="world-sand" width="30" height="20" visible="0">
   <data encoding="csv">
@@ -251,6 +251,102 @@
 50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,
 50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,
 50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
+</data>
+ </layer>
+ <layer id="15" name="world-ocean-1" width="30" height="20" visible="0">
+  <data encoding="csv">
+46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+18,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18
+</data>
+ </layer>
+ <layer id="16" name="world-ocean-2" width="30" height="20" visible="0">
+  <data encoding="csv">
+46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+18,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18
+</data>
+ </layer>
+ <layer id="17" name="world-ocean-3" width="30" height="20" visible="0">
+  <data encoding="csv">
+46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+18,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18
+</data>
+ </layer>
+ <layer id="18" name="world-ocean-4" width="30" height="20" visible="0">
+  <data encoding="csv">
+46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+3,3,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,
+18,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18
 </data>
  </layer>
 </map>
diff --git a/src/assets/maps/crypt.tmx b/src/assets/maps/crypt.tmx
index 9b30ce9b..346e6f89 100644
--- a/src/assets/maps/crypt.tmx
+++ b/src/assets/maps/crypt.tmx
@@ -6,7 +6,7 @@
  </properties>
  <tileset firstgid="1" source="tiles/environment.tsx"/>
  <tileset firstgid="72" source="tiles/objects.tsx"/>
- <tileset firstgid="88" source="tiles/creatures.tsx"/>
+ <tileset firstgid="89" source="tiles/creatures.tsx"/>
  <layer id="1" name="Terrain" width="25" height="39">
   <data encoding="csv">
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
@@ -26,19 +26,19 @@
 32,32,55,55,55,55,32,55,55,23,23,23,32,23,23,32,23,23,32,32,32,32,23,23,32,
 32,32,55,32,32,32,32,55,55,55,32,23,23,23,32,32,32,32,32,32,32,32,32,23,32,
 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,23,32,
-9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,6,9,
+9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,0,9,
 9,9,9,9,9,9,9,9,9,9,9,33,33,9,9,9,9,33,33,9,33,9,33,33,9,
 9,9,9,9,9,9,9,33,33,9,9,33,33,9,9,9,9,33,33,9,33,9,33,9,9,
-9,33,33,33,33,33,24,33,33,6,33,33,33,9,9,9,9,9,24,9,24,9,24,9,9,
+9,33,33,33,33,33,24,33,33,0,33,33,33,9,9,9,9,9,24,9,24,9,24,9,9,
 9,33,9,9,9,9,9,33,33,9,9,9,9,9,33,9,33,33,33,33,33,33,33,33,9,
-9,33,33,33,33,9,9,9,9,9,9,9,33,33,33,6,33,33,33,33,33,33,33,33,9,
+9,33,33,33,33,9,9,9,9,9,9,9,33,33,33,0,33,33,33,33,33,33,33,33,9,
 9,9,9,9,33,33,9,9,9,9,9,9,33,9,33,9,33,33,33,33,33,33,33,33,9,
 40,40,40,9,9,33,9,9,9,9,9,9,33,9,9,9,9,9,24,9,24,9,24,9,9,
 39,39,40,40,9,33,9,9,9,9,9,9,33,9,9,9,9,33,33,9,33,9,33,9,9,
 39,39,39,39,9,33,9,9,9,9,9,9,33,9,9,9,9,33,33,9,33,9,33,9,9,
-39,39,39,39,9,6,9,9,33,33,33,9,33,9,9,9,9,9,9,9,9,9,9,9,9,
-39,39,39,39,24,33,6,33,33,17,33,9,33,33,33,9,9,9,9,9,9,9,9,9,9,
-39,39,39,39,9,6,9,9,33,33,33,9,9,9,33,33,9,9,9,9,9,9,9,9,9,
+39,39,39,39,9,0,9,9,33,33,33,9,33,9,9,9,9,9,9,9,9,9,9,9,9,
+39,39,39,39,24,33,0,33,33,17,33,9,33,33,33,9,9,9,9,9,9,9,9,9,9,
+39,39,39,39,9,0,9,9,33,33,33,9,9,9,33,33,9,9,9,9,9,9,9,9,9,
 39,39,39,39,9,33,9,9,9,9,9,9,9,9,9,33,33,9,9,9,9,9,9,9,9,
 39,39,40,40,9,33,9,9,9,9,9,9,9,9,9,9,33,33,33,33,33,33,33,33,9,
 40,9,9,9,9,33,9,9,33,9,9,9,9,9,9,9,9,9,9,9,9,9,9,33,9,
@@ -76,7 +76,7 @@
     <property name="type" value="sign"/>
    </properties>
   </object>
-  <object id="5" name="skeletonGuard.png" class="CombatFeatureComponent" gid="150" x="128" y="528" width="16" height="16">
+  <object id="5" name="skeletonGuard.png" class="CombatFeatureComponent" gid="151" x="128" y="528" width="16" height="16">
    <properties>
     <property name="creatures" value=""/>
     <property name="gold" value="12"/>
@@ -87,7 +87,7 @@
     <property name="type" value="encounter"/>
    </properties>
   </object>
-  <object id="6" name="ghoul.png" class="CombatFeatureComponent" gid="101" x="304" y="560" width="16" height="16">
+  <object id="6" name="ghoul.png" class="CombatFeatureComponent" gid="102" x="304" y="560" width="16" height="16">
    <properties>
     <property name="ambushed" value="true"/>
     <property name="creatures" value=""/>
@@ -99,7 +99,7 @@
     <property name="type" value="encounter"/>
    </properties>
   </object>
-  <object id="7" name="phantom2.png" class="CombatFeatureComponent" gid="143" x="224" y="352" width="16" height="16">
+  <object id="7" name="phantom2.png" class="CombatFeatureComponent" gid="144" x="224" y="352" width="16" height="16">
    <properties>
     <property name="creatures" value=""/>
     <property name="gold" value="9"/>
@@ -118,7 +118,7 @@
     <property name="type" value="ship"/>
    </properties>
   </object>
-  <object id="9" name="skeletonWizard.png" class="CombatFeatureComponent" gid="151" x="160" y="32" width="16" height="16">
+  <object id="9" name="skeletonWizard.png" class="CombatFeatureComponent" gid="152" x="160" y="32" width="16" height="16">
    <properties>
     <property name="ambushed" value="true"/>
     <property name="creatures" value=""/>
diff --git a/src/assets/maps/keep.tmx b/src/assets/maps/keep.tmx
index 49a86cc6..7f543ad7 100644
--- a/src/assets/maps/keep.tmx
+++ b/src/assets/maps/keep.tmx
@@ -9,7 +9,7 @@
 9,33,33,33,9,9,9,9,9,9,33,33,33,9,9,9,9,9,9,33,33,33,9,
 9,33,33,33,9,9,9,9,9,9,33,33,33,9,9,9,9,9,9,33,33,33,9,
 9,33,33,33,9,9,9,9,9,30,33,33,33,30,9,9,9,9,9,33,33,33,9,
-9,9,6,9,9,33,33,33,33,33,33,33,33,33,33,33,33,33,9,9,6,9,9,
+9,9,77,9,9,33,33,33,33,33,33,33,33,33,33,33,33,33,9,9,77,9,9,
 9,9,33,9,9,33,33,33,33,33,30,33,30,33,33,33,33,33,9,9,33,9,9,
 9,9,33,9,9,33,33,33,33,33,33,33,33,33,33,33,33,33,9,9,33,9,9,
 9,9,33,9,9,33,33,33,33,33,33,33,33,33,33,33,33,33,9,9,33,9,9,
@@ -18,10 +18,10 @@
 9,9,33,9,9,33,33,33,33,17,33,33,33,17,33,33,33,33,9,9,33,9,9,
 9,9,33,9,9,33,33,33,33,33,33,33,33,33,33,33,33,33,9,9,33,9,9,
 9,9,33,9,9,33,33,33,33,33,33,33,33,33,33,33,33,33,9,9,33,9,9,
-9,9,33,9,9,9,9,9,9,9,9,24,9,9,9,9,9,9,9,9,33,9,9,
-9,9,33,9,33,33,33,33,33,6,33,33,33,6,33,33,33,33,33,9,33,9,9,
+9,9,33,9,9,9,9,9,9,9,9,77,9,9,9,9,9,9,9,9,33,9,9,
+9,9,33,9,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,9,33,9,9,
 9,9,33,9,33,33,33,33,9,9,9,33,9,9,9,33,33,33,33,9,33,9,9,
-9,9,6,9,9,9,9,9,9,9,9,33,9,9,9,9,9,9,9,9,6,9,9,
+9,9,77,9,9,9,9,9,9,9,9,33,9,9,9,9,9,9,9,9,77,9,9,
 9,33,33,33,9,49,49,49,9,70,9,24,9,70,9,49,49,49,9,33,33,33,9,
 9,33,33,33,9,49,49,49,9,70,49,49,49,70,9,49,49,49,9,33,33,33,9,
 9,33,33,33,9,49,49,49,49,49,70,49,70,49,49,49,49,49,9,33,33,33,9,
diff --git a/src/assets/maps/port.tmx b/src/assets/maps/port.tmx
index afd49cf8..5dbfa711 100644
--- a/src/assets/maps/port.tmx
+++ b/src/assets/maps/port.tmx
@@ -5,14 +5,14 @@
  </properties>
  <tileset firstgid="1" source="tiles/environment.tsx"/>
  <tileset firstgid="72" source="tiles/objects.tsx"/>
- <tileset firstgid="88" source="tiles/creatures.tsx"/>
+ <tileset firstgid="89" source="tiles/creatures.tsx"/>
  <layer id="1" name="Terrain" width="29" height="22">
   <data encoding="csv">
 18,18,18,18,18,18,18,69,18,18,69,69,69,69,69,69,69,69,69,46,46,46,69,69,69,69,69,69,69,
 18,18,18,18,18,18,18,69,18,69,69,69,69,69,69,69,69,69,69,46,46,46,69,69,69,69,69,69,69,
 18,18,18,18,69,69,18,18,18,69,69,69,69,69,69,69,69,69,69,69,46,69,69,69,69,69,69,69,69,
 18,18,18,18,18,18,18,18,69,69,69,69,69,69,69,69,69,69,69,69,46,69,69,69,69,69,69,69,69,
-18,18,18,18,18,18,18,18,9,9,9,9,9,9,9,9,9,9,9,9,6,9,9,9,9,9,69,69,69,
+18,18,18,18,18,18,18,18,9,9,9,9,9,9,9,9,9,9,9,9,0,9,9,9,9,9,69,69,69,
 18,18,18,18,18,69,18,69,69,69,69,69,69,69,69,69,69,69,9,69,33,69,9,69,69,9,69,69,69,
 18,18,18,18,18,18,18,69,69,69,69,69,69,69,69,69,69,69,9,46,33,46,9,69,69,9,69,69,69,
 18,18,18,69,46,18,69,69,69,69,69,69,69,69,69,69,69,69,9,69,33,69,9,69,69,9,69,69,69,
@@ -46,7 +46,7 @@
     <property name="type" value="block"/>
    </properties>
   </object>
-  <object id="3" name="Elvish Guard" class="DialogFeatureComponent" gid="104" x="304" y="96" width="16" height="16">
+  <object id="3" name="Elvish Guard" class="DialogFeatureComponent" gid="105" x="304" y="96" width="16" height="16">
    <properties>
     <property name="icon" value="gnome3.png"/>
     <property name="text" value="Welcome, travellers from the South."/>
@@ -54,7 +54,7 @@
     <property name="type" value="sign"/>
    </properties>
   </object>
-  <object id="4" name="Elvish Guard" class="DialogFeatureComponent" gid="104" x="336" y="96" width="16" height="16">
+  <object id="4" name="Elvish Guard" class="DialogFeatureComponent" gid="105" x="336" y="96" width="16" height="16">
    <properties>
     <property name="icon" value="gnome3.png"/>
     <property name="text" value="May your stay in Port Artha be peaceful and restful, despite the difficulty of these times."/>
@@ -62,7 +62,7 @@
     <property name="type" value="sign"/>
    </properties>
   </object>
-  <object id="5" name="Elf" class="DialogFeatureComponent" gid="102" x="112" y="224" width="16" height="16">
+  <object id="5" name="Elf" class="DialogFeatureComponent" gid="103" x="112" y="224" width="16" height="16">
    <properties>
     <property name="icon" value="gnome.png"/>
     <property name="text" value="We once sailed dozens of boats from this port. We traded with our kin, the Merfolk. But they have since become distrustful and aggressive, attacking all vessels that sail the Wandering Sea."/>
@@ -80,7 +80,7 @@
     <property name="sellRate" value="25"/>
    </properties>
   </object>
-  <object id="7" name="Elvish Elder" class="DialogFeatureComponent" gid="103" x="256" y="272" width="16" height="16">
+  <object id="7" name="Elvish Elder" class="DialogFeatureComponent" gid="104" x="256" y="272" width="16" height="16">
    <properties>
     <property name="icon" value="gnome2.png"/>
     <property name="text" value="We are struggling under the weight of endless Goblin assaults! It is believed that a powerful and ambitious Goblin King in the Eastern edge of the forest is behind the attacks."/>
@@ -89,7 +89,7 @@
     <property name="until" value="goblin-king"/>
    </properties>
   </object>
-  <object id="8" name="Elvish Elder" class="DialogFeatureComponent" gid="103" x="256" y="272" width="16" height="16">
+  <object id="8" name="Elvish Elder" class="DialogFeatureComponent" gid="104" x="256" y="272" width="16" height="16">
    <properties>
     <property name="after" value="goblin-king"/>
     <property name="icon" value="gnome2.png"/>
@@ -98,7 +98,7 @@
     <property name="type" value="sign"/>
    </properties>
   </object>
-  <object id="9" name="Elvish Councillor" class="DialogFeatureComponent" gid="105" x="240" y="272" width="16" height="16">
+  <object id="9" name="Elvish Councillor" class="DialogFeatureComponent" gid="106" x="240" y="272" width="16" height="16">
    <properties>
     <property name="altIcon" value="goldKey.png"/>
     <property name="icon" value="gnomeKing.png"/>
@@ -108,7 +108,7 @@
     <property name="until" value="goblin-fortress-key"/>
    </properties>
   </object>
-  <object id="10" name="Elvish Councillor" class="DialogFeatureComponent" gid="105" x="240" y="272" width="16" height="16">
+  <object id="10" name="Elvish Councillor" class="DialogFeatureComponent" gid="106" x="240" y="272" width="16" height="16">
    <properties>
     <property name="after" value="goblin-fortress-key"/>
     <property name="icon" value="gnomeKing.png"/>
@@ -118,7 +118,7 @@
     <property name="until" value="goblin-king"/>
    </properties>
   </object>
-  <object id="11" name="Elvish Councillor" class="DialogFeatureComponent" gid="105" x="240" y="272" width="16" height="16">
+  <object id="11" name="Elvish Councillor" class="DialogFeatureComponent" gid="106" x="240" y="272" width="16" height="16">
    <properties>
     <property name="after" value="goblin-king"/>
     <property name="altIcon" value="rolledScroll.png"/>
@@ -129,7 +129,7 @@
     <property name="until" value="castleStart"/>
    </properties>
   </object>
-  <object id="12" name="Elvish Councillor" class="DialogFeatureComponent" gid="105" x="240" y="272" width="16" height="16">
+  <object id="12" name="Elvish Councillor" class="DialogFeatureComponent" gid="106" x="240" y="272" width="16" height="16">
    <properties>
     <property name="after" value="castleStart"/>
     <property name="icon" value="gnomeKing.png"/>
@@ -139,7 +139,7 @@
     <property name="until" value="castleDone"/>
    </properties>
   </object>
-  <object id="13" name="Elvish Councillor" class="DialogFeatureComponent" gid="105" x="240" y="272" width="16" height="16">
+  <object id="13" name="Elvish Councillor" class="DialogFeatureComponent" gid="106" x="240" y="272" width="16" height="16">
    <properties>
     <property name="after" value="castleDone"/>
     <property name="icon" value="gnomeKing.png"/>
diff --git a/src/assets/maps/ruins.tmx b/src/assets/maps/ruins.tmx
index d2553bf8..7632c3a7 100644
--- a/src/assets/maps/ruins.tmx
+++ b/src/assets/maps/ruins.tmx
@@ -62,7 +62,7 @@
 0,0,0,0,0,0,9,9,9,0,66,33,0,0,0,9,0,0,0,
 0,0,0,0,0,0,44,0,0,0,0,33,44,9,9,9,0,0,0,
 0,0,0,0,3,3,0,0,0,33,33,33,9,0,9,0,0,0,0,
-0,0,0,0,0,0,33,33,33,33,33,33,33,0,6,0,0,0,0,
+0,0,0,0,0,0,33,33,33,33,33,33,33,0,0,0,0,0,0,
 0,0,0,0,3,3,0,0,0,33,33,33,9,0,9,0,0,0,0,
 0,0,0,0,0,0,9,9,44,9,44,0,9,9,9,9,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,
diff --git a/src/assets/maps/sewer.tmx b/src/assets/maps/sewer.tmx
index f56eb8a5..9eb737fb 100644
--- a/src/assets/maps/sewer.tmx
+++ b/src/assets/maps/sewer.tmx
@@ -15,7 +15,7 @@
 9,9,9,9,33,33,33,33,9,9,9,9,9,9,9,35,9,9,9,9,33,9,9,
 9,9,9,9,33,33,33,33,9,9,9,9,9,9,9,35,9,9,33,33,33,9,9,
 9,9,9,9,33,33,33,33,9,9,9,9,9,33,35,35,35,33,33,33,33,33,9,
-9,9,9,9,9,6,9,9,9,9,9,9,9,33,35,35,35,33,33,9,9,33,9,
+9,9,9,9,9,0,9,9,9,9,9,9,9,33,35,35,35,33,33,9,9,33,9,
 9,9,9,9,9,33,9,9,9,9,9,9,9,33,35,35,35,33,9,9,9,33,9,
 9,9,9,9,9,33,9,9,9,9,9,9,9,33,33,35,35,33,9,9,9,33,9,
 9,9,9,9,9,33,9,9,33,33,33,33,33,33,33,35,33,33,9,9,9,33,9,
@@ -24,10 +24,10 @@
 9,9,9,9,9,9,9,9,33,33,33,9,9,9,35,35,9,9,9,33,33,33,9,
 9,9,9,9,9,9,9,9,33,33,33,9,9,35,35,35,9,9,9,33,9,9,9,
 9,9,9,9,9,9,9,9,33,33,33,9,9,35,9,9,9,9,9,33,33,9,9,
-9,9,9,33,33,33,6,33,33,33,33,33,33,35,9,9,9,9,9,33,33,9,9,
+9,9,9,33,33,33,0,33,33,33,33,33,33,35,9,9,9,9,9,33,33,9,9,
 9,9,9,33,33,33,9,9,9,9,9,9,33,35,9,9,9,33,33,33,33,9,9,
 9,9,9,33,33,33,9,9,9,9,9,9,33,35,9,9,9,33,9,9,33,9,9,
-9,9,9,6,9,9,9,9,9,9,9,9,33,35,9,9,9,33,9,9,33,9,9,
+9,9,9,0,9,9,9,9,9,9,9,9,33,35,9,9,9,33,9,9,33,9,9,
 9,9,9,33,9,9,9,9,9,9,9,9,33,35,9,9,9,33,9,9,33,9,9,
 9,9,9,33,9,9,9,33,33,9,9,9,33,3,33,33,33,33,9,9,33,9,9,
 9,9,9,33,9,9,9,33,9,9,9,9,9,35,9,9,9,9,9,9,33,9,9,
@@ -37,9 +37,9 @@
 9,9,9,33,33,33,33,33,33,33,33,33,33,35,9,9,9,9,9,9,33,9,9,
 9,9,9,9,9,9,9,33,33,33,33,33,33,35,9,9,9,9,9,9,33,9,9,
 9,9,9,9,9,9,9,33,33,33,33,33,33,35,9,9,9,9,9,9,33,9,9,
-9,9,9,9,9,9,9,9,9,9,6,9,9,35,9,9,9,9,9,9,33,9,9,
+9,9,9,9,9,9,9,9,9,9,0,9,9,35,9,9,9,9,9,9,33,9,9,
 9,9,35,35,35,35,35,35,9,9,33,9,9,35,9,9,9,9,9,9,33,9,9,
-9,9,9,35,35,35,35,35,35,9,33,9,9,35,9,9,9,9,9,9,6,9,9,
+9,9,9,35,35,35,35,35,35,9,33,9,9,35,9,9,9,9,9,9,0,9,9,
 9,35,35,35,35,35,35,35,35,9,33,9,9,35,9,9,33,33,33,33,33,9,9,
 9,9,35,9,9,35,35,35,35,35,12,35,35,35,9,9,33,33,33,33,33,9,9,
 9,35,35,9,33,33,35,35,35,33,33,33,35,35,9,9,33,33,33,33,33,9,9,
diff --git a/src/assets/maps/tiles/environment.tsx b/src/assets/maps/tiles/environment.tsx
index d3e2e38f..424dc5ce 100644
--- a/src/assets/maps/tiles/environment.tsx
+++ b/src/assets/maps/tiles/environment.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.9" tiledversion="1.9.2" name="../../images/environment.png" tilewidth="16" tileheight="16" tilecount="52" columns="0" objectalignment="topleft">
+<tileset version="1.9" tiledversion="1.9.2" name="../../images/environment.png" tilewidth="16" tileheight="16" tilecount="51" columns="0" objectalignment="topleft">
  <tile id="2">
   <properties>
    <property name="color" value="#63390e"/>
@@ -31,16 +31,6 @@
   </properties>
   <image width="16" height="16" source="../../../art/sprites/environment/darkBridgeVertical.png"/>
  </tile>
- <tile id="5">
-  <properties>
-   <property name="color" value="#631c0e"/>
-   <property name="icon" value="doorInWall.png"/>
-   <property name="opaque" value="true"/>
-   <property name="passable" value="true"/>
-   <property name="shipPassable" value="false"/>
-  </properties>
-  <image width="16" height="16" source="../../../art/sprites/environment/doorInWall.png"/>
- </tile>
  <tile id="6">
   <properties>
    <property name="icon" value="iceGateCenter.png"/>
@@ -240,6 +230,7 @@
  <tile id="35">
   <properties>
    <property name="icon" value="well.png"/>
+   <property name="passable" type="bool" value="false"/>
   </properties>
   <image width="16" height="16" source="../../../art/sprites/environment/well.png"/>
  </tile>
diff --git a/src/assets/maps/town.tmx b/src/assets/maps/town.tmx
index cc0a4f86..81163d16 100644
--- a/src/assets/maps/town.tmx
+++ b/src/assets/maps/town.tmx
@@ -5,7 +5,7 @@
  </properties>
  <tileset firstgid="1" source="tiles/environment.tsx"/>
  <tileset firstgid="72" source="tiles/objects.tsx"/>
- <tileset firstgid="88" source="tiles/creatures.tsx"/>
+ <tileset firstgid="89" source="tiles/creatures.tsx"/>
  <layer id="1" name="Terrain" width="27" height="22">
   <data encoding="csv">
 46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,18,18,18,
@@ -33,20 +33,12 @@
 </data>
  </layer>
  <objectgroup id="2" name="Features">
-  <object id="1" name="wilderness" class="PortalFeatureComponent" gid="6" x="192" y="64" width="16" height="16">
-   <properties>
-    <property name="icon" value="doorInWall.png"/>
-    <property name="target" type="file" value="wilderness.tmx"/>
-    <property name="targetX" value="16"/>
-    <property name="targetY" value="51"/>
-   </properties>
-  </object>
   <object id="2" class="block" x="192" y="48" width="16" height="16" visible="0">
    <properties>
     <property name="type" value="block"/>
    </properties>
   </object>
-  <object id="3" name="Guard" class="DialogFeatureComponent" gid="154" x="176" y="96" width="16" height="16">
+  <object id="3" name="Guard" class="DialogFeatureComponent" gid="155" x="176" y="96" width="16" height="16">
    <properties>
     <property name="icon" value="soldier.png"/>
     <property name="text" value="Don't forget to equip basic weapons and armor before wandering too far from town."/>
@@ -54,7 +46,7 @@
     <property name="type" value="sign"/>
    </properties>
   </object>
-  <object id="4" name="Guard" class="DialogFeatureComponent" gid="154" x="208" y="96" width="16" height="16">
+  <object id="4" name="Guard" class="DialogFeatureComponent" gid="155" x="208" y="96" width="16" height="16">
    <properties>
     <property name="icon" value="soldier.png"/>
     <property name="text" value="Be careful exploring heavily forested areas as they contain more monsters than the open fields."/>
@@ -62,7 +54,7 @@
     <property name="type" value="sign"/>
    </properties>
   </object>
-  <object id="5" name="Citizen" class="DialogFeatureComponent" gid="126" x="128" y="256" width="16" height="16">
+  <object id="5" name="Citizen" class="DialogFeatureComponent" gid="127" x="128" y="256" width="16" height="16">
    <properties>
     <property name="icon" value="man.png"/>
     <property name="text" value="I hear the Kobolds have an armory in the sewers beneath the ruins north of here.  It's well-guarded, and for good reason. I bet they have some nice weapons in there."/>
diff --git a/src/assets/maps/wilderness.tmx b/src/assets/maps/wilderness.tmx
index 86985dd8..72f047fc 100644
--- a/src/assets/maps/wilderness.tmx
+++ b/src/assets/maps/wilderness.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="96" height="72" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="27">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="96" height="72" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="31">
  <properties>
   <property name="combat" value="true"/>
  </properties>
@@ -145,7 +145,7 @@
 45,45,45,45,45,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,45,45,0,0,0,45,45,0,0,0,45,45,45,45,45,45,45,0,45,45,0,0,45,45,45,45,0,0,0,45,45,45,45,45,45,
 45,45,45,45,45,45,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,45,45,45,45,0,0,0,45,45,45,0,0,0,45,45,45,45,45,45,
 45,45,45,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,45,45,0,45,0,0,0,0,45,45,0,0,0,45,45,45,45,45,45,
-45,45,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,0,0,0,0,0,0,45,45,45,45,45,45,45,45,
+45,45,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,82,0,83,45,45,45,45,0,0,0,0,0,0,45,45,45,45,45,45,45,45,
 45,45,45,45,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,0,0,0,0,0,0,0,45,45,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,45,45,0,0,0,0,45,45,0,45,45,45,45,45,45,45,45,45,45,
 45,45,45,45,45,45,0,0,0,0,0,45,45,0,0,0,0,45,45,45,45,45,0,0,0,0,45,45,45,0,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,45,45,45,45,0,45,45,45,45,45,45,45,45,45,45,
 45,45,45,45,45,45,0,0,0,0,0,45,45,45,45,0,0,45,45,45,45,0,0,0,0,45,45,45,45,45,45,45,45,0,0,0,0,0,45,45,45,45,0,0,45,45,45,45,45,45,45,45,45,45,45,45,45,45,0,0,0,45,45,0,0,0,45,0,45,45,0,0,0,0,0,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
@@ -243,7 +243,6 @@
     <property name="passable" value="true"/>
    </properties>
   </object>
-
   <object id="1" name="town" class="PortalFeatureComponent" gid="76" x="256" y="816" width="16" height="16">
    <properties>
     <property name="icon" value="city.png"/>
@@ -379,5 +378,26 @@
   <object id="23" name="world-forest" class="CombatZoneClass" x="28" y="42" width="665" height="440"/>
   <object id="24" name="world-sand" class="CombatZoneClass" x="548" y="770" width="779" height="333"/>
   <object id="25" name="world-ice" class="CombatZoneClass" x="935" y="82" width="575" height="429"/>
+  <object id="30" template="templates/combat-zone.tx" name="world-ocean-4" x="362.667" y="520" width="1156" height="625.333">
+   <properties>
+    <property name="water" type="bool" value="true"/>
+   </properties>
+  </object>
+  <object id="29" template="templates/combat-zone.tx" name="world-ocean-3" x="702.667" y="44" width="820" height="472">
+   <properties>
+    <property name="water" type="bool" value="true"/>
+   </properties>
+  </object>
+  <object id="28" template="templates/combat-zone.tx" name="world-ocean-2" x="365.333" y="44" width="333.333" height="470.667">
+   <properties>
+    <property name="water" type="bool" value="true"/>
+   </properties>
+  </object>
+  <object id="27" template="templates/combat-zone.tx" name="world-ocean-1" x="24" y="216" width="337.333" height="886.667">
+   <properties>
+    <property name="name" value=""/>
+    <property name="water" type="bool" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>