AlpacaBot
/
AlpacaLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Release 1.27

master
Kasi 2019-05-31 21:06:57 +01:00
parent 00928dc173
commit fa12d77f44
53 changed files with 89 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Include/Core/Globals.hpp
View File

@ -89,11 +89,13 @@ namespace Globals
std::int32_t ContentChild = -1; std::int32_t ContentChild = -1;
} ChatWidgetDef; } ChatWidgetDef;
const ChatWidgetDef CHAT_NPC_CHAT_WIDGETS = { 231, 2, 3, 4 }; const ChatWidgetDef CHAT_NPC_CHAT_WIDGETS = { 231, 2, 3, 4 }; // Appears when a NPC is talking (NPC head is visible in dialogue)
const ChatWidgetDef CHAT_PLAYER_CHAT_WIDGETS = { 217, 2, 3, 4 }; const ChatWidgetDef CHAT_PLAYER_CHAT_WIDGETS = { 217, 2, 3, 4 }; // Appears when a Player is talking (Player head is visible in dialogue)
const ChatWidgetDef CHAT_GAME_CHAT_WIDGETS = { 193, 2, 3, 4 }; const ChatWidgetDef CHAT_GAME_CHAT_WIDGETS = { 193, 2, 3, 4 }; // Unknown
const ChatWidgetDef CHAT_LEVEL_UP_CHAT_WIDGETS = { 233, 1, 3, 2 }; const ChatWidgetDef CHAT_LEVEL_UP_CHAT_WIDGETS = { 233, 1, 3, 2 }; // Appears when leveling up
const ChatWidgetDef CHAT_BANK_PIN_ERROR_WIDGETS = { 229, 1, 2 }; const ChatWidgetDef CHAT_BANK_PIN_ERROR_WIDGETS = { 229, 1, 2 }; // Appears when entering the bank pin wrong
const WidgetDef CHAT_QUEST_DIALOGUE_CONTINUE = { 193, 0, 2 }; // Quest dialogues
const WidgetDef CHAT_QUEST_DIALOGUE_CONTENT = { 193, 2 }; // Quest dialogues
const WidgetDef CHAT_SELECT_OPTION_CONTAINER = { 219, 1 }; // Container for all Select Option options const WidgetDef CHAT_SELECT_OPTION_CONTAINER = { 219, 1 }; // Container for all Select Option options
const WidgetDef CHAT_SELECT_OPTION_TITLE = { CHAT_SELECT_OPTION_CONTAINER.Parent, CHAT_SELECT_OPTION_CONTAINER.Child, 0 }; const WidgetDef CHAT_SELECT_OPTION_TITLE = { CHAT_SELECT_OPTION_CONTAINER.Parent, CHAT_SELECT_OPTION_CONTAINER.Child, 0 };
@ -223,9 +225,9 @@ namespace Globals
//************ Combat.cpp ************// //************ Combat.cpp ************//
const std::int32_t COMBAT_PARENT = 593 ; const std::int32_t COMBAT_PARENT = 593 ;
const WidgetDef COMBAT_AUTORETALIATE = { COMBAT_PARENT, 29 }; const WidgetDef COMBAT_AUTORETALIATE = { COMBAT_PARENT, 30 };
const WidgetDef COMBAT_SPECIAL = { COMBAT_PARENT, 34 }; const WidgetDef COMBAT_SPECIAL = { COMBAT_PARENT, 36 };
const std::int32_t COMBAT_STYLE_CHILDREN[4] = { 3, 7, 11, 15 }; // Uses COMBAT_PARENT as Parent const std::int32_t COMBAT_STYLE_CHILDREN[4] = { 4, 8, 12, 16 }; // Uses COMBAT_PARENT as Parent
//************ Equipment.cpp ************// //************ Equipment.cpp ************//
const std::int32_t EQUIPMENT_CONTAINER_ID = 94; const std::int32_t EQUIPMENT_CONTAINER_ID = 94;

5
Include/Core/Math.hpp
View File

