Release 0.79

master
Kasi 2018-08-06 05:30:12 +01:00
parent dc72c8c984
commit 243d12cab5
14 changed files with 103 additions and 75 deletions

View File

@ -17,7 +17,9 @@ namespace Internal
std::int32_t GetAmountTraded() const; std::int32_t GetAmountTraded() const;
std::int32_t GetItemID() const; std::int32_t GetItemID() const;
std::int32_t GetPrice() const;
std::int8_t GetProgress() const; std::int8_t GetProgress() const;
std::int32_t GetSpent() const;
std::int32_t GetTotalAmount() const; std::int32_t GetTotalAmount() const;
}; };

View File

@ -152,6 +152,7 @@ namespace Internal
std::int32_t GetLoginState(); std::int32_t GetLoginState();
std::int32_t GetLoginWindow(); std::int32_t GetLoginWindow();
std::int32_t GetMapAngle(); std::int32_t GetMapAngle();
std::vector<std::int32_t> GetMapRegions();
std::vector<std::string> GetMenuActions(); std::vector<std::string> GetMenuActions();
std::int32_t GetMenuCount(); std::int32_t GetMenuCount();
std::int32_t GetMenuHeight(); std::int32_t GetMenuHeight();
@ -253,6 +254,7 @@ namespace Internal
Point TileToMainscreen(const Tile& T, std::int32_t X, std::int32_t Y, std::int32_t Z); Point TileToMainscreen(const Tile& T, std::int32_t X, std::int32_t Y, std::int32_t Z);
std::string GetItemName(std::int32_t ID); std::string GetItemName(std::int32_t ID);
bool IsItemPlaceholder(std::int32_t ID); bool IsItemPlaceholder(std::int32_t ID);
bool IsItemStackable(std::int32_t ID);
std::vector<Box> GetBlockingWidgetBoxes(); std::vector<Box> GetBlockingWidgetBoxes();
std::int32_t GetHealthPercentage(const Internal::Character& C); std::int32_t GetHealthPercentage(const Internal::Character& C);
std::vector<Widget> GetWidgets(std::int32_t Container); std::vector<Widget> GetWidgets(std::int32_t Container);

View File

