Don't set victim when picking up an item from the floor #735
Conversation
game/world/world.cpp
Outdated
| void World::sendPassivePerc(Npc &self, Npc &other, Npc &victum, int32_t perc) { | ||
| wobj.sendPassivePerc(self,other,victum,nullptr,perc); | ||
| wobj.sendPassivePerc(self,other,&victum,nullptr,perc); |
There was a problem hiding this comment.
Since original assumption about victim cannot be null is now know to be not valid, we also need to update code that call to his function, such as:
// Interactive::implTick
npc.world().sendPassivePerc(npc,npc,npc,PERC_ASSESSUSEMOB);
There was a problem hiding this comment.
Hopefully I caught all of them now.
One interesting decision I had a hard time with, was wether or not to have the World::sendPassivePerc() variants.
Before the victim change, there were two sendPassivePerc variants, hiding the the possible item nullptr from users.
I've gone now with introducing similar variants for victim and victimless variants, but this already increases variants to 4.
The other option would be of course to just add the nullptr when calling World::sentPassivePerc(). I'll defer that to your preference :-) .
mmind
force-pushed
the
dev/pickuptheft
branch
from
0cad4b4 to
afe93dd
Compare
At least the Gothic 1 script assesses theft differently depending on whether
a victim is set or not.
if (npc_canseenpc(self, other)) {
printdebugnpc(pd_zs_check, "...NSC kann den Dieb sehen!");
if (hlp_isvaliditem(item) && (!hlp_isvalidnpc(victim))) {
printdebugnpc(pd_zs_check, "...Item wurde aufgehoben!"); // Item picked up
...
}
else {
printdebugnpc(pd_zs_check, "...Taschendiebstahl!"); //pickpocket
...
}
This causes NPC around an item to tell the player that something is getting
stolen right now and also indicates that victim is not always set in the
perception process.
So adapt the sent passivePerc accordingly to not transmit the player as victim
when picking up items.
GameScript::invokeState() already removed the default setting of other=npc
for the !other case in commit 3fc5c39 ("damage from faling") as part
of the fix for Try#18, so do the same for the current default victim setting.
This fixes Try#717.
mmind
force-pushed
the
dev/pickuptheft
branch
from
afe93dd to
7383d2a
Compare
At least the Gothic 1 script assesses theft differently depending on whether a victim is set or not.
This causes NPC around an item to tell the player that something is getting stolen right now and also indicates that victim is not always set in the perception process.
So adapt the sent passivePerc accordingly to not transmit the player as victim when picking up items.
GameScript::invokeState() already removed the default setting of other=npc for the !other case in commit 3fc5c39 ("damage from faling") as part of the fix for #18, so do the same for the current default victim setting.
This fixes #717.