, camera(100, 100, &tempTarget)
, walkingSpeed(64)
, nextDirection(-1)
-, afterLock(false) {
+, afterLock(false)
+, debug(false) {
}
} else {
nextDirection = -1;
}
+
+ if (input.JustPressed(Input::DEBUG_1)) {
+ debug = !debug;
+ }
}
void MapState::UpdateWorld(float deltaT) {
// TODO: halt all activity if lock caused a state/map transition
if (nextDirection >= 0) {
- const Tile &tile(map->TileAt(controlled->Position()));
- bool blocked(false);
- switch (nextDirection) {
- case Entity::ORIENTATION_NORTH:
- blocked = tile.BlocksNorth();
- break;
- case Entity::ORIENTATION_EAST:
- blocked = tile.BlocksEast();
- break;
- case Entity::ORIENTATION_SOUTH:
- blocked = tile.BlocksSouth();
- break;
- case Entity::ORIENTATION_WEST:
- blocked = tile.BlocksWest();
- break;
- }
+ bool blocked(CheckBlocking());
if (afterLock) {
OnMove(!blocked);
afterLock = false;
lastLock = nowLock;
}
+bool MapState::CheckBlocking() const {
+ const Tile &tile(map->TileAt(controlled->Position()));
+ Vector<int> nextPosition;
+ switch (nextDirection) {
+ case Entity::ORIENTATION_NORTH:
+ if (tile.BlocksNorth()) {
+ return true;
+ } else {
+ nextPosition = Vector<int>(
+ controlled->Position().X(),
+ controlled->Position().Y() - map->Tileset()->Height());
+ }
+ break;
+ case Entity::ORIENTATION_EAST:
+ if (tile.BlocksEast()) {
+ return true;
+ } else {
+ nextPosition = Vector<int>(
+ controlled->Position().X() + map->Tileset()->Width(),
+ controlled->Position().Y());
+ }
+ break;
+ case Entity::ORIENTATION_SOUTH:
+ if (tile.BlocksSouth()) {
+ return true;
+ } else {
+ nextPosition = Vector<int>(
+ controlled->Position().X(),
+ controlled->Position().Y() + map->Tileset()->Height());
+ }
+ break;
+ case Entity::ORIENTATION_WEST:
+ if (tile.BlocksWest()) {
+ return true;
+ } else {
+ nextPosition = Vector<int>(
+ controlled->Position().X() - map->Tileset()->Width(),
+ controlled->Position().Y());
+ }
+ break;
+ default:
+ return false;
+ }
+ Vector<int> nextTileCoords(map->TileCoordinates(nextPosition));
+ 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;
+}
+
void MapState::OnGridLock() {
LockEntities();
- Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
- if (trigger) {
- // TODO: run trigger
- }
- // TODO: check for adjacent monsters
- // TODO: force all entities into their grid positions?
+ CheckMonster();
+ CheckTrigger();
}
void MapState::LockEntities() {
}
}
+void 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: remove entity, push battle state and transition and halt all other activity
+ // needed information here:
+ // - battle background (from tile?)
+ // - monsters + layout (from entity)
+ // - battle resources (from global resources)
+ }
+ }
+ }
+}
+
+void MapState::CheckTrigger() {
+ Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
+ if (trigger) {
+ // TODO: run trigger
+ }
+
+}
+
void MapState::OnMove(bool realMove) {
// TODO: evaluate monster movements
if (realMove) {
Vector<int> offset(camera.CalculateOffset());
map->Render(screen, offset);
+ if (debug) {
+ map->RenderDebug(screen, offset);
+ }
+
std::sort(entities.begin(), entities.end(), ZCompare);
for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
(*i)->Render(screen, offset);