tollyx/dungeon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make the hero controllable

Browse source
This commit is contained in:
Adrian Hedqvist 2017-09-23 18:55:41 +02:00
parent 574391857d
commit abc1c8fbce
4 changed files with 52 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Hero.cpp
View file

@ -13,7 +13,7 @@ Hero::Hero(Tilemap* map, vec2i pos) : Actor(map, pos) {
health = 6; health = 6;
maxhealth = 6; maxhealth = 6;
strength = 2; strength = 2;
/*
BehaviourTreeSelector* root = new BehaviourTreeSelector(nullptr); BehaviourTreeSelector* root = new BehaviourTreeSelector(nullptr);
bt = new BehaviourTree(root); bt = new BehaviourTree(root);
{ {
@ -25,6 +25,7 @@ Hero::Hero(Tilemap* map, vec2i pos) : Actor(map, pos) {
//new ExploreNode(root); //new ExploreNode(root);
new WanderNode(root); new WanderNode(root);
} }
*/
} }

86
src/PlayState.cpp
View file

@ -51,6 +51,8 @@ const std::string map =
"# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #" "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #"
"# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #"; "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #";
InputAction action;
void PlayState::load() { void PlayState::load() {
SDL_LogVerbose(SDL_LOG_CATEGORY_SYSTEM, "Creating ascii tileset...\n"); SDL_LogVerbose(SDL_LOG_CATEGORY_SYSTEM, "Creating ascii tileset...\n");
ascii = new Tileset(app->renderer, "./assets/12x12.bmp", 192, 192, 12, 12); ascii = new Tileset(app->renderer, "./assets/12x12.bmp", 192, 192, 12, 12);
@ -65,6 +67,7 @@ void PlayState::load() {
app->input->bind_key(SDLK_KP_2, ACTION_MOVE_SOUTH); app->input->bind_key(SDLK_KP_2, ACTION_MOVE_SOUTH);
app->input->bind_key(SDLK_KP_1, ACTION_MOVE_SOUTHWEST); app->input->bind_key(SDLK_KP_1, ACTION_MOVE_SOUTHWEST);
app->input->bind_key(SDLK_KP_3, ACTION_MOVE_SOUTHEAST); app->input->bind_key(SDLK_KP_3, ACTION_MOVE_SOUTHEAST);
app->input->bind_key(SDLK_KP_5, ACTION_WAIT);
app->input->bind_key(SDLK_F1, ACTION_TOGGLE_DEBUG); app->input->bind_key(SDLK_F1, ACTION_TOGGLE_DEBUG);
app->input->bind_key(SDLK_r, ACTION_RESET); app->input->bind_key(SDLK_r, ACTION_RESET);
@ -74,7 +77,7 @@ void PlayState::load() {
} }
void PlayState::new_game() { void PlayState::new_game() {
paused = true; action = ACTION_NONE;
if (tilemap != nullptr) { if (tilemap != nullptr) {
delete tilemap; delete tilemap;
@ -136,25 +139,53 @@ void PlayState::new_game() {
Gamestate *PlayState::update(double delta) { Gamestate *PlayState::update(double delta) {
timer += delta; timer += delta;
if (!paused) { if (action != ACTION_NONE) {
if (timer >= delay) { if (hero) {
timer = 0; vec2i dir;
switch (action) {
auto actors = tilemap->get_actor_list(); case ACTION_MOVE_NORTH: dir = {0, -1}; break;
for (Actor* var : *actors) { case ACTION_MOVE_NORTHWEST: dir = {-1, -1}; break;
var->update(); case ACTION_MOVE_NORTHEAST: dir = {1, -1}; break;
case ACTION_MOVE_WEST: dir = {-1, 0}; break;
case ACTION_MOVE_EAST: dir = {1, 0}; break;
case ACTION_MOVE_SOUTH: dir = {0, 1}; break;
case ACTION_MOVE_SOUTHWEST: dir = {-1, 1}; break;
case ACTION_MOVE_SOUTHEAST: dir = {1, 1}; break;
case ACTION_WAIT: dir = {0, 0}; break;
default: action = ACTION_NONE; return nullptr; // abort turn
} }
for (int i = (int)actors->size() - 1; i >= 0; i--) { if (dir != vec2i(0,0)) {
if (!actors->at(i)->alive) { if (!hero->Move(dir.x, dir.y)) {
if (actors->at(i) == hero) { vec2i heropos = hero->get_position();
hero = nullptr; Actor* act = tilemap->GetActor(heropos.x + dir.x, heropos.y + dir.y, ACT_BASE);
if (act) {
act->health -= hero->strength;
if (act->health <= 0) {
act->Kill();
}
}
else {
return nullptr; // abort turn
} }
delete actors->at(i);
actors->erase(actors->begin() + i);
} }
} }
fov->calc(hero->get_position(), 6);
} }
auto actors = tilemap->get_actor_list();
for (Actor* var : *actors) {
var->update();
}
for (int i = (int)actors->size() - 1; i >= 0; i--) {
if (!actors->at(i)->alive) {
if (actors->at(i) == hero) {
hero = nullptr;
}
delete actors->at(i);
actors->erase(actors->begin() + i);
}
}
fov->calc(hero->get_position(), 6);
action = ACTION_NONE;
} }
return nullptr; return nullptr;
} }
@ -234,26 +265,6 @@ void PlayState::draw(double delta) {
app->renderer->draw_sprite(ascii->get_sprite(3), i * 12, 0); app->renderer->draw_sprite(ascii->get_sprite(3), i * 12, 0);
} }
} }
if (paused) {
app->renderer->set_color(255, 0, 0, 255);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 0, 0);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 1, 0);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 2, 0);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 3, 0);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 4, 0);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 5, 0);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 6, 0);
app->renderer->draw_sprite(ascii->get_sprite(219), 12 * 7, 0);
app->renderer->set_color(0, 0, 0, 255);
app->renderer->draw_sprite(ascii->get_sprite('-'), 12 * 0, 0);
app->renderer->draw_sprite(ascii->get_sprite('P'), 12 * 1, 0);
app->renderer->draw_sprite(ascii->get_sprite('A'), 12 * 2, 0);
app->renderer->draw_sprite(ascii->get_sprite('U'), 12 * 3, 0);
app->renderer->draw_sprite(ascii->get_sprite('S'), 12 * 4, 0);
app->renderer->draw_sprite(ascii->get_sprite('E'), 12 * 5, 0);
app->renderer->draw_sprite(ascii->get_sprite('D'), 12 * 6, 0);
app->renderer->draw_sprite(ascii->get_sprite('-'), 12 * 7, 0);
}
} }
void PlayState::quit() { void PlayState::quit() {
@ -264,9 +275,10 @@ void PlayState::inputevent(InputEvent *event) {
if (event->type == INPUT_KEY_EVENT && event->pressed) { if (event->type == INPUT_KEY_EVENT && event->pressed) {
switch (event->action) { switch (event->action) {
case ACTION_TOGGLE_DEBUG: debug = !debug; break; case ACTION_TOGGLE_DEBUG: debug = !debug; break;
case ACTION_ESCAPE_MENU: paused = !paused; break;
case ACTION_RESET: new_game(); break; case ACTION_RESET: new_game(); break;
default: break; case ACTION_ESCAPE_MENU: break; // TODO
case ACTION_NONE: break;
default: action = event->action; break;
} }
} }
} }

1
src/PlayState.h
View file

@ -21,7 +21,6 @@ class PlayState : public Gamestate {
float delay = .5; float delay = .5;
double timer; double timer;
bool paused;
bool debug; bool debug;
public: public:
void new_game(); void new_game();

2
src/Tilemap.cpp
View file

@ -157,7 +157,7 @@ void Tilemap::draw(Renderer *renderer, Tileset* tileset, int ox, int oy, FieldOf
renderer->draw_sprite(tileset->get_sprite(GetTile(x, y)), ox + x * 12, oy + y * 12); renderer->draw_sprite(tileset->get_sprite(GetTile(x, y)), ox + x * 12, oy + y * 12);
if (view != nullptr && !view->can_see({x, y})) { if (view != nullptr && !view->can_see({x, y})) {
renderer->set_color(0, 0, 0, .5f); renderer->set_color(0, 0, 0, .6f);
renderer->draw_sprite(tileset->get_sprite(219), ox + x * 12, oy + y * 12); renderer->draw_sprite(tileset->get_sprite(219), ox + x * 12, oy + y * 12);
} }
} }