Add player Lua functions from SE

1 files changed, 7 insertions, 2 deletions

diff --git a/source/game/StarPlayer.cpp b/source/game/StarPlayer.cpp
index b3e48a3..3969646 100644
--- a/source/game/StarPlayer.cpp
+++ b/source/game/StarPlayer.cpp
@@ -245,6 +245,7 @@ void Player::diskLoad(Json const& diskStore) {
 
   m_genericProperties = diskStore.getObject("genericProperties");
 
+  m_armor->reset();
   refreshArmor();
 
   m_codexes->learnInitialCodexes(species());
@@ -2162,10 +2163,14 @@ void Player::addChatMessage(String const& message) {
   m_pendingChatActions.append(SayChatAction{entityId(), message, mouthPosition()});
 }
 
-void Player::addEmote(HumanoidEmote const& emote) {
+void Player::addEmote(HumanoidEmote const& emote, Maybe<float> emoteCooldown) {
   starAssert(!isSlave());
   m_emoteState = emote;
-  m_emoteCooldownTimer = m_emoteCooldown;
+  m_emoteCooldownTimer = emoteCooldown.value(m_emoteCooldown);
+}
+
+pair<HumanoidEmote, float> Player::currentEmote() const {
+  return make_pair(m_emoteState, m_emoteCooldownTimer);
 }
 
 List<ChatAction> Player::pullPendingChatActions() {