ForgottenGlory / Masterstroke

2 stars 1 forks source link

Public Whore warns player if no weapon equipped #153

Closed ForgottenGlory closed 2 years ago

ForgottenGlory commented 2 years ago

Is bug?: Confirm

Read the readme?: Confirm

List Version: 1.0.1

Reproducable?: Yes

Discord Username: Milk#6756

Rule 11?: No

Type: Gameplay (objects which cannot be activated or other gameplay related bugs)

Summary: Public Whore warns player if no weapon equipped

Details: Note that players will not encounter this issue with the Masterstroke MCM settings, as it allows weapons in the Public Whore MCM. However, I was told to report this on Discord. Discussion: https://discord.com/channels/690583538210308106/989999428502974504/994016058124009593

This is happening because the Unarmed (1F4) weapon is equipped at all times. I suspect that Adamant is doing this, but I am not certain.

Unrelated to Public Whore, and this happens with the default MCM settings, occasionally the message "was unequipped" pops up as well. So far it seems harmless, but I believe this to be related to mods unequipping your weapons while unarmed.

The script file of Public Whore PW_MainLoopScript has this code:

    equippedWeapon = player.GetEquippedWeapon()

    isPlayerCollared = collarSlotItem != none
    isPlayerYoked = yokeSlotItem != none
    isPlayerGagged = (gagSlotItem != none && (gagSlotItem.HasKeyWordString("zad_DeviousGag") || gagSlotItem.HasKeyWordString("zbfWornGag")))
    isPlayerNaked = getPlayerNudity() >= nudityLevel
    isPlayerArmed = equippedWeapon != none

Here equippedWeapon is Unarmed.

In case you are interested in patching the script files of mods, I would propose the following patch:

    isPlayerArmed = equippedWeapon != none && !equippedWeapon.HasKeyWordString("SexLabNoStrip")

Together with an esp patch which adds this keyword to the Unarmed weapon. This would also fix SexLab trying to unequip it. I uploaded my version of these patches here: https://discord.com/channels/690583538210308106/989999428502974504/994026427215257680

Steps to reproduce: 1. Unequip all weapons

  1. Set MCM > Public Whore > On-duty Settings > Allowed to hold weapons to false
  2. Become Public Whore
  3. Observe warning that you are wearing a weapon

Crash log:

Screenshots:

ForgottenGlory commented 2 years ago

No fix needed, allowed to hold weapons should be set to true