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

slight polishing

Browse Source
This commit is contained in:
Kae 2023-06-21 20:36:08 +10:00
parent ee296e3381
commit 320428eddf
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/game/StarPlayer.cpp
View File

@ -285,7 +285,6 @@ void Player::init(World* world, EntityId entityId, EntityMode mode) {
Entity::init(world, entityId, mode); Entity::init(world, entityId, mode);
auto speciesDefinition = Root::singleton().speciesDatabase()->species(m_identity.species); auto speciesDefinition = Root::singleton().speciesDatabase()->species(m_identity.species);
m_statusController->setStatusProperty("ouchNoise", speciesDefinition->ouchNoise(m_identity.gender));
m_tools->init(this); m_tools->init(this);
m_movementController->init(world); m_movementController->init(world);
@ -295,6 +294,7 @@ void Player::init(World* world, EntityId entityId, EntityMode mode) {
m_techController->init(this, m_movementController.get(), m_statusController.get()); m_techController->init(this, m_movementController.get(), m_statusController.get());
if (mode == EntityMode::Master) { if (mode == EntityMode::Master) {
m_statusController->setStatusProperty("ouchNoise", speciesDefinition->ouchNoise(m_identity.gender));
m_emoteState = HumanoidEmote::Idle; m_emoteState = HumanoidEmote::Idle;
m_questManager->init(world); m_questManager->init(world);
m_companions->init(this, world); m_companions->init(this, world);
@ -1088,6 +1088,9 @@ Json Player::getGenericProperty(String const& name, Json const& defaultValue) co
} }
void Player::setGenericProperty(String const& name, Json const& value) { void Player::setGenericProperty(String const& name, Json const& value) {
if (value.isNull())
m_genericProperties.erase(name);
else
m_genericProperties.set(name, value); m_genericProperties.set(name, value);
} }
@ -2086,8 +2089,11 @@ QuestManagerPtr Player::questManager() const {
Json Player::diskStore() { Json Player::diskStore() {
JsonObject genericScriptStorage; JsonObject genericScriptStorage;
for (auto& p : m_genericScriptContexts) for (auto& p : m_genericScriptContexts) {
genericScriptStorage[p.first] = p.second->getScriptStorage(); auto scriptStorage = p.second->getScriptStorage();
if (!scriptStorage.empty())
genericScriptStorage[p.first] = move(scriptStorage);
}
return JsonObject{ return JsonObject{
{"uuid", *uniqueId()}, {"uuid", *uniqueId()},

15
source/game/StarWorldServer.cpp
View File

@ -2037,13 +2037,20 @@ Json WorldServer::getProperty(String const& propertyName, Json const& def) const
} }
void WorldServer::setProperty(String const& propertyName, Json const& property) { void WorldServer::setProperty(String const& propertyName, Json const& property) {
if (m_worldProperties.value(propertyName) == property) // Kae: Properties set to null (nil from Lua) should be erased instead of lingering around
return; auto entry = m_worldProperties.find(propertyName);
bool missing = entry == m_worldProperties.end();
m_worldProperties[propertyName] = property; if (missing ? !property.isNull() : property != entry->second) {
if (missing) // property can't be null if we're doing this when missing is true
m_worldProperties.emplace(propertyName, property);
else if (property.isNull())
m_worldProperties.erase(entry);
else
entry->second = property;
for (auto const& pair : m_clientInfo) for (auto const& pair : m_clientInfo)
pair.second->outgoingPackets.append(make_shared<UpdateWorldPropertiesPacket>(JsonObject{ {propertyName, property} })); pair.second->outgoingPackets.append(make_shared<UpdateWorldPropertiesPacket>(JsonObject{ {propertyName, property} }));
} }
}
void WorldServer::timer(int stepsDelay, WorldAction worldAction) { void WorldServer::timer(int stepsDelay, WorldAction worldAction) {
m_timers.append({stepsDelay, worldAction}); m_timers.append({stepsDelay, worldAction});