+ if (game->state->capsule) {
+ battleState->SetCapsule(&game->state->GetCapsule());
+ }
+ for (battle::Monster **m(monster.MonstersBegin()); m != monster.MonstersEnd(); ++m) {
+ battleState->AddMonster(**m);
+ }
+
+ // TODO: pass turn advantage to battle, see #26
+ Entity::Orientation faceDirection;
+ if (monster.Position().Y() < hero.Position().Y()) {
+ faceDirection = Entity::ORIENTATION_NORTH;
+ } else if (monster.Position().X() > hero.Position().X()) {
+ faceDirection = Entity::ORIENTATION_EAST;
+ } else if (monster.Position().Y() > hero.Position().Y()) {
+ faceDirection = Entity::ORIENTATION_SOUTH;
+ } else {
+ faceDirection = Entity::ORIENTATION_WEST;
+ }
+ if (hero.GetOrientation() == monster.GetOrientation()
+ && hero.GetOrientation() == faceDirection) {
+ // advantage hero
+ } else if (hero.GetOrientation() == monster.GetOrientation()
+ && hero.GetOrientation() == ((faceDirection + 2) % 4)) {
+ // advantage monster
+ } else if (((monster.GetOrientation() == faceDirection && (hero.GetOrientation() % 2) != (faceDirection % 2))
+ || (hero.GetOrientation() == faceDirection && (monster.GetOrientation() % 2) != (faceDirection % 2)))
+ && rand() % 2) {
+ // 50% advantage chance hero
+ } else if ((monster.GetOrientation() == (faceDirection + 2) % 4)
+ && ((hero.GetOrientation() % 2) != (faceDirection % 2))
+ && rand() % 2) {
+ // 50% advantage chance monster
+ }
+
+ // TODO: other transition
+ 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);
+}
+
+bool MapState::CheckLockTrigger() {
+ Trigger *trigger(map->TriggerAt(ToInt(controlled->Position())));
+ if (!trigger || trigger->GetType() != Trigger::TYPE_CONTACT) return false;
+ RunTrigger(*trigger);
+ return true;