Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update oc_capture.lsl #969

Closed
wants to merge 1 commit into from
Closed

Conversation

Pingout
Copy link
Collaborator

@Pingout Pingout commented Jul 26, 2023

A number of problems are addressed in this Commit:

  1. Owner will have the ability to end a capture
  2. Owner and Captor are both notified of successful capture and end of capture
  3. BLOCKED individuals are prevented from using Capture Ref Issue 959 I can access my Capture menu while blocked #959
  4. Wearer can now end a capture using the Capture menu when in a non-Risky capture

A number of problems are addressed in this Commit:
1) Owner will have the ability to end a capture
2) Owner and Captor are both notified of successful capture and end of capture
3) BLOCKED individuals are prevented from using Capture
4) Wearer can now end a capture using the Capture menu when in a non-Risky capture
Copy link

@Trinkitz Trinkitz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We successfully tested this. Edit: We tested with wearer being owned, but not an owner themselves. Subsequent tests have shown that release through the menu is possible in both "risky" and "non-risky" modes. I have been unable to duplicate the inability to release when capture is in "risky" mode.

@NikkiLacrima
Copy link
Contributor

In order to only allow unowned wearer to release capture in non risky mode cange line 144 to:

if(g_iCaptured && (iNum == CMD_OWNER || (iNum == CMD_WEARER && !g_iRisky))){ // ask stop capture before any other changes to capture settings.

@Pingout
Copy link
Collaborator Author

Pingout commented Jul 27, 2023

In order to only allow unowned wearer to release capture in non risky mode cange line 144 to:

if(g_iCaptured && (iNum == CMD_OWNER || (iNum == CMD_WEARER && !g_iRisky))){ // ask stop capture before any other changes to capture settings.

This does not compile inworld. The curly brace needs to be a ;
That being said, this fix sends a notice to the captive saying Access Denied, but still allows the captive to end the capture.
I believe the bug allowing the wearer to access the Capture Menu is further in to the script

@NikkiLacrima
Copy link
Contributor

It compiles for me and does what it should, of course needs more testing.

The fragment in the merged file at line 144

        if(g_iCaptured){ // ask stop capture before any other changes to capture settings.
            StopCapture(kID, iNum);
        } 

This allows anyone with menu access to release the capture,
is replaced by

        if(g_iCaptured && (iNum == CMD_OWNER || (iNum == CMD_WEARER && !g_iRisky))){ // ask stop capture before any other changes to capture settings.
            StopCapture(kID, iNum);
        } 

This allows release only by owners or wearer in non risky mode.

@Pingout
Copy link
Collaborator Author

Pingout commented Jul 27, 2023

It compiles for me and does what it should, of course needs more testing.

> > This allows release only by owners or wearer in non risky mode.

You are of course correct. I missed a close parenthesis when I copied your changes into the script. I will post the full script with all the changes here so we can do testing and comment. Thanks for your help.

Pingout added a commit that referenced this pull request Jul 27, 2023
A revision to PR #969 
This update has most of the features of 969 without the bugs, plus an important detail:
1) Owner can now end a Capture Issue #903 
2) Owner and Captor are both notified of successful Capture and End of Capture
3) BLOCKED individuals can not Capture Issue #959
4) Wearer can end Capture when Risky is off
5) When Risky is active, the Captive's only escape is using Safeword
6) Fixes a bug in the timer when Captive relogs and Captor leaves the sim Issue #858
@Pingout Pingout mentioned this pull request Jul 27, 2023
@Pingout
Copy link
Collaborator Author

Pingout commented Jul 27, 2023

Moved to PR #970

@Pingout Pingout closed this Jul 27, 2023
@Pingout Pingout deleted the Pingout-patch-16 branch May 15, 2024 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants