#1 make NPCs sleep properly

[szapp]

This PR is not ready for merging yet. The issue below should be addressed first.

Are you sure this works as expected? A check against Npc_GetBodyState rarely renders true, because the body state is a bitfield, a combination of multiple active body states. That's why there is the function C_BodyStateContains. Is there a particular reason why you used Npc_GetBodyState?

Originally posted by @szapp in #1 (comment)

To test this fix, manual confirmation is required: When running test 1 from the console, the hero is teleported to a hut at night. The user can confirm if the NPC inside remains asleep.

[szapp]

Ready for merge

[AmProsius]

@szapp can you resolve the conflicts? I'm not sure about the contents of misc.d.

[AmProsius]

I'm not sure if that's the intended behavior: When I run test 1, I'm teleported in front of a hut, the NPC inside is awake in the middle of the hut and immediately goes to bed. If I run test 1 again, the NPC is resetted to the middle of the hut and goes to bed again.

[szapp]

Yes, this seems correct. The test is a bit "light" and depends pretty much on observation. The thing to look out for is whether the NPC stays asleep or immediately gets up out of bed again and stands around. There are no prints or anything automatic to double check that.

You can remove the fix and run the test again to compare. To do so, comment out/remove this line:

gothic-1-community-patch/src/Ninja/G1CP/Content/NinjaInit.d

Line 17 in 9e7e735

Ninja_G1CP_001_FixNpcSleep(); // #1

[AmProsius]

Thanks, I will try that.

[AmProsius]

I can now confirm that this fix works as intended. Without the fix, the NPC gets out of bed and with the fix the NPC remains sleeping. Great work!

[szapp]

Thanks for double checking. That was the first test with "manual confirmation" that I wrote, that's why the automation and instruction was lacking a bit.