X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fwillowisp.cpp;h=eafe2874c301aa23db3a9ba19f31508007aa7ba1;hb=38e4d5afd0cc150f75d57778ff1ab1a55688e2f4;hp=657bed89a5aa96ad94013f2ff0d0dbcecfa6273b;hpb=9f9a92cd9d8433c6d4d63b0178fd038a95b9e1a1;p=supertux.git diff --git a/src/badguy/willowisp.cpp b/src/badguy/willowisp.cpp index 657bed89a..eafe2874c 100644 --- a/src/badguy/willowisp.cpp +++ b/src/badguy/willowisp.cpp @@ -24,6 +24,7 @@ #include "game_session.hpp" #include "object/lantern.hpp" #include "object/player.hpp" +#include "scripting/squirrel_util.hpp" static const float FLYSPEED = 64; /**< speed in px per second */ static const float TRACK_RANGE = 384; /**< at what distance to start tracking the player */ @@ -33,24 +34,34 @@ static const std::string SOUNDFILE = "sounds/willowisp.wav"; WillOWisp::WillOWisp(const lisp::Lisp& reader) : BadGuy(reader, "images/creatures/willowisp/willowisp.sprite", LAYER_FLOATINGOBJECTS), mystate(STATE_IDLE), target_sector("main"), target_spawnpoint("main") { + bool running = false; + flyspeed = FLYSPEED; + track_range = TRACK_RANGE; + vanish_range = VANISH_RANGE; + reader.get("sector", target_sector); reader.get("spawnpoint", target_spawnpoint); + reader.get("name", name); + reader.get("flyspeed", flyspeed); + reader.get("track-range", track_range); + reader.get("vanish-range", vanish_range); + reader.get("hit-script", hit_script); + reader.get("running", running); + + const lisp::Lisp* pathLisp = reader.get_lisp("path"); + if(pathLisp != NULL) { + path.reset(new Path()); + path->read(*pathLisp); + walker.reset(new PathWalker(path.get(), running)); + if(running) + mystate = STATE_PATHMOVING_TRACK; + } countMe = false; sound_manager->preload(SOUNDFILE); -} - -void -WillOWisp::write(lisp::Writer& writer) -{ - writer.start_list("willowisp"); + sound_manager->preload("sounds/warp.wav"); - writer.write_float("x", start_position.x); - writer.write_float("y", start_position.y); - writer.write_string("sector", target_sector); - writer.write_string("spawnpoint", target_spawnpoint); - - writer.end_list("willowisp"); + sprite->set_action("idle"); } void @@ -75,43 +86,58 @@ WillOWisp::active_update(float elapsed_time) Vector p2 = player->get_pos() + (player->get_bbox().p2 - player->get_bbox().p1) / 2; Vector dist = (p2 - p1); - if (mystate == STATE_IDLE) { - if (dist.norm() <= TRACK_RANGE) { + switch(mystate) { + case STATE_STOPPED: + break; + + case STATE_IDLE: + if (dist.norm() <= track_range) { mystate = STATE_TRACKING; } - } + break; - if (mystate == STATE_TRACKING) { - if (dist.norm() <= VANISH_RANGE) { + case STATE_TRACKING: + if (dist.norm() <= vanish_range) { Vector dir = dist.unit(); - movement = dir*elapsed_time*FLYSPEED; + movement = dir * elapsed_time * flyspeed; } else { vanish(); } sound_source->set_position(get_pos()); - } + break; - if (mystate == STATE_WARPING) { + case STATE_WARPING: if(sprite->animation_done()) { remove_me(); } - } - if (mystate == STATE_VANISHING) { + case STATE_VANISHING: { Vector dir = dist.unit(); - movement = dir*elapsed_time*FLYSPEED; + movement = dir * elapsed_time * flyspeed; if(sprite->animation_done()) { remove_me(); } + break; } + case STATE_PATHMOVING: + case STATE_PATHMOVING_TRACK: + if(walker.get() == NULL) + return; + movement = walker->advance(elapsed_time) - get_pos(); + if(mystate == STATE_PATHMOVING_TRACK && dist.norm() <= track_range) { + mystate = STATE_TRACKING; + } + break; + + default: + assert(false); + } } void WillOWisp::activate() { - sprite->set_action("idle"); - sound_source.reset(sound_manager->create_sound_source(SOUNDFILE)); sound_source->set_position(get_pos()); sound_source->set_looping(true); @@ -126,7 +152,10 @@ WillOWisp::deactivate() sound_source.reset(NULL); switch (mystate) { + case STATE_STOPPED: case STATE_IDLE: + case STATE_PATHMOVING: + case STATE_PATHMOVING_TRACK: break; case STATE_TRACKING: mystate = STATE_IDLE; @@ -139,38 +168,113 @@ WillOWisp::deactivate() } void -WillOWisp::kill_fall() -{ -} - -void WillOWisp::vanish() { mystate = STATE_VANISHING; sprite->set_action("vanishing", 1); - set_group(COLGROUP_DISABLED); + set_colgroup_active(COLGROUP_DISABLED); } bool WillOWisp::collides(GameObject& other, const CollisionHit& ) { - if (dynamic_cast(&other)) return true; - if (dynamic_cast(&other)) return true; + Lantern* lantern = dynamic_cast(&other); + + if (lantern && lantern->is_open()) + return true; + + if (dynamic_cast(&other)) + return true; + return false; } HitResponse WillOWisp::collision_player(Player& player, const CollisionHit& ) { - if(player.is_invincible()) return ABORT_MOVE; + if(player.is_invincible()) + return ABORT_MOVE; - if (mystate != STATE_TRACKING) return ABORT_MOVE; + if (mystate != STATE_TRACKING) + return ABORT_MOVE; mystate = STATE_WARPING; sprite->set_action("warping", 1); - GameSession::current()->respawn(target_sector, target_spawnpoint); + if(hit_script != "") { + std::istringstream stream(hit_script); + Sector::current()->run_script(stream, "hit-script"); + } else { + GameSession::current()->respawn(target_sector, target_spawnpoint); + } sound_manager->play("sounds/warp.wav"); return CONTINUE; } +void +WillOWisp::goto_node(int node_no) +{ + walker->goto_node(node_no); + if(mystate != STATE_PATHMOVING && mystate != STATE_PATHMOVING_TRACK) { + mystate = STATE_PATHMOVING; + } +} + +void +WillOWisp::start_moving() +{ + walker->start_moving(); +} + +void +WillOWisp::stop_moving() +{ + walker->stop_moving(); +} + +void +WillOWisp::set_state(const std::string& new_state) +{ + if(new_state == "stopped") { + mystate = STATE_STOPPED; + } else if(new_state == "idle") { + mystate = STATE_IDLE; + } else if(new_state == "move_path") { + mystate = STATE_PATHMOVING; + walker->start_moving(); + } else if(new_state == "move_path_track") { + mystate = STATE_PATHMOVING_TRACK; + walker->start_moving(); + } else if(new_state == "normal") { + mystate = STATE_IDLE; + } else if(new_state == "vanish") { + vanish(); + } else { + std::ostringstream msg; + msg << "Can't set unknown willowisp state '" << new_state << "', should " + "be stopped, move_path, move_path_track or normal"; + throw new std::runtime_error(msg.str()); + } +} + +void +WillOWisp::expose(HSQUIRRELVM vm, SQInteger table_idx) +{ + if (name.empty()) + return; + + std::cout << "Expose me '" << name << "'\n"; + Scripting::WillOWisp* interface = static_cast (this); + expose_object(vm, table_idx, interface, name); +} + +void +WillOWisp::unexpose(HSQUIRRELVM vm, SQInteger table_idx) +{ + if (name.empty()) + return; + + std::cout << "UnExpose me '" << name << "'\n"; + Scripting::unexpose_object(vm, table_idx, name); +} + IMPLEMENT_FACTORY(WillOWisp, "willowisp")