From a45d790e0f5c7468ec61aabef833888f49b02d24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nuno=20Gon=C3=A7alves=20=28Ulukyn=29?= Date: Thu, 13 Jul 2023 15:27:12 +0100 Subject: [PATCH] Fixes and add getPlayerPosition --- .../mission_manager/missions_commands.cpp | 31 ++++++++++++++++++++++ .../player_manager/character.cpp | 1 - 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp b/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp index 6c3e95971..c2827f029 100644 --- a/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp +++ b/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp @@ -668,6 +668,10 @@ NLMISC_COMMAND(spawnItem, "Spawn a new Item", " < item->recommended(recommended); } + const CStaticItem* form = CSheets::getForm(sheet); + if (form != NULL && form->Family == ITEMFAMILY::ITEM_SAP_RECHARGE) + item->setSapLoad(quality); + log.displayNL("OK"); return true; } @@ -703,6 +707,13 @@ NLMISC_COMMAND(spawnItem, "Spawn a new Item", " < finalItem->recommended(recommended); } + const CStaticItem* form = finalItem->getStaticForm(); + + if (form != NULL) { + if (form->Family == ITEMFAMILY::ITEM_SAP_RECHARGE) + finalItem->setSapLoad(finalItem->quality()); + } + if (c->addItemToInventory(getTInventory(selected_inv), finalItem)) { log.displayNL("OK"); @@ -1313,6 +1324,26 @@ NLMISC_COMMAND(getPosition, "get position of entity", "") //---------------------------------------------------------------------------- +NLMISC_COMMAND(getPlayerPosition, "get position of an user", "") +{ + if (args.size() != 1) + return false; + + CCharacter * player = PlayerManager.getCharacterByName(args[0]); + if (!player || !TheDataset.isAccessible(player->getEntityRowId())) + { + log.displayNL("ERR: user not found"); + return true; + } + + log.displayNL("%s", player->getPositionInfos().c_str()); + return true; +} + + + + +//---------------------------------------------------------------------------- // DEPRECATED use getTarget who send also position NLMISC_COMMAND(getTargetPosition, "get position of entity", "") { diff --git a/ryzom/server/src/entities_game_service/player_manager/character.cpp b/ryzom/server/src/entities_game_service/player_manager/character.cpp index e1a924919..66893d05e 100644 --- a/ryzom/server/src/entities_game_service/player_manager/character.cpp +++ b/ryzom/server/src/entities_game_service/player_manager/character.cpp @@ -23755,7 +23755,6 @@ void CCharacter::incAggroCount() bool CCharacter::isInWater() const { - nlinfo("check is in water = %d", (_EntityState.Z.getValue() & 4)); if (!_PlayerIsInWater && (((_EntityState.Z.getValue() & 4) != 0) || (_ActionFlags.getValue() & RYZOMACTIONFLAGS::InWater))) { entersWater(); -- 2.11.4.GIT