@ -5,9 +5,6 @@
#include <vector> #include <vector>
#include "Types/Point.hpp" #include "Types/Point.hpp"
/** @addtogroup Math
* @{ */
std::int32_t BinomialRandom(std::int32_t Min, std::int32_t Max, double Probability); std::int32_t BinomialRandom(std::int32_t Min, std::int32_t Max, double Probability);
std::int32_t UniformRandom(std::int32_t Min, std::int32_t Max); std::int32_t UniformRandom(std::int32_t Min, std::int32_t Max);
double UniformRandom(); double UniformRandom();
@ -16,6 +13,4 @@ std::int32_t NormalRandom(std::int32_t Low, std::int32_t High, double Percentage
void GetLine(Point A, Point B, std::vector<Point>* Res); void GetLine(Point A, Point B, std::vector<Point>* Res);
std::vector<Point> ConvexHull(std::vector<Point> Points); std::vector<Point> ConvexHull(std::vector<Point> Points);
/** @} */
#endif // MATH_HPP_INCLUDED #endif // MATH_HPP_INCLUDED

4
Include/Core/Paint.hpp
View File

@ -5,8 +5,6 @@
#include "Types/Convex.hpp" #include "Types/Convex.hpp"
#include "Types/Tile.hpp" #include "Types/Tile.hpp"
/** @addtogroup Core
* @{ */
namespace Paint namespace Paint
{ {
struct Pixel struct Pixel
@ -34,6 +32,4 @@ namespace Paint
void SwapBuffer(); void SwapBuffer();
} }
/** @} */
#endif // PAINT_HPP_INCLUDED #endif // PAINT_HPP_INCLUDED

5
Include/Core/Time.hpp
View File

@ -4,9 +4,6 @@
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>
/** @addtogroup Time
* @{ */
void Wait(std::int64_t Duration); void Wait(std::int64_t Duration);
std::uint64_t CurrentTimeMillis(); std::uint64_t CurrentTimeMillis();
std::uint64_t CurrentTimeNanos(); std::uint64_t CurrentTimeNanos();
@ -16,6 +13,4 @@ std::string MillisToHumanShort(std::int64_t Millseconds); // HH:MM:SS
std::string MillisToHumanMedium(std::int64_t Milliseconds); // 1h 30m 50s std::string MillisToHumanMedium(std::int64_t Milliseconds); // 1h 30m 50s
std::string MillisToHumanLong(std::int64_t Millseconds); // Hours, Minutes, Seconds std::string MillisToHumanLong(std::int64_t Millseconds); // Hours, Minutes, Seconds
/** @} */
#endif // TIME_HPP_INCLUDED #endif // TIME_HPP_INCLUDED

4
Include/Core/Types/Area.hpp
View File

@ -6,8 +6,6 @@
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
/** @addtogroup Types
* @{ */
class Area class Area
{ {
private: private:
@ -34,6 +32,4 @@ class Area
~Area(); ~Area();
}; };
/** @} */
#endif // AREA_HPP_INCLUDED #endif // AREA_HPP_INCLUDED

4
Include/Core/Types/Box.hpp
View File

@ -7,8 +7,6 @@
class Point; class Point;
/** @addtogroup Types
* @{ */
class Box class Box
{ {
public: public:
@ -151,6 +149,4 @@ class Box
~Box(); ~Box();
}; };
/** @} */
#endif // BOX_HPP_INCLUDED #endif // BOX_HPP_INCLUDED

4
Include/Core/Types/Convex.hpp
View File

@ -5,8 +5,6 @@
#include "Point.hpp" #include "Point.hpp"
#include "Box.hpp" #include "Box.hpp"
/** @addtogroup Types
* @{ */
class Convex class Convex
{ {
public: public:
@ -31,6 +29,4 @@ class Convex
virtual ~Convex(); virtual ~Convex();
}; };
/** @} */
#endif // CONVEX_HPP_INCLUDED #endif // CONVEX_HPP_INCLUDED

4
Include/Core/Types/Countdown.hpp
View File

@ -4,8 +4,6 @@
#include <iostream> #include <iostream>
#include <cstdint> #include <cstdint>
/** @addtogroup Types
* @{ */
class Countdown class Countdown
{ {
public: public:
@ -26,6 +24,4 @@ class Countdown
std::uint64_t StartTime; std::uint64_t StartTime;
}; };
/** @} */
#endif // COUNTDOWN_HPP_INCLUDED #endif // COUNTDOWN_HPP_INCLUDED

4
Include/Core/Types/Counter.hpp
View File

@ -4,8 +4,6 @@
#include <iostream> #include <iostream>
#include <cstdint> #include <cstdint>
/** @addtogroup Types
* @{ */
class Counter class Counter
{ {
public: public:
@ -25,6 +23,4 @@ class Counter
std::int32_t Iterations; std::int32_t Iterations;
}; };
/** @} */
#endif // COUNTER_HPP_INCLUDED #endif // COUNTER_HPP_INCLUDED

4
Include/Core/Types/Logger.hpp
View File

@ -4,8 +4,6 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
/** @addtogroup Types
* @{ */
class Logger : public std::ostream, public std::streambuf class Logger : public std::ostream, public std::streambuf
{ {
public: public:
@ -29,6 +27,4 @@ class Logger : public std::ostream, public std::streambuf
bool NewLine = true; bool NewLine = true;
}; };
/** @} */
#endif // LOGGER_HPP_INCLUDED #endif // LOGGER_HPP_INCLUDED

4
Include/Core/Types/Point.hpp
View File

@ -6,8 +6,6 @@
class Box; class Box;
/** @addtogroup Types
* @{ */
class Point class Point
{ {
public: public:
@ -82,6 +80,4 @@ class Point
~Point(); ~Point();
}; };
/** @} */
#endif // POINT_HPP_INCLUDED #endif // POINT_HPP_INCLUDED

4
Include/Core/Types/Tile.hpp
View File

@ -4,8 +4,6 @@
#include <iostream> #include <iostream>
#include <cstdint> #include <cstdint>
/** @addtogroup Types
* @{ */
class Tile class Tile
{ {
public: public:
@ -75,6 +73,4 @@ class Tile
~Tile(); ~Tile();
}; };
/** @} */
#endif // TILE_HPP_INCLUDED #endif // TILE_HPP_INCLUDED

4
Include/Core/Types/Timer.hpp
View File

@ -4,8 +4,6 @@
#include <iostream> #include <iostream>
#include <cstdint> #include <cstdint>
/** @addtogroup Types
* @{ */
class Timer class Timer
{ {
public: public:
@ -83,6 +81,4 @@ class Timer
std::int64_t Offset; std::int64_t Offset;
}; };
/** @} */
#endif // TIMER_HPP_INCLUDED #endif // TIMER_HPP_INCLUDED

43
Include/Game/Core.hpp
View File

@ -62,47 +62,4 @@
#include "Interactable/WallObject.hpp" #include "Interactable/WallObject.hpp"
#include "Interactable/Widget.hpp" #include "Interactable/Widget.hpp"
//=======================================================
// Groups
//=======================================================
/**
* @defgroup Core Core
*
* @defgroup Types Types
* @brief @b Types Module
* @ingroup Core
*
* @defgroup Math Math
* @brief @b Math Module
* @ingroup Core
*
* @defgroup Time Time
* @brief @b Time Module
* @ingroup Core
*
* @defgroup Game Game
*
* @defgroup Interfaces Interfaces
* @brief @b Interfaces Module
* @ingroup Game
*
* @defgroup Models Models
* @brief @b Models Module
* @ingroup Game
*
* @defgroup Tools Tools
* @brief @b Tools Module
* @ingroup Game
*
*/
//=======================================================
// SubGroups
//=======================================================
/**
* @defgroup GameTabs GameTabs
* @brief @b GameTabs Module
* @ingroup Interfaces
*
**/
#endif // CORE_HPP_INCLUDED #endif // CORE_HPP_INCLUDED

5
Include/Game/Interfaces/Bank.hpp
View File

@ -8,9 +8,6 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
/** @addtogroup Interfaces
* @{
*/
namespace Bank namespace Bank
{ {
enum BANK_AMOUNT enum BANK_AMOUNT
@ -115,6 +112,4 @@ namespace Bank
bool SetDefaultWithdrawQuantity(std::int32_t Amount); bool SetDefaultWithdrawQuantity(std::int32_t Amount);
} }
/** @} */
#endif // BANK_HPP_INCLUDED #endif // BANK_HPP_INCLUDED

75
Include/Game/Interfaces/Chat.hpp
View File

@ -6,8 +6,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
/** @addtogroup Interfaces
* @{ */
namespace Chat namespace Chat
{ {
typedef enum DIALOGUE_STATE typedef enum DIALOGUE_STATE
@ -22,34 +20,67 @@ namespace Chat
typedef enum CHAT_TYPE typedef enum CHAT_TYPE
{ {
SERVER = 0, /** Game message */
PUBLIC_MOD = 1, GAME_MESSAGE = 0,
/** Public chat message from a moderator */
MOD = 1,
/** Public chat message */
PUBLIC = 2, PUBLIC = 2,
PRIVATE_MESSAGE_RECEIVED = 3, /** Private message from another player */
TRADE_RECEIVED = 4, PRIVATE = 3,
PRIVATE_MESSAGE_INFO = 5, ENGINE = 4,
PRIVATE_MESSAGE_SENT = 6, /** Received when a friend logs in or out */
PRIVATE_MESSAGE_RECEIVED_MOD = 7, LOGIN_LOGOUT_NOTIFICATION = 5,
CLANCHAT = 9, /** Private message sent to another player */
CLANCHAT_INFO = 11, PRIVATE_OUT = 6,
/** Private message received from a moderator */
MOD_PRIVATE = 7,
/** Clan chat message */
FRIENDS = 9,
/** Message with information about the current clan chat */
FRIENDS_NOTIFICATION = 11,
/** Trade request being sent */
TRADE_SENT = 12, TRADE_SENT = 12,
ABUSE_REPORT = 26, /** Game broadcast */
BROADCAST = 14,
/** Abuse report submitted */
SNAPSHOT_FEEDBACK = 26,
/** Examine item message */
EXAMINE_ITEM = 27, EXAMINE_ITEM = 27,
/** Examine NPC message */
EXAMINE_NPC = 28, EXAMINE_NPC = 28,
EXAMINE_OBJECT = 29, /** Examine object message */
FRIENDS_LIST_ADD = 30, EXAMINE_OBJ = 29,
IGNORE_LIST_ADD = 31, /** Message sent when adding a player to friends list */
AUTOCHAT = 90, FRIEND_NOTIFICATION = 30,
GAME = 99, /** Message sent when adding a player to ignore list */
TRADE = 101, IGNORE_NOTIFICATION = 31,
DUEL = 103, /** Autotyper message from a player */
FILTERED = 105, AUTOTYPER = 90,
ACTION = 109, /** Autotyper message from a moderator */
MOD_AUTOTYPER = 91,
/** Message sent typically when a setting changes */
CONSOLE = 99,
/** Message recieved when another sends a trade offer to the local player */
TRADE_REQUEST = 101,
/** Message recieved when completing a trade or duel */
TRADE = 102,
/** Message received when somebody sends a duel offer */
CHALREQ_TRADE = 103,
/** Message received when another player sends a clan challenge offer */
CHALREQ_FRIENDS = 104,
/** Filtered message */
SPAM = 105,
PLAYER_RELATED = 106,
TENSEC_TIMEOUT = 107,
UNKNOWN = -1 UNKNOWN = -1
} CHAT_TYPE; } CHAT_TYPE;
std::vector<Internal::MessageNode> GetMessages(bool Sort = true);
std::vector<Internal::MessageNode> GetMessages(CHAT_TYPE Type, bool Sort = true); std::vector<Internal::MessageNode> GetMessages(CHAT_TYPE Type, bool Sort = true);
std::vector<Internal::MessageNode> GetMessages(const std::vector<CHAT_TYPE>& Type, bool Sort = true); std::vector<Internal::MessageNode> GetMessages(const std::vector<CHAT_TYPE>& Type, bool Sort = true);
Internal::MessageNode GetLastMessage();
Internal::MessageNode GetLastMessage(CHAT_TYPE Type); Internal::MessageNode GetLastMessage(CHAT_TYPE Type);
DIALOGUE_STATE GetDialogueState(); DIALOGUE_STATE GetDialogueState();
@ -70,6 +101,4 @@ namespace Chat
bool WaitDialogueState(std::uint32_t Duration, std::uint32_t Step, Chat::DIALOGUE_STATE State, bool Result = true); // Waits until the current chat state equals State bool WaitDialogueState(std::uint32_t Duration, std::uint32_t Step, Chat::DIALOGUE_STATE State, bool Result = true); // Waits until the current chat state equals State
} }
/** @} */
#endif // CHAT_HPP_INCLUDED #endif // CHAT_HPP_INCLUDED

4
Include/Game/Interfaces/DepositBox.hpp
View File

@ -1,8 +1,6 @@
#ifndef DEPOSITBOX_HPP #ifndef DEPOSITBOX_HPP
#define DEPOSITBOX_HPP #define DEPOSITBOX_HPP
/** @addtogroup Interfaces
* @{ */
namespace DepositBox namespace DepositBox
{ {
bool IsOpen(); bool IsOpen();
@ -13,6 +11,4 @@ namespace DepositBox
bool DepositLoot(); bool DepositLoot();
} }
/** @} */
#endif // DEPOSITBOX_HPP #endif // DEPOSITBOX_HPP

4
Include/Game/Interfaces/Exchange.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#include <functional> #include <functional>
/** @addtogroup Interfaces
* @{ */
namespace Exchange namespace Exchange
{ {
typedef std::int32_t SLOT; typedef std::int32_t SLOT;
@ -112,6 +110,4 @@ namespace Exchange
bool OpenOffer(const Exchange::SLOT Slot); bool OpenOffer(const Exchange::SLOT Slot);
} }
/** @} */
#endif // EXCHANGE_HPP_INCLUDED #endif // EXCHANGE_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/AccountManagement.hpp
View File

@ -3,15 +3,11 @@
#include <cstdint> #include <cstdint>
/** @addtogroup GameTabs
* @{ */
namespace AccountManagement namespace AccountManagement
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
} }
/** @} */
#endif // ACCOUNTMANAGEMENT_HPP_INCLUDED #endif // ACCOUNTMANAGEMENT_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Clan.hpp
View File

