Lua Hooks to disable drops from players

Source/lua/lua_event.cpp

@@ -4,7 +4,7 @@
 #include <string_view>
 #include <utility>
 
 #include <sol/sol.hpp>
 
 #include "lua/lua_global.hpp"
 #include "monster.h"
@@ -16,15 +16,15 @@
 namespace lua {
 
 template <typename... Args>
 void CallLuaEvent(std::string_view name, Args &&...args)
 {
 	sol::table *events = GetLuaEvents();
 	if (events == nullptr) {
 		return;
 	}
 
 	const auto trigger = events->traverse_get<std::optional<sol::object>>(name, "trigger");
 	if (!trigger.has_value() || !trigger->is<sol::protected_function>()) {
 		LogError("events.{}.trigger is not a function", name);
 		return;
 	}
@@ -33,7 +33,7 @@
 }
 
 template <typename T, typename... Args>
 T CallLuaEventReturn(T defaultValue, std::string_view name, Args &&...args)
 {
 	sol::table *events = GetLuaEvents();
 	if (events == nullptr) {
@@ -45,7 +45,7 @@
 		return defaultValue;
 	}
 	const sol::protected_function fn = trigger->as<sol::protected_function>();
 	sol::object result = SafeCallResult(fn(std::forward<Args>(args)...), /*optional=*/true);
 	if (result.is<T>()) {
 		return result.as<T>();
 	}
@@ -79,7 +79,19 @@
 	CallLuaEvent("OnMonsterTakeDamage", monster, damage, damageType);
 }
 
+bool OnPlayerDeathDropEar(const Player *player)
+{
+	return CallLuaEventReturn<bool>(true, "OnPlayerDeathDropEar", player);
+}
+bool OnPlayerDeathDropGold(const Player *player)
+{
+	return CallLuaEventReturn<bool>(true, "OnPlayerDeathDropGold", player);
+}
+bool OnPlayerDeathDropItem(const Player *player)
+{
+	return CallLuaEventReturn<bool>(true, "OnPlayerDeathDropItem", player);
+}
 void OnPlayerGainExperience(const Player *player, uint32_t exp)
 {
 	CallLuaEvent("OnPlayerGainExperience", player, exp);
 }

Source/lua/lua_event.hpp

@@ -19,6 +19,9 @@ void StoreOpened(std::string_view name);
 
 void OnMonsterTakeDamage(const Monster *monster, int damage, int damageType);
 
+bool OnPlayerDeathDropEar(const Player *player);
+bool OnPlayerDeathDropGold(const Player *player);
+bool OnPlayerDeathDropItem(const Player *player);
 void OnPlayerGainExperience(const Player *player, uint32_t exp);
 void OnPlayerTakeDamage(const Player *player, int damage, int damageType);
 

Source/player.cpp

@@ -11,14 +11,14 @@
 #include <SDL3/SDL_events.h>
 #include <SDL3/SDL_timer.h>
 #else
 #include <SDL.h>
 #endif
 
 #include <fmt/core.h>
 
 #include "control/control.hpp"
 #include "controls/control_mode.hpp"
 #include "controls/plrctrls.h"
 #include "cursor.h"
 #include "dead.h"
 #ifdef _DEBUG
@@ -2689,9 +2689,19 @@
 		gamemenu_off();
 	}
 
-	const bool dropGold = !gbIsMultiplayer || !(player.isOnLevel(16) || player.isOnArenaLevel());
-	const bool dropItems = dropGold && deathReason == DeathReason::MonsterOrTrap;
-	const bool dropEar = dropGold && deathReason == DeathReason::Player;
+	bool dropGold = !gbIsMultiplayer || !(player.isOnLevel(16) || player.isOnArenaLevel());
+	bool dropItems = dropGold && deathReason == DeathReason::MonsterOrTrap;
+	bool dropEar = dropGold && deathReason == DeathReason::Player;
+
+	if (dropGold && !lua::OnPlayerDeathDropGold(&player)) {
+		dropGold = false;
+	}
+	if (dropItems && !lua::OnPlayerDeathDropItem(&player)) {
+		dropItems = false;
+	}
+	if (dropEar && !lua::OnPlayerDeathDropEar(&player)) {
+		dropEar = false;
+	}
 
 	player.Say(HeroSpeech::AuughUh);
 

assets/lua/devilutionx/events.lua

@@ -80,6 +80,18 @@ local events = {
   ---Called when Player gains experience.
   OnPlayerGainExperience = CreateEvent(),
   __doc_OnPlayerGainExperience = "Called when Player gains experience.",
+
+  ---Called when Player dies to determine if gold is dropped. Return false to prevent gold drop.
+  OnPlayerDeathDropGold = CreateEvent(),
+  __doc_OnPlayerDeathDropGold = "Called when Player dies to determine if gold is dropped. Return false to prevent gold drop.",
+
+  ---Called when Player dies to determine if items are dropped. Return false to prevent item drop.
+  OnPlayerDeathDropItem = CreateEvent(),
+  __doc_OnPlayerDeathDropItem = "Called when Player dies to determine if items are dropped. Return false to prevent item drop.",
+
+  ---Called when Player dies to determine if an ear is dropped. Return false to prevent ear drop.
+  OnPlayerDeathDropEar = CreateEvent(),
+  __doc_OnPlayerDeathDropEar = "Called when Player dies to determine if an ear is dropped. Return false to prevent ear drop.",
 }
 
 ---Registers a custom event type with the given name.