@ -46,17 +46,17 @@ class Point
* @brief Returns the distance from one Point to another * @brief Returns the distance from one Point to another
* @return The distance from one Point to another * @return The distance from one Point to another
*/ */
double DistanceFrom(Point P) const; double DistanceFrom(const Point& P) const;
/** /**
* @brief Returns True if the Point is inside the passed Box * @brief Returns True if the Point is inside the passed Box
* @return True if the Point is inside the passed Box * @return True if the Point is inside the passed Box
*/ */
bool InBox(Box B) const; bool InBox(const Box& B) const;
/** /**
* @brief Returns True if the Point is inside a Circle defined by a starting Point, and Radius * @brief Returns True if the Point is inside a Circle defined by a starting Point, and Radius
* @return True if the Point is inside a Circle defined by a starting Point, and Radius * @return True if the Point is inside a Circle defined by a starting Point, and Radius
*/ */
bool InCircle(Point P, std::int32_t Radius) const; bool InCircle(const Point& P, std::int32_t Radius) const;
/** /**
* @brief Returns True if the Point is less than 0, not equal to * @brief Returns True if the Point is less than 0, not equal to
* @return True if the Point is less than 0, not equal to * @return True if the Point is less than 0, not equal to

View File

@ -50,7 +50,7 @@ class Tile
* @brief Returns the distance from one Tile to another * @brief Returns the distance from one Tile to another
* @return The distance from one Tile to another * @return The distance from one Tile to another
*/ */
double DistanceFrom(Tile T) const; double DistanceFrom(const Tile& T) const;
/** /**
* @brief Returns True if the Tile is less than 0, not equal to * @brief Returns True if the Tile is less than 0, not equal to
* @return True if the Tile is less than 0, not equal to * @return True if the Tile is less than 0, not equal to

View File

@ -18,6 +18,7 @@ namespace Interactable
private: private:
Tile LocalTile; Tile LocalTile;
public: public:
GroundItem();
GroundItem(const Internal::GroundItem& G); GroundItem(const Internal::GroundItem& G);
GroundItem(const Internal::GroundItem& G, const Tile& LocalTile); GroundItem(const Internal::GroundItem& G, const Tile& LocalTile);
GroundItem(const GroundItem& G); GroundItem(const GroundItem& G);

View File

@ -40,6 +40,13 @@ class Exchange
MODE_UNDEFINED = 3 MODE_UNDEFINED = 3
} SLOT_MODE; } SLOT_MODE;
typedef enum COLLECT_METHOD
{
ITEM,
NOTE,
BANK
} COLLECT_METHOD;
static bool IsOpen(); static bool IsOpen();
static bool Open(); static bool Open();
static bool Close(); static bool Close();
@ -57,9 +64,11 @@ class Exchange
static bool OfferOpen(); static bool OfferOpen();
static bool CloseOffer(); static bool CloseOffer();
static bool OffersOpen(); static bool OffersOpen();
static bool SlotUseble(const Exchange::SLOT Slot); static bool SlotUsable(const Exchange::SLOT Slot);
static bool CanCollect(); static bool CanCollect();
static bool Collect(const bool Inventory = true);
static bool CollectAll(const bool Inventory = true);
static bool Collect(const Exchange::COLLECT_METHOD Method = Exchange::BANK);
static bool IsBuyOfferOpen(); static bool IsBuyOfferOpen();
static bool IsSellOfferOpen(); static bool IsSellOfferOpen();

View File

@ -13,19 +13,21 @@ class DecorativeObjects
{ {
public: public:
static std::vector<Interactable::DecorativeObject> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::DecorativeObject> GetAll(); static std::vector<Interactable::DecorativeObject> GetAll();
static std::vector<Interactable::DecorativeObject> GetAll(std::int32_t ID); static std::vector<Interactable::DecorativeObject> GetAll(std::int32_t ID, std::int32_t Distance = -1);
static std::vector<Interactable::DecorativeObject> GetAll(const std::string& Name); static std::vector<Interactable::DecorativeObject> GetAll(const std::string& Name, std::int32_t Distance = -1);
static std::vector<Interactable::DecorativeObject> GetAll(const std::vector<std::int32_t>& IDs); static std::vector<Interactable::DecorativeObject> GetAll(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static std::vector<Interactable::DecorativeObject> GetAll(const std::vector<std::string>& Names); static std::vector<Interactable::DecorativeObject> GetAll(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static std::vector<Interactable::DecorativeObject> GetAll(const std::function<bool (const Interactable::DecorativeObject&)>& Filter); static std::vector<Interactable::DecorativeObject> GetAll(const std::function<bool (const Interactable::DecorativeObject&)>& Filter, std::int32_t Distance = -1);
static Interactable::DecorativeObject Get(const Tile& T); static Interactable::DecorativeObject Get(const Tile& T);
static Interactable::DecorativeObject Get(std::int32_t ID); static Interactable::DecorativeObject Get(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::DecorativeObject Get(const std::string& Name); static Interactable::DecorativeObject Get(const std::string& Name, std::int32_t Distance = -1);
static Interactable::DecorativeObject Get(const std::vector<std::int32_t>& IDs); static Interactable::DecorativeObject Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::DecorativeObject Get(const std::vector<std::string>& Names); static Interactable::DecorativeObject Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static Interactable::DecorativeObject Get(const std::function<bool (const Interactable::DecorativeObject&)>& Filter); static Interactable::DecorativeObject Get(const std::function<bool (const Interactable::DecorativeObject&)>& Filter, std::int32_t Distance = -1);
}; };
/** @} */ /** @} */

