NPCs don't collect weapons after fight

[AmProsius]

Describe the bug
NPCs don't always collect their weapons and loast ammunition when they regain consciousness after a lost fight.

Expected behavior
NPCs now always pick up their weapons and lost ammunition after a lost fight.

[catalinstoian]

gothic-1-community-patch/scriptbase/_work/Data/Scripts/Content/AI/AI_Intern/B_Functions.d

Lines 297 to 312 in 746a440

	func void B_RegainDroppedWeapon(var C_NPC slf)
	{
	//-------- fallgelassene Waffe aufheben... --------
	Npc_PerceiveAll (slf);
	if ( Wld_DetectItem (slf, ITEM_KAT_NF) || Wld_DetectItem (slf, ITEM_KAT_FF) )
	{
	if !Npc_IsPlayer(slf)
	&& Npc_CanSeeItem(slf,item)
	{
	PrintDebugNpc(PD_ZS_CHECK, "...NSC hebt seine Waffen wieder auf!" );
	AI_TakeItem (slf, item);
	AI_EquipBestMeleeWeapon(slf);
	AI_EquipBestRangedWeapon(slf);
	};
	};
	};

changed to

func void B_RegainDroppedWeapon(var C_NPC slf)
{
	//-------- fallgelassene Waffe aufheben... --------
	Npc_PerceiveAll (slf);
	if ( Wld_DetectItem (slf, ITEM_KAT_NF) )
	{
		if	!Npc_IsPlayer(slf)
		&&	Npc_CanSeeItem(slf,item)
		&&	!Npc_HasEquippedMeleeWeapon(slf)
		{
			PrintDebugNpc(PD_ZS_CHECK, "...NSC hebt seine Nahkampf-Waffe wieder auf!" );
			AI_TakeItem (slf, item);
			AI_EquipBestMeleeWeapon(slf);
		};
	};
	Npc_PerceiveAll (slf);
	if ( Wld_DetectItem (slf, ITEM_KAT_FF) )
	{
		if	!Npc_IsPlayer(slf)
		&&	Npc_CanSeeItem(slf,item)
		&&	!Npc_HasEquippedRangedWeapon(slf)
		{
			PrintDebugNpc(PD_ZS_CHECK, "...NSC hebt seine Fernkampf-Waffe wieder auf!" );
			AI_TakeItem (slf, item);
			AI_EquipBestRangedWeapon(slf);
		};
	};
	Npc_PerceiveAll (slf);
	if ( Wld_DetectItem (slf, ITEM_KAT_MUN) )
	{
		if	!Npc_IsPlayer(slf)
		&&	Npc_CanSeeItem(slf,item)
		{
			PrintDebugNpc(PD_ZS_CHECK, "...NSC hebt seine Munition wieder auf!" );
			AI_TakeItem (slf, item);
		};
	};
};

[szapp]

gothic-1-community-patch/src/Ninja/G1CP/Content/Fixes/Session/fix003_RegainDroppedWeapon.d

Lines 32 to 70 in 04830dc

	/*
	* This function essentially replaces (not technically!) the function 'B_RegainDroppedWeapon'
	*/
	func void G1CP_003_RegainDroppedWeapon_Logic(var C_Npc slf) {
	Npc_PerceiveAll(slf);
	// Define possibly missing symbols locally
	const int ITEM_KAT_NF = 1<<1;
	const int ITEM_KAT_FF = 1<<2;
	const int ITEM_KAT_MUN = 1<<3;
	// Melee weapon
	if (Wld_DetectItem(slf, ITEM_KAT_NF)) {
	if (Npc_GetDistToItem(slf, item) < 5000) // Prevent walking off too far
	&& (G1CP_Npc_CanSeeItemFreeLOS(slf, item)) // Does not have to face it, only line of sight
	&& (!Npc_HasEquippedMeleeWeapon(slf)) {
	AI_TakeItem(slf, item);
	AI_Function_NI(slf, EquipWeapon, slf, Hlp_GetInstanceID(item)); // Equip this exact weapon in particular
	};
	};
	// Ranged weapon
	if (Wld_DetectItem(slf, ITEM_KAT_FF)) {
	if (Npc_GetDistToItem(slf, item) < 5000)
	&& (G1CP_Npc_CanSeeItemFreeLOS(slf, item))
	&& (!Npc_HasEquippedRangedWeapon(slf)) {
	AI_TakeItem(slf, item);
	AI_Function_NI(slf, EquipWeapon, slf, Hlp_GetInstanceID(item));
	};
	};
	// Ammunition (just a bonus)
	if (Wld_DetectItem(slf, ITEM_KAT_MUN)) {
	if (Npc_GetDistToItem(slf, item) < 5000)
	&& (G1CP_Npc_CanSeeItemFreeLOS(slf, item)) {
	AI_TakeItem(slf, item);
	};
	};
	};

It seems like a made a mistake with the distances here. 5000 corresponds to 50 meters, which is way too far. Something like 300 as found in the function below seems more reasonable.

gothic-1-community-patch/scriptbase/_work/Data/Scripts/Content/AI/B_Human/B_AssessBody.d

Lines 110 to 130 in 04830dc

	func void ZS_AssessBody_RecoverWeapon ()
	{
	PrintDebugNpc (PD_ZS_FRAME, "ZS_AssessBody_RecoverWeapon");
	B_SetPerception (self);
	//-------- nach der evtl. fallengelassenen Waffe suchen --------
	Npc_PerceiveAll (self);
	if (( Wld_DetectItem (self,ITEM_KAT_NF) || Wld_DetectItem (self,ITEM_KAT_FF) )
	&& Npc_GetDistToItem(self,item) < 300 )
	{
	PrintDebugNpc (PD_ZS_CHECK, "...Nah- oder Fernkampfwaffe gefunden!" );
	B_SayOverlay (self, NULL, "$ITakeYourWeapon");
	AI_TakeItem (self, item);
	AI_EquipBestMeleeWeapon(self);
	AI_EquipBestRangedWeapon(self);
	};
	//-------- Heilen ! --------
	AI_StartState (self, ZS_HealSelf, 1, "");
	};