Release 0.82

master
Kasi 2018-08-19 16:52:11 +01:00
parent b4587addef
commit 0c03c93cc0
8 changed files with 96 additions and 2 deletions

View File

@ -16,7 +16,6 @@ namespace Internal
GraphicsObject(const GraphicsObject& G);
static Class GetClass();
Animation GetAnimation() const;
std::int32_t GetAnimationFrame() const;
bool GetFinished() const;
std::int32_t GetHeight() const;

View File

@ -0,0 +1,34 @@
#ifndef PROJECTILE_HPP_INCLUDED
#define PROJECTILE_HPP_INCLUDED
#include "Renderable.hpp"
#include "../JavaClass/Class.hpp"
#include <cstdint>
namespace Internal
{
class Projectile : public Renderable
{
public:
Projectile();
Projectile(const void* Obj);
Projectile(const Projectile& P);
static Class GetClass();
std::int32_t GetAnimationFrame() const;
std::int32_t GetEndTick() const;
double GetHeight() const;
std::int32_t GetID() const;
std::int32_t GetInteractIndex() const;
bool GetMoving() const;
std::int32_t GetPlane() const;
std::int32_t GetRotationX() const;
std::int32_t GetRotationY() const;
std::int32_t GetStartTick() const;
double GetX() const;
double GetY() const;
};
}
#endif // PROJECTILE_HPP_INCLUDED

View File

@ -81,6 +81,7 @@
#include "Classes/PlayerInfo.hpp"
#include "Classes/PlayerManager.hpp"
#include "Classes/Preferences.hpp"
#include "Classes/Projectile.hpp"
#include "Classes/Queue.hpp"
#include "Classes/Region.hpp"
#include "Classes/Renderable.hpp"
@ -174,6 +175,7 @@ namespace Internal
AttackOption GetPlayerAttackOption();
Cache GetPlayerModelCache();
std::vector<Player> GetPlayers();
Deque GetProjectiles();
std::int32_t GetRunEnergy();
std::string GetSelectedItemName();
std::string GetSelectedSpellName();
@ -221,6 +223,7 @@ namespace Internal
Box GetWidgetBox(const Widget& W, const std::vector<std::int32_t>& Xs, const std::vector<std::int32_t>& Ys);
ItemContainer GetItemContainer(std::int32_t ID);
NPC GetNPC(std::int32_t Index);
Player GetPlayer(std::int32_t Index);
std::vector<Point> ProjectModel(const Model& M, std::int32_t LocalX, std::int32_t LocalY,
std::int32_t LocalZ, std::int32_t Angle);
Model GetPlayerModel(std::int64_t ID);
@ -243,6 +246,7 @@ namespace Internal
std::vector<Point> GetPlayerModel(const Player& P);
std::vector<Point> GetNPCModel(const NPC& N);
std::vector<Point> GetGraphicsObjectModel(const GraphicsObject& O);
std::vector<Point> GetProjectileModel(const Internal::Projectile& P);
SceneTile GetSceneTile(std::int32_t X, std::int32_t Y, std::int32_t Plane);
std::vector<std::vector<SceneTile>> GetSceneTiles(std::int32_t Plane);
Point TileToMinimap(const Tile& T);

View File

@ -44,6 +44,7 @@
#include "Models/GroundObjects.hpp"
#include "Models/NPCs.hpp"
#include "Models/Players.hpp"
#include "Models/Projectiles.hpp"
#include "Models/WallObjects.hpp"
#include "Interactable/DecorativeObject.hpp"
@ -53,6 +54,7 @@
#include "Interactable/Item.hpp"
#include "Interactable/NPC.hpp"
#include "Interactable/Player.hpp"
#include "Interactable/Projectile.hpp"
#include "Interactable/WallObject.hpp"
#include "Interactable/Widget.hpp"

View File

@ -41,7 +41,6 @@ namespace Interactable
bool Interact(const std::string& Option, bool CheckTarget = true) const;
bool Interact(const std::vector<std::string>& Options, bool CheckTarget = true) const;
operator Internal::GroundObject() const;
};
}

View File

@ -0,0 +1,27 @@
#ifndef INTERACTABLEPROJECTILE_HPP_INCLUDED
#define INTERACTABLEPROJECTILE_HPP_INCLUDED
#include "../../Core/Classes/Projectile.hpp"
#include <vector>
#include "../../Core/Types/Point.hpp"
#include "../../Core/Types/Tile.hpp"
#include "../../Core/Classes/Character.hpp"
namespace Interactable
{
class Projectile : public Internal::Projectile
{
public:
Projectile(const Internal::Projectile& P);
Projectile(const Projectile& P);
std::vector<Point> GetModel() const;
Tile GetTile() const;
Internal::Character GetInteracting() const;
bool Interacting() const;
bool Interacting(const Internal::Character& C) const;
};
}
#endif // INTERACTABLEPROJECTILE_HPP_INCLUDED

View File

@ -0,0 +1,29 @@
#ifndef PROJECTILES_HPP_INCLUDED
#define PROJECTILES_HPP_INCLUDED
#include "../../Game/Interactable/Projectile.hpp"
#include <functional>
#include <cstdint>
#include <vector>
#include <string>
class Projectiles
{
public:
static std::vector<Interactable::Projectile> GetAllWithin(std::int32_t Distance);
static std::vector<Interactable::Projectile> GetAll();
static std::vector<Interactable::Projectile> GetAll(const Tile& T);
static std::vector<Interactable::Projectile> GetAll(std::int32_t ID, std::int32_t Distance = -1);
static std::vector<Interactable::Projectile> GetAll(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static std::vector<Interactable::Projectile> GetAll(const std::function<bool (Interactable::Projectile&)>& Filter, std::int32_t Distance = -1);
static Interactable::Projectile Get(const Tile& T);
static Interactable::Projectile Get(std::int32_t ID, std::int32_t Distance = -1);
static Interactable::Projectile Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
static Interactable::Projectile Get(const std::function<bool (Interactable::Projectile&)>& Filter, std::int32_t Distance = -1);
};
#endif // PROJECTILES_HPP_INCLUDED

Binary file not shown.