@ -5,17 +5,13 @@
#include <functional> #include <functional>
#include <vector> #include <vector>
/** @addtogroup GameTabs
* @{ */
namespace Clan namespace Clan
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
std::vector<Internal::ClanMember> GetAll(); std::vector<Internal::ClanMember> GetAll();
std::vector<Internal::ClanMember> GetAll(const std::function<bool (Internal::ClanMember&)>& Filter); std::vector<Internal::ClanMember> GetAll(const std::function<bool (Internal::ClanMember&)>& Filter);
} }
/** @} */
#endif // CLAN_HPP_INCLUDED #endif // CLAN_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Combat.hpp
View File

@ -4,12 +4,10 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
/** @addtogroup GameTabs
* @{ */
namespace Combat namespace Combat
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
std::int32_t GetHealth(); std::int32_t GetHealth();
@ -33,6 +31,4 @@ namespace Combat
bool SetStyle(std::int32_t Index); bool SetStyle(std::int32_t Index);
} }
/** @} */
#endif // COMBAT_HPP_INCLUDED #endif // COMBAT_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Emotes.hpp
View File

@ -3,15 +3,11 @@
#include <cstdint> #include <cstdint>
/** @addtogroup GameTabs
* @{ */
namespace Emotes namespace Emotes
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
} }
/** @} */
#endif // EMOTES_HPP_INCLUDED #endif // EMOTES_HPP_INCLUDED

