diff options
-rw-r--r-- | .1AOor2.settings.txt | 1 | ||||
-rw-r--r-- | .1ring.theme.txt | 3 | ||||
-rw-r--r-- | 1AOor2.lsl | 33 | ||||
-rw-r--r-- | ~1AOor2.command.data.txt | 10 |
4 files changed, 45 insertions, 2 deletions
diff --git a/.1AOor2.settings.txt b/.1AOor2.settings.txt index bcf4439..603d6ef 100644 --- a/.1AOor2.settings.txt +++ b/.1AOor2.settings.txt | |||
@@ -1,5 +1,6 @@ | |||
1 | AO=1 | 1 | AO=1 |
2 | SUPER=0 | 2 | SUPER=0 |
3 | SPEED=1.0 | ||
3 | OSANIM=1 | 4 | OSANIM=1 |
4 | OSSIT=1 | 5 | OSSIT=1 |
5 | OSSPEED=1 | 6 | OSSPEED=1 |
diff --git a/.1ring.theme.txt b/.1ring.theme.txt index c7ef112..0e6c330 100644 --- a/.1ring.theme.txt +++ b/.1ring.theme.txt | |||
@@ -73,6 +73,9 @@ MENU moves | movement menu | MORE | |||
73 | TOMENU Follow | CHOOSE_ALL | 73 | TOMENU Follow | CHOOSE_ALL |
74 | TOMENU Go to | CHOOSE_ALL | 74 | TOMENU Go to | CHOOSE_ALL |
75 | TOMENU Sit | CHOOSE_ALL | 75 | TOMENU Sit | CHOOSE_ALL |
76 | BUTTON slower - | 1AOor2.SLOWER_- | ||
77 | BUTTON normal | 1AOor2.NORMAL_SPEED | ||
78 | BUTTON faster + | 1AOor2.FASTER_+ | ||
76 | TOGGLE free | 79 | TOGGLE free |
77 | BUTTON stop | STOP | 80 | BUTTON stop | STOP |
78 | BUTTON Stand | STAND | 81 | BUTTON Stand | STAND |
@@ -269,6 +269,26 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ | |||
269 | Smile = llList2String(Smiles, (integer) llFrand(2.5)); | 269 | Smile = llList2String(Smiles, (integer) llFrand(2.5)); |
270 | addEvent(3.0 + llFrand(5.0), cmd); | 270 | addEvent(3.0 + llFrand(5.0), cmd); |
271 | animBegin(llGetOwner(), Smile); | 271 | animBegin(llGetOwner(), Smile); |
272 | else if ("SLOWER_-" == cmd) | ||
273 | { | ||
274 | integer sp = llListFindList(AOspeeds, [getSetting("SPEED")]); | ||
275 | if (sp > 0) sp--; else sp = 0; | ||
276 | setSetting(id, "SPEED", llList2String(AOspeeds, sp), fMENU); | ||
277 | s("Now moving at " + llList2String(AOspeedNames, sp) + " speed."); | ||
278 | } | ||
279 | else if ("NORMAL_SPEED" == cmd) | ||
280 | { | ||
281 | setSetting(id, "SPEED", "1.0", fMENU); | ||
282 | s("Now moving at normal speed."); | ||
283 | } | ||
284 | else if ("FASTER_+" == cmd) | ||
285 | { | ||
286 | integer sp = llListFindList(AOspeeds, [getSetting("SPEED")]); | ||
287 | integer l = llGetListLength(AOspeeds) - 1; | ||
288 | if (sp < l) sp++; else sp = l; | ||
289 | setSetting(id, "SPEED", llList2String(AOspeeds, sp), fMENU); | ||
290 | s("Now moving at " + llList2String(AOspeedNames, sp) + " speed."); | ||
291 | } | ||
272 | } | 292 | } |
273 | else if ("LESS_-" == cmd) | 293 | else if ("LESS_-" == cmd) |
274 | { | 294 | { |
@@ -651,6 +671,18 @@ integer Swimming; | |||
651 | integer Bobbing; | 671 | integer Bobbing; |
652 | float Tick = 0.2; | 672 | float Tick = 0.2; |
653 | float AOspeed = 1.0; | 673 | float AOspeed = 1.0; |
674 | list AOspeeds = ["0.1", "0.5", "1.0", "2.0", "5.0", "10.0", "20.0", "50.0"]; // Strings coz LSL can't find floats. | ||
675 | list AOspeedNames = | ||
676 | [ | ||
677 | "snail", | ||
678 | "slow", | ||
679 | "normal", | ||
680 | "fast", | ||
681 | "light", | ||
682 | "ridiculous", | ||
683 | "ludicrous", | ||
684 | "plaid" | ||
685 | ]; | ||
654 | list flyStates; | 686 | list flyStates; |
655 | list initialStates; // "Taking Off", "hover_up", | 687 | list initialStates; // "Taking Off", "hover_up", |
656 | list ANIMATIONS; | 688 | list ANIMATIONS; |
@@ -1631,6 +1663,7 @@ checkAO() | |||
1631 | else AOspeed = 4.0; | 1663 | else AOspeed = 4.0; |
1632 | } | 1664 | } |
1633 | else AOspeed = 1.0; | 1665 | else AOspeed = 1.0; |
1666 | AOspeed = AOspeed * (float) getSetting("speed"); | ||
1634 | if (0.0 < AOspeed) speed(Owner, AOspeed + ((AOspeed / 2) * (fast + (2 * (integer) getSetting("super"))))); | 1667 | if (0.0 < AOspeed) speed(Owner, AOspeed + ((AOspeed / 2) * (fast + (2 * (integer) getSetting("super"))))); |
1635 | else AOspeed = 1.0; | 1668 | else AOspeed = 1.0; |
1636 | for (f = 0; f < l; f += pSTRIDE) | 1669 | for (f = 0; f < l; f += pSTRIDE) |
diff --git a/~1AOor2.command.data.txt b/~1AOor2.command.data.txt index 80c413b..0d40b21 100644 --- a/~1AOor2.command.data.txt +++ b/~1AOor2.command.data.txt | |||
@@ -58,9 +58,15 @@ h | |||
58 | 1AOor2.MORE_+ | 58 | 1AOor2.MORE_+ |
59 | 59 | ||
60 | 31 | 60 | 31 |
61 | 1AOor2.TEXTS | 61 | 1AOor2.SLOWER_- |
62 | 62 | ||
63 | 31 | 63 | 9 |
64 | 1AOor2.NORMAL_SPEED | ||
65 | |||
66 | 9 | ||
67 | 1AOor2.FASTER_+ | ||
68 | |||
69 | 9 | ||
64 | 1AOor2.SAVE | 70 | 1AOor2.SAVE |
65 | 71 | ||
66 | 9 | 72 | 9 |