Skip to content

Commit b53e095

Browse files
authored
Merge pull request #417 from osse101/fix-itemhandler-18204570734183862940
Fix lootbox grouping for money and update bomb usage message
2 parents b9d88ac + 88b7986 commit b53e095

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

internal/itemhandler/bomb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func handleBomb(ctx context.Context, ec EffectContext, _ *domain.User, inventory
4848
}
4949

5050
log.Info("Bombs set successfully", "setter", username, "platform", platform, "count", totalQueued)
51-
return fmt.Sprintf("%s set %s! Waiting for a crowd...", username, lastDisplayName), nil
51+
return fmt.Sprintf("%s set %s! It will detonate when the crowd gathers...", username, lastDisplayName), nil
5252
}
5353

5454
// BombHandler handles bomb items.

internal/itemhandler/lootbox.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,12 @@ func aggregateDropsAndUpdateInventory(ec EffectContext, inventory *domain.Invent
128128
})
129129

130130
// Get display name
131-
itemDisplayName := ec.GetDisplayName(drop.ItemName, drop.QualityLevel)
131+
var itemDisplayName string
132+
if drop.ItemName == domain.ItemMoney {
133+
itemDisplayName = ec.GetDisplayName(domain.ItemMoney, "")
134+
} else {
135+
itemDisplayName = ec.GetDisplayName(drop.ItemName, drop.QualityLevel)
136+
}
132137

133138
if group, exists := displayGroups[itemDisplayName]; exists {
134139
group.Quantity += drop.Quantity

0 commit comments

Comments
 (0)