7
Include/Game/Interfaces/GameTabs/Equipment.hpp
View File

@ -7,8 +7,6 @@
#include <string> #include <string>
#include <functional> #include <functional>
/** @addtogroup GameTabs
* @{ */
namespace Equipment namespace Equipment
{ {
typedef enum SLOT typedef enum SLOT
@ -27,7 +25,7 @@ namespace Equipment
} SLOT; } SLOT;
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
bool IsEmpty(); bool IsEmpty();
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
@ -79,11 +77,10 @@ namespace Equipment
bool ContainsOnly(const std::vector<std::string>& Names); bool ContainsOnly(const std::vector<std::string>& Names);
bool ContainsOnly(const std::vector<Interactable::Item>& Items); bool ContainsOnly(const std::vector<Interactable::Item>& Items);
bool Unequip(SLOT Slot);
bool Unequip(std::int32_t ID); bool Unequip(std::int32_t ID);
bool Unequip(const std::string& Name); bool Unequip(const std::string& Name);
bool Unequip(const Interactable::Item& Item); bool Unequip(const Interactable::Item& Item);
} }
/** @} */
#endif // EQUIPMENT_HPP_INCLUDED #endif // EQUIPMENT_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Friends.hpp
View File

@ -5,17 +5,13 @@
#include <functional> #include <functional>
#include <vector> #include <vector>
/** @addtogroup GameTabs
* @{ */
namespace Friends namespace Friends
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
std::vector<Internal::Friend> GetAll(); std::vector<Internal::Friend> GetAll();
std::vector<Internal::Friend> GetAll(const std::function<bool (Internal::Friend&)>& Filter); std::vector<Internal::Friend> GetAll(const std::function<bool (Internal::Friend&)>& Filter);
} }
/** @} */
#endif // FRIENDS_HPP_INCLUDED #endif // FRIENDS_HPP_INCLUDED

