evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Player: Make interaction radius scriptable

Browse Source
This commit is contained in:
Kae 2023-08-02 21:59:07 +10:00
parent c80b2d2dbc
commit 32e6eab069
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/game/StarPlayer.cpp
View File

@ -1334,7 +1334,7 @@ InteractiveEntityPtr Player::bestInteractionEntity(bool includeNearby) {
return {}; return {};
InteractiveEntityPtr interactiveEntity; InteractiveEntityPtr interactiveEntity;
if (auto entity = world()->getInteractiveInRange(m_aimPosition, position(), m_interactRadius)) { if (auto entity = world()->getInteractiveInRange(m_aimPosition, isAdmin() ? m_aimPosition : position(), m_interactRadius)) {
interactiveEntity = entity; interactiveEntity = entity;
} else if (includeNearby) { } else if (includeNearby) {
Vec2F interactBias = m_walkIntoInteractBias; Vec2F interactBias = m_walkIntoInteractBias;
@ -1346,7 +1346,7 @@ InteractiveEntityPtr Player::bestInteractionEntity(bool includeNearby) {
interactiveEntity = entity; interactiveEntity = entity;
} }
if (interactiveEntity && world()->canReachEntity(position(), interactRadius(), interactiveEntity->entityId())) if (interactiveEntity && (isAdmin() || world()->canReachEntity(position(), interactRadius(), interactiveEntity->entityId())))
return interactiveEntity; return interactiveEntity;
return {}; return {};
} }
@ -1480,6 +1480,10 @@ float Player::interactRadius() const {
return m_interactRadius; return m_interactRadius;
} }
void Player::setInteractRadius(float interactRadius) {
m_interactRadius = interactRadius;
}
List<InteractAction> Player::pullInteractActions() { List<InteractAction> Player::pullInteractActions() {
List<InteractAction> results; List<InteractAction> results;
eraseWhere(m_pendingInteractActions, [&results](auto& promise) { eraseWhere(m_pendingInteractActions, [&results](auto& promise) {
@ -1822,7 +1826,7 @@ bool Player::inInteractionRange() const {
} }
bool Player::inInteractionRange(Vec2F aimPos) const { bool Player::inInteractionRange(Vec2F aimPos) const {
return world()->geometry().diff(aimPos, position()).magnitude() < interactRadius(); return isAdmin() || world()->geometry().diff(aimPos, position()).magnitude() < interactRadius();
} }
bool Player::inToolRange() const { bool Player::inToolRange() const {
@ -1830,7 +1834,7 @@ bool Player::inToolRange() const {
} }
bool Player::inToolRange(Vec2F const& aimPos) const { bool Player::inToolRange(Vec2F const& aimPos) const {
return world()->geometry().diff(aimPos, position()).magnitude() < toolRadius(); return isAdmin() || world()->geometry().diff(aimPos, position()).magnitude() < toolRadius();
} }
void Player::getNetStates(bool initial) { void Player::getNetStates(bool initial) {

1
source/game/StarPlayer.hpp
View File

@ -147,6 +147,7 @@ public:
float toolRadius() const; float toolRadius() const;
float interactRadius() const override; float interactRadius() const override;
void setInteractRadius(float interactRadius);
List<InteractAction> pullInteractActions(); List<InteractAction> pullInteractActions();
uint64_t currency(String const& currencyType) const; uint64_t currency(String const& currencyType) const;

2
source/game/StarWorldClient.cpp
View File

@ -2005,7 +2005,7 @@ void WorldClient::setProperty(String const& propertyName, Json const& property)
} }
bool WorldClient::playerCanReachEntity(EntityId entityId, bool preferInteractive) const { bool WorldClient::playerCanReachEntity(EntityId entityId, bool preferInteractive) const {
return canReachEntity(m_mainPlayer->position(), m_mainPlayer->interactRadius(), entityId, preferInteractive); return m_mainPlayer->isAdmin() || canReachEntity(m_mainPlayer->position(), m_mainPlayer->interactRadius(), entityId, preferInteractive);
} }
void WorldClient::disconnectAllWires(Vec2I wireEntityPosition, WireNode const& node) { void WorldClient::disconnectAllWires(Vec2I wireEntityPosition, WireNode const& node) {

3
source/game/scripting/StarPlayerLuaBindings.cpp
View File

@ -104,6 +104,9 @@ LuaCallbacks LuaBindings::makePlayerCallbacks(Player* player) {
player->setPersonality(parsePersonality(newPersonality, personalityConfig)); player->setPersonality(parsePersonality(newPersonality, personalityConfig));
}); });
callbacks.registerCallback( "interactRadius", [player]() { return player->interactRadius(); });
callbacks.registerCallback("setInteractRadius", [player](float radius) { player->setInteractRadius(radius); });
callbacks.registerCallback("id", [player]() { return player->entityId(); }); callbacks.registerCallback("id", [player]() { return player->entityId(); });
callbacks.registerCallback("uniqueId", [player]() { return player->uniqueId(); }); callbacks.registerCallback("uniqueId", [player]() { return player->uniqueId(); });
callbacks.registerCallback("isAdmin", [player]() { return player->isAdmin(); }); callbacks.registerCallback("isAdmin", [player]() { return player->isAdmin(); });