X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=51e99869f618588b2bb09b3b76dfdde1b9cbc687;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=8f5a1277e610b1d86e787eb8c2c8fef009278ce8;hpb=3d7e44003c4a2d555c753b078d7199736af4a939;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 8f5a127..51e9986 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -1,10 +1,3 @@
-/*
- * MapState.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "MapState.h"
 
 #include "Map.h"
@@ -17,6 +10,7 @@
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
 #include "../graphics/ColorFade.h"
+#include "../menu/PartyMenu.h"
 
 #include <algorithm>
 
@@ -24,51 +18,58 @@ using app::Application;
 using app::Input;
 using battle::BattleState;
 using common::GameConfig;
-using geometry::Vector;
+using math::Fixed;
+using math::Vector;
 using graphics::ColorFade;
+using menu::PartyMenu;
 
 namespace map {
 
 MapState::MapState(GameConfig *g, Map *map)
 : game(g)
-, ctrl(0)
 , map(map)
 , controlled(0)
-, tempTarget(20, 20)
-, camera(100, 100, &tempTarget)
+, pushed(0)
+, lastLock(-1, -1)
+, camera(100, 100, 0)
 , walkingSpeed(64)
 , nextDirection(-1)
 , afterLock(false)
 , skipLock(false)
+, pushing(false)
 , debug(false) {
 
 }
 
 
-void MapState::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void MapState::OnEnterState(SDL_Surface *screen) {
 	camera.Resize(screen->w, screen->h);
 	LoadMap(map);
 }
 
-void MapState::ExitState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnExitState(SDL_Surface *screen) {
 
 }
 
-void MapState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnResumeState(SDL_Surface *screen) {
 	camera.Resize(screen->w, screen->h);
 }
 
-void MapState::PauseState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnPauseState(SDL_Surface *screen) {
 
 }
 
-void MapState::Resize(int width, int height) {
+void MapState::OnResize(int width, int height) {
 	camera.Resize(width, height);
 }
 
 
 void MapState::HandleEvents(const Input &input) {
+	if (input.JustPressed(Input::ACTION_X)) {
+		Ctrl().PushState(new PartyMenu(game));
+		return;
+	}
+
 	if (!controlled) return;
 
 	if (input.IsDown(Input::PAD_UP)) {
@@ -83,12 +84,14 @@ void MapState::HandleEvents(const Input &input) {
 		nextDirection = -1;
 	}
 
+	pushing = input.IsDown(Input::ACTION_A);
+
 	if (input.JustPressed(Input::DEBUG_1)) {
 		debug = !debug;
 	}
 }
 
-void MapState::UpdateWorld(float deltaT) {
+void MapState::UpdateWorld(Uint32 deltaT) {
 	if (controlled && controlled->TileLock(map->Tileset()->Size())) {
 		OnTileLock();
 	}
@@ -100,7 +103,7 @@ void MapState::UpdateWorld(float deltaT) {
 void MapState::OnTileLock() {
 	if (moveTimer.Running() && !moveTimer.JustHit()) return;
 
-	Vector<int> nowLock(controlled->Position());
+	Vector<int> nowLock(ToInt(controlled->Position()));
 	bool event(false);
 	if (nowLock != lastLock) {
 		event = OnGridLock();
@@ -116,86 +119,139 @@ void MapState::OnTileLock() {
 	}
 
 	if (nextDirection >= 0) {
-		bool blocked(CheckBlocking());
 		if (afterLock) {
+			bool blocked(CheckBlocking());
 			OnMove(!blocked);
-			afterLock = false;
-		}
-		controlled->SetOrientation(Entity::Orientation(nextDirection));
-		if (!blocked) {
-			controlled->SetSpeed(walkingSpeed);
-			moveTimer.Clear();
-		} 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);
+			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);
+				StopFollowers(*controlled);
+				if (!moveTimer.Running()) {
+					int tileSize((controlled->GetOrientation() % 2) ? map->Tileset()->Width() : map->Tileset()->Height());
+					moveTimer = PhysicsTimers().StartInterval(tileSize/walkingSpeed.Int());
+				}
+				pushed = 0;
+			}
+			if (!controlled->AnimationRunning()) {
+				controlled->StartAnimation(*this);
 			}
-		}
-		if (!controlled->AnimationRunning()) {
-			controlled->StartAnimation(*this);
 		}
 	} else {
-		controlled->SetSpeed(0.0f);
+		controlled->SetSpeed(0);
 		StopFollowers(*controlled);
 		controlled->StopAnimation();
 		moveTimer.Clear();
+		if (pushed) {
+			pushed->SetSpeed(0);
+			pushed = 0;
+		}
 	}
 
 	lastLock = nowLock;
 }
 
-bool MapState::CheckBlocking() const {
-	const Tile *tile(map->TileAt(controlled->Position()));
-	if (!tile) {
-		return false;
+bool MapState::CheckBlocking() {
+	if (pushed) {
+		pushed->SetSpeed(0);
+		pushed = 0;
 	}
-	Vector<int> nextPosition;
+	const Tile *tile(map->TileAt(ToInt(controlled->Position())));
+	Vector<int> direction;
 	switch (nextDirection) {
 		case Entity::ORIENTATION_NORTH:
-			if (tile->BlocksNorth()) {
+			if (tile && tile->BlocksNorth()) {
 				return true;
 			} else {
-				nextPosition = Vector<int>(
-						controlled->Position().X(),
-						controlled->Position().Y() - map->Tileset()->Height());
+				direction = Vector<int>(0, -map->Tileset()->Height());
 			}
 			break;
 		case Entity::ORIENTATION_EAST:
-			if (tile->BlocksEast()) {
+			if (tile && tile->BlocksEast()) {
 				return true;
 			} else {
-				nextPosition = Vector<int>(
-						controlled->Position().X() + map->Tileset()->Width(),
-						controlled->Position().Y());
+				direction = Vector<int>(map->Tileset()->Width(), 0);
 			}
 			break;
 		case Entity::ORIENTATION_SOUTH:
-			if (tile->BlocksSouth()) {
+			if (tile && tile->BlocksSouth()) {
 				return true;
 			} else {
-				nextPosition = Vector<int>(
-						controlled->Position().X(),
-						controlled->Position().Y() + map->Tileset()->Height());
+				direction = Vector<int>(0, map->Tileset()->Height());
 			}
 			break;
 		case Entity::ORIENTATION_WEST:
-			if (tile->BlocksWest()) {
+			if (tile && tile->BlocksWest()) {
 				return true;
 			} else {
-				nextPosition = Vector<int>(
-						controlled->Position().X() - map->Tileset()->Width(),
-						controlled->Position().Y());
+				direction = Vector<int>(-map->Tileset()->Width(), 0);
 			}
 			break;
 		default:
 			return false;
 	}
-	Vector<int> nextTileCoords(map->TileCoordinates(nextPosition));
+	Vector<int> nextTilePosition(direction + ToInt(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 && e.Blocking()) {
+		if (map->TileCoordinates(ToInt(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(ToInt(e.Position())) == nextTileCoords && e.Blocking()) {
 			return true;
 		}
 	}
@@ -208,7 +264,7 @@ bool MapState::OnGridLock() {
 		return false;
 	} else {
 		LockEntities();
-		return CheckMonster() || CheckTrigger();
+		return CheckMonster() || CheckLockTrigger();
 	}
 }
 
@@ -223,7 +279,7 @@ void MapState::LockEntities() {
 }
 
 bool MapState::CheckMonster() {
-	Vector<int> coords(map->TileCoordinates(controlled->Position()));
+	Vector<int> coords(map->TileCoordinates(ToInt(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
@@ -232,17 +288,20 @@ bool MapState::CheckMonster() {
 
 	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]) {
+			if ((*e)->Hostile() && map->TileCoordinates(ToInt((*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()));
+				BattleState *battleState(new BattleState(game, map->BattleBackgroundAt(ToInt((*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);
+				if (game->state->capsule) {
+					battleState->SetCapsule(&game->state->GetCapsule());
+				}
+				for (battle::Monster **monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
+					battleState->AddMonster(**monster);
 				}
 
 				ColorFade *fadeIn(new ColorFade(this, 0, 500, true));
@@ -250,38 +309,29 @@ bool MapState::CheckMonster() {
 				ColorFade *fadeOut(new ColorFade(this, 0, 500));
 				fadeOut->SetLeadOutTime(500);
 
-				ctrl->PushState(fadeIn);
-				ctrl->PushState(battleState);
-				ctrl->PushState(fadeOut);
+				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::CheckTrigger() {
-	Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
-	if (trigger) {
-		// TODO: run trigger script
-		if (trigger->map) {
-			ctrl->PushState(new ColorFade(this, 0, 500, true));
-			ctrl->PushState(new TransitionState(this, trigger->map, trigger->target));
-			ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
-			fadeOut->SetLeadOutTime(500);
-			ctrl->PushState(fadeOut);
-			return true;
-		}
-	}
-	return false;
+bool MapState::CheckLockTrigger() {
+	Trigger *trigger(map->TriggerAt(ToInt(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);
@@ -290,14 +340,26 @@ void MapState::OnMove(bool realMove) {
 	}
 }
 
+bool MapState::CheckMoveTrigger() {
+	Trigger *trigger(map->TriggerAt(ToInt(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);
 
-	Vector<int> coords(map->TileCoordinates(e.Position()));
-	Vector<int> fCoords(map->TileCoordinates(f.Position()));
+	Vector<int> coords(map->TileCoordinates(ToInt(e.Position())));
+	Vector<int> fCoords(map->TileCoordinates(ToInt(f.Position())));
 	Vector<int> direction(coords - fCoords);
 
 	if (direction.Y() < 0) {
@@ -317,14 +379,14 @@ void MapState::UpdateFollower(Entity &e) {
 		f.SetSpeed(walkingSpeed);
 		f.StartAnimation(*this);
 	} else {
-		f.SetSpeed(0.0f);
+		f.SetSpeed(0);
 		f.StopAnimation();
 	}
 }
 
 void MapState::StopFollowers(Entity &e) {
 	for (Entity *f(e.Follower()); f; f = f->Follower()) {
-		f->SetSpeed(0.0f);
+		f->SetSpeed(0);
 		f->StopAnimation();
 	}
 }
@@ -349,6 +411,7 @@ void MapState::LoadMap(Map *m) {
 	map = m;
 	for (Entity *e(m->EntitiesBegin()), *end(m->EntitiesEnd()); e != end; ++e) {
 		entities.push_back(e);
+		e->ResetPosition(map->Tileset()->Size());
 	}
 	for (Entity *e(controlled); e; e = e->Follower()) {
 		entities.push_back(e);
@@ -377,4 +440,18 @@ bool MapState::ZCompare(const Entity *lhs, const Entity *rhs) {
 	return lhs->Position().Y() < rhs->Position().Y();
 }
 
+
+void MapState::HandleSyscall(common::ScriptRunner &r) {
+	switch (r.IntegerRegister(0)) {
+		case TRANSITION: {
+			Ctrl().PushState(new ColorFade(this, 0, 500, true));
+			Ctrl().PushState(new TransitionState(this, reinterpret_cast<Map *>(r.AddressRegister(0)), r.VectorRegister(0)));
+			ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
+			fadeOut->SetLeadOutTime(500);
+			Ctrl().PushState(fadeOut);
+			break;
+		}
+	}
+}
+
 }