From 77f6808c459701460c2f92d0e97cc754f84bb38a Mon Sep 17 00:00:00 2001
From: BoroBongo <borobongo@gmail.com>
Date: Mon, 15 Jun 2026 02:46:50 +0100
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20ZS=5FDead=20equivalent=20=E2=80=94?=
 =?UTF-8?q?=20death=20XP=20and=20loot=20init=20on=20NPC=20kill?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FightService.OnNpcDied() now replicates Gothic's ZS_Dead AI state logic:
1. Resets AIV_PLUNDERED to 0 (FALSE) on the dead NPC's instance
2. If EnableDeathXP and the killer is the hero: calls B_DeathXP via the
   Daedalus VM (sets XP, level, LP), then syncs results to hero.Vob via
   NpcService.SyncHeroInstanceToVob()
3. Always calls B_GiveDeathInv so the loot panel has items to show
4. Restores GlobalSelf / GlobalOther after both VM calls

EnableDeathXP is gated behind EnableCombatSystem in DeveloperConfig and
marked WIP (damage values are still debug stubs).

Also adds EnableLevel5Cheat and EnableGuildCheat flags in DeveloperConfig
(Misc / WIP section) used by StatusMenu cheat triggers.
---
 .../Scripts/Models/Config/DeveloperConfig.cs  | 10 ++++++
 .../Scripts/Services/Npc/FightService.cs      | 34 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs b/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs
index 97a281486..9fa876881 100644
--- a/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs
+++ b/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs
@@ -177,6 +177,10 @@ public class DebugChannelTypesCollection : CollectionWrapper<DeveloperConfigEnum
 
         [Tooltip("Enable player→NPC melee combat (hit detection, damage, hurt/death animations). WIP - debug damage values only.")]
         public bool EnableCombatSystem;
+
+        [ConditionalField(fieldToCheck: nameof(EnableCombatSystem), compareValues: true)]
+        [Tooltip("Call B_DeathXP on kill to grant XP. WIP - XP values may be incorrect.")]
+        public bool EnableDeathXP;
         
         [ConditionalField(fieldToCheck: nameof(EnableNpcs), compareValues: true)]
         public bool EnableNpcMeshCulling = true;
@@ -291,5 +295,11 @@ public class DebugChannelTypesCollection : CollectionWrapper<DeveloperConfigEnum
         public bool EnableDecalVisuals;
         public bool EnableParticleEffects;
 
+        [Tooltip("Click MENU_ITEM_LEVEL 5 times within 2s in StatusMenu to instantly set hero to level 5 (exp=7500, next=10500, LP+50, HP+60).")]
+        public bool EnableLevel5Cheat;
+
+        [Tooltip("Click MENU_ITEM_PLAYERGUILD 3 times within 2s in StatusMenu to set hero guild to Novice (GIL_NOV).")]
+        public bool EnableGuildCheat;
+
     }
 }
diff --git a/Assets/Gothic-Core/Scripts/Services/Npc/FightService.cs b/Assets/Gothic-Core/Scripts/Services/Npc/FightService.cs
index 163910d20..ab7be6e00 100644
--- a/Assets/Gothic-Core/Scripts/Services/Npc/FightService.cs
+++ b/Assets/Gothic-Core/Scripts/Services/Npc/FightService.cs
@@ -19,6 +19,8 @@ public class FightService
         [Inject] private PhysicsService _physicsService;
         [Inject] private NpcHelperService _npcHelperService;
         [Inject] private readonly ConfigService _configService;
+        [Inject] private readonly Gothic.Core.Services.GameStateService _gameStateService;
+        [Inject] private readonly NpcService _npcService;
 
         public void Init()
         {
@@ -39,6 +41,8 @@ private void OnHit(NpcContainer attacker, NpcContainer target, Vector3 __)
                 Logger.Log($"[FightService.OnHit] {target.Instance.GetName(NpcNameSlot.Slot0)} is DEAD", LogCat.Npc);
                 target.Props.BodyState = VmGothicEnums.BodyState.BsDead;
                 OnDyingChangeAnimation(target);
+                if (_configService.Dev.EnableDeathXP)
+                    OnNpcDied(target, attacker);
             }
             else
             {
@@ -88,6 +92,36 @@ private bool OnHitUpdateHealth(NpcContainer attacker, NpcContainer target)
             return hitPoints <= 0;
         }
 
