fix shooting gallery bugs (#1702)

dGame/Entity.cpp

@@ -1493,6 +1493,14 @@ void Entity::OnChoiceBoxResponse(Entity* sender, int32_t button, const std::u16s
 	GetScript()->OnChoiceBoxResponse(this, sender, button, buttonIdentifier, identifier);
 }
 
+void Entity::OnActivityNotify(GameMessages::ActivityNotify& notify) {
+	GetScript()->OnActivityNotify(this, notify);
+}
+
+void Entity::OnShootingGalleryFire(GameMessages::ShootingGalleryFire& fire) {
+	GetScript()->OnShootingGalleryFire(*this, fire);
+}
+
 void Entity::RequestActivityExit(Entity* sender, LWOOBJID player, bool canceled) {
 	GetScript()->OnRequestActivityExit(sender, player, canceled);
 }

dGame/Entity.h

@@ -13,6 +13,11 @@
 #include "eKillType.h"
 #include "Observable.h"
 
+namespace GameMessages {
+	struct ActivityNotify;
+	struct ShootingGalleryFire;
+};
+
 namespace Loot {
 	class Info;
 };
@@ -210,6 +215,8 @@ public:
 	void OnZonePropertyModelRemoved(Entity* player);
 	void OnZonePropertyModelRemovedWhileEquipped(Entity* player);
 	void OnZonePropertyModelRotated(Entity* player);
+	void OnActivityNotify(GameMessages::ActivityNotify& notify);
+	void OnShootingGalleryFire(GameMessages::ShootingGalleryFire& notify);
 
 	void OnMessageBoxResponse(Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData);
 	void OnChoiceBoxResponse(Entity* sender, int32_t button, const std::u16string& buttonIdentifier, const std::u16string& identifier);

dGame/LeaderboardManager.cpp

@@ -95,7 +95,7 @@ void QueryToLdf(Leaderboard& leaderboard, const std::vector<ILeaderboard::Entry>
 			// Score:1
 			entry.push_back(new LDFData<int32_t>(u"Streak", leaderboardEntry.secondaryScore));
 			// Streak:1
-			entry.push_back(new LDFData<float>(u"HitPercentage", (leaderboardEntry.tertiaryScore / 100.0f)));
+			entry.push_back(new LDFData<float>(u"HitPercentage", leaderboardEntry.tertiaryScore));
 			// HitPercentage:3 between 0 and 1
 			break;
 		case Racing:
@@ -199,9 +199,9 @@ std::vector<ILeaderboard::Entry> FilterFriends(const std::vector<ILeaderboard::E
 	std::vector<ILeaderboard::Entry> friendsLeaderboard;
 	for (const auto& entry : leaderboard) {
 		const auto res = std::ranges::find_if(friendOfPlayer, [&entry, relatedPlayer](const FriendData& data) {
-			return entry.charId == data.friendID || entry.charId == relatedPlayer;
+			return entry.charId == data.friendID;
 			});
-		if (res != friendOfPlayer.cend()) {
+		if (res != friendOfPlayer.cend() || entry.charId == relatedPlayer) {
 			friendsLeaderboard.push_back(entry);
 		}
 	}

dGame/dComponents/InventoryComponent.cpp

@@ -69,9 +69,10 @@ InventoryComponent::InventoryComponent(Entity* parent) : Component(parent) {
 	auto slot = 0u;
 
 	for (const auto& item : items) {
-		if (!item.equip || !Inventory::IsValidItem(item.itemid)) {
-			continue;
-		}
+		if (!Inventory::IsValidItem(item.itemid)) continue;
+		AddItem(item.itemid, item.count);
+
+		if (!item.equip) continue;
 
 		const LWOOBJID id = ObjectIDManager::GenerateObjectID();
 

dGame/dComponents/MovementAIComponent.cpp

@@ -265,6 +265,7 @@ void MovementAIComponent::PullToPoint(const NiPoint3& point) {
 
 void MovementAIComponent::SetPath(std::vector<PathWaypoint> path) {
 	if (path.empty()) return;
+	while (!m_CurrentPath.empty()) m_CurrentPath.pop();
 	std::for_each(path.rbegin(), path.rend() - 1, [this](const PathWaypoint& point) {
 		this->m_CurrentPath.push(point);
 		});

dGame/dComponents/PetComponent.cpp

@@ -524,7 +524,7 @@ void PetComponent::NotifyTamingBuildSuccess(NiPoint3 position) {
 
 	GameMessages::SendRegisterPetDBID(m_Tamer, petSubKey, tamer->GetSystemAddress());
 
-	inventoryComponent->AddItem(m_Parent->GetLOT(), 1, eLootSourceType::ACTIVITY, eInventoryType::MODELS, {}, LWOOBJID_EMPTY, true, false, petSubKey);
+	inventoryComponent->AddItem(m_Parent->GetLOT(), 1, eLootSourceType::INVENTORY, eInventoryType::MODELS, {}, LWOOBJID_EMPTY, true, false, petSubKey);
 	auto* item = inventoryComponent->FindItemBySubKey(petSubKey, MODELS);
 
 	if (item == nullptr) {

dGame/dComponents/SkillComponent.cpp

@@ -123,6 +123,11 @@ void SkillComponent::SyncPlayerProjectile(const LWOOBJID projectileId, RakNet::B
 	behavior->Handle(sync_entry.context, bitStream, branch);
 
 	this->m_managedProjectiles.erase(this->m_managedProjectiles.begin() + index);
+
+	GameMessages::ActivityNotify notify;
+	notify.notification.push_back( std::make_unique<LDFData<int32_t>>(u"shot_done", sync_entry.skillId));
+
+	m_Parent->OnActivityNotify(notify);
 }
 
 void SkillComponent::RegisterPlayerProjectile(const LWOOBJID projectileId, BehaviorContext* context, const BehaviorBranchContext& branch, const LOT lot) {
@@ -132,6 +137,7 @@ void SkillComponent::RegisterPlayerProjectile(const LWOOBJID projectileId, Behav
 	entry.branchContext = branch;
 	entry.lot = lot;
 	entry.id = projectileId;
+	entry.skillId = context->skillID;
 
 	this->m_managedProjectiles.push_back(entry);
 }

dGame/dComponents/SkillComponent.h

@@ -40,6 +40,8 @@ struct ProjectileSyncEntry {
 
 	BehaviorBranchContext branchContext{ 0, 0 };
 
+	int32_t skillId{ 0 };
+
 	explicit ProjectileSyncEntry();
 };
 

dGame/dGameMessages/GameMessageHandler.cpp

@@ -703,6 +703,12 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 	case MessageType::Game::UPDATE_INVENTORY_GROUP_CONTENTS:
 		GameMessages::HandleUpdateInventoryGroupContents(inStream, entity, sysAddr);
 		break;
+	case MessageType::Game::SHOOTING_GALLERY_FIRE: {
+		GameMessages::ShootingGalleryFire fire{};
+		fire.Deserialize(inStream);
+		fire.Handle(*entity, sysAddr);
+		break;
+	}
 
 	default:
 		LOG_DEBUG("Received Unknown GM with ID: %4i, %s", messageID, StringifiedEnum::ToString(messageID).data());

dGame/dGameMessages/GameMessages.cpp

@@ -6395,4 +6395,35 @@ namespace GameMessages {
 		bitStream.Write(targetPosition.y);
 		bitStream.Write(targetPosition.z);
 	}
+
+	void SetModelToBuild::Serialize(RakNet::BitStream& bitStream) const {
+		bitStream.Write(modelLot != -1);
+		if (modelLot != -1) bitStream.Write(modelLot);
+	}
+
+	void SpawnModelBricks::Serialize(RakNet::BitStream& bitStream) const {
+		bitStream.Write(amount != 0.0f);
+		if (amount != 0.0f) bitStream.Write(amount);
+		bitStream.Write(position != NiPoint3Constant::ZERO);
+		if (position != NiPoint3Constant::ZERO) {
+			bitStream.Write(position.x);
+			bitStream.Write(position.y);
+			bitStream.Write(position.z);
+		}
+	}
+
+	bool ShootingGalleryFire::Deserialize(RakNet::BitStream& bitStream) {
+		if (!bitStream.Read(target.x)) return false;
+		if (!bitStream.Read(target.y)) return false;
+		if (!bitStream.Read(target.z)) return false;
+		if (!bitStream.Read(rotation.w)) return false;
+		if (!bitStream.Read(rotation.x)) return false;
+		if (!bitStream.Read(rotation.y)) return false;
+		if (!bitStream.Read(rotation.z)) return false;
+		return true;
+	}
+
+	void ShootingGalleryFire::Handle(Entity& entity, const SystemAddress& sysAddr) {
+		entity.OnShootingGalleryFire(*this);
+	}
 }

dGame/dGameMessages/GameMessages.h

@@ -54,6 +54,8 @@ namespace GameMessages {
 		virtual ~GameMsg() = default;
 		void Send(const SystemAddress& sysAddr) const;
 		virtual void Serialize(RakNet::BitStream& bitStream) const {}
+		virtual bool Deserialize(RakNet::BitStream& bitStream) { return true; }
+		virtual void Handle(Entity& entity, const SystemAddress& sysAddr) {};
 		MessageType::Game msgId;
 		LWOOBJID target{ LWOOBJID_EMPTY };
 	};
@@ -727,6 +729,35 @@ namespace GameMessages {
 		ConfigureRacingControl() : GameMsg(MessageType::Game::CONFIGURE_RACING_CONTROL) {}
 		std::vector<std::unique_ptr<LDFBaseData>> racingSettings{};
 	};
+
+	struct SetModelToBuild : public GameMsg {
+		SetModelToBuild() : GameMsg(MessageType::Game::SET_MODEL_TO_BUILD) {}
+		void Serialize(RakNet::BitStream& bitStream) const override;
+		LOT modelLot{ -1 };
+	};
+
+	struct SpawnModelBricks : public GameMsg {
+		SpawnModelBricks() : GameMsg(MessageType::Game::SPAWN_MODEL_BRICKS) {}
+		void Serialize(RakNet::BitStream& bitStream) const override;
+
+		float amount{ 0.0f };
+		NiPoint3 position{ NiPoint3Constant::ZERO };
+	};
+
+	struct ActivityNotify : public GameMsg {
+		ActivityNotify() : GameMsg(MessageType::Game::ACTIVITY_NOTIFY) {}
+
+		std::vector<std::unique_ptr<LDFBaseData>> notification{};
+	};
+
+	struct ShootingGalleryFire : public GameMsg {
+		ShootingGalleryFire() : GameMsg(MessageType::Game::SHOOTING_GALLERY_FIRE) {}
+		bool Deserialize(RakNet::BitStream& bitStream) override;
+		void Handle(Entity& entity, const SystemAddress& sysAddr) override;
+
+		NiPoint3 target{};
+		NiQuaternion rotation{};
+	};
 };
 
 #endif // GAMEMESSAGES_H