Release 0.16
parent
0702172a39
commit
b30a6117f3
|
@ -0,0 +1,23 @@
|
||||||
|
#ifndef INDEXABLEDATA_HPP_INCLUDED
|
||||||
|
#define INDEXABLEDATA_HPP_INCLUDED
|
||||||
|
|
||||||
|
#include "../JavaClass/Object.hpp"
|
||||||
|
#include "../JavaClass/Class.hpp"
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace Internal
|
||||||
|
{
|
||||||
|
class IndexableData : public Object
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
IndexableData();
|
||||||
|
IndexableData(const void* Obj);
|
||||||
|
IndexableData(const IndexableData& IndexableData);
|
||||||
|
static Class GetClass();
|
||||||
|
|
||||||
|
std::vector<std::vector<Object>> GetChildren() const;
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // INDEXABLEDATA_HPP_INCLUDED
|
|
@ -53,6 +53,7 @@
|
||||||
#include "Classes/HashTable.hpp"
|
#include "Classes/HashTable.hpp"
|
||||||
#include "Classes/Ignore.hpp"
|
#include "Classes/Ignore.hpp"
|
||||||
#include "Classes/IgnoreList.hpp"
|
#include "Classes/IgnoreList.hpp"
|
||||||
|
#include "Classes/IndexableData.hpp"
|
||||||
#include "Classes/ItemContainer.hpp"
|
#include "Classes/ItemContainer.hpp"
|
||||||
#include "Classes/ItemInfo.hpp"
|
#include "Classes/ItemInfo.hpp"
|
||||||
#include "Classes/LinkedList.hpp"
|
#include "Classes/LinkedList.hpp"
|
||||||
|
@ -113,6 +114,7 @@ namespace Internal
|
||||||
Deque GetGraphicsObjects();
|
Deque GetGraphicsObjects();
|
||||||
std::vector<std::vector<std::vector<Deque>>> GetGroundItems();
|
std::vector<std::vector<std::vector<Deque>>> GetGroundItems();
|
||||||
HashTable GetItemContainers();
|
HashTable GetItemContainers();
|
||||||
|
IndexableData GetItemIndexableData();
|
||||||
Cache GetItemInfoCache();
|
Cache GetItemInfoCache();
|
||||||
Cache GetItemModelCache();
|
Cache GetItemModelCache();
|
||||||
std::int32_t GetItemSelected();
|
std::int32_t GetItemSelected();
|
||||||
|
@ -144,9 +146,11 @@ namespace Internal
|
||||||
std::int32_t GetMouseX();
|
std::int32_t GetMouseX();
|
||||||
std::int32_t GetMouseY();
|
std::int32_t GetMouseY();
|
||||||
AttackOption GetNPCAttackOption();
|
AttackOption GetNPCAttackOption();
|
||||||
|
IndexableData GetNPCIndexableData();
|
||||||
std::vector<std::int32_t> GetNPCIndices();
|
std::vector<std::int32_t> GetNPCIndices();
|
||||||
Cache GetNPCModelCache();
|
Cache GetNPCModelCache();
|
||||||
std::vector<NPC> GetNPCs();
|
std::vector<NPC> GetNPCs();
|
||||||
|
IndexableData GetObjectIndexableData();
|
||||||
Cache GetObjectInfoCache();
|
Cache GetObjectInfoCache();
|
||||||
std::string GetPassword();
|
std::string GetPassword();
|
||||||
AttackOption GetPlayerAttackOption();
|
AttackOption GetPlayerAttackOption();
|
||||||
|
@ -225,9 +229,9 @@ namespace Internal
|
||||||
Sprite GetItemSprite(std::int32_t ID, std::int32_t Amount, std::int32_t BorderThickness,
|
Sprite GetItemSprite(std::int32_t ID, std::int32_t Amount, std::int32_t BorderThickness,
|
||||||
std::int32_t ShadowColor, std::int32_t StackType);
|
std::int32_t ShadowColor, std::int32_t StackType);
|
||||||
Convex GetItemSpriteConvex(const Sprite& S);
|
Convex GetItemSpriteConvex(const Sprite& S);
|
||||||
|
|
||||||
std::int32_t GetSettings(std::int32_t ID);
|
std::int32_t GetSettings(std::int32_t ID);
|
||||||
std::int32_t GetVarbitSettings(std::int32_t VarbitSettingIndex);
|
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);
|
Point TileToMainscreen(const Tile& T, std::int32_t X, std::int32_t Y, std::int32_t Z);
|
||||||
|
std::string GetItemName(std::int32_t ID);
|
||||||
}
|
}
|
||||||
#endif // INTERNAL_HPP_INCLUDED
|
#endif // INTERNAL_HPP_INCLUDED
|
||||||
|
|
|
@ -10,6 +10,7 @@ class Object
|
||||||
Object();
|
Object();
|
||||||
Object(const void* Obj);
|
Object(const void* Obj);
|
||||||
Object(const Object& O);
|
Object(const Object& O);
|
||||||
|
Object(Object&& O);
|
||||||
Object& operator=(const Object& O);
|
Object& operator=(const Object& O);
|
||||||
bool operator==(const Object& O) const;
|
bool operator==(const Object& O) const;
|
||||||
bool operator!=(const Object& O) const;
|
bool operator!=(const Object& O) const;
|
||||||
|
|
|
@ -32,11 +32,13 @@
|
||||||
#include "Interfaces/GameTabs/Quests.hpp"
|
#include "Interfaces/GameTabs/Quests.hpp"
|
||||||
#include "Interfaces/GameTabs/Stats.hpp"
|
#include "Interfaces/GameTabs/Stats.hpp"
|
||||||
|
|
||||||
#include "Models/SceneObjects.hpp"
|
#include "Models/DecorativeObjects.hpp"
|
||||||
|
#include "Models/GameObjects.hpp"
|
||||||
#include "Models/GroundItems.hpp"
|
#include "Models/GroundItems.hpp"
|
||||||
|
#include "Models/GroundObjects.hpp"
|
||||||
#include "Models/NPCs.hpp"
|
#include "Models/NPCs.hpp"
|
||||||
#include "Models/Players.hpp"
|
#include "Models/Players.hpp"
|
||||||
#include "Models/GameObjects.hpp"
|
#include "Models/WallObjects.hpp"
|
||||||
|
|
||||||
#include "Interactable/GameObject.hpp"
|
#include "Interactable/GameObject.hpp"
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ class Login
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
typedef enum LOGIN_STATE
|
typedef enum LOGIN_SCREEN_STATE
|
||||||
{
|
{
|
||||||
WELCOME_SCREEN,
|
WELCOME_SCREEN,
|
||||||
ENTER_CREDENTIALS,
|
ENTER_CREDENTIALS,
|
||||||
|
@ -30,9 +30,9 @@ class Login
|
||||||
LOADING,
|
LOADING,
|
||||||
LOBBY_SCREEN,
|
LOBBY_SCREEN,
|
||||||
LOGGED_IN
|
LOGGED_IN
|
||||||
} LOGIN_STATE;
|
} LOGIN_SCREEN_STATE;
|
||||||
|
|
||||||
static LOGIN_STATE GetState();
|
static LOGIN_SCREEN_STATE GetLoginScreenState();
|
||||||
|
|
||||||
static bool IsWorldSelectOpen();
|
static bool IsWorldSelectOpen();
|
||||||
static bool CloseWorldSelect();
|
static bool CloseWorldSelect();
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
#ifndef DECORATIVEOBJECTS_HPP_INCLUDED
|
||||||
|
#define DECORATIVEOBJECTS_HPP_INCLUDED
|
||||||
|
|
||||||
|
#include "../../Core/Classes/DecorativeObject.hpp"
|
||||||
|
#include "../../Core/Classes/ObjectInfo.hpp"
|
||||||
|
#include "../../Core/Types/Tile.hpp"
|
||||||
|
#include "../../Core/Types/Convex.hpp"
|
||||||
|
#include <functional>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <vector>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
/** @addtogroup Models
|
||||||
|
* @{ */
|
||||||
|
class DecorativeObjects
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
static Internal::ObjectInfo GetInfoOf(const Internal::DecorativeObject& D);
|
||||||
|
static Tile GetTileOf(const Internal::DecorativeObject& D);
|
||||||
|
static std::vector<Point> GetModelOf(const Internal::DecorativeObject& D);
|
||||||
|
static Convex GetConvexOf(const Internal::DecorativeObject& D);
|
||||||
|
|
||||||
|
//consider changing to Interactable::GameObject
|
||||||
|
static std::vector<Internal::DecorativeObject> GetAll();
|
||||||
|
static std::vector<Internal::DecorativeObject> GetAll(std::int32_t ID);
|
||||||
|
static std::vector<Internal::DecorativeObject> GetAll(const std::string& Name);
|
||||||
|
static std::vector<Internal::DecorativeObject> GetAll(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
|
static std::vector<Internal::DecorativeObject> GetAll(const std::vector<std::string>& PossibleNames);
|
||||||
|
static std::vector<Internal::DecorativeObject> GetAll(const std::function<bool (const Internal::DecorativeObject&)>& Filter);
|
||||||
|
|
||||||
|
static Internal::DecorativeObject Get(const Tile& T);
|
||||||
|
static Internal::DecorativeObject Get(std::int32_t ID);
|
||||||
|
static Internal::DecorativeObject Get(const std::string& Name);
|
||||||
|
static Internal::DecorativeObject Get(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
|
static Internal::DecorativeObject Get(const std::vector<std::string>& PossibleNames);
|
||||||
|
static Internal::DecorativeObject Get(const std::function<bool (const Internal::DecorativeObject&)>& Filter);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** @} */
|
||||||
|
|
||||||
|
#endif // DECORATIVEOBJECTS_HPP_INCLUDED
|
|
@ -10,6 +10,8 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
/** @addtogroup Models
|
||||||
|
* @{ */
|
||||||
class GameObjects
|
class GameObjects
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -20,21 +22,22 @@ class GameObjects
|
||||||
static Convex GetConvexOf(const Internal::GameObject& G);
|
static Convex GetConvexOf(const Internal::GameObject& G);
|
||||||
|
|
||||||
//consider changing to Interactable::GameObject
|
//consider changing to Interactable::GameObject
|
||||||
static Internal::GameObject Get(const Tile& T);
|
|
||||||
static Internal::GameObject Get(std::int32_t ID);
|
|
||||||
static Internal::GameObject Get(const std::string& Name);
|
|
||||||
static Internal::GameObject Get(const std::vector<std::int32_t>& PossibleIDs);
|
|
||||||
static Internal::GameObject Get(const std::vector<std::string>& PossibleNames);
|
|
||||||
static Internal::GameObject Get(const std::function<bool (Internal::GameObject&)>& Filter);
|
|
||||||
|
|
||||||
static std::vector<Internal::GameObject> GetAll();
|
static std::vector<Internal::GameObject> GetAll();
|
||||||
static std::vector<Internal::GameObject> GetAll(const Tile& T);
|
static std::vector<Internal::GameObject> GetAll(const Tile& T);
|
||||||
static std::vector<Internal::GameObject> GetAll(std::int32_t ID);
|
static std::vector<Internal::GameObject> GetAll(std::int32_t ID);
|
||||||
static std::vector<Internal::GameObject> GetAll(const std::string& Name);
|
static std::vector<Internal::GameObject> GetAll(const std::string& Name);
|
||||||
static std::vector<Internal::GameObject> GetAll(const std::vector<std::int32_t>& PossibleIDs);
|
static std::vector<Internal::GameObject> GetAll(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
static std::vector<Internal::GameObject> GetAll(const std::vector<std::string>& PossibleNames);
|
static std::vector<Internal::GameObject> GetAll(const std::vector<std::string>& PossibleNames);
|
||||||
static std::vector<Internal::GameObject> GetAll(const std::function<bool (Internal::GameObject&)>& Filter);
|
static std::vector<Internal::GameObject> GetAll(const std::function<bool (const Internal::GameObject&)>& Filter);
|
||||||
|
|
||||||
|
static Internal::GameObject Get(const Tile& T);
|
||||||
|
static Internal::GameObject Get(std::int32_t ID);
|
||||||
|
static Internal::GameObject Get(const std::string& Name);
|
||||||
|
static Internal::GameObject Get(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
|
static Internal::GameObject Get(const std::vector<std::string>& PossibleNames);
|
||||||
|
static Internal::GameObject Get(const std::function<bool (const Internal::GameObject&)>& Filter);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** @} */
|
||||||
|
|
||||||
#endif // GAMEOBJECTS_HPP_INCLUDED
|
#endif // GAMEOBJECTS_HPP_INCLUDED
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
#ifndef GROUNDOBJECTS_HPP_INCLUDED
|
||||||
|
#define GROUNDOBJECTS_HPP_INCLUDED
|
||||||
|
|
||||||
|
#include "../../Core/Classes/GroundObject.hpp"
|
||||||
|
#include "../../Core/Classes/ObjectInfo.hpp"
|
||||||
|
#include "../../Core/Types/Tile.hpp"
|
||||||
|
#include "../../Core/Types/Convex.hpp"
|
||||||
|
#include <functional>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <vector>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
/** @addtogroup Models
|
||||||
|
* @{ */
|
||||||
|
class GroundObjects
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
static Internal::ObjectInfo GetInfoOf(const Internal::GroundObject& G);
|
||||||
|
static Tile GetTileOf(const Internal::GroundObject& G);
|
||||||
|
static std::vector<Point> GetModelOf(const Internal::GroundObject& G);
|
||||||
|
static Convex GetConvexOf(const Internal::GroundObject& G);
|
||||||
|
|
||||||
|
//consider changing to Interactable::GameObject
|
||||||
|
static std::vector<Internal::GroundObject> GetAll();
|
||||||
|
static std::vector<Internal::GroundObject> GetAll(std::int32_t ID);
|
||||||
|
static std::vector<Internal::GroundObject> GetAll(const std::string& Name);
|
||||||
|
static std::vector<Internal::GroundObject> GetAll(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
|
static std::vector<Internal::GroundObject> GetAll(const std::vector<std::string>& PossibleNames);
|
||||||
|
static std::vector<Internal::GroundObject> GetAll(const std::function<bool (const Internal::GroundObject&)>& Filter);
|
||||||
|
|
||||||
|
static Internal::GroundObject Get(const Tile& T);
|
||||||
|
static Internal::GroundObject Get(std::int32_t ID);
|
||||||
|
static Internal::GroundObject Get(const std::string& Name);
|
||||||
|
static Internal::GroundObject Get(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
|
static Internal::GroundObject Get(const std::vector<std::string>& PossibleNames);
|
||||||
|
static Internal::GroundObject Get(const std::function<bool (const Internal::GroundObject&)>& Filter);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** @} */
|
||||||
|
|
||||||
|
#endif // GROUNDOBJECTS_HPP_INCLUDED
|
|
@ -1,67 +0,0 @@
|
||||||
#ifndef SCENEOBJECTS_HPP_INCLUDED
|
|
||||||
#define SCENEOBJECTS_HPP_INCLUDED
|
|
||||||
|
|
||||||
#include "../../Core/Classes/GameObject.hpp"
|
|
||||||
#include "../../Core/Classes/DecorativeObject.hpp"
|
|
||||||
#include "../../Core/Classes/GroundObject.hpp"
|
|
||||||
#include "../../Core/Classes/WallObject.hpp"
|
|
||||||
#include "../../Core/Classes/ObjectInfo.hpp"
|
|
||||||
#include "../../Core/Types/Tile.hpp"
|
|
||||||
#include "../../Core/Types/Convex.hpp"
|
|
||||||
#include <functional>
|
|
||||||
#include <cstdint>
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
/** @addtogroup Models
|
|
||||||
* @{ */
|
|
||||||
class SceneObjects
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
typedef enum OBJECT_TYPE
|
|
||||||
{
|
|
||||||
GAME_OBJECT = (1 << 1),
|
|
||||||
DECORATIVE_OBJECT = (1 << 2),
|
|
||||||
GROUND_OBJECT = (1 << 3),
|
|
||||||
WALL_OBJECT = (1 << 4),
|
|
||||||
ALL = (GAME_OBJECT | DECORATIVE_OBJECT | GROUND_OBJECT | WALL_OBJECT)
|
|
||||||
} OBJECT_TYPE;
|
|
||||||
|
|
||||||
static std::vector<Object> GetAll(OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static std::vector<Object> GetAll(const Tile& T, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static std::vector<Object> GetAll(std::int32_t ID, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static std::vector<Object> GetAll(const std::string& Name, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static std::vector<Object> GetAll(const std::vector<std::int32_t>& PossibleIDs, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static std::vector<Object> GetAll(const std::vector<std::string>& PossibleNames, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static std::vector<Object> GetAll(const std::function<bool (const Object&)>& Filter, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
|
|
||||||
static Object Get(const Tile& T, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static Object Get(std::int32_t ID, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static Object Get(const std::string& Name, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static Object Get(const std::vector<std::int32_t>& PossibleIDs, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static Object Get(const std::vector<std::string>& PossibleNames, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
static Object Get(const std::function<bool (const Object&)>& Filter, OBJECT_TYPE ObjectTypes = ALL);
|
|
||||||
|
|
||||||
static Internal::ObjectInfo GetInfoOf(const Object& O);
|
|
||||||
static Internal::ObjectInfo GetInfoOf(const Internal::GameObject& G);
|
|
||||||
static Internal::ObjectInfo GetInfoOf(const Internal::DecorativeObject& D);
|
|
||||||
static Internal::ObjectInfo GetInfoOf(const Internal::GroundObject& G);
|
|
||||||
static Internal::ObjectInfo GetInfoOf(const Internal::WallObject& W);
|
|
||||||
|
|
||||||
static Tile GetTileOf(const Object& O);
|
|
||||||
static Tile GetTileOf(const Internal::GameObject& G);
|
|
||||||
static Tile GetTileOf(const Internal::DecorativeObject& D);
|
|
||||||
static Tile GetTileOf(const Internal::GroundObject& G);
|
|
||||||
static Tile GetTileOf(const Internal::WallObject& W);
|
|
||||||
|
|
||||||
static Convex GetConvexOf(const Object& O);
|
|
||||||
static Convex GetConvexOf(const Internal::GameObject& G);
|
|
||||||
static Convex GetConvexOf(const Internal::DecorativeObject& D);
|
|
||||||
static Convex GetConvexOf(const Internal::GroundObject& G);
|
|
||||||
static Convex GetConvexOf(const Internal::WallObject& W);
|
|
||||||
};
|
|
||||||
|
|
||||||
/** @} */
|
|
||||||
|
|
||||||
#endif // SCENEOBJECTS_HPP_INCLUDED
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
#ifndef WALLOBJECTS_HPP_INCLUDED
|
||||||
|
#define WALLOBJECTS_HPP_INCLUDED
|
||||||
|
|
||||||
|
#include "../../Core/Classes/WallObject.hpp"
|
||||||
|
#include "../../Core/Classes/ObjectInfo.hpp"
|
||||||
|
#include "../../Core/Types/Tile.hpp"
|
||||||
|
#include "../../Core/Types/Convex.hpp"
|
||||||
|
#include <functional>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <vector>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
/** @addtogroup Models
|
||||||
|
* @{ */
|
||||||
|
class WallObjects
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
static Internal::ObjectInfo GetInfoOf(const Internal::WallObject& W);
|
||||||
|
static Tile GetTileOf(const Internal::WallObject& W);
|
||||||
|
static std::vector<Point> GetModelOf(const Internal::WallObject& W);
|
||||||
|
static Convex GetConvexOf(const Internal::WallObject& W);
|
||||||
|
|
||||||
|
//consider changing to Interactable::GameObject
|
||||||
|
static std::vector<Internal::WallObject> GetAll();
|
||||||
|
static std::vector<Internal::WallObject> GetAll(std::int32_t ID);
|
||||||
|
static std::vector<Internal::WallObject> GetAll(const std::string& Name);
|
||||||
|
static std::vector<Internal::WallObject> GetAll(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
|
static std::vector<Internal::WallObject> GetAll(const std::vector<std::string>& PossibleNames);
|
||||||
|
static std::vector<Internal::WallObject> GetAll(const std::function<bool (const Internal::WallObject&)>& Filter);
|
||||||
|
|
||||||
|
static Internal::WallObject Get(const Tile& T);
|
||||||
|
static Internal::WallObject Get(std::int32_t ID);
|
||||||
|
static Internal::WallObject Get(const std::string& Name);
|
||||||
|
static Internal::WallObject Get(const std::vector<std::int32_t>& PossibleIDs);
|
||||||
|
static Internal::WallObject Get(const std::vector<std::string>& PossibleNames);
|
||||||
|
static Internal::WallObject Get(const std::function<bool (const Internal::WallObject&)>& Filter);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** @} */
|
||||||
|
|
||||||
|
#endif // WALLOBJECTS_HPP_INCLUDED
|
Binary file not shown.
Loading…
Reference in New Issue