AriasCreations/AVsitter
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove or add parentheses as necessary to improve clarity.

Browse source 
There should be no changes in the code compiled from source directly.
This commit is contained in:
Sei Lisa 2017-08-14 20:01:47 +02:00 • committed by Sei-Lisa
parent 2488349a1b
commit 202b4503d1
12 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AVsitter2/Plugins/AVcontrol/[AV]root-RLV-extra.lsl
View file

@ -366,7 +366,7 @@ state running
{
icon = iconHalf;
}
if (wornThis == 3 && wornSub == 0 || (wornThis == 0 && wornSub == 3) || (wornThis == 3 && wornSub == 3))
if ((wornThis == 3 && wornSub == 0) || (wornThis == 0 && wornSub == 3) || (wornThis == 3 && wornSub == 3))
{
icon = iconFull;
}
@ -394,7 +394,7 @@ state running
msg = "Folder: /" + llDumpList2String(folderPath, "/") + "\n[" + icon + "]\n" + folderInfo;
}
}
if ((!llGetListLength(folderOptions)) && (!llGetListLength(BUTTONS)))
if (!llGetListLength(folderOptions) && !llGetListLength(BUTTONS))
{
msg = "#RLV folder empty";
}

16
AVsitter2/Plugins/AVcontrol/[AV]root-RLV.lsl
View file

