Actions/Drop.h Events/Beatify.h @@ -3,6 +3,7 @@ #include "Apply.h" #include "ApplyInDirection.h" #include "Call.h" +#include "Drop.h" #include "Eat.h" #include "EatCorpse.h" #include "Engrave.h" @@ -56,6 +57,7 @@ const int Throw::ID = 23; const int Unlock::ID = 24; const int FarLook::ID = 25; const int Enhance::ID = 26; +const int Drop::ID = 27; /* constructors/destructor */ Action::Action(analyzer::Analyzer* analyzer) : _sequence(0), _analyzer(analyzer) { Actions/Action.cpp @@ -1,4 +1,5 @@ #include "Amulet.h" + #include "../EventBus.h" #include "../Globals.h" #include "../Inventory.h" @@ -8,6 +9,7 @@ #include "../Actions/Remove.h" #include "../Actions/Select.h" #include "../Data/Amulet.h" +#include "../Events/Beatify.h" #include "../Events/Event.h" #include "../Events/ChangedInventoryItems.h" #include "../Events/ReceivedItems.h" @@ -31,8 +33,18 @@ void Amulet::onEvent(Event * const event) { ChangedInventoryItems* e = static_cast<ChangedInventoryItems*> (event); wearAmulet(e->keys()); } else if (event->id() == ReceivedItems::ID) { + ReceivedItems* e = static_cast<ReceivedItems*> (event); + for (map<unsigned char, Item>::iterator i = e->items().begin(); i != e->items().end(); ++i) { + if (data::Amulet::amulets().find(i->second.name()) != data::Amulet::amulets().end()) { + if (i->second.beatitude() == BEATITUDE_UNKNOWN) { + /* beatify amulet */ + Beatify b(i->first, 100); + EventBus::broadcast(&b); + } + } + + } // FIXME - //ReceivedItems* e = static_cast<ReceivedItems*>(event); //wearAmulet(e->items); } else if (event->id() == WantItems::ID) { WantItems* e = static_cast<WantItems*> (event); Analyzers/Amulet.cpp @@ -1,6 +1,7 @@ #include "Analyzer.h" #include "Amulet.h" +#include "Beatitude.h" #include "Elbereth.h" #include "Enhance.h" #include "Explore.h" @@ -26,6 +27,7 @@ Analyzer::~Analyzer() { void Analyzer::init() { /* init analyzers */ World::registerAnalyzer(new Amulet()); + World::registerAnalyzer(new Beatitude()); World::registerAnalyzer(new Door()); World::registerAnalyzer(new Elbereth()); World::registerAnalyzer(new Enhance()); Analyzers/Analyzer.cpp @@ -1,81 +1,79 @@ #include "Beatitude.h" + #include "../Globals.h" #include "../Item.h" -#include "../Player.h" -#include "../Request.h" #include "../Saiph.h" #include "../World.h" +#include "../Actions/Drop.h" +#include "../Actions/Move.h" +#include "../Events/Beatify.h" +#include "../Events/WantItems.h" using namespace analyzer; +using namespace event; using namespace std; /* constructors/destructor */ -Beatitude::Beatitude(Saiph* saiph) : Analyzer("Beatitude"), saiph(saiph), check_beatitude(false) { +Beatitude::Beatitude() : Analyzer("Beatitude") { } /* methods */ void Beatitude::analyze() { - if (!check_beatitude) - return; // noone has requested beatifying items - else if (priority >= PRIORITY_BEATITUDE_DROP_ALTAR) + if (_beatify.size() <= 0) + return; // no items to beatify + else if (Saiph::blind() || Saiph::confused() || Saiph::stunned()) + return; // no buc-testing while blind/confused/stunned + else if (_max_priority < World::currentPriority()) return; // got something more important to do - else if (saiph->world->player.blind) - return; // no buc-testing while blind /* path to nearest altar */ - const PathNode& node = saiph->shortestPath(ALTAR); - if (node.cost >= UNPASSABLE) - return; // don't know of any altars - else if (node.dir == NOWHERE) - command = DROP_MENU; // we're standing on the altar, drop items + Tile tile = World::shortestPath(ALTAR); + if (tile.cost() >= UNPASSABLE) + return; // can't path to altar + if (tile.direction() == NOWHERE) + World::setAction(static_cast<action::Action*> (new action::Drop(this, _max_priority))); else - command = node.dir; // move towards altar - priority = PRIORITY_BEATITUDE_DROP_ALTAR; + World::setAction(static_cast<action::Action*> (new action::Move(this, tile.direction(), _max_priority))); } -void Beatitude::parseMessages(const string& messages) { - if (saiph->got_drop_menu && saiph->getDungeonSymbol() == ALTAR) { - /* drop stuff we don't know beatitude of */ - for (map<unsigned char, Item>::iterator d = saiph->drop.begin(); d != saiph->drop.end(); ++d) { - if (!beatify(d->second)) - continue; - /* mark this */ - command = d->first; - priority = PRIORITY_SELECT_ITEM; - return; +void Beatitude::onEvent(event::Event * const event) { + if (event->id() == Beatify::ID) { + Beatify* e = static_cast<Beatify*> (event); + set<unsigned char>::iterator b = _beatify.find(e->key()); + _beatify.insert(e->key()); + if (e->priority() > _max_priority) + _max_priority = e->priority(); + } else if (event->id() == WantItems::ID && World::level().tile().symbol() == ALTAR) { + /* looting or picking up items at an altar */ + WantItems* e = static_cast<WantItems*> (event); + if (e->dropping()) { + for (map<unsigned char, Item>::iterator i = e->items().begin(); i != e->items().end(); ++i) { + if (dropItem(i->second)) + i->second.count(0); // setting count to 0 to force dropping the item + } + _beatify.clear(); + _max_priority = ILLEGAL_PRIORITY; } - /* if we got this far, we've selected everything we don't know beatitude of (on this page) */ - check_beatitude = false; - command = CLOSE_PAGE; - priority = PRIORITY_CLOSE_PAGE; - } -} - -bool Beatitude::request(const Request& request) { - if (request.request == REQUEST_BEATIFY_ITEMS) { - check_beatitude = true; - return true; } - return false; } /* private methods */ -bool Beatitude::beatify(const Item& item) { - if (item.beatitude != BEATITUDE_UNKNOWN) +bool Beatitude::dropItem(const Item& item) { + if (item.beatitude() != BEATITUDE_UNKNOWN) return false; - if (item.name == "gold piece") + if (item.name() == "gold piece") return false; - if (item.additional == "being worn") + if (item.additional() == "being worn") return false; - if (item.additional == "embedded in your skin") + if (item.additional() == "embedded in your skin") return false; - if (item.additional == "in use") + if (item.additional() == "in use") return false; - if (item.additional == "wielded") + if (item.additional() == "wielded") return false; - if (item.additional.find("weapon in ", 0) == 0 || item.additional.find("wielded in other ", 0) == 0) + if (item.additional().find("weapon in ", 0) == 0 || item.additional().find("wielded in other ", 0) == 0) return false; - if (item.additional.find("on left ", 0) == 0 || item.additional.find("on right ", 0) == 0) + if (item.additional().find("on left ", 0) == 0 || item.additional().find("on right ", 0) == 0) return false; return true; } Analyzers/Beatitude.cpp @@ -1,27 +1,25 @@ #ifndef ANALYZER_BEATITUDE_H #define ANALYZER_BEATITUDE_H -#include <string> +#include <set> #include "Analyzer.h" class Item; -class Request; -class Saiph; namespace analyzer { + class Beatitude : public Analyzer { public: - Beatitude(Saiph* saiph); + Beatitude(); void analyze(); - void parseMessages(const std::string& messages); - bool request(const Request& request); + void onEvent(event::Event * const event); private: - Saiph* saiph; - bool check_beatitude; + std::set<unsigned char> _beatify; + int _max_priority; - bool beatify(const Item& item); + bool dropItem(const Item& item); }; } #endif Analyzers/Beatitude.h @@ -1,4 +1,5 @@ #include "Food.h" + #include "../Debug.h" #include "../EventBus.h" #include "../Saiph.h" Analyzers/Food.cpp @@ -1,6 +1,7 @@ +#include "Loot.h" + #include <sstream> #include <stdlib.h> -#include "Loot.h" #include "../Debug.h" #include "../EventBus.h" #include "../Inventory.h" @@ -86,6 +87,7 @@ void Loot::parseMessages(const string& messages) { _wi.addItem(messages[pos - 4], Item(messages.substr(pos, length), 0)); pos += length; } + _wi.dropping(false); /* broadcast event */ EventBus::broadcast(static_cast<Event*> (&_wi)); /* pick up stuff that was wanted by analyzers */ @@ -136,6 +138,7 @@ void Loot::parseMessages(const string& messages) { } pos += length; } + _wi.dropping(true); /* broadcast event */ EventBus::broadcast(static_cast<Event*> (&_wi)); /* drop stuff no analyzer wanted */ Analyzers/Loot.cpp @@ -3,7 +3,7 @@ CXX = g++ RM = rm -f CXXFLAGS = -O0 -Wall -Wextra -g3 -gdwarf-2 -OBJECTS = Analyzer.o Amulet.o Door.o Elbereth.o Enhance.o Explore.o Fight.o Food.o Health.o Loot.o MonsterInfo.o Shop.o +OBJECTS = Analyzer.o Amulet.o Beatitude.o Door.o Elbereth.o Enhance.o Explore.o Fight.o Food.o Health.o Loot.o MonsterInfo.o Shop.o analyzers: $(OBJECTS) Analyzers/Makefile @@ -1,4 +1,6 @@ #include "Event.h" + +#include "Beatify.h" #include "ChangedInventoryItems.h" #include "EatItem.h" #include "ElberethQuery.h" @@ -20,6 +22,7 @@ const int ReceivedItems::ID = 4; const int StashChanged::ID = 5; const int TakeMeThere::ID = 6; const int WantItems::ID = 7; +const int Beatify::ID = 8; /* constructors/destructor */ Event::Event(const std::string& name) : _name(name) { Events/Event.cpp @@ -19,7 +19,7 @@ namespace event { public: static const int ID; - WantItems() : Event("WantItems"), _items() { + WantItems() : Event("WantItems"), _items(), _dropping(false) { } virtual ~WantItems() { @@ -46,8 +46,18 @@ namespace event { _items[key] = item; } + virtual bool dropping() { + return _dropping; + } + + virtual bool dropping(const bool& dropping) { + _dropping = dropping; + return this->dropping(); + } + private: std::map<unsigned char, Item> _items; + bool _dropping; }; } #endif Events/WantItems.h @@ -6,13 +6,13 @@ <in>Action.cpp</in> <in>Action.h</in> <in>Answer.h</in> - <in>Answer_1.h</in> <in>Apply.h</in> <in>ApplyInDirection.h</in> <in>Call.h</in> <in>Eat.h</in> <in>EatCorpse.h</in> <in>Engrave.h</in> + <in>Enhance.h</in> <in>FarLook.h</in> <in>Fight.h</in> <in>Kick.h</in> @@ -197,6 +197,7 @@ <in>Whip.h</in> </df> <df name="Events"> + <in>Beatify.h</in> <in>ChangedInventoryItems.h</in> <in>EatItem.h</in> <in>ElberethQuery.h</in> @@ -302,14 +303,6 @@ </item> <item path="/home/canidae/projects/saiph/Analyzers/Armor.h" ex="true" tool="3"> </item> - <item path="/home/canidae/projects/saiph/Analyzers/Beatitude.cpp" - ex="true" - tool="1"> - </item> - <item path="/home/canidae/projects/saiph/Analyzers/Beatitude.h" - ex="true" - tool="3"> - </item> <item path="/home/canidae/projects/saiph/Analyzers/Blind.cpp" ex="true" tool="1"> nbproject/configurations.xml caf76a8036570b5aea396ca8fd5fe4026a30d975 Vidar Wahlberg canidae@exent.net http://github.com/canidae/saiph/commit/4fc8d978572d6f67e682ce90403429b5e3dfc957 4fc8d978572d6f67e682ce90403429b5e3dfc957 2009-10-31T05:07:43-07:00 2009-10-31T05:07:43-07:00 she should now know how to beatify items 4442df0f8414545e2d4212f45be37d6e862591c7 Vidar Wahlberg canidae@exent.net