Add new ONSIT CAPIFSUB to RLV
It captures only when the automatically assigned sitter number corresponds to the role of a sub.
This commit is contained in:
parent
6e8a228b3f
commit
a32c8496ba
1 changed files with 16 additions and 10 deletions
|
@ -437,7 +437,7 @@ find_seat(key id, integer index, string msg, integer captureSub)
|
||||||
{
|
{
|
||||||
if (index != -1)
|
if (index != -1)
|
||||||
{
|
{
|
||||||
if (msg == Dominant_name)
|
if (msg == Dominant_name || msg == "D")
|
||||||
msg = "D";
|
msg = "D";
|
||||||
else
|
else
|
||||||
msg = "S";
|
msg = "S";
|
||||||
|
@ -682,6 +682,9 @@ state running
|
||||||
{
|
{
|
||||||
menu = "";
|
menu = "";
|
||||||
SITTING_AVATARS += id;
|
SITTING_AVATARS += id;
|
||||||
|
// If they must be assigned a SUB spot, regardless of the
|
||||||
|
// automatically assigned sitter, lock them as they sit.
|
||||||
|
// That happens with ONSIT CAPTURE and with force-sitting.
|
||||||
if (onSit == "CAPTURE" || (string)CONTROLLER + (string)id == PairWhoStartedCapture)
|
if (onSit == "CAPTURE" || (string)CONTROLLER + (string)id == PairWhoStartedCapture)
|
||||||
{
|
{
|
||||||
if (llListFindList(DESIGNATIONS_NOW, ["S"]) != -1)
|
if (llListFindList(DESIGNATIONS_NOW, ["S"]) != -1)
|
||||||
|
@ -689,18 +692,21 @@ state running
|
||||||
find_seat(id, one, Submissive_name, TRUE);
|
find_seat(id, one, Submissive_name, TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else if (num == 90070)
|
||||||
|
{
|
||||||
|
// This is the first message where we know the sitter number
|
||||||
|
if (llListFindList(DESIGNATIONS_NOW, [id]) == -1)
|
||||||
|
{
|
||||||
|
if (onSit == "CAPIFSUB")
|
||||||
|
{
|
||||||
|
find_seat(id, one, llList2String(DESIGNATIONS_NOW, one), TRUE);
|
||||||
|
}
|
||||||
else if (onSit == "ASK")
|
else if (onSit == "ASK")
|
||||||
{
|
{
|
||||||
ask_role(id);
|
ask_role(id);
|
||||||
}
|
}
|
||||||
else
|
else if (onSit == "NONE")
|
||||||
{
|
|
||||||
two = llListFindList(DESIGNATIONS_NOW, ["S"]);
|
|
||||||
if (llGetInventoryType(main_script + " 1") == INVENTORY_SCRIPT)
|
|
||||||
{
|
|
||||||
two = one;
|
|
||||||
}
|
|
||||||
if (two != -1)
|
|
||||||
{
|
{
|
||||||
DESIGNATIONS_NOW = llListReplaceList(DESIGNATIONS_NOW, [id], one, one);
|
DESIGNATIONS_NOW = llListReplaceList(DESIGNATIONS_NOW, [id], one, one);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue