Release 0.54

master
Kasi 2018-06-07 04:43:38 +01:00
parent 6890fbf4e2
commit ba06643d41
8 changed files with 166 additions and 43 deletions

View File

@ -3,6 +3,10 @@
#include "../../Include/Core/Types/Logger.hpp"
#ifndef VERBOSE_LOG_MACRO
#define VERBOSE Debug::Verbose << __PRETTY_FUNCTION__ << " > "
#endif // VERBOSE_LOG_MACRO
class Debug
{
public:

View File

@ -78,6 +78,8 @@ class Inventory
static bool InteractItemByIndex(std::int32_t Index, const std::vector<std::string>& Options);
static bool InteractItem(std::int32_t ID, const std::string& Option);
static bool InteractItem(const std::string& Name, const std::string& Option);
static bool InteractItem(std::int32_t ID, const std::vector<std::string>& Options);
static bool InteractItem(const std::string& Name, const std::vector<std::string>& Options);
static bool InteractItem(const std::vector<std::int32_t>& IDs, const std::vector<std::string>& Options); //Interacts with first found ID
static bool InteractItem(const std::vector<std::string>& Names, const std::vector<std::string>& Options); //Interacts with first found Name

View File

@ -42,14 +42,6 @@ class Mainscreen
static bool IsUpText(const std::vector<std::string>& UpTexts);
static bool WaitIsUpText(std::uint32_t Duration, std::uint32_t Step, const std::string& UpText);
static bool WaitUpTextContains(std::uint32_t Duration, std::uint32_t Step, const std::string& UpText);
static std::int32_t GetCameraX();
static std::int32_t GetCameraY();
static std::int32_t GetCameraZ();
static std::int32_t GetCameraPitch();
static std::int32_t GetCameraYaw();
static bool SetCameraPitch(std::int32_t Pitch);
};
/** @} */

View File

@ -11,24 +11,53 @@
class Minimap
{
public:
/**
* @brief Returns the middle point of the minimap
*
* @return the middle point of the minimap
*/
static Point GetMiddle();
static Tile GetPosition();
/**
* @brief Returns the plane the local player is on
*
* @return the plane the local player is on
*/
static std::int32_t GetPlane();
static std::int32_t GetPositionX();
static std::int32_t GetPositionY();
/**
* @brief Returns the tile the local player is on
*
* @return the tile the local player is on
*/
static Tile GetPosition();
/**
* @brief Returns the tile of the local players destination
*
* @return the tile of the local players destination
*/
static Tile GetDestination();
static std::int32_t GetDestinationX();
static std::int32_t GetDestinationY();
static bool CloseTo(Tile T, std::int32_t Distance);
static bool TileOnMM(Tile T);
/**
* @brief Returns true if the local players position is close to the passed tile, uses pixels as distance
*
* @param T tile to check
* @param Distance in pixels
* @return true if the local players position is close to the passed tile
*/
static bool IsCloseTo(const Tile& T, std::int32_t Distance);
/**
* @brief Returns true if the passed tile is on the minimap
*
* @param T tile to check
* @return true if the passed tile is on the minimap
*/
static bool IsTileOn(const Tile& T);
static double GetCompassAngle();
// Angle - Calculates the angle you the tile to be in relation to your player, 0 = north, 90 = east, 180 = south, 270 = west
static void RotateTo(const Tile& T, std::int32_t Angle = 0);
static void RotateCompass(std::int32_t Degrees);
/**
* @brief Clicks on the minimap compass to quickly face North
*
* @return true if the function succesfully clicks the compass, and the camera angle is 0 / North
*/
static bool ClickCompass(); // Clicks north
};
/** @} */

View File

@ -20,7 +20,7 @@ class NPCs
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 (Interactable::NPC&)>& Filter);
static std::vector<Interactable::NPC> GetAll(const std::function<bool (const Interactable::NPC&)>& Filter);
static Interactable::NPC Get();
static Interactable::NPC Get(const Tile& Tile);
@ -28,7 +28,7 @@ class NPCs
static Interactable::NPC Get(const std::string& Name);
static Interactable::NPC Get(const std::vector<std::int32_t>& IDs);
static Interactable::NPC Get(const std::vector<std::string>& Names);
static Interactable::NPC Get(const std::function<bool (Interactable::NPC&)>& Filter);
static Interactable::NPC Get(const std::function<bool (const Interactable::NPC&)>& Filter);
};
/** @} */

