Release 0.31

master
Kasi 2018-04-18 06:50:40 +01:00
parent b86b17e665
commit 3948808f49
9 changed files with 66 additions and 4 deletions

View File

@ -11,6 +11,7 @@ class Debug
static Logger Warning; static Logger Warning;
static Logger Error; static Logger Error;
static Logger Fatal; static Logger Fatal;
static Logger Internal;
static void ShowConsole(); static void ShowConsole();
static void HideConsole(); static void HideConsole();

View File

@ -55,7 +55,6 @@ void ScrollUp();
void ScrollDown(); void ScrollDown();
void MouseDown(std::int32_t B); void MouseDown(std::int32_t B);
void MouseUp(std::int32_t B); void MouseUp(std::int32_t B);
void MouseClick(std::int32_t B);
void MouseMove(Point P); void MouseMove(Point P);
void MouseMove(std::int32_t X, std::int32_t Y); void MouseMove(std::int32_t X, std::int32_t Y);
void KeyDown(std::int32_t K); void KeyDown(std::int32_t K);

View File

@ -17,6 +17,7 @@
#include "Interfaces/Mainscreen.hpp" #include "Interfaces/Mainscreen.hpp"
#include "Interfaces/Menu.hpp" #include "Interfaces/Menu.hpp"
#include "Interfaces/Minimap.hpp" #include "Interfaces/Minimap.hpp"
#include "Interfaces/Trade.hpp"
#include "Interfaces/GameTabs/Clan.hpp" #include "Interfaces/GameTabs/Clan.hpp"
#include "Interfaces/GameTabs/Combat.hpp" #include "Interfaces/GameTabs/Combat.hpp"
#include "Interfaces/GameTabs/Emotes.hpp" #include "Interfaces/GameTabs/Emotes.hpp"

View File

@ -0,0 +1,35 @@
#ifndef INTERACTABLEGROUNDITEM_HPP_INCLUDED
#define INTERACTABLEGROUNDITEM_HPP_INCLUDED
#include "../../Core/Classes/GroundItem.hpp"
#include "../../Core/Classes/ObjectInfo.hpp"
#include "../../Core/Types/Tile.hpp"
#include "../../Core/Types/Point.hpp"
#include "../../Core/Types/Convex.hpp"
#include <cstdint>
namespace Interactable
{
class GroundItem : public Internal::GroundItem
{
private:
std::int32_t X;
std::int32_t Y;
public:
GroundItem(const Internal::GroundItem& G);
GroundItem(const Internal::GroundItem& G, std::int32_t X, std::int32_t Y);
GroundItem(const GroundItem& G);
std::int32_t GetID() const;
std::string GetName() const;
Tile GetTile() const;
Internal::ObjectInfo GetInfo() const;
std::vector<Point> GetModel() const;
Convex GetConvex() const;
operator Internal::GroundItem() const;
};
}
#endif // INTERACTABLEGROUNDITEM_HPP_INCLUDED

View File

@ -23,6 +23,7 @@ namespace Interactable
Internal::Character GetInteracting() const; Internal::Character GetInteracting() const;
bool Interacting() const; bool Interacting() const;
bool Interacting(const Internal::Character& C) const; bool Interacting(const Internal::Character& C) const;
bool Interact(const std::string& Option) const;
operator Internal::Player() const; operator Internal::Player() const;
}; };

View File

@ -16,6 +16,7 @@ class Menu
static bool Open(); static bool Open();
static std::int32_t GetCount(); static std::int32_t GetCount();
static std::vector<std::string> GetActionsRaw();
static std::vector<std::string> GetActions(); static std::vector<std::string> GetActions();
static std::vector<std::string> GetTargetsRaw(); static std::vector<std::string> GetTargetsRaw();
static std::vector<std::string> GetTargets(); static std::vector<std::string> GetTargets();

View File

@ -0,0 +1,24 @@
#ifndef TRADE_HPP_INCLUDED
#define TRADE_HPP_INCLUDED
#include <cstdint>
#include <vector>
#include <string>
class Trade
{
public:
static bool IsOpen();
static std::vector<std::int32_t> GetYourOfferItemIDs();
static std::vector<std::string> GetYourOfferItemNames();
static std::vector<std::int32_t> GetYourOfferItemAmounts();
static std::vector<std::int32_t> GetTheirOfferItemIDs();
static std::vector<std::string> GetTheirOfferItemNames();
static std::vector<std::int32_t> GetTheirOfferItemAmounts();
};
#endif // TRADE_HPP_INCLUDED

View File

@ -60,12 +60,12 @@ class Widgets
* @brief Returns the specified Widget by Parent ID * @brief Returns the specified Widget by Parent ID
* @code std::vector<Internal::Widget> BankParent = Widgets::Get(15); @endcode * @code std::vector<Internal::Widget> BankParent = Widgets::Get(15); @endcode
*/ */
static std::vector<Internal::Widget> Get(std::int32_t Parent); static std::vector<Internal::Widget> GetAll(std::int32_t Parent);
/** /**
* @brief Returns the specified Widget by Parent, and Child ID * @brief Returns the specified Widget by Parent, and Child ID
* @code Widget BankInventory = Widgets::Get(15, 3); @endcode * @code Widget BankInventory = Widgets::Get(15, 3); @endcode
*/ */
static Internal::Widget Get(std::int32_t Parent, std::int32_t Child); static Internal::Widget Get(std::int32_t Parent, std::int32_t Child = -1);
/** /**
* @brief Returns the specified Widget by Parent, and Child, and Grandchild ID * @brief Returns the specified Widget by Parent, and Child, and Grandchild ID
* @code Widget BankCloseButton = Widgets::Get(12, 3, 11); @endcode * @code Widget BankCloseButton = Widgets::Get(12, 3, 11); @endcode
@ -78,7 +78,7 @@ class Widgets
* std::vector<Widget> Widgets = Widgets::Get(WTextEquals); @endcode * std::vector<Widget> Widgets = Widgets::Get(WTextEquals); @endcode
* Will return all Widgets whose Text equals Enter Amount * Will return all Widgets whose Text equals Enter Amount
*/ */
static std::vector<Internal::Widget> Get(const std::function<bool (Internal::Widget&)>& Filter); static std::vector<Internal::Widget> GetAll(const std::function<bool (Internal::Widget&)>& Filter);
}; };

Binary file not shown.