@@ -12,6 +12,9 @@ namespace action { Answer(analyzer::Analyzer* analyzer, const std::string& answer) : Action(analyzer), _answer(answer, PRIORITY_CONTINUE_ACTION) { } + Answer(analyzer::Analyzer* analyzer, const unsigned char& answer) : Action(analyzer), _answer(answer, PRIORITY_CONTINUE_ACTION) { + } + virtual ~Answer() { } Actions/Answer.h @@ -39,7 +39,7 @@ namespace action { } else if (_sequence == 1) { /* mark inventory dirty if _update_inventory is true */ if (_update_inventory) - Inventory::updated(false); + Inventory::update(); _sequence = 2; } } Actions/Apply.h @@ -44,7 +44,7 @@ namespace action { } else if (_sequence == 2) { /* mark inventory dirty if update_inventory is true */ if (_update_inventory) - Inventory::updated(false); + Inventory::update(); _sequence = 3; } }; Actions/ApplyInDirection.h @@ -32,7 +32,7 @@ namespace action { return _call_item; case 3: - Inventory::updated(false); + Inventory::update(); return _set_call; default: @@ -49,7 +49,7 @@ namespace action { _sequence = 3; } else if (_sequence == 3) { /* we need to mark inventory as not updated */ - Inventory::updated(false); + Inventory::update(); _sequence = 4; } } Actions/Call.h @@ -52,7 +52,7 @@ namespace action { _sequence = 3; } else if (_sequence < 4) { /* ate item, inventory is no longer updated */ - Inventory::updated(false); + Inventory::update(); _sequence = 4; } } Actions/Eat.h @@ -32,7 +32,7 @@ namespace action { return _name_item; case 3: - Inventory::updated(false); + Inventory::update(); return _set_name; default: @@ -49,7 +49,7 @@ namespace action { _sequence = 3; } else if (_sequence == 3) { /* we need to mark inventory as not updated */ - Inventory::updated(false); + Inventory::update(); _sequence = 4; } } Actions/Name.h @@ -38,7 +38,7 @@ namespace action { _sequence = 1; } else if (_sequence == 1) { /* also mark the inventory dirty when we do this */ - Inventory::updated(false); + Inventory::update(); _sequence = 2; } } Actions/PutOn.h @@ -38,7 +38,7 @@ namespace action { _sequence = 1; } else if (_sequence == 1) { /* also mark the inventory dirty when we do this */ - Inventory::updated(false); + Inventory::update(); _sequence = 2; } } Actions/Remove.h @@ -38,7 +38,7 @@ namespace action { _sequence = 1; } else if (_sequence == 1) { /* also mark the inventory dirty when we do this */ - Inventory::updated(false); + Inventory::update(false); _sequence = 2; } } Actions/TakeOff.h @@ -43,7 +43,7 @@ namespace action { _sequence = 2; } else if (_sequence == 2) { /* mark inventory dirty */ - Inventory::updated(false); + Inventory::update(); _sequence = 3; } } Actions/Throw.h @@ -38,7 +38,7 @@ namespace action { _sequence = 1; } else if (_sequence == 1) { /* also mark the inventory dirty when we do this */ - Inventory::updated(false); + Inventory::update(false); _sequence = 2; } } Actions/Wear.h @@ -1,6 +1,7 @@ #include "Analyzer.h" #include "Amulet.h" +#include "Armor.h" #include "Beatitude.h" #include "Elbereth.h" #include "Enhance.h" @@ -29,6 +30,7 @@ Analyzer::~Analyzer() { void Analyzer::init() { /* init analyzers */ World::registerAnalyzer(new Amulet()); + World::registerAnalyzer(new Armor()); World::registerAnalyzer(new Beatitude()); World::registerAnalyzer(new Door()); World::registerAnalyzer(new Elbereth()); Analyzers/Analyzer.cpp @@ -1,4 +1,6 @@ #include "Armor.h" + +#include "../EventBus.h" #include "../Inventory.h" #include "../Item.h" #include "../Saiph.h" @@ -17,6 +19,10 @@ using namespace std; /* constructors/destructor */ Armor::Armor() : Analyzer("Armor"), _change_armor(false) { + /* register events */ + EventBus::registerEvent(ChangedInventoryItems::ID, this); + EventBus::registerEvent(ReceivedItems::ID, this); + EventBus::registerEvent(WantItems::ID, this); } /* methods */ @@ -48,12 +54,8 @@ void Armor::parseMessages(const string& messages) { remove = true; } World::setAction(static_cast<action::Action*> (new action::Answer(this, (remove ? YES : NO)))); - } else if (messages.find(MESSAGE_YOU_FINISH_TAKING_OFF, 0) != string::npos) { - /* took of last armor, mark inventory dirty */ - req.request = REQUEST_DIRTY_INVENTORY; - Saiph::request(req); - } else if (Saiph::inventory_changed || _change_armor) { - wearArmor(); + } else if (_change_armor) { + //wearArmor(); } } @@ -64,19 +66,22 @@ void Armor::onEvent(event::Event * const event) { } 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) { - // TODO: - // if (i->second.beatitude() != BEATITUDE_UNKNOWN || data::Amulet::amulets().find(i->second.name()) == data::Amulet::amulets().end()) - // continue; // known beatitude or not an amulet - // Beatify b(i->first, 100); - // EventBus::broadcast(&b); + if (i->second.beatitude() != BEATITUDE_UNKNOWN || data::Armor::armors().find(i->second.name()) != data::Armor::armors().end()) + continue; // known beatitude or not armor + Beatify b(i->first, 100); + EventBus::broadcast(&b); } - // TODO: check if we should wear armor + // TODO: check if we should change armor } else if (event->id() == WantItems::ID) { WantItems* e = static_cast<WantItems*> (event); for (map<unsigned char, Item>::iterator i = e->items().begin(); i != e->items().end(); ++i) { - // TODO: - // if (wantItem(i->second)) - // i->second.want(i->second.count()); + if (wantItem(i->second)) + i->second.want(i->second.count()); } } +} + +/* private methods */ +bool Armor::wantItem(const Item& item) { + return Saiph::encumbrance() < BURDENED && item.beatitude() != CURSED && data::Armor::armors().find(item.name()) != data::Armor::armors().end(); } \ No newline at end of file Analyzers/Armor.cpp @@ -10,7 +10,10 @@ #define ARMOR_WONT_FIT_HORN " won't fit over your horn" #define ARMOR_TOO_MANY_HOOVES " You have too many hooves to wear " +class Item; + namespace analyzer { + class Armor : public Analyzer { public: Armor(); @@ -20,6 +23,8 @@ namespace analyzer { private: bool _change_armor; + + bool wantItem(const Item& item); }; } #endif Analyzers/Armor.h @@ -91,7 +91,7 @@ void Door::parseMessages(const string& messages) { World::level(Saiph::position().level()).symbols((unsigned char) CLOSED_DOOR)[_position] = 1; } else if (messages.find(MESSAGE_BREAK_SHOP_DOOR, 0) != string::npos) { /* oops, we broke a shopkeepers door, better pay */ - World::setAction(static_cast<action::Action*> (new action::Answer(this, string(1, YES)))); + World::setAction(static_cast<action::Action*> (new action::Answer(this, YES))); } else if (messages.find(MESSAGE_CANT_REACH_OVER_PIT, 0) != string::npos) { /* we're in a pit, can't reach door from here */ _in_a_pit = true; Analyzers/Door.cpp @@ -29,7 +29,7 @@ void Lamp::analyze() { map<unsigned char, Item>::iterator l = Inventory::items().find(_lamp_key); if (l == Inventory::items().end()) - Inventory::updated(false); // something must've happened to our inventory + Inventory::update(); // something must've happened to our inventory else if (l->second.additional() == "") World::setAction(static_cast<action::Action*> (new action::Apply(this, _lamp_key, 100, false))); // turn on lamp } @@ -39,14 +39,14 @@ void Lamp::parseMessages(const string& messages) { /* lamp/lantern turned on */ map<unsigned char, Item>::iterator l = Inventory::items().find(_lamp_key); if (l == Inventory::items().end()) - Inventory::updated(false); // something must've happened to our inventory + Inventory::update(); // something must've happened to our inventory else l->second.additional(LAMP_LIT); // set "additional" instead of flashing inventory } else if (messages.find(LAMP_TURNED_OFF) != string::npos) { /* lamp/lantern turned off */ map<unsigned char, Item>::iterator l = Inventory::items().find(_lamp_key); if (l == Inventory::items().end()) - Inventory::updated(false); // something must've happened to our inventory + Inventory::update(); // something must've happened to our inventory else l->second.additional(""); // set "additional" instead of flashing inventory } Analyzers/Lamp.cpp @@ -29,7 +29,7 @@ Loot::Loot() : Analyzer("Loot"), _showing_pickup(false), _showing_drop(false) { /* methods */ void Loot::analyze() { /* check inventory if it's not updated */ - if (!Inventory::updated()) { + if (!Inventory::update()) { World::setAction(static_cast<action::Action*> (new action::ListInventory(this))); return; } Analyzers/Loot.cpp @@ -3,7 +3,7 @@ CXX = g++ RM = rm -f CXXFLAGS = -O0 -Wall -Wextra -g3 -gdwarf-2 -OBJECTS = Analyzer.o Amulet.o Beatitude.o Door.o Elbereth.o Enhance.o Explore.o Fight.o Food.o Health.o Lamp.o Loot.o MonsterInfo.o Shop.o Vault.o +OBJECTS = Analyzer.o Amulet.o Armor.o Beatitude.o Door.o Elbereth.o Enhance.o Explore.o Fight.o Food.o Health.o Lamp.o Loot.o MonsterInfo.o Shop.o Vault.o analyzers: $(OBJECTS) Analyzers/Makefile @@ -16,6 +16,8 @@ map<unsigned char, Item> Inventory::_items; unsigned char Inventory::_slots[] = {'\0'}; ChangedInventoryItems Inventory::_changed; set<unsigned char> Inventory::_lost; +unsigned long long int Inventory::_extrinsics_from_items = 0; +bool Inventory::_extrinsics_updated = false; /* methods */ void Inventory::analyze() { @@ -67,9 +69,11 @@ void Inventory::parseMessages(const string& messages) { if (_changed.keys().size() > 0) { /* broadcast ChangedInventoryItems */ EventBus::broadcast(static_cast<Event*> (&_changed)); + _extrinsics_updated = false; } } else if (messages.find(MESSAGE_NOT_CARRYING_ANYTHING) != string::npos || messages.find(MESSAGE_NOT_CARRYING_ANYTHING_EXCEPT_GOLD) != string::npos) { /* we're not carrying anything */ + _extrinsics_updated = true; _changed.clear(); for (map<unsigned char, Item>::iterator i = _items.begin(); i != _items.end(); ++i) _changed.add(i->first); @@ -82,7 +86,7 @@ void Inventory::parseMessages(const string& messages) { } else if (messages.find(MESSAGE_STEALS) != string::npos || messages.find(MESSAGE_STOLE) != string::npos || messages.find(MESSAGE_DESTROY_POTION_FIRE) != string::npos || messages.find(MESSAGE_DESTROY_POTION_FIRE2) != string::npos || messages.find(MESSAGE_DESTROY_POTION_COLD) != string::npos || messages.find(MESSAGE_DESTROY_POTION_COLD2) != string::npos || messages.find(MESSAGE_DESTROY_RING) != string::npos || messages.find(MESSAGE_DESTROY_RING2) != string::npos || messages.find(MESSAGE_DESTROY_WAND) != string::npos || messages.find(MESSAGE_DESTROY_WAND2) != string::npos || messages.find(MESSAGE_POLYMORPH) != string::npos || messages.find(MESSAGE_FOOCUBUS_QUESTION) != string::npos || messages.find(MESSAGE_FOOCUBUS_REMOVE) != string::npos) { /* we got robbed, some of our stuff was destroyed. we polymorphed or encountered a foocubi. * mark inventory as not updated */ - _updated = false; + update(); } } @@ -113,6 +117,7 @@ void Inventory::addItem(const unsigned char& key, const Item& item) { if (item.count() <= 0) return; Debug::inventory() << "Adding " << item << " to inventory slot " << key << endl; + _extrinsics_updated = false; map<unsigned char, Item>::iterator i = _items.find(key); if (i != _items.end()) { /* existing item, add amount */ @@ -132,6 +137,7 @@ void Inventory::removeItem(const unsigned char& key, const Item& item) { if (i == _items.end()) return; Debug::inventory() << "Removing " << item << " from inventory slot " << key << endl; + _extrinsics_updated = false; if (i->second.count() > item.count()) { /* reduce stack */ i->second.count(i->second.count() - item.count()); @@ -147,12 +153,19 @@ void Inventory::removeItem(const unsigned char& key, const Item& item) { } } +const unsigned long long int& Inventory::extrinsicsFromItems() { + if (!_extrinsics_updated) + updateExtrinsics(); + return _extrinsics_from_items; +} + const bool& Inventory::updated() { return _updated; } -const bool& Inventory::updated(const bool& updated) { - _updated = updated; +const bool& Inventory::update() { + _updated = false; + _extrinsics_updated = false; return Inventory::updated(); } @@ -183,3 +196,18 @@ void Inventory::setSlot(const unsigned char& key, const Item& item) { _slots[SLOT_RIGHT_RING] = key; } } + +void Inventory::updateExtrinsics() { + /* figure out what extrinsics we get from items */ + for (int s = 0; s < SLOTS; ++s) { + const Item& item = itemInSlot(s); + if (item.count() <= 0) + continue; // no item in slot + map<const string, const data::Item*>::const_iterator i = data::Item::items().find(item.name()); + if (i == data::Item::items().end()) + continue; // item not in database, shouldn't happen very often + _extrinsics_updated |= i->second->properties(); + } + /* TODO: items that give extrinsics by only carrying them (ie. longbow of diana) */ + _extrinsics_updated = true; +} \ No newline at end of file Inventory.cpp @@ -20,8 +20,9 @@ public: static const unsigned char& keyForSlot(const int& slot); static void addItem(const unsigned char& key, const Item& item); static void removeItem(const unsigned char& key, const Item& item); + static const unsigned long long int& extrinsicsFromItems(); static const bool& updated(); - static const bool& updated(const bool& updated); + static const bool& update(); private: static bool _updated; @@ -29,7 +30,10 @@ private: static unsigned char _slots[SLOTS]; static event::ChangedInventoryItems _changed; static std::set<unsigned char> _lost; + static unsigned long long int _extrinsics_from_items; + static bool _extrinsics_updated; static void setSlot(const unsigned char& key, const Item& item); + static void updateExtrinsics(); }; #endif \ No newline at end of file Inventory.h @@ -1,6 +1,8 @@ +#include "Saiph.h" + #include <string.h> #include "Globals.h" -#include "Saiph.h" +#include "Inventory.h" using namespace analyzer; using namespace std; @@ -316,16 +318,16 @@ const unsigned long long int& Saiph::removeIntrinsics(const unsigned long long i return Saiph::intrinsics(); } -const unsigned long long int& Saiph::extrinsics() { - return _extrinsics; +unsigned long long int Saiph::extrinsics() { + return _extrinsics | Inventory::extrinsicsFromItems(); } -const unsigned long long int& Saiph::addExtrinsics(const unsigned long long int& extrinsics) { +unsigned long long int Saiph::addExtrinsics(const unsigned long long int& extrinsics) { _extrinsics |= extrinsics; return Saiph::extrinsics(); } -const unsigned long long int& Saiph::removeExtrinsics(const unsigned long long int& extrinsics) { +unsigned long long int Saiph::removeExtrinsics(const unsigned long long int& extrinsics) { _extrinsics &= ~extrinsics; return Saiph::extrinsics(); } Saiph.cpp @@ -53,9 +53,9 @@ public: static const unsigned long long int& intrinsics(); static const unsigned long long int& addIntrinsics(const unsigned long long int& intrinsics); static const unsigned long long int& removeIntrinsics(const unsigned long long int& intrinsics); - static const unsigned long long int& extrinsics(); - static const unsigned long long int& addExtrinsics(const unsigned long long int& extrinsics); - static const unsigned long long int& removeExtrinsics(const unsigned long long int& extrinsics); + static unsigned long long int extrinsics(); + static unsigned long long int addExtrinsics(const unsigned long long int& extrinsics); + static unsigned long long int removeExtrinsics(const unsigned long long int& extrinsics); static const int& lastPrayed(); static const int& lastPrayed(const int& last_prayed); Saiph.h 2f919579fa135f8717bfa0aceed7351a2c391ffc Vidar Wahlberg canidae@exent.net http://github.com/canidae/saiph/commit/73b40f7695b88be672d3c55ac71b0b87e22f6130 73b40f7695b88be672d3c55ac71b0b87e22f6130 2009-11-07T08:02:09-08:00 2009-11-07T08:02:09-08:00 Inventory::updated(bool) -> update(), beatify armor, ++ f8987d9ae561714cffcb67a01126d9320090ec15 Vidar Wahlberg canidae@exent.net