diff --git a/Include/Core/Classes/Character.hpp b/Include/Core/Classes/Character.hpp index 0677132..406eb26 100644 --- a/Include/Core/Classes/Character.hpp +++ b/Include/Core/Classes/Character.hpp @@ -34,8 +34,6 @@ namespace Internal std::int32_t GetSubPoseAnimationID() const; std::int32_t GetX() const; std::int32_t GetY() const; - std::int32_t GetIntField1() const; - bool GetBoolField1() const; }; } diff --git a/Include/Core/Classes/CombatInfo.hpp b/Include/Core/Classes/CombatInfo.hpp new file mode 100644 index 0000000..bae938e --- /dev/null +++ b/Include/Core/Classes/CombatInfo.hpp @@ -0,0 +1,25 @@ +#ifndef COMBATINFO_HPP_INCLUDED +#define COMBATINFO_HPP_INCLUDED + +#include "Node.hpp" +#include "../JavaClass/Class.hpp" +#include "LinkedList.hpp" +#include "HealthInfo.hpp" + +namespace Internal +{ + class CombatInfo : public Node + { + public: + CombatInfo(); + CombatInfo(const void* Obj); + CombatInfo(const CombatInfo& C); + static Class GetClass(); + + LinkedList GetHealthBar() const; + HealthInfo GetHealthInfo() const; + + }; +} + +#endif // COMBATINFO_HPP_INCLUDED diff --git a/Include/Core/Classes/HealthBar.hpp b/Include/Core/Classes/HealthBar.hpp new file mode 100644 index 0000000..0660425 --- /dev/null +++ b/Include/Core/Classes/HealthBar.hpp @@ -0,0 +1,24 @@ +#ifndef HEALTHBAR_HPP_INCLUDED +#define HEALTHBAR_HPP_INCLUDED + +#include "Node.hpp" +#include "../JavaClass/Class.hpp" +#include + +namespace Internal +{ + class HealthBar : public Node + { + public: + HealthBar(); + HealthBar(const void* Obj); + HealthBar(const HealthBar& H); + static Class GetClass(); + + std::int32_t GetHealthRatio() const; + std::int32_t GetTick() const; + + }; +} + +#endif // HEALTHBAR_HPP_INCLUDED diff --git a/Include/Core/Classes/HealthInfo.hpp b/Include/Core/Classes/HealthInfo.hpp new file mode 100644 index 0000000..f5808cc --- /dev/null +++ b/Include/Core/Classes/HealthInfo.hpp @@ -0,0 +1,23 @@ +#ifndef HEALTHINFO_HPP_INCLUDED +#define HEALTHINFO_HPP_INCLUDED + +#include "CacheableNode.hpp" +#include "../JavaClass/Class.hpp" +#include + +namespace Internal +{ + class HealthInfo : public CacheableNode + { + public: + HealthInfo(); + HealthInfo(const void* Obj); + HealthInfo(const HealthInfo& H); + static Class GetClass(); + + std::int32_t GetScale() const; + + }; +} + +#endif // HEALTHINFO_HPP_INCLUDED diff --git a/Include/Core/Classes/NPC.hpp b/Include/Core/Classes/NPC.hpp index 983a87d..21fe122 100644 --- a/Include/Core/Classes/NPC.hpp +++ b/Include/Core/Classes/NPC.hpp @@ -15,7 +15,7 @@ namespace Internal NPC(const NPC& N); static Class GetClass(); - NPCInfo GetInfo() const; + NPCInfo GetNPCInfo() const; }; } diff --git a/Include/Core/Classes/Player.hpp b/Include/Core/Classes/Player.hpp index 697257f..07627e7 100644 --- a/Include/Core/Classes/Player.hpp +++ b/Include/Core/Classes/Player.hpp @@ -22,9 +22,9 @@ namespace Internal std::vector GetActions() const; std::int32_t GetCombatLevel() const; bool GetHidden() const; - PlayerInfo GetInfo() const; NamePair GetNamePair() const; std::int32_t GetOverheadIcon() const; + PlayerInfo GetPlayerInfo() const; std::int32_t GetSkullIcon() const; std::int32_t GetTeam() const; std::int32_t GetTotalLevel() const; diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 98d5a4f..39069ac 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -39,6 +39,7 @@ #include "Classes/ClanMember.hpp" #include "Classes/ClanMemberList.hpp" #include "Classes/CollisionData.hpp" +#include "Classes/CombatInfo.hpp" #include "Classes/DecorativeObject.hpp" #include "Classes/Deque.hpp" #include "Classes/DirectByteBuffer.hpp" @@ -55,6 +56,8 @@ #include "Classes/GroundItem.hpp" #include "Classes/GroundObject.hpp" #include "Classes/HashTable.hpp" +#include "Classes/HealthBar.hpp" +#include "Classes/HealthInfo.hpp" #include "Classes/Ignore.hpp" #include "Classes/IgnoreList.hpp" #include "Classes/IndexableData.hpp" @@ -230,13 +233,14 @@ namespace Internal std::vector> GetSceneTiles(std::int32_t Plane); Point TileToMinimap(const Tile& T); std::int32_t GetTileItemHeight(std::int32_t X, std::int32_t Y, std::int32_t Plane); - Sprite GetItemSprite(std::int32_t ID, std::int32_t Amount, std::int32_t BorderThickness, - std::int32_t ShadowColor, std::int32_t StackType); + Sprite GetItemSprite(std::int32_t ID, std::int32_t Amount); Convex GetItemSpriteConvex(const Sprite& S); std::int32_t GetSettings(std::int32_t ID); std::int32_t GetVarbitSettings(std::int32_t VarbitSettingIndex); 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::vector GetBlockingWidgetBoxes(); + std::int32_t GetHealthPercentage(const Internal::Character& C); + } #endif // INTERNAL_HPP_INCLUDED diff --git a/Include/Game/Interfaces/Bank.hpp b/Include/Game/Interfaces/Bank.hpp index 0598aec..a6a2603 100644 --- a/Include/Game/Interfaces/Bank.hpp +++ b/Include/Game/Interfaces/Bank.hpp @@ -273,6 +273,10 @@ class Bank static bool DepositAllOf(const std::string& Name); static bool DepositXOf(std::int32_t ID, std::int32_t Amount); static bool DepositXOf(const std::string& Name, std::int32_t Amount); + static bool DepositAllExcept(const std::string Name); + static bool DepositAllExcept(const std::vector Names); + static bool DepositAllExcept(std::int32_t ID); + static bool DepositAllExcept(const std::vector IDs); static bool DepositAll(); static bool DepositEquipment(); }; diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index c703080..8ecef23 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