#52 Raw, Fennec: guess the firebomb type

Author: drweissbrot

src/themes/fennec/radar/grenade/grenade-projectile/grenade-projectile.js

@@ -40,7 +40,7 @@ export default {
 		grenadeIconName() {
 			switch (this.grenade.type) {
 				case 'decoy': return 'decoy'
-				case 'firebomb': return 'molotov' // TODO need to find out when this is incgrenade
+				case 'firebomb': return this.grenade.firebombType || 'molotov'
 				case 'flashbang': return 'flashbang'
 				case 'frag': return 'hegrenade'
 				case 'smoke': return 'smokegrenade'

src/themes/raw/gsi/parse-grenades.js

@@ -1,7 +1,27 @@
 import { gsiState, players } from '/hud/core/state.js'
 import { parsePosition } from '/hud/gsi/parse-position.js'
 
-const additionalGrenadeData = (grenade) => {
+const cachedFirebombTypes = {}
+
+const getFirebombType = (grenadeId, owner) => {
+	const ownerActiveGrenade = owner?.grenades?.find((nade) => nade.isActive)
+
+	if (! ownerActiveGrenade) {
+		return cachedFirebombTypes[grenadeId]
+	}
+
+	if (ownerActiveGrenade.name === 'weapon_incgrenade') {
+		cachedFirebombTypes[grenadeId] = 'incgrenade'
+		return 'incgrenade'
+	}
+
+	if (ownerActiveGrenade.name === 'weapon_molotov') {
+		cachedFirebombTypes[grenadeId] = 'molotov'
+		return 'molotov'
+	}
+}
+
+const additionalGrenadeData = (grenade, grenadeId, owner) => {
 	switch (grenade.type) {
 		case 'inferno':
 			return {
@@ -11,6 +31,11 @@ const additionalGrenadeData = (grenade) => {
 				}))
 			}
 
+		case 'firebomb':
+			return {
+				firebombType: getFirebombType(grenadeId, owner),
+			}
+
 		case 'decoy':
 		case 'smoke':
 			return {
@@ -21,19 +46,37 @@ const additionalGrenadeData = (grenade) => {
 	}
 }
 
-export const parseGrenades = () => Object.entries(gsiState.grenades).map(([id, grenade]) => {
-	const velocity = parsePosition(grenade.velocity)
+export const parseGrenades = () => {
+	const firebombGrenadeIds = new Set()
+
+	const grenades = Object.entries(gsiState.grenades).map(([id, grenade]) => {
+		const velocity = parsePosition(grenade.velocity)
+		const owner = players.find((player) => player.steam64Id === grenade.owner)
 
-	return {
-		id,
-		velocity,
+		if (grenade.type === 'firebomb') {
+			firebombGrenadeIds.add(id)
+		}
 
-		isDetonated: velocity && velocity[0] === 0 && velocity[1] === 0 && velocity[2] === 0,
-		lifeTimeSec: Number(grenade.lifetime),
-		owner: players.find((player) => player.steam64Id === grenade.owner),
-		position: parsePosition(grenade.position),
-		type: grenade.type,
+		return {
+			id,
+			owner,
+			velocity,
 
-		...additionalGrenadeData(grenade),
+			isDetonated: velocity && velocity[0] === 0 && velocity[1] === 0 && velocity[2] === 0,
+			lifeTimeSec: Number(grenade.lifetime),
+			position: parsePosition(grenade.position),
+			type: grenade.type,
+
+			...additionalGrenadeData(grenade, id, owner),
+		}
+	})
+
+	for (const id in cachedFirebombTypes) {
+		if (! firebombGrenadeIds.has(id)) {
+			delete cachedFirebombTypes[id]
+			console.log('deleting', id)
+		}
 	}
-})
+
+	return grenades
+}