+        private void OnNpcDied(NpcContainer dead, NpcContainer killer)
+        {
+            var vm = _gameStateService.GothicVm;
+            var aivPlundered = vm.GetSymbolByName("AIV_PLUNDERED")?.GetInt(0) ?? 8;
+            dead.Instance.SetAiVar(aivPlundered, 0);
+
+            var oldSelf = vm.GlobalSelf;
+            var oldOther = vm.GlobalOther;
+            vm.GlobalSelf = dead.Instance;
+            vm.GlobalOther = killer.Instance;
+
+            if (_configService.Dev.EnableDeathXP && killer.PrefabProps.IsHero())
+            {
+                var bDeathXp = vm.GetSymbolByName("B_DeathXP");
+                if (bDeathXp != null)
+                {
+                    vm.Call(bDeathXp.Index);
+                    _npcService.SyncHeroInstanceToVob();
+                    Logger.Log($"[FightService.OnNpcDied] B_DeathXP: {dead.Instance.GetName(NpcNameSlot.Slot0)} killed by hero", LogCat.Npc);
+                }
+            }
+
+            var bGiveDeathInv = vm.GetSymbolByName("B_GiveDeathInv");
+            if (bGiveDeathInv != null)
+                vm.Call(bGiveDeathInv.Index);
+
+            vm.GlobalSelf = oldSelf;
+            vm.GlobalOther = oldOther;
+        }
+
         private void OnDyingChangeAnimation(NpcContainer target)
         {
             // Clear pending AI queue and stop all running animations (e.g. s_walk still looping).

From d9a053491b589a38401aefacbc54bb8e89456f7a Mon Sep 17 00:00:00 2001
From: BoroBongo <borobongo@gmail.com>
Date: Mon, 15 Jun 2026 22:30:57 +0100
Subject: [PATCH 2/3] fix: remove cheat config fields that don't belong in
 zs-dead

---
 Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs b/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs
index 9fa876881..66c348579 100644
--- a/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs
+++ b/Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs
@@ -295,11 +295,6 @@ public class DebugChannelTypesCollection : CollectionWrapper<DeveloperConfigEnum
         public bool EnableDecalVisuals;
         public bool EnableParticleEffects;
 
-        [Tooltip("Click MENU_ITEM_LEVEL 5 times within 2s in StatusMenu to instantly set hero to level 5 (exp=7500, next=10500, LP+50, HP+60).")]
-        public bool EnableLevel5Cheat;
-
-        [Tooltip("Click MENU_ITEM_PLAYERGUILD 3 times within 2s in StatusMenu to set hero guild to Novice (GIL_NOV).")]
-        public bool EnableGuildCheat;
 
     }
 }

From 4a2e129abc19b5907a3f2dda85941d8138b7471d Mon Sep 17 00:00:00 2001
From: BoroBongo <borobongo@gmail.com>
Date: Wed, 17 Jun 2026 12:49:53 +0100
Subject: [PATCH 3/3] feat: add SyncHeroInstanceToVob to sync hero XP and level
 to Vob after B_DeathXP

---
 Assets/Gothic-Core/Scripts/Services/Npc/NpcService.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Assets/Gothic-Core/Scripts/Services/Npc/NpcService.cs b/Assets/Gothic-Core/Scripts/Services/Npc/NpcService.cs
index d52ec2b88..e486b8407 100644
--- a/Assets/Gothic-Core/Scripts/Services/Npc/NpcService.cs
+++ b/Assets/Gothic-Core/Scripts/Services/Npc/NpcService.cs
@@ -247,6 +247,15 @@ public void ExtNpcChangeAttribute(NpcInstance npc, int attributeId, int value)
             vob.Attributes[attributeId] = value;
         }
 
+        public void SyncHeroInstanceToVob()
+        {
+            var hero = GetHeroContainer();
+            hero.Vob.Level = hero.Instance.Level;
+            hero.Vob.Xp = hero.Instance.Exp;
+            hero.Vob.XpNextLevel = hero.Instance.ExpNext;
+            hero.Vob.Lp = hero.Instance.Lp;
+        }
+
         public NpcContainer GetHeroContainer()
         {
             return ((NpcInstance)_gameStateService.GothicVm.GlobalHero).GetUserData();