4
Include/Game/Interfaces/GameTabs/Ignores.hpp
View File

@ -5,8 +5,6 @@
#include <functional> #include <functional>
#include <vector> #include <vector>
/** @addtogroup GameTabs
* @{ */
namespace Ignores namespace Ignores
{ {
bool IsOpen(); bool IsOpen();
@ -16,6 +14,4 @@ namespace Ignores
std::vector<Internal::Ignore> GetAll(const std::function<bool (Internal::Ignore&)>& Filter); std::vector<Internal::Ignore> GetAll(const std::function<bool (Internal::Ignore&)>& Filter);
} }
/** @} */
#endif // IGNORES_HPP_INCLUDED #endif // IGNORES_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Inventory.hpp
View File

@ -9,12 +9,10 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
/** @addtogroup GameTabs
* @{ */
namespace Inventory namespace Inventory
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
std::vector<std::int32_t> GetItemIDs(); std::vector<std::int32_t> GetItemIDs();
@ -99,6 +97,4 @@ namespace Inventory
bool Drop(const Interactable::Item& Item, bool AllowShiftClick = true); bool Drop(const Interactable::Item& Item, bool AllowShiftClick = true);
} }
/** @} */
#endif // INVENTORY_HPP_INCLUDED #endif // INVENTORY_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Logout.hpp
View File

@ -7,12 +7,10 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
/** @addtogroup GameTabs
* @{ */
namespace Logout namespace Logout
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
bool LogoutPlayer(); bool LogoutPlayer();
@ -29,6 +27,4 @@ namespace Logout
Interactable::Widget GetWorldWidget(std::int32_t WorldID); Interactable::Widget GetWorldWidget(std::int32_t WorldID);
} }
/** @} */
#endif // LOGOUT_HPP_INCLUDED #endif // LOGOUT_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Magic.hpp
View File

@ -4,8 +4,6 @@
#include <string> #include <string>
#include <cstdint> #include <cstdint>
/** @addtogroup GameTabs
* @{ */
namespace Magic namespace Magic
{ {
typedef enum SPELL typedef enum SPELL
@ -195,7 +193,7 @@ namespace Magic
} SPELL; } SPELL;
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
bool HasLevel(const SPELL& Spell); bool HasLevel(const SPELL& Spell);
@ -210,6 +208,4 @@ namespace Magic
bool SelectSpell(const SPELL& Spell); bool SelectSpell(const SPELL& Spell);
} }
/** @} */
#endif // MAGIC_HPP_INCLUDED #endif // MAGIC_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Music.hpp
View File

@ -3,15 +3,11 @@
#include <cstdint> #include <cstdint>
/** @addtogroup GameTabs
* @{ */
namespace Music namespace Music
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
} }
/** @} */
#endif // MUSIC_HPP_INCLUDED #endif // MUSIC_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Options.hpp
View File

@ -3,12 +3,10 @@
#include <cstdint> #include <cstdint>
/** @addtogroup GameTabs
* @{ */
namespace Options namespace Options
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
bool GetAcceptAid(); bool GetAcceptAid();
@ -18,6 +16,4 @@ namespace Options
bool ToggleRunMode(bool Toggle); bool ToggleRunMode(bool Toggle);
} }
/** @} */
#endif // OPTIONS_HPP_INCLUDED #endif // OPTIONS_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Prayer.hpp
View File

@ -4,8 +4,6 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
/** @addtogroup GameTabs
* @{ */
namespace Prayer namespace Prayer
{ {
typedef enum PRAYERS typedef enum PRAYERS
@ -42,7 +40,7 @@ namespace Prayer
} PRAYERS; } PRAYERS;
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
std::int32_t GetPoints(); std::int32_t GetPoints();
bool HasLevel(PRAYERS Prayer); bool HasLevel(PRAYERS Prayer);
@ -53,6 +51,4 @@ namespace Prayer
bool Deactivate(PRAYERS Prayer); bool Deactivate(PRAYERS Prayer);
} }
/** @} */
#endif // PRAYER_HPP_INCLUDED #endif // PRAYER_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Quests.hpp
View File

@ -3,15 +3,11 @@
#include <cstdint> #include <cstdint>
/** @addtogroup GameTabs
* @{ */
namespace Quests namespace Quests
{ {
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
} }
/** @} */
#endif // QUESTS_HPP_INCLUDED #endif // QUESTS_HPP_INCLUDED

6
Include/Game/Interfaces/GameTabs/Stats.hpp
View File

@ -3,8 +3,6 @@
#include <cstdint> #include <cstdint>
/** @addtogroup GameTabs
* @{ */
namespace Stats namespace Stats
{ {
typedef enum SKILLS typedef enum SKILLS
@ -36,7 +34,7 @@ namespace Stats
} SKILLS; } SKILLS;
bool IsOpen(); bool IsOpen();
bool Open(); bool Open(bool UseHotkey = false);
std::int32_t GetTabHotkey(); std::int32_t GetTabHotkey();
std::int32_t GetWeight(); std::int32_t GetWeight();
std::int32_t GetRunEnergy(); std::int32_t GetRunEnergy();
@ -46,6 +44,4 @@ namespace Stats
std::int32_t GetExperienceTo(SKILLS Skill, std::int32_t Level); std::int32_t GetExperienceTo(SKILLS Skill, std::int32_t Level);
} }
/** @} */
#endif // STATS_HPP_INCLUDED #endif // STATS_HPP_INCLUDED