View File

@ -0,0 +1,116 @@
#ifndef CAMERA_HPP_INCLUDED
#define CAMERA_HPP_INCLUDED
#include "../../Core/Types/Tile.hpp"
#include <cstdint>
/** @addtogroup Tools
* @{ */
class Camera
{
public:
typedef enum COMPASS_DIRECTION
{
NORTH = 0,
EAST = 90,
SOUTH = 180,
WEST = 270
} COMPASS_DIRECTION;
typedef enum CAMERA_PITCH
{
LOWEST = 128,
MIDDLE = 191,
HIGHEST = 383
} CAMERA_PITCH;
/**
* @brief Returns the cameras X
*
* @return Camera X
*/
static std::int32_t GetX();
/**
* @brief Returns the cameras Z
*
* @return Camera Z
*/
static std::int32_t GetY();
/**
* @brief Returns the cameras Z
*
* @return Camera Z
*/
static std::int32_t GetZ();
/**
* @brief Returns the cameras Yaw
*
* @return Camera Yaw
*/
static std::int32_t GetYaw();
/**
* @brief Returns the camera/compass angle in degrees
*
* @return the camera/compass angle in degrees
*/
static double GetAngle();
/**
* @brief Returns the camera pitch
*
* @return the camera pitch
*/
static std::int32_t GetPitch();
/**
* @brief Rotates the camera to the passed angle/degree
*
* @param Angle or degree
* @return true if it rotates within (+/-) 10 of the passed angle
*/
static bool RotateTo(std::int32_t Angle);
/**
* @brief Rotates the camera to the passed direction (Camera::NORTH/EAST/SOUTH/WEST)
*
* @param Direction Camera::NORTH / EAST / SOUTH / WEST
* @return true if it rotates within (+/-) 10 of the passed direction
*/
static bool RotateTo(COMPASS_DIRECTION Direction);
/**
* @brief Rotates the camera to the passed tile, with an optional desired Angle
*
* @param T tile to rotate to
* @param Angle optional desired angle of where the tile should be in relation to the player, defaulted to 0 or North
* @return true if it rotates within (+/-) 10 of the passed tile and angle
*/
static bool RotateTo(const Tile& T, std::int32_t Angle = 0);
/**
* @brief Rotates the camera to the passed tile, with an optional desired direction
*
* @param T tile to rotate to
* @param Direction optional desired angle of where the tile should be in relation to the player (NORTH/EAST/SOUTH/WEST), defaulted to North
* @return true if it rotates within (+/-) 10 of the passed tile and direction
*/
static bool RotateTo(const Tile& T, COMPASS_DIRECTION Direction = NORTH);
/**
* @brief Sets the pitch of the camera
*
* @param Pitch desired pitch
* @return true if the camera sets the pitch (+/-) 10 of the passed pitch
*/
static bool SetPitch(std::int32_t Pitch);
/**
* @brief Sets the pitch of the camera
*
* @param Pitch desired pitch (Camera::LOWEST/MIDDLE/HIGHEST)
* @return true if the camera sets the pitch (+/-) 10 of the passed pitch
*/
static bool SetPitch(CAMERA_PITCH Pitch);
};
/** @} */
#endif // CAMERA_HPP_INCLUDED

View File

@ -1,20 +0,0 @@
#ifndef TOOLS_HPP_INCLUDED
#define TOOLS_HPP_INCLUDED
#include "../../Core/Classes/ItemInfo.hpp"
#include "../../Core/Classes/ItemContainer.hpp"
#include <cstdint>
#include <string>
/** @addtogroup Tools
* @{ */
class Tools
{
public:
};
/** @} */
#endif // TOOLS_HPP_INCLUDED

Binary file not shown.