@ -196,7 +196,7 @@ rlv_top_menu()
list menu_items;
string text = "RLV for " + slaveName;
list extra;
if (llGetListLength(SITTING_AVATARS) > 1 || (~llListFindList(DESIGNATIONS_NOW, ["S"])))
if (llGetListLength(SITTING_AVATARS) > 1 || ~llListFindList(DESIGNATIONS_NOW, ["S"]))
{
extra += "[BACK]";
}
@ -207,7 +207,7 @@ rlv_top_menu()
{
if (slaveWearingRelay)
{
if ((~designationIndex) && llList2String(SITTER_DESIGNATIONS_MASTER, designationIndex) == "D")
if (~designationIndex && llList2String(SITTER_DESIGNATIONS_MASTER, designationIndex) == "D")
{
text = slaveName + " has not chosen submissive role.";
}
@ -320,7 +320,7 @@ release(key SLAVE, integer allowUnsit)
llSay(0, llKey2Name(SLAVE) + " was released.");
relay(SLAVE, baseReleaseRestrictions);
relay(SLAVE, "!release");
if (allowUnsit && (~llSubStringIndex(baseReleaseRestrictions, "@unsit=force")))
if (allowUnsit && ~llSubStringIndex(baseReleaseRestrictions, "@unsit=force"))
{
llUnSit(SLAVE);
}
@ -413,7 +413,7 @@ select_submissive_rlv()
{
text = "There are no submissives sitting.";
}
if ((~llListFindList(DESIGNATIONS_NOW, ["S"])) && llGetListLength(SITTING_AVATARS) < llGetListLength(DESIGNATIONS_NOW))
if (~llListFindList(DESIGNATIONS_NOW, ["S"]) && llGetListLength(SITTING_AVATARS) < llGetListLength(DESIGNATIONS_NOW))
{
text += "\n\nCapture = trap a new avatar.";
menu_items += "Capture...";
@ -745,7 +745,7 @@ state running
integer isSittingIndex = llListFindList(SITTING_AVATARS, [id]);
if (~isSittingIndex)
{
if (RLV_ON && (~designationIndex) && llList2String(SITTER_DESIGNATIONS_MASTER, designationIndex) == "S")
if (RLV_ON && ~designationIndex && llList2String(SITTER_DESIGNATIONS_MASTER, designationIndex) == "S")
{
if (subControl)
{
@ -1014,12 +1014,12 @@ state running
}
else if (msg == "Stop" || msg == "Start")
{
TimelockPaused = (!TimelockPaused);
TimelockPaused = !TimelockPaused;
llSetTimerEvent(1);
}
else if (msg == "Hide" || msg == "Show")
{
TimelockHidden = (!TimelockHidden);
TimelockHidden = !TimelockHidden;
}
else
{
@ -1264,7 +1264,7 @@ state running
}
else if (command == "TIMELOCK")
{
defaultTimelock = (TimelockSecUntilRelease = (integer)part0 * 60);
defaultTimelock = TimelockSecUntilRelease = (integer)part0 * 60;
}
else if (command == "ONCAPTURE")
{

2
AVsitter2/Plugins/AVfaces/[AV]faces.lsl
View file

@ -205,7 +205,7 @@ remove_sequences(key id)
running_pointers = llDeleteSubList(running_pointers, index, index);
while (sequence)
{
if ((!IsInteger(llList2String(sequence, 0))) && llList2String(sequence, 0) != "none")
if (!IsInteger(llList2String(sequence, 0)) && llList2String(sequence, 0) != "none")
{
llMessageLinked(LINK_THIS, 90002, llList2String(sequence, 0), id);
}

6
AVsitter2/Plugins/AVprop/[AV]object.lsl
View file

@ -132,7 +132,7 @@ state prop
touch_start(integer touched)
{
if ((!llGetAttached()) && (prop_type == 2 || prop_type == 1))
if (!llGetAttached() && (prop_type == 2 || prop_type == 1))
{
llRequestExperiencePermissions(llDetectedKey(0), "");
}
@ -212,7 +212,7 @@ state prop
{
remove = TRUE;
}
else if (command == "REM_INDEX" || (command == "REM_WORLD" && (!llGetAttached())))
else if (command == "REM_INDEX" || (command == "REM_WORLD" && !llGetAttached()))
{
if (~llListFindList(data, [(string)prop_id]))
{
@ -241,7 +241,7 @@ state prop
}
}
}
else if (message == "PROPSEARCH" && (!llGetAttached()))
else if (message == "PROPSEARCH" && !llGetAttached())
{
llSay(comm_channel, "SAVEPROP|" + (string)prop_id);
}

8
AVsitter2/Plugins/AVsequence/[AV]sequence.lsl
View file

@ -182,7 +182,7 @@ string parse_text(string say)
start_sequence(integer index)
{
no_waits_yet = (sequence_running = TRUE);
no_waits_yet = sequence_running = TRUE;
SEQUENCE_POINTER = 0;
CURRENT_SEQUENCE_NAME = llList2String(SEQUENCE_DATA_NAMES, index);
CURRENT_SEQUENCE_ACTIONS = llParseStringKeepNulls(llList2String(SEQUENCE_DATA_ACTIONS, index), ["◆"], []);
@ -199,7 +199,7 @@ stop_sequence(integer stopSound)
sequence_running = FALSE;
SEQUENCE_POINTER = -1;
llSetTimerEvent(0);
if (stopSound && (~llListFindList(CURRENT_SEQUENCE_ACTIONS, ["SOUND"])))
if (stopSound && ~llListFindList(CURRENT_SEQUENCE_ACTIONS, ["SOUND"]))
{
llStopSound();
}
@ -342,7 +342,7 @@ state running
else if (num == 90205)
{
llMessageLinked(LINK_SET, 90005, "", id);
playsounds = (!playsounds);
playsounds = !playsounds;
if (playsounds)
{
llSay(0, "Sounds ON");
@ -363,7 +363,7 @@ state running
if (index != -1)
{
start_sequence(index);
if ((~llListFindList(CURRENT_SEQUENCE_ACTIONS, ["WAIT"])) && (~llListFindList(CURRENT_SEQUENCE_ACTIONS, ["PLAY"])))
if (~llListFindList(CURRENT_SEQUENCE_ACTIONS, ["WAIT"]) && ~llListFindList(CURRENT_SEQUENCE_ACTIONS, ["PLAY"]))
{
sequence_control();
}

2
AVsitter2/Utilities/MLP-converter.lsl
View file

@ -41,7 +41,7 @@ string FormatFloat(float f, integer num_decimals)
f -= rounding;
else
f += rounding;
string ret = llGetSubString((string)f, 0, num_decimals - (!num_decimals) - 7);
string ret = llGetSubString((string)f, 0, num_decimals - !num_decimals - 7);
if (llSubStringIndex(ret, ".") != -1)
{
while (llGetSubString(ret, -1, -1) == "0")

2
AVsitter2/Utilities/Updater/update-receiver.lsl
View file

@ -44,7 +44,7 @@ default
timer()
{
if (llGetLinkNumber() == 0 || llGetLinkNumber() == 1 && llGetInventoryType("[AV]object") != INVENTORY_SCRIPT)
if ((llGetLinkNumber() == 0 || llGetLinkNumber() == 1) && llGetInventoryType("[AV]object") != INVENTORY_SCRIPT)
{
if (llGetAgentSize(llGetLinkKey(llGetNumberOfPrims())) == ZERO_VECTOR)
{

6
AVsitter2/[AV]adjuster.lsl
View file

@ -54,7 +54,7 @@ string FormatFloat(float f, integer num_decimals)
f -= rounding;
else
f += rounding;
string ret = llGetSubString((string)f, 0, num_decimals - (!num_decimals) - 7);
string ret = llGetSubString((string)f, 0, num_decimals - !num_decimals - 7);
if (~llSubStringIndex(ret, "."))
{
while (llGetSubString(ret, -1, -1) == "0")
@ -321,7 +321,7 @@ unsit_all()
toggle_helper_mode()
{
helper_mode = (!helper_mode);
helper_mode = !helper_mode;
if (helper_mode)
{
if (OLD_HELPER_METHOD)
@ -779,7 +779,7 @@ default
{
llRequestPermissions(id, PERMISSION_TRACK_CAMERA);
}
else if ((~llListFindList(["[DONE]", "1", "2", "3", "4", "5", "6", "7", "8", "9"], [msg])) && (~llListFindList(["[POSE]", "[SYNC]", "[SYNC]2", "[PROP]", "[FACE]"], [adding])))
else if (~llListFindList(["[DONE]", "1", "2", "3", "4", "5", "6", "7", "8", "9"], [msg]) && ~llListFindList(["[POSE]", "[SYNC]", "[SYNC]2", "[PROP]", "[FACE]"], [adding]))
{
string choice = llList2String(get_choices(), (integer)msg - 1);
if (adding == "[PROP]")

8
AVsitter2/[AV]helper.lsl
View file

@ -107,7 +107,7 @@ default
llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, ALL_SIDES, "5748decc-f629-461c-9a36-a35a221fe21f", <1,1,0>, <0,0,0>, 0, PRIM_FULLBRIGHT, ALL_SIDES, TRUE]);
}
integer everyonePerms = llGetObjectPermMask(MASK_EVERYONE);
if ((!(everyonePerms & PERM_MOVE)) && llGetOwner() == llGetInventoryCreator(llGetScriptName()))
if (!(everyonePerms & PERM_MOVE) && llGetOwner() == llGetInventoryCreator(llGetScriptName()))
{
llOwnerSay("WARNING! AVhelper should be set to 'Anyone Can Move'");
}
@ -134,7 +134,7 @@ default
sitter_number = helper_index;
if (start < -1000000000)
{
helper_index = (sitter_number = 0);
helper_index = sitter_number = 0;
}
comm_channel = llFloor(start / 1000) * 1000;
llListen(5, "", "", "");
@ -189,12 +189,12 @@ default
integer two = (integer)llList2String(data, 2);
if (sitter_number == one)
{
sitter_number = (helper_index = two);
sitter_number = helper_index = two;
setup();
}
else if (sitter_number == two)
{
sitter_number = (helper_index = one);
sitter_number = helper_index = one;
setup();
}
}

4
AVsitter2/[AV]select.lsl
View file

@ -60,7 +60,7 @@ menu(key av)
for (i = 0; i < llGetListLength(BUTTONS); i++)
{
string avname = llKey2Name(llList2Key(SITTERS, i));
if ((!select_type) && llList2Integer(SYNCS, i) == FALSE || select_type == 2 && avname != "" && av != llList2Key(SITTERS, i))
if ((!select_type && llList2Integer(SYNCS, i) == FALSE || select_type == 2) && avname != "" && av != llList2Key(SITTERS, i))
{
menu_buttons += "⊘" + llGetSubString(strReplace(avname, " Resident", " "), 0, 11);
}
@ -115,7 +115,7 @@ default
{
llMessageLinked(LINK_SET, 90101, llDumpList2String(["X", message, id], "|"), id);
}
else if (llGetSubString(message, 0, 0) == "⊘" || ((!select_type) && llList2Integer(SYNCS, button_index) == FALSE && llList2Key(SITTERS, button_index) != NULL_KEY && llList2Key(SITTERS, button_index) != id))
else if (llGetSubString(message, 0, 0) == "⊘" || (!select_type && llList2Integer(SYNCS, button_index) == FALSE && llList2Key(SITTERS, button_index) != NULL_KEY && llList2Key(SITTERS, button_index) != id))
{
menu(id);
}

34
AVsitter2/[AV]sitA.lsl
View file

@ -248,7 +248,7 @@ sittargets()
prep()
{
has_security = (has_texture = FALSE);
has_security = has_texture = FALSE;
if (!SCRIPT_CHANNEL)
{
llMessageLinked(LINK_SET, 90201, "", ""); // 90201=Ask for info about plugins
@ -405,17 +405,17 @@ sit_using_prim_params()
localrot = llGetLocalRot();
localpos = llGetLocalPos();
}
if (HASKEYFRAME == 2 && (!llGetStatus(STATUS_PHYSICS)))
if (HASKEYFRAME == 2 && !llGetStatus(STATUS_PHYSICS))
{
llSleep(0.4);
}
if (HASKEYFRAME && (!llGetStatus(STATUS_PHYSICS)))
if (HASKEYFRAME && !llGetStatus(STATUS_PHYSICS))
{
llSetKeyframedMotion([], [KFM_COMMAND, KFM_CMD_PAUSE]);
llSleep(0.15);
}
llSetLinkPrimitiveParamsFast(sitter_prim, [PRIM_ROT_LOCAL, llEuler2Rot((CURRENT_ROTATION + <0,0,0.002>) * DEG_TO_RAD) * localrot, PRIM_POS_LOCAL, CURRENT_POSITION * localrot + localpos]);
if (HASKEYFRAME && (!llGetStatus(STATUS_PHYSICS)))
if (HASKEYFRAME && !llGetStatus(STATUS_PHYSICS))
{
llSleep(0.15);
llSetKeyframedMotion([], [KFM_COMMAND, KFM_CMD_PLAY]);
@ -477,7 +477,7 @@ default
{
SEQUENCE_POINTER += 2;
list SEQUENCE = llParseStringKeepNulls(CURRENT_ANIMATION_SEQUENCE, ["<22>"], []);
if (SEQUENCE_POINTER >= llGetListLength(SEQUENCE) || (~llListFindList(["M", "F"], llList2List(SEQUENCE, SEQUENCE_POINTER, SEQUENCE_POINTER))))
if (SEQUENCE_POINTER >= llGetListLength(SEQUENCE) || ~llListFindList(["M", "F"], llList2List(SEQUENCE, SEQUENCE_POINTER, SEQUENCE_POINTER)))
{
SEQUENCE_POINTER = 0;
}
@ -502,7 +502,7 @@ default
touch_end(integer touched)
{
if ((!SCRIPT_CHANNEL) && (!has_security) && MTYPE < 3)
if (!SCRIPT_CHANNEL && !has_security && MTYPE < 3)
{
llMessageLinked(LINK_SET, 90005, "", llDetectedKey(0)); // 90005=send menu to user
}
@ -575,7 +575,7 @@ default
{
if (index < 2)
{
pos_rot_adjust_toggle = (!pos_rot_adjust_toggle);
pos_rot_adjust_toggle = !pos_rot_adjust_toggle;
}
else if (index < 8)
{
@ -621,7 +621,7 @@ default
}
adjust_pose_menu();
}
else if (msg == "[HELPER]" && id != llGetOwner() && (!~llSubStringIndex(llGetLinkName(!!llGetLinkNumber()), "HELPER")))
else if (msg == "[HELPER]" && id != llGetOwner() && !~llSubStringIndex(llGetLinkName(!!llGetLinkNumber()), "HELPER"))
{
dialog("Only the owner can rez the helpers. If the owner is nearby they can type '/5 helper' in chat.", ["[BACK]"]);
}
@ -766,8 +766,8 @@ default
CURRENT_POSE_NAME = llList2String(data, 0);
OLD_ANIMATION_FILENAME = CURRENT_ANIMATION_FILENAME;
CURRENT_ANIMATION_SEQUENCE = llList2String(data, 1);
DEFAULT_POSITION = (CURRENT_POSITION = (vector)llList2String(data, 2));
DEFAULT_ROTATION = (CURRENT_ROTATION = (vector)llList2String(data, 3));
DEFAULT_POSITION = CURRENT_POSITION = (vector)llList2String(data, 2);
DEFAULT_ROTATION = CURRENT_ROTATION = (vector)llList2String(data, 3);
if (FIRST_POSENAME == "" || CURRENT_POSE_NAME == FIRST_POSENAME)
{
FIRST_POSENAME = CURRENT_POSE_NAME;
@ -945,9 +945,9 @@ default
}
}
}
if (stood && (!llStringLength(llDumpList2String(SITTERS, ""))))
if (stood && !llStringLength(llDumpList2String(SITTERS, "")))
{
if (DFLT || (!~llSubStringIndex(CURRENT_POSE_NAME, "P:")))
if (DFLT || !~llSubStringIndex(CURRENT_POSE_NAME, "P:"))
{
DEFAULT_POSITION = FIRST_POSITION;
DEFAULT_ROTATION = FIRST_ROTATION;
@ -994,7 +994,7 @@ default
animation_menu_function = -1;
}
reused_key = "";
SITTERS = llListReplaceList(SITTERS, [CONTROLLER = (MY_SITTER = llGetPermissionsKey())], SCRIPT_CHANNEL, SCRIPT_CHANNEL);
SITTERS = llListReplaceList(SITTERS, [CONTROLLER = MY_SITTER = llGetPermissionsKey()], SCRIPT_CHANNEL, SCRIPT_CHANNEL);
string channel_or_swap = (string)SCRIPT_CHANNEL;
integer lnk = 90000; // 90000=play pose
if (SWAPPED)
@ -1170,8 +1170,8 @@ default
string rot = "<" + llList2String(parts, 2);
if (command == FIRST_POSENAME || "P:" + command == FIRST_POSENAME)
{
FIRST_POSITION = (DEFAULT_POSITION = (CURRENT_POSITION = (vector)pos));
FIRST_ROTATION = (DEFAULT_ROTATION = (CURRENT_ROTATION = (vector)rot));
FIRST_POSITION = DEFAULT_POSITION = CURRENT_POSITION = (vector)pos;
FIRST_ROTATION = DEFAULT_ROTATION = CURRENT_ROTATION = (vector)rot;
}
llMessageLinked(LINK_THIS, 90301, (string)SCRIPT_CHANNEL, command + "|" + pos + "|" + rot); // 90301=send update to AVsitB
}
@ -1197,8 +1197,8 @@ default
{
if (FIRST_POSENAME == "")
{
FIRST_POSENAME = (CURRENT_POSE_NAME = part0);
FIRST_ANIMATION_SEQUENCE = (CURRENT_ANIMATION_SEQUENCE = part1);
FIRST_POSENAME = CURRENT_POSE_NAME = part0;
FIRST_ANIMATION_SEQUENCE = CURRENT_ANIMATION_SEQUENCE = part1;
}
if (llList2String(parts, -1) == "M")
{

26
AVsitter2/[AV]sitB.lsl
View file

@ -79,7 +79,7 @@ memory()
integer animation_menu(integer animation_menu_function)
{
if (animation_menu_function == -1 || (MENU_LIST != []) < 2 && (!helper_mode) && llGetInventoryType(select_script) == INVENTORY_SCRIPT)
if ((animation_menu_function == -1 || (MENU_LIST != []) < 2) && !helper_mode && llGetInventoryType(select_script) == INVENTORY_SCRIPT)
{
llMessageLinked(LINK_SET, 90009, CONTROLLER, MY_SITTER);
}
@ -137,7 +137,7 @@ integer animation_menu(integer animation_menu_function)
}
list menu_items0;
list menu_items2;
if ((~current_menu) || llGetInventoryType(select_script) == INVENTORY_SCRIPT)
if (~current_menu || llGetInventoryType(select_script) == INVENTORY_SCRIPT)
{
menu_items0 += "[BACK]";
}
@ -160,14 +160,14 @@ integer animation_menu(integer animation_menu_function)
menu_items0 += "<< Softer";
menu_items0 += "Harder >>";
}
if (AMENU == 2 || (AMENU == 1 && (!~current_menu)) || (~llSubStringIndex(submenu_info, "A")))
if (AMENU == 2 || (AMENU == 1 && !~current_menu) || ~llSubStringIndex(submenu_info, "A"))
{
if (!(OLD_HELPER_METHOD && helper_mode))
{
menu_items2 += "[ADJUST]";
}
}
if (llSubStringIndex(onSit, "ASK") && ((!~current_menu) && SWAP == 1 || SWAP == 2 || (~llSubStringIndex(submenu_info, "S"))) && (number_of_sitters > 1 && (!(llGetInventoryType(select_script) == INVENTORY_SCRIPT))))
if (llSubStringIndex(onSit, "ASK") && ((!~current_menu && SWAP == 1) || SWAP == 2 || ~llSubStringIndex(submenu_info, "S")) && (number_of_sitters > 1 && llGetInventoryType(select_script) != INVENTORY_SCRIPT))
{
menu_items2 += "[SWAP]";
}
@ -339,7 +339,7 @@ default
if (~current_menu)
{
current_menu -= 1;
while ((~current_menu) && llSubStringIndex(llList2String(MENU_LIST, current_menu), "M:") != 0)
while (~current_menu && llSubStringIndex(llList2String(MENU_LIST, current_menu), "M:") != 0)
{
current_menu--;
}
@ -409,7 +409,7 @@ default
{
doit = TRUE;
}
if (doit && ((~index) || msg == ""))
if (doit && (~index || msg == ""))
{
ANIM_INDEX = index;
integer broadcast = TRUE;
@ -465,7 +465,7 @@ default
}
else if (num == 90030 && (one == SCRIPT_CHANNEL || two == SCRIPT_CHANNEL))
{
CONTROLLER = (MY_SITTER = "");
CONTROLLER = MY_SITTER = "";
}
else if (num == 90100 || num == 90101)
{
@ -473,8 +473,8 @@ default
if (llList2String(data, 1) == "[HELPER]")
{
menu_page = 0;
helper_mode = (!helper_mode);
if ((key)llList2String(data, 2) == MY_SITTER && (!OLD_HELPER_METHOD))
helper_mode = !helper_mode;
if ((key)llList2String(data, 2) == MY_SITTER && !OLD_HELPER_METHOD)
{
animation_menu(0);
}
@ -517,11 +517,11 @@ default
}
if (num == 90299)
{
MENU_LIST = (DATA_LIST = (POS_ROT_LIST = []));
MENU_LIST = DATA_LIST = POS_ROT_LIST = [];
}
else if (num == 90070)
{
CONTROLLER = (MY_SITTER = id);
CONTROLLER = MY_SITTER = id;
menu_page = 0;
current_menu = -1;
menu_channel = ((integer)llFrand(2147483646) + 1) * -1;
@ -529,7 +529,7 @@ default
}
else if (num == 90065 && sender == llGetLinkNumber())
{
CONTROLLER = (MY_SITTER = "");
CONTROLLER = MY_SITTER = "";
llListenRemove(menu_handle);
}
else if (num == 90300)
@ -585,7 +585,7 @@ default
MTYPE = (integer)llList2String(data, 3);
ETYPE = (integer)llList2String(data, 4);
SWAP = (integer)llList2String(data, 5);
FIRST_INDEX = (ANIM_INDEX = llListFindList(MENU_LIST, [llList2String(data, 6)]));
FIRST_INDEX = ANIM_INDEX = llListFindList(MENU_LIST, [llList2String(data, 6)]);
BRAND = llList2String(data, 7);
CUSTOM_TEXT = llList2String(data, 8);
ADJUST_MENU = llList2String(data, 9);