4
Include/Game/Interfaces/Login.hpp
View File

@ -8,8 +8,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
/** @addtogroup Interfaces
* @{ */
namespace Login namespace Login
{ {
typedef enum LOGIN_SCREEN_STATE typedef enum LOGIN_SCREEN_STATE
@ -74,6 +72,4 @@ namespace Login
} }
/** @} */
#endif // LOGIN_HPP_INCLUDED #endif // LOGIN_HPP_INCLUDED

4
Include/Game/Interfaces/Mainscreen.hpp
View File

@ -8,8 +8,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
/** @addtogroup Interfaces
* @{ */
/** /**
* @brief A namespace containing various functions related to the Mainscreen * @brief A namespace containing various functions related to the Mainscreen
*/ */
@ -147,6 +145,4 @@ namespace Mainscreen
std::vector<Box> GetBlockingWidgetBoxes(); std::vector<Box> GetBlockingWidgetBoxes();
} }
/** @} */
#endif // MAINSCREEN_HPP_INCLUDED #endif // MAINSCREEN_HPP_INCLUDED

4
Include/Game/Interfaces/Makescreen.hpp
View File

@ -4,8 +4,6 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
/** @addtogroup Interfaces
* @{ */
namespace Makescreen namespace Makescreen
{ {
enum MAKE_AMOUNT enum MAKE_AMOUNT
@ -38,6 +36,4 @@ namespace Makescreen
std::string GetCraftingName(); std::string GetCraftingName();
} }
/** @} */
#endif // MAKESCREEN_HPP_INCLUDED #endif // MAKESCREEN_HPP_INCLUDED

4
Include/Game/Interfaces/Menu.hpp
View File

@ -6,8 +6,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
/** @addtogroup Interfaces
* @{ */
/** /**
* @brief A namespace containing various functions for the right-click menu * @brief A namespace containing various functions for the right-click menu
*/ */
@ -305,6 +303,4 @@ namespace Menu
Box GetBox(); Box GetBox();
} }
/** @} */
#endif // MENU_HPP_INCLUDED #endif // MENU_HPP_INCLUDED

4
Include/Game/Interfaces/Minimap.hpp
View File

