Merge branch 'feat/soulpit' of https://github.com/opentibiabr/canary …

…into feat/soulpit
opentibiabr · Dec 9, 2024 · e68559d · e68559d
2 parents 384f35d + c61916e
commit e68559d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/data-otservbr-global/lib/others/soulpit.lua b/data-otservbr-global/lib/others/soulpit.lua
@@ -1,9 +1,10 @@
 SoulPit = {
 	registeredMonstersSpell = {},
 	SoulCoresConfiguration = {
-		chanceToGetSameMonsterSoulCore = 30, -- 30%
-		chanceToDropSoulCore = 50, -- 50%
-		chanceToGetOminousSoulCore = 5, -- 5%
+		chanceToGetSameMonsterSoulCore = 15, -- 15%
+		chanceToDropSoulCore = 10, -- 10%
+		chanceToGetOminousSoulCore = 3, -- 3%
+		chanceToDropSoulPrism = 8, -- 8%
 		monsterVariationsSoulCore = {
 			["Horse"] = "horse soul core (taupe)",
 			["Brown Horse"] = "horse soul core (brown)",

diff --git a/data/scripts/eventcallbacks/monster/ondroploot_soul_core.lua b/data/scripts/eventcallbacks/monster/ondroploot_soul_core.lua
@@ -8,7 +8,7 @@ function callback.monsterOnDropLoot(monster, corpse)
 	if not player or not player:canReceiveLoot() then
 		return
 	end
-	if monster:getMonsterForgeClassification() == FORGE_NORMAL_MONSTER then
+	if monster:getMonsterForgeClassification() ~= FORGE_FIENDISH_MONSTER then
 		return
 	end
 
@@ -36,15 +36,22 @@ function callback.monsterOnDropLoot(monster, corpse)
 		end
 
 		if soulCoreId then
-			lootTable = {
-				[soulCoreId] = {
-					count = 1,
-				},
+			lootTable[soulCoreId] = {
+				count = 1,
 			}
 		else
 			return {}
 		end
 	end
+
+	if math.random(100) < SoulPit.SoulCoresConfiguration.chanceToDropSoulPrism then
+		local soulPrismId = getItemIdByName("soul prism")
+		if soulPrismId then
+			lootTable[soulPrismId] = {
+				count = 1,
+			}
+		end
+	end
 	corpse:addLoot(mType:generateLootRoll({}, lootTable, player))
 end