View File

@ -13,20 +13,22 @@ class GameObjects
{ {
public: public:
static std::vector<Interactable::GameObject> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::GameObject> GetAll(); static std::vector<Interactable::GameObject> GetAll();
static std::vector<Interactable::GameObject> GetAll(const Tile& T); static std::vector<Interactable::GameObject> GetAll(const Tile& T);
static std::vector<Interactable::GameObject> GetAll(std::int32_t ID); static std::vector<Interactable::GameObject> GetAll(std::int32_t ID, std::int32_t Distance = -1);
static std::vector<Interactable::GameObject> GetAll(const std::string& Name); static std::vector<Interactable::GameObject> GetAll(const std::string& Name, std::int32_t Distance = -1);
static std::vector<Interactable::GameObject> GetAll(const std::vector<std::int32_t>& IDs); static std::vector<Interactable::GameObject> GetAll(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static std::vector<Interactable::GameObject> GetAll(const std::vector<std::string>& Names); static std::vector<Interactable::GameObject> GetAll(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static std::vector<Interactable::GameObject> GetAll(const std::function<bool (const Interactable::GameObject&)>& Filter); static std::vector<Interactable::GameObject> GetAll(const std::function<bool (const Interactable::GameObject&)>& Filter, std::int32_t Distance = -1);
static Interactable::GameObject Get(const Tile& T); static Interactable::GameObject Get(const Tile& T);
static Interactable::GameObject Get(std::int32_t ID); static Interactable::GameObject Get(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::GameObject Get(const std::string& Name); static Interactable::GameObject Get(const std::string& Name, std::int32_t Distance = -1);
static Interactable::GameObject Get(const std::vector<std::int32_t>& IDs); static Interactable::GameObject Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::GameObject Get(const std::vector<std::string>& Names); static Interactable::GameObject Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static Interactable::GameObject Get(const std::function<bool (const Interactable::GameObject&)>& Filter); static Interactable::GameObject Get(const std::function<bool (const Interactable::GameObject&)>& Filter, std::int32_t Distance = -1);
}; };
/** @} */ /** @} */

View File

@ -13,20 +13,22 @@ class GroundItems
{ {
public: public:
static std::vector<Interactable::GroundItem> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::GroundItem> GetAll(); static std::vector<Interactable::GroundItem> GetAll();
static std::vector<Interactable::GroundItem> GetAll(const Tile& T); static std::vector<Interactable::GroundItem> GetAll(const Tile& T);
static std::vector<Interactable::GroundItem> GetAll(std::int32_t ID); static std::vector<Interactable::GroundItem> GetAll(std::int32_t ID, std::int32_t Distance = -1);
static std::vector<Interactable::GroundItem> GetAll(const std::string& Name); static std::vector<Interactable::GroundItem> GetAll(const std::string& Name, std::int32_t Distance = -1);
static std::vector<Interactable::GroundItem> GetAll(const std::vector<std::int32_t>& IDs); static std::vector<Interactable::GroundItem> GetAll(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static std::vector<Interactable::GroundItem> GetAll(const std::vector<std::string>& Names); static std::vector<Interactable::GroundItem> GetAll(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static std::vector<Interactable::GroundItem> GetAll(const std::function<bool (Interactable::GroundItem&)>& Filter); static std::vector<Interactable::GroundItem> GetAll(const std::function<bool (Interactable::GroundItem&)>& Filter, std::int32_t Distance = -1);
static Interactable::GroundItem Get(const Tile& T); static Interactable::GroundItem Get(const Tile& T);
static Interactable::GroundItem Get(std::int32_t ID); static Interactable::GroundItem Get(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::GroundItem Get(const std::string& Name); static Interactable::GroundItem Get(const std::string& Name, std::int32_t Distance = -1);
static Interactable::GroundItem Get(const std::vector<std::int32_t>& IDs); static Interactable::GroundItem Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::GroundItem Get(const std::vector<std::string>& Names); static Interactable::GroundItem Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static Interactable::GroundItem Get(const std::function<bool (Interactable::GroundItem&)>& Filter); static Interactable::GroundItem Get(const std::function<bool (Interactable::GroundItem&)>& Filter, std::int32_t Distance = -1);
}; };
/** @} */ /** @} */

View File

@ -13,19 +13,21 @@ class GroundObjects
{ {
public: public:
static std::vector<Interactable::GroundObject> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::GroundObject> GetAll(); static std::vector<Interactable::GroundObject> GetAll();
static std::vector<Interactable::GroundObject> GetAll(std::int32_t ID); static std::vector<Interactable::GroundObject> GetAll(std::int32_t ID, std::int32_t Distance = -1);
static std::vector<Interactable::GroundObject> GetAll(const std::string& Name); static std::vector<Interactable::GroundObject> GetAll(const std::string& Name, std::int32_t Distance = -1);
static std::vector<Interactable::GroundObject> GetAll(const std::vector<std::int32_t>& IDs); static std::vector<Interactable::GroundObject> GetAll(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static std::vector<Interactable::GroundObject> GetAll(const std::vector<std::string>& Names); static std::vector<Interactable::GroundObject> GetAll(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static std::vector<Interactable::GroundObject> GetAll(const std::function<bool (const Interactable::GroundObject&)>& Filter); static std::vector<Interactable::GroundObject> GetAll(const std::function<bool (const Interactable::GroundObject&)>& Filter, std::int32_t Distance = -1);
static Interactable::GroundObject Get(const Tile& T); static Interactable::GroundObject Get(const Tile& T);
static Interactable::GroundObject Get(std::int32_t ID); static Interactable::GroundObject Get(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::GroundObject Get(const std::string& Name); static Interactable::GroundObject Get(const std::string& Name, std::int32_t Distance = -1);
static Interactable::GroundObject Get(const std::vector<std::int32_t>& IDs); static Interactable::GroundObject Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::GroundObject Get(const std::vector<std::string>& Names); static Interactable::GroundObject Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static Interactable::GroundObject Get(const std::function<bool (const Interactable::GroundObject&)>& Filter); static Interactable::GroundObject Get(const std::function<bool (const Interactable::GroundObject&)>& Filter, std::int32_t Distance = -1);
}; };
/** @} */ /** @} */

View File

@ -14,20 +14,22 @@ class NPCs
{ {
public: public:
static std::vector<Interactable::NPC> GetAll(); static std::vector<Interactable::NPC> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::NPC> GetAll(const Tile& Tile);
static std::vector<Interactable::NPC> GetAll(std::int32_t ID);
static std::vector<Interactable::NPC> GetAll(const std::string& Name);
static std::vector<Interactable::NPC> GetAll(const std::vector<std::int32_t>& IDs);
static std::vector<Interactable::NPC> GetAll(const std::vector<std::string>& Names);
static std::vector<Interactable::NPC> GetAll(const std::function<bool (const Interactable::NPC&)>& Filter);
static Interactable::NPC Get(const Tile& Tile); static std::vector<Interactable::NPC> GetAll();
static Interactable::NPC Get(std::int32_t ID); static std::vector<Interactable::NPC> GetAll(const Tile& T);
static Interactable::NPC Get(const std::string& Name); static std::vector<Interactable::NPC> GetAll(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::NPC Get(const std::vector<std::int32_t>& IDs); static std::vector<Interactable::NPC> GetAll(const std::string& Name, std::int32_t Distance = -1);
static Interactable::NPC Get(const std::vector<std::string>& Names); static std::vector<Interactable::NPC> GetAll(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::NPC Get(const std::function<bool (const Interactable::NPC&)>& Filter); static std::vector<Interactable::NPC> GetAll(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static std::vector<Interactable::NPC> GetAll(const std::function<bool (const Interactable::NPC&)>& Filter, std::int32_t Distance = -1);
static Interactable::NPC Get(const Tile& T);
static Interactable::NPC Get(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::NPC Get(const std::string& Name, std::int32_t Distance = -1);
static Interactable::NPC Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::NPC Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static Interactable::NPC Get(const std::function<bool (const Interactable::NPC&)>& Filter, std::int32_t Distance = -1);
}; };
/** @} */ /** @} */

View File

@ -14,16 +14,18 @@ class Players
public: public:
static Interactable::Player GetLocal(); static Interactable::Player GetLocal();
static std::vector<Interactable::Player> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::Player> GetAll(); static std::vector<Interactable::Player> GetAll();
static std::vector<Interactable::Player> GetAll(const Tile& Tile); static std::vector<Interactable::Player> GetAll(const Tile& Tile);
static std::vector<Interactable::Player> GetAll(const std::string& Name); static std::vector<Interactable::Player> GetAll(const std::string& Name, std::int32_t Distance = -1);
static std::vector<Interactable::Player> GetAll(const std::vector<std::string>& Names); static std::vector<Interactable::Player> GetAll(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static std::vector<Interactable::Player> GetAll(const std::function<bool (Interactable::Player&)>& Filter); static std::vector<Interactable::Player> GetAll(const std::function<bool (Interactable::Player&)>& Filter, std::int32_t Distance = -1);
static Interactable::Player Get(const Tile& Tile); static Interactable::Player Get(const Tile& Tile);
static Interactable::Player Get(const std::string& Name); static Interactable::Player Get(const std::string& Name, std::int32_t Distance = -1);
static Interactable::Player Get(const std::vector<std::string>& Names); static Interactable::Player Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static Interactable::Player Get(const std::function<bool (const Interactable::Player&)>& Filter); static Interactable::Player Get(const std::function<bool (const Interactable::Player&)>& Filter, std::int32_t Distance = -1);
}; };
/** @} */ /** @} */

View File

@ -13,19 +13,21 @@ class WallObjects
{ {
public: public:
static std::vector<Interactable::WallObject> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::WallObject> GetAll(); static std::vector<Interactable::WallObject> GetAll();
static std::vector<Interactable::WallObject> GetAll(std::int32_t ID); static std::vector<Interactable::WallObject> GetAll(std::int32_t ID, std::int32_t Distance = -1);
static std::vector<Interactable::WallObject> GetAll(const std::string& Name); static std::vector<Interactable::WallObject> GetAll(const std::string& Name, std::int32_t Distance = -1);
static std::vector<Interactable::WallObject> GetAll(const std::vector<std::int32_t>& IDs); static std::vector<Interactable::WallObject> GetAll(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static std::vector<Interactable::WallObject> GetAll(const std::vector<std::string>& Names); static std::vector<Interactable::WallObject> GetAll(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static std::vector<Interactable::WallObject> GetAll(const std::function<bool (const Interactable::WallObject&)>& Filter); static std::vector<Interactable::WallObject> GetAll(const std::function<bool (const Interactable::WallObject&)>& Filter, std::int32_t Distance = -1);
static Interactable::WallObject Get(const Tile& T); static Interactable::WallObject Get(const Tile& T);
static Interactable::WallObject Get(std::int32_t ID); static Interactable::WallObject Get(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::WallObject Get(const std::string& Name); static Interactable::WallObject Get(const std::string& Name, std::int32_t Distance = -1);
static Interactable::WallObject Get(const std::vector<std::int32_t>& IDs); static Interactable::WallObject Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::WallObject Get(const std::vector<std::string>& Names); static Interactable::WallObject Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
static Interactable::WallObject Get(const std::function<bool (const Interactable::WallObject&)>& Filter); static Interactable::WallObject Get(const std::function<bool (const Interactable::WallObject&)>& Filter, std::int32_t Distance = -1);
}; };
/** @} */ /** @} */

Binary file not shown.