+ if (controlled && controlled->TileLock(map->Tileset()->Size())) {
+ OnTileLock();
+ }
+ for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+ (*i)->Update(deltaT);
+ }
+}
+
+void MapState::OnTileLock() {
+ if (moveTimer.Running() && !moveTimer.JustHit()) return;
+
+ Vector<int> nowLock(controlled->Position());
+ bool event(false);
+ if (nowLock != lastLock) {
+ event = OnGridLock();
+ afterLock = true;
+ moveTimer.Clear();
+ } else if (moveTimer.JustHit()) {
+ event = OnGridLock();
+ afterLock = true;
+ }
+
+ if (event) {
+ return;
+ }
+
+ if (nextDirection >= 0) {
+ if (afterLock) {
+ bool blocked(CheckBlocking());
+ OnMove(!blocked);
+ controlled->SetOrientation(Entity::Orientation(nextDirection));
+ if (!blocked) {
+ afterLock = false;
+ controlled->SetSpeed(walkingSpeed);
+ moveTimer.Clear();
+ if (pushed) {
+ pushed->SetOrientation(Entity::Orientation(nextDirection));
+ pushed->SetSpeed(walkingSpeed);
+ controlled->SetPushing();
+ } else {
+ controlled->SetHandsFree();
+ }
+ } else {
+ controlled->SetSpeed(0.0f);
+ StopFollowers(*controlled);
+ if (!moveTimer.Running()) {
+ int tileSize((controlled->GetOrientation() % 2) ? map->Tileset()->Width() : map->Tileset()->Height());
+ moveTimer = PhysicsTimers().StartInterval(tileSize/walkingSpeed);
+ }
+ pushed = 0;
+ }
+ if (!controlled->AnimationRunning()) {
+ controlled->StartAnimation(*this);
+ }
+ }
+ } else {
+ controlled->SetSpeed(0.0f);
+ StopFollowers(*controlled);
+ controlled->StopAnimation();
+ moveTimer.Clear();
+ if (pushed) {
+ pushed->SetSpeed(0.0f);
+ pushed = 0;
+ }
+ }
+
+ lastLock = nowLock;
+}
+
+bool MapState::CheckBlocking() {
+ if (pushed) {
+ pushed->SetSpeed(0.0f);
+ pushed = 0;
+ }
+ const Tile *tile(map->TileAt(controlled->Position()));
+ Vector<int> direction;
+ switch (nextDirection) {
+ case Entity::ORIENTATION_NORTH:
+ if (tile && tile->BlocksNorth()) {
+ return true;
+ } else {
+ direction = Vector<int>(0, -map->Tileset()->Height());
+ }
+ break;
+ case Entity::ORIENTATION_EAST:
+ if (tile && tile->BlocksEast()) {
+ return true;
+ } else {
+ direction = Vector<int>(map->Tileset()->Width(), 0);
+ }
+ break;
+ case Entity::ORIENTATION_SOUTH:
+ if (tile && tile->BlocksSouth()) {
+ return true;
+ } else {
+ direction = Vector<int>(0, map->Tileset()->Height());
+ }
+ break;
+ case Entity::ORIENTATION_WEST:
+ if (tile && tile->BlocksWest()) {
+ return true;
+ } else {
+ direction = Vector<int>(-map->Tileset()->Width(), 0);
+ }
+ break;
+ default:
+ return false;
+ }
+ Vector<int> nextTilePosition(direction + controlled->Position());
+ Vector<int> nextTileCoords(map->TileCoordinates(nextTilePosition));
+ for (std::vector<Entity *>::const_iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+ const Entity &e(**i);
+ if (map->TileCoordinates(e.Position()) != nextTileCoords) continue;
+ if (!e.Blocking()) continue;
+ if (!pushing || !e.Pushable()) return true;
+ if (CheckBlocking(nextTilePosition, Entity::Orientation(nextDirection))) return true;
+ pushed = *i;
+ }
+ return false;
+}
+
+bool MapState::CheckBlocking(const Vector<int> &position, Entity::Orientation direction) const {
+ const Tile *tile(map->TileAt(position));
+ Vector<int> directionVector;
+ switch (direction) {
+ case Entity::ORIENTATION_NORTH:
+ if (tile && tile->BlocksNorth()) {
+ return true;
+ } else {
+ directionVector = Vector<int>(0, -map->Tileset()->Height());
+ }
+ break;
+ case Entity::ORIENTATION_EAST:
+ if (tile && tile->BlocksEast()) {
+ return true;
+ } else {
+ directionVector = Vector<int>(map->Tileset()->Width(), 0);
+ }
+ break;
+ case Entity::ORIENTATION_SOUTH:
+ if (tile && tile->BlocksSouth()) {
+ return true;
+ } else {
+ directionVector = Vector<int>(0, map->Tileset()->Height());
+ }
+ break;
+ case Entity::ORIENTATION_WEST:
+ if (tile && tile->BlocksWest()) {
+ return true;
+ } else {
+ directionVector = Vector<int>(-map->Tileset()->Width(), 0);
+ }
+ break;
+ default:
+ return false;
+ }
+ Vector<int> nextTileCoords(map->TileCoordinates(directionVector + position));
+ for (std::vector<Entity *>::const_iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+ const Entity &e(**i);
+ if (map->TileCoordinates(e.Position()) == nextTileCoords && e.Blocking()) {
+ return true;
+ }
+ }
+ return false;
+}
+
+bool MapState::OnGridLock() {
+ if (skipLock) {
+ skipLock = false;
+ return false;
+ } else {
+ LockEntities();
+ return CheckMonster() || CheckLockTrigger();
+ }
+}
+
+void MapState::LockEntities() {
+ for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+ if (*i == controlled) {
+ // don't lock player
+ continue;
+ }
+ (*i)->Position().Lock(map->Tileset()->Size());
+ }
+}
+
+bool MapState::CheckMonster() {
+ Vector<int> coords(map->TileCoordinates(controlled->Position()));
+ Vector<int> neighbor[4];
+ neighbor[0] = Vector<int>(coords.X(), coords.Y() - 1); // N
+ neighbor[1] = Vector<int>(coords.X() + 1, coords.Y()); // E
+ neighbor[2] = Vector<int>(coords.X(), coords.Y() + 1); // S
+ neighbor[3] = Vector<int>(coords.X() - 1, coords.Y()); // W
+
+ for (int i(0); i < 4; ++i) {
+ for (std::vector<Entity *>::iterator e(entities.begin()), end(entities.end()); e != end; ++e) {
+ if ((*e)->Hostile() && map->TileCoordinates((*e)->Position()) == neighbor[i]) {
+ // TODO: check for turn advantage, see #26
+ // TODO: other transition
+ BattleState *battleState(new BattleState(game, map->BattleBackgroundAt((*e)->Position()), (*e)->PartyLayout()));
+ for (int i(0); i < 4; ++i) {
+ if (game->state->party[i]) {
+ battleState->AddHero(*game->state->party[i]);
+ }
+ }
+ for (battle::Monster *monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
+ battleState->AddMonster(*monster);
+ }
+
+ ColorFade *fadeIn(new ColorFade(this, 0, 500, true));
+ fadeIn->SetLeadInTime(500);
+ ColorFade *fadeOut(new ColorFade(this, 0, 500));
+ fadeOut->SetLeadOutTime(500);
+
+ Ctrl().PushState(fadeIn);
+ Ctrl().PushState(battleState);
+ Ctrl().PushState(fadeOut);
+ // TODO: move entity erase to happen after the transition or battle
+ entities.erase(e);
+ return true;
+ // needed information here:
+ // - battle background (from tile/area/map)
+ // - monsters + layout (from entity)
+ }
+ }
+ }
+ return false;
+}
+
+bool MapState::CheckLockTrigger() {
+ Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
+ if (!trigger || trigger->GetType() != Trigger::TYPE_CONTACT) return false;
+ RunTrigger(*trigger);
+ return true;
+}
+
+void MapState::OnMove(bool realMove) {
+ if (CheckMoveTrigger()) {
+ return;
+ }
+ // TODO: evaluate monster movements
+ if (realMove) {
+ UpdateFollower(*controlled);
+ } else {
+ StopFollowers(*controlled);
+ }
+}
+
+bool MapState::CheckMoveTrigger() {
+ Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
+ if (!trigger || int(trigger->GetType()) != nextDirection) return false;
+ RunTrigger(*trigger);
+ return true;
+}
+
+void MapState::RunTrigger(Trigger &trigger) {
+ if (!trigger.HasScript()) return;
+ runner.Run(*this, trigger.GetScript());
+}
+
+void MapState::UpdateFollower(Entity &e) {
+ if (!e.Follower()) return;
+
+ Entity &f(*e.Follower());
+ UpdateFollower(f);