fix: bag you desire drop

data-otservbr-global/lib/quests/soul_war.lua

@@ -30,8 +30,7 @@ SoulWarQuest = {
 
 	timeToReturnImmuneMegalomania = 70, -- In seconds
 
-	baseBagYouDesireChance = 500, -- 1000 = 1% chance, 500 = 0.5% chance
-	bagYouDesireChancePerTaint = 1, -- Increases 1% per taint
+	bagYouDesireChancePerTaint = 10, -- Increases % per taint
 	bagYouDesireMonsters = {
 		"Bony Sea Devil",
 		"Brachiodemon",
@@ -1089,7 +1088,7 @@ function Monster:createSoulWarWhiteTiles(centerRoomPosition, zonePositions, exec
 	addEvent(revertTilesAndApplyDamage, executeInterval or 3000, zonePositions)
 end
 
-function Monster:generateBagYouDesireLoot(player)
+function MonsterType:calculateBagYouDesireChance(player, itemChance)
 	local playerTaintLevel = player:getTaintLevel()
 	if not playerTaintLevel or playerTaintLevel == 0 then
 		return {}
@@ -1102,29 +1101,24 @@ function Monster:generateBagYouDesireLoot(player)
 	end
 
 	local loot = {}
-	local totalChance = SoulWarQuest.baseBagYouDesireChance
 	local soulWarQuest = player:soulWarQuestKV()
 	local megalomaniaKills = soulWarQuest:scoped("megalomania-kills"):get("count") or 0
 
 	if monsterName == "Goshnar's Megalomania" then
 		-- Special handling for Goshnar's Megalomania
-		totalChance = totalChance + megalomaniaKills * SoulWarQuest.bagYouDesireChancePerTaint
+		itemChance = itemChance + megalomaniaKills * SoulWarQuest.bagYouDesireChancePerTaint
 	else
 		-- General handling for other monsters (bosses and non-bosses)
-		totalChance = totalChance + (playerTaintLevel * SoulWarQuest.bagYouDesireChancePerTaint)
+		itemChance = itemChance + (playerTaintLevel * SoulWarQuest.bagYouDesireChancePerTaint)
 	end
 
-	logger.trace("Player {} killed {} with {} taints, loot chance {}", player:getName(), monsterName, playerTaintLevel, totalChance)
+	logger.info("Player {} killed {} with {} taints, loot chance {}", player:getName(), monsterName, playerTaintLevel, itemChance)
 
 	if math.random(1, 100000) <= totalChance then
-		local itemType = ItemType(SoulWarQuest.bagYouDesireItemId)
-		if itemType then
-			loot[itemType:getId()] = { count = 1 }
-			logger.debug("Player {} killed {} and got a bag you desire with drop chance {}", player:getName(), monsterName, totalChance)
-			if monsterName == "Goshnar's Megalomania" then
-				-- Reset kill count on successful drop
-				soulWarQuest:scoped("megalomania-kills"):set("count", 0)
-			end
+		logger.debug("Player {} killed {} and got a bag you desire with drop chance {}", player:getName(), monsterName, itemChance)
+		if monsterName == "Goshnar's Megalomania" then
+			-- Reset kill count on successful drop
+			soulWarQuest:scoped("megalomania-kills"):set("count", 0)
 		end
 	else
 		if monsterName == "Goshnar's Megalomania" then
@@ -1133,7 +1127,7 @@ function Monster:generateBagYouDesireLoot(player)
 		end
 	end
 
-	return loot
+	return itemChance
 end
 
 local intervalBetweenExecutions = 10000

data-otservbr-global/monster/quests/soul_war/goshnar's_megalomania_blue.lua

@@ -94,6 +94,7 @@ monster.loot = {
 	{ name = "figurine of megalomania", chance = 400 },
 	{ name = "megalomania's skull", chance = 400 },
 	{ name = "megalomania's essence", chance = 400 },
+	{ name = "bag you desire", chance = 100 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/goshnar's_megalomania_green.lua

@@ -99,6 +99,7 @@ monster.loot = {
 	{ name = "figurine of megalomania", chance = 400 },
 	{ name = "megalomania's skull", chance = 400 },
 	{ name = "megalomania's essence", chance = 400 },
+	{ name = "bag you desire", chance = 100 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/goshnars_cruelty.lua

@@ -96,6 +96,7 @@ monster.loot = {
 	{ name = "figurine of cruelty", chance = 400 },
 	{ name = "spectral saddle", chance = 400 },
 	{ name = "spectral horse tack", chance = 400 },
+	{ name = "bag you desire", chance = 100 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/goshnars_greed.lua

@@ -97,6 +97,7 @@ monster.loot = {
 	{ name = "greed's arm", chance = 25000, maxCount = 1 },
 	{ name = "figurine of greed", chance = 400 },
 	{ name = "the skull of a beast", chance = 400 },
+	{ name = "bag you desire", chance = 100 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/goshnars_hatred.lua

@@ -96,6 +96,7 @@ monster.loot = {
 	{ name = "spectral horseshoe", chance = 400 },
 	{ name = "spectral horse tack", chance = 400 },
 	{ name = "bracelet of strengthening", chance = 400 },
+	{ name = "bag you desire", chance = 100 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/goshnars_malice.lua

@@ -97,6 +97,7 @@ monster.loot = {
 	{ name = "spectral horseshoe", chance = 400 },
 	{ name = "the skull of a beast", chance = 400 },
 	{ name = "figurine of malice", chance = 400 },
+	{ name = "bag you desire", chance = 100 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/goshnars_spite.lua

@@ -93,6 +93,7 @@ monster.loot = {
 	{ name = "the skull of a beast", chance = 400 },
 	{ name = "figurine of spite", chance = 400 },
 	{ name = "spite's spirit", chance = 400 },
+	{ name = "bag you desire", chance = 100 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/bony_sea_devil.lua

@@ -100,6 +100,7 @@ monster.loot = {
 	{ name = "goblet of gloom", chance = 880 },
 	{ name = "glacier kilt", chance = 880 },
 	{ name = "glacial rod", chance = 1210 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/brachiodemon.lua

@@ -103,6 +103,7 @@ monster.loot = {
 	{ name = "mastermind shield", chance = 420 },
 	{ name = "assassin dagger", chance = 340 },
 	{ name = "alloy legs", chance = 170 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/branchy_crawler.lua

@@ -98,6 +98,7 @@ monster.loot = {
 	{ name = "twiceslicer", chance = 420 },
 	{ name = "crystalline sword", chance = 390 },
 	{ name = "ruthless axe", chance = 330 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/capricious_phantom.lua

@@ -97,6 +97,7 @@ monster.loot = {
 	{ id = 23542, chance = 1180 }, -- collar of blue plasma
 	{ name = "glacial rod", chance = 940 },
 	{ name = "ornate crossbow", chance = 940 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/distorted_phantom.lua

@@ -96,6 +96,7 @@ monster.loot = {
 	{ name = "spellbook of warding", chance = 2890 },
 	{ id = 23531, chance = 1930 }, -- ring of green plasma
 	{ name = "glacial rod", chance = 1290 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/druid's_apparition.lua

@@ -94,6 +94,7 @@ monster.loot = {
 	{ name = "platinum amulet", chance = 1750 },
 	{ name = "glacier robe", chance = 880 },
 	{ id = 23544, chance = 440 }, -- collar of red plasma
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/furious_crater/cloak_of_terror.lua

@@ -98,6 +98,7 @@ monster.loot = {
 	{ name = "blue gem", chance = 1490 },
 	{ name = "brooch of embracement", chance = 1490 },
 	{ name = "wand of defiance", chance = 990 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/furious_crater/courage_leech.lua

@@ -96,6 +96,7 @@ monster.loot = {
 	{ name = "stone skin amulet", chance = 910 },
 	{ name = "nightmare blade", chance = 1190 },
 	{ name = "demonrage sword", chance = 600 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/furious_crater/poor_soul.lua

@@ -84,7 +84,6 @@ monster.loot = {
 	{ id = 33932, chance = 3520 }, -- head
 	{ name = "glacial rod", chance = 620 },
 	{ id = 34024, chance = 650 }, -- gruesome fan
-	{ id = 34109, chance = 1 }, -- bag you desire
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/furious_crater/vibrant_phantom.lua

@@ -98,6 +98,7 @@ monster.loot = {
 	{ name = "violet crystal shard", chance = 1080 },
 	{ id = 23529, chance = 1080 }, -- ring of blue plasma
 	{ name = "green gem", chance = 1080 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/infernal_demon.lua

@@ -98,6 +98,7 @@ monster.loot = {
 	{ name = "giant sword", chance = 2860 },
 	{ name = "magma boots", chance = 2290 },
 	{ name = "stone skin amulet", chance = 570 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/infernal_phantom.lua

@@ -99,6 +99,7 @@ monster.loot = {
 	{ name = "crystal mace", chance = 1610 },
 	{ name = "war axe", chance = 1410 },
 	{ name = "warrior's axe", chance = 1410 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/knight's_apparition.lua

@@ -92,6 +92,7 @@ monster.loot = {
 	{ name = "giant sword", chance = 1720 },
 	{ name = "stone skin amulet", chance = 1500 },
 	{ name = "crown shield", chance = 640 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/many_faces.lua

@@ -99,6 +99,7 @@ monster.loot = {
 	{ name = "glacier robe", chance = 2130 },
 	{ name = "gruesome fan", chance = 610 },
 	{ name = "glacial rod", chance = 610 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/mould_phantom.lua

@@ -97,6 +97,7 @@ monster.loot = {
 	{ id = 23529, chance = 1040 }, -- ring of blue plasma
 	{ name = "ornate crossbow", chance = 840 },
 	{ name = "crystal crossbow", chance = 620 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/paladin's_apparition.lua

@@ -95,6 +95,7 @@ monster.loot = {
 	{ name = "stone skin amulet", chance = 1560 },
 	{ id = 23542, chance = 1250 }, -- collar of blue plasma
 	{ id = 23529, chance = 1250 }, -- ring of blue plasma
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/rotten_golem.lua

@@ -95,6 +95,7 @@ monster.loot = {
 	{ name = "stone skin amulet", chance = 740 },
 	{ name = "terra mantle", chance = 510 },
 	{ name = "rubber cap", chance = 430 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/sorcerer's_apparition.lua

@@ -96,6 +96,7 @@ monster.loot = {
 	{ name = "wand of starstorm", chance = 1310 },
 	{ name = "stone skin amulet", chance = 1310 },
 	{ name = "alloy legs", chance = 440 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/quests/soul_war/normal_monsters/turbulent_elemental.lua

@@ -95,6 +95,7 @@ monster.loot = {
 	{ name = "crystalline armor", chance = 710 },
 	{ name = "rubber cap", chance = 710 },
 	{ name = "stone skin amulet", chance = 470 },
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data-otservbr-global/monster/undeads/hazardous_phantom.lua

@@ -82,6 +82,7 @@ monster.loot = {
 	{ id = 282, chance = 1570 }, -- giant shimmering pearl
 	{ name = "wand of everblazing", chance = 790 },
 	{ id = 23542, chance = 790 }, -- collar of blue plasma
+	{ name = "bag you desire", chance = 15 },
 }
 
 monster.attacks = {

data/libs/functions/monster.lua

@@ -204,7 +204,7 @@ do
 		return table.contains(equipmentTypes, t)
 	end
 
-	function MonsterType.getBossReward(self, lootFactor, topScore, equipmentOnly, lootTable)
+	function MonsterType.getBossReward(self, lootFactor, topScore, equipmentOnly, lootTable, player)
 		if configManager.getNumber(configKeys.RATE_LOOT) <= 0 then
 			return lootTable or {}
 		end
@@ -221,6 +221,6 @@ do
 				end
 				return true
 			end,
-		}, lootTable)
+		}, lootTable, player)
 	end
 end

data/libs/functions/monstertype.lua

@@ -1,7 +1,7 @@
 -- return a dictionary of itemId => { count, gut }
 ---@param config { factor: number, gut: boolean, filter?: fun(itemType: ItemType, unique: boolean): boolean }
 ---@return LootItems
-function MonsterType:generateLootRoll(config, resultTable)
+function MonsterType:generateLootRoll(config, resultTable, player)
 	if configManager.getNumber(configKeys.RATE_LOOT) <= 0 then
 		return resultTable or {}
 	end
@@ -28,6 +28,11 @@ function MonsterType:generateLootRoll(config, resultTable)
 		end
 
 		local chance = item.chance
+		if iType:getId() == SoulWarQuest.bagYouDesireItemId then
+			result[item.itemId].chance = self:calculateBagYouDesireChance(player, chance)
+			logger.debug("Final chance for bag you desire: {}, original chance: {}", result[item.itemId].chance, chance)
+		end
+
 		if config.gut and iType:getType() == ITEM_TYPE_CREATUREPRODUCT then
 			chance = math.ceil((chance * GLOBAL_CHARM_GUT) / 100)
 		end

data/scripts/eventcallbacks/monster/ondroploot__base.lua

@@ -22,7 +22,7 @@ function callback.monsterOnDropLoot(monster, corpse)
 	local charm = player and player:getCharmMonsterType(CHARM_GUT)
 	local gut = charm and charm:raceId() == mType:raceId()
 
-	local lootTable = mType:generateLootRoll({ factor = factor, gut = gut }, {})
+	local lootTable = mType:generateLootRoll({ factor = factor, gut = gut }, {}, player)
 	corpse:addLoot(lootTable)
 	for _, item in ipairs(lootTable) do
 		if item.gut then

data/scripts/eventcallbacks/monster/ondroploot_boosted.lua

@@ -22,7 +22,7 @@ function callback.monsterOnDropLoot(monster, corpse)
 
 	local factor = 1.0
 	local msgSuffix = " (boosted loot)"
-	corpse:addLoot(mType:generateLootRoll({ factor = factor, gut = false }, {}))
+	corpse:addLoot(mType:generateLootRoll({ factor = factor, gut = false }, {}, player))
 
 	local existingSuffix = corpse:getAttribute(ITEM_ATTRIBUTE_LOOTMESSAGE_SUFFIX) or ""
 	corpse:setAttribute(ITEM_ATTRIBUTE_LOOTMESSAGE_SUFFIX, existingSuffix .. msgSuffix)

data/scripts/eventcallbacks/monster/ondroploot_hazard.lua

@@ -31,7 +31,7 @@ function callback.monsterOnDropLoot(monster, corpse)
 
 	local lootTable = {}
 	for _ = 1, rolls do
-		lootTable = mType:generateLootRoll({ factor = factor, gut = false }, lootTable)
+		lootTable = mType:generateLootRoll({ factor = factor, gut = false }, lootTable, player)
 	end
 	corpse:addLoot(lootTable)
 

data/scripts/eventcallbacks/monster/ondroploot_prey.lua

@@ -42,7 +42,7 @@ function callback.monsterOnDropLoot(monster, corpse)
 		msgSuffix = msgSuffix .. " (active prey bonus)"
 	end
 
-	corpse:addLoot(mType:generateLootRoll({ factor = factor, gut = false }, {}))
+	corpse:addLoot(mType:generateLootRoll({ factor = factor, gut = false }, {}, player))
 	local existingSuffix = corpse:getAttribute(ITEM_ATTRIBUTE_LOOTMESSAGE_SUFFIX) or ""
 	corpse:setAttribute(ITEM_ATTRIBUTE_LOOTMESSAGE_SUFFIX, existingSuffix .. msgSuffix)
 end

data/scripts/eventcallbacks/monster/ondroploot_wealth_duplex.lua

@@ -59,7 +59,7 @@ function callback.monsterOnDropLoot(monster, corpse)
 
 	local lootTable = {}
 	for _ = 1, rolls do
-		lootTable = mType:generateLootRoll({ factor = factor, gut = false }, lootTable)
+		lootTable = mType:generateLootRoll({ factor = factor, gut = false }, lootTable, player)
 	end
 	corpse:addLoot(lootTable)
 

data/scripts/systems/reward_chest.lua

@@ -103,9 +103,9 @@ function bossDeath.onDeath(creature, corpse, killer, mostDamageKiller, lastHitUn
 				end
 
 				local playerLoot = creature:generateGemAtelierLoot()
-				playerLoot = monsterType:getBossReward(lootFactor, _ == 1, false, playerLoot)
+				playerLoot = monsterType:getBossReward(lootFactor, _ == 1, false, playerLoot, player)
 				for _ = 2, rolls do
-					playerLoot = monsterType:getBossReward(lootFactor, false, true, playerLoot)
+					playerLoot = monsterType:getBossReward(lootFactor, false, true, playerLoot, player)
 				end
 
 				-- Add droped items to reward container