@ -7,8 +7,6 @@
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>
/** @addtogroup Interfaces
* @{ */
namespace Minimap namespace Minimap
{ {
/** /**
@ -88,6 +86,4 @@ namespace Minimap
bool IsReachable(const Tile& T); bool IsReachable(const Tile& T);
} }
/** @} */
#endif // MINIMAP_HPP_INCLUDED #endif // MINIMAP_HPP_INCLUDED

4
Include/Game/Models/DecorativeObjects.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
/** @addtogroup Models
* @{ */
namespace DecorativeObjects namespace DecorativeObjects
{ {
std::vector<Interactable::DecorativeObject> GetAllWithin(std::int32_t Distance); std::vector<Interactable::DecorativeObject> GetAllWithin(std::int32_t Distance);
@ -28,6 +26,4 @@ namespace DecorativeObjects
Interactable::DecorativeObject Get(const std::function<bool (const Interactable::DecorativeObject&)>& Filter, std::int32_t Distance = -1); Interactable::DecorativeObject Get(const std::function<bool (const Interactable::DecorativeObject&)>& Filter, std::int32_t Distance = -1);
} }
/** @} */
#endif // DECORATIVEOBJECTS_HPP_INCLUDED #endif // DECORATIVEOBJECTS_HPP_INCLUDED

4
Include/Game/Models/GameObjects.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
/** @addtogroup Models
* @{ */
namespace GameObjects namespace GameObjects
{ {
std::vector<Interactable::GameObject> GetAllWithin(std::int32_t Distance); std::vector<Interactable::GameObject> GetAllWithin(std::int32_t Distance);
@ -29,6 +27,4 @@ namespace GameObjects
Interactable::GameObject Get(const std::function<bool (const Interactable::GameObject&)>& Filter, std::int32_t Distance = -1); Interactable::GameObject Get(const std::function<bool (const Interactable::GameObject&)>& Filter, std::int32_t Distance = -1);
} }
/** @} */
#endif // GAMEOBJECTS_HPP_INCLUDED #endif // GAMEOBJECTS_HPP_INCLUDED

3
Include/Game/Models/GroundItems.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
/** @addtogroup Models
* @{ */
namespace GroundItems namespace GroundItems
{ {
std::vector<Interactable::GroundItem> GetAllWithin(std::int32_t Distance); std::vector<Interactable::GroundItem> GetAllWithin(std::int32_t Distance);
@ -28,6 +26,5 @@ namespace GroundItems
Interactable::GroundItem Get(const std::vector<std::string>& Names, std::int32_t Distance = -1); Interactable::GroundItem Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
Interactable::GroundItem Get(const std::function<bool (Interactable::GroundItem&)>& Filter, std::int32_t Distance = -1); Interactable::GroundItem Get(const std::function<bool (Interactable::GroundItem&)>& Filter, std::int32_t Distance = -1);
} }
/** @} */
#endif // GROUNDITEMS_HPP_INCLUDED #endif // GROUNDITEMS_HPP_INCLUDED

4
Include/Game/Models/GroundObjects.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
/** @addtogroup Models
* @{ */
namespace GroundObjects namespace GroundObjects
{ {
std::vector<Interactable::GroundObject> GetAllWithin(std::int32_t Distance); std::vector<Interactable::GroundObject> GetAllWithin(std::int32_t Distance);
@ -28,6 +26,4 @@ namespace GroundObjects
Interactable::GroundObject Get(const std::function<bool (const Interactable::GroundObject&)>& Filter, std::int32_t Distance = -1); Interactable::GroundObject Get(const std::function<bool (const Interactable::GroundObject&)>& Filter, std::int32_t Distance = -1);
} }
/** @} */
#endif // GROUNDOBJECTS_HPP_INCLUDED #endif // GROUNDOBJECTS_HPP_INCLUDED

4
Include/Game/Models/NPCs.hpp
View File

@ -7,9 +7,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
/** @addtogroup Models
* @{ */
namespace NPCs namespace NPCs
{ {
std::vector<Interactable::NPC> GetAllWithin(std::int32_t Distance); std::vector<Interactable::NPC> GetAllWithin(std::int32_t Distance);
@ -29,6 +26,5 @@ namespace NPCs
Interactable::NPC Get(const std::vector<std::string>& Names, std::int32_t Distance = -1); Interactable::NPC Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
Interactable::NPC Get(const std::function<bool (const Interactable::NPC&)>& Filter, std::int32_t Distance = -1); Interactable::NPC Get(const std::function<bool (const Interactable::NPC&)>& Filter, std::int32_t Distance = -1);
} }
/** @} */
#endif // NPCS_HPP_INCLUDED #endif // NPCS_HPP_INCLUDED

4
Include/Game/Models/Players.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
/** @addtogroup Models
* @{ */
namespace Players namespace Players
{ {
Interactable::Player GetLocal(); Interactable::Player GetLocal();
@ -26,6 +24,4 @@ namespace Players
Interactable::Player Get(const std::function<bool (const Interactable::Player&)>& Filter, std::int32_t Distance = -1); Interactable::Player Get(const std::function<bool (const Interactable::Player&)>& Filter, std::int32_t Distance = -1);
} }
/** @} */
#endif // PLAYERS_HPP_INCLUDED #endif // PLAYERS_HPP_INCLUDED

4
Include/Game/Models/WallObjects.hpp
View File

@ -7,8 +7,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
/** @addtogroup Models
* @{ */
namespace WallObjects namespace WallObjects
{ {
std::vector<Interactable::WallObject> GetAllWithin(std::int32_t Distance); std::vector<Interactable::WallObject> GetAllWithin(std::int32_t Distance);
@ -28,6 +26,4 @@ namespace WallObjects
Interactable::WallObject Get(const std::function<bool (const Interactable::WallObject&)>& Filter, std::int32_t Distance = -1); Interactable::WallObject Get(const std::function<bool (const Interactable::WallObject&)>& Filter, std::int32_t Distance = -1);
} }
/** @} */
#endif // WALLOBJECTS_HPP_INCLUDED #endif // WALLOBJECTS_HPP_INCLUDED

5
Include/Game/Tools/Camera.hpp
View File

@ -4,9 +4,6 @@
#include "../../Core/Types/Tile.hpp" #include "../../Core/Types/Tile.hpp"
#include <cstdint> #include <cstdint>
/** @addtogroup Tools
* @{ */
namespace Camera namespace Camera
{ {
typedef enum COMPASS_DIRECTION typedef enum COMPASS_DIRECTION
@ -115,6 +112,4 @@ namespace Camera
bool SetPitch(CAMERA_PITCH Pitch); bool SetPitch(CAMERA_PITCH Pitch);
} }
/** @} */
#endif // CAMERA_HPP_INCLUDED #endif // CAMERA_HPP_INCLUDED

4
Include/Game/Tools/Interact.hpp
View File

@ -7,8 +7,6 @@
#include <string> #include <string>
#include <cstdint> #include <cstdint>
/** @addtogroup Tools
* @{ */
namespace Interact namespace Interact
{ {
bool MoveMouse(const Point& P); bool MoveMouse(const Point& P);
@ -39,6 +37,4 @@ namespace Interact
bool TypeString(const std::string& String, bool PressEnter = false); bool TypeString(const std::string& String, bool PressEnter = false);
} }
/** @} */
#endif // INTERACT_HPP_INCLUDED #endif // INTERACT_HPP_INCLUDED

28
Include/Game/Tools/Pathfinding.hpp
View File

@ -63,11 +63,11 @@ namespace Pathfinding
/** @brief The collision flag associated with the node */ /** @brief The collision flag associated with the node */
std::int32_t Flag; std::int32_t Flag;
/** @brief <B> For pathfinding use only </B> */ /** @brief <B> For pathfinding use only </B> */
bool Inspected; bool Inspected = false;
/** @brief True if this node matches the whitelisted tiles set in Pathfinding */ /** @brief True if this node matches the whitelisted tiles set in Pathfinding */
bool MatchesWhitelist; bool MatchesWhitelist = false;
/** @brief True if this node matches the blacklisted tiles set in Pathfinding */ /** @brief True if this node matches the blacklisted tiles set in Pathfinding */
bool MatchesBlacklist; bool MatchesBlacklist = false;
/** @brief <B> For pathfinding use only </B> */ /** @brief <B> For pathfinding use only </B> */
std::int32_t Parent[2]; std::int32_t Parent[2];
TileNode(); TileNode();
@ -76,6 +76,8 @@ namespace Pathfinding
bool IsBlocked() const; bool IsBlocked() const;
/** @brief Adds ClientX/Y to the local X and Y coordinates of the node, returning a world tile */ /** @brief Adds ClientX/Y to the local X and Y coordinates of the node, returning a world tile */
Tile ToWorldTile() const; Tile ToWorldTile() const;
/** @brief Adds ClientX/Y to the local X and Y coordinates of the node, returning a world tile */
Tile ToWorldTile(std::int32_t ClientX, std::int32_t ClientY, std::int32_t ClientPlane) const;
bool operator==(const TileNode& N) const; bool operator==(const TileNode& N) const;
operator bool() const; operator bool() const;
}; };
@ -122,20 +124,14 @@ namespace Pathfinding
std::vector<Pathfinding::TileNode> FindNodePathTo(const std::vector<Tile>& Goals, std::vector<Pathfinding::TileNode> FindNodePathTo(const std::vector<Tile>& Goals,
std::int32_t Options = CHECK_COLLISION | CHECK_WHITELIST | CHECK_BLACKLIST, std::int32_t Options = CHECK_COLLISION | CHECK_WHITELIST | CHECK_BLACKLIST,
PATHFINDER Finder = BREADTH_FIRST_SEARCH); PATHFINDER Finder = BREADTH_FIRST_SEARCH);
/*private: //std::vector<std::vector<TileNode>> Nodes;
static std::vector<std::vector<TileNode>> Nodes; //std::vector<Tile> Whitelist;
static std::vector<Tile> Whitelist; //std::vector<Tile> Blacklist;
static std::vector<Tile> Blacklist;
static bool IsInside(std::uint32_t X, std::uint32_t Y); bool IsInside(std::int32_t X, std::int32_t Y);
static std::vector<Pathfinding::TileNode*> GetNeighborsTo(std::uint32_t X, std::uint32_t Y, bool CheckCollision = true); std::vector<Pathfinding::TileNode*> GetNeighborsTo(std::int32_t X, std::int32_t Y, bool CheckCollision = true);
std::vector<Pathfinding::TileNode> Finder_BFS(std::uint32_t StartX, std::uint32_t StartY, std::uint32_t EndX, std::uint32_t EndY, std::int32_t Options );
static std::vector<Pathfinding::TileNode> Finder_BFS( std::uint32_t StartX, std::uint32_t StartY, std::vector<Pathfinding::TileNode> Finder_BFS(std::uint32_t StartX, std::uint32_t StartY, const std::vector<std::pair<std::uint32_t, std::uint32_t>>& Ends, std::int32_t Options );
std::uint32_t EndX, std::uint32_t EndY,
std::int32_t Options );
static std::vector<Pathfinding::TileNode> Finder_BFS( std::uint32_t StartX, std::uint32_t StartY,
const std::vector<std::pair<std::uint32_t, std::uint32_t>>& Ends,
std::int32_t Options );*/
} }
#endif // PATHFINDING_HPP_INCLUDED #endif // PATHFINDING_HPP_INCLUDED

4
Include/Game/Tools/Profile.hpp
View File

@ -5,8 +5,6 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
/** @addtogroup Tools
* @{ */
namespace Profile namespace Profile
{ {
std::string GetUsername(); std::string GetUsername();
@ -126,6 +124,4 @@ namespace Profile
} }
/** @} */
#endif // PROFILE_HPP_INCLUDED #endif // PROFILE_HPP_INCLUDED

4
Include/Game/Tools/Settings.hpp
View File

@ -4,8 +4,6 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
/** @addtogroup Tools
* @{ */
namespace Settings namespace Settings
{ {
std::vector<std::int32_t> GetAll(); std::vector<std::int32_t> GetAll();
@ -42,6 +40,4 @@ namespace Settings
bool IsScrollToZoomOn(); bool IsScrollToZoomOn();
} }
/** @} */
#endif // SETTINGS_HPP_INCLUDED #endif // SETTINGS_HPP_INCLUDED

4
Include/Game/Tools/Widgets.hpp
View File

@ -6,8 +6,6 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
/** @addtogroup Tools
* @{ */
namespace Widgets namespace Widgets
{ {
std::vector<std::vector<Interactable::Widget>> GetAll(); std::vector<std::vector<Interactable::Widget>> GetAll();
@ -19,6 +17,4 @@ namespace Widgets
Interactable::Widget Get(const std::function<bool (Interactable::Widget&)>& Filter); Interactable::Widget Get(const std::function<bool (Interactable::Widget&)>& Filter);
} }
/** @} */
#endif // WIDGETS_HPP_INCLUDED #endif // WIDGETS_HPP_INCLUDED

4
Include/Game/Tools/Worlds.hpp
View File

@ -7,8 +7,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
/** @addtogroup Tools
* @{ */
namespace Worlds namespace Worlds
{ {
bool Refresh(); bool Refresh();
@ -32,6 +30,4 @@ namespace Worlds
std::vector<Internal::World> GetBy(const std::function<bool (Internal::World&)>& Filter); std::vector<Internal::World> GetBy(const std::function<bool (Internal::World&)>& Filter);
} }
/** @} */
#endif // WORLDS_HPP_INCLUDED #endif // WORLDS_HPP_INCLUDED

BIN
Library/libAlpacaLibrary.a
View File

Binary file not shown.