corrade-lsl-templates – Diff between revs 11 and 15

Subversion Repositories:
Rev:
Only display areas with differencesRegard whitespace
Rev 11 Rev 15
1 /////////////////////////////////////////////////////////////////////////// 1 ///////////////////////////////////////////////////////////////////////////
2 // Copyright (C) Wizardry and Steamworks 2016 - License: GNU GPLv3 // 2 // Copyright (C) Wizardry and Steamworks 2016 - License: GNU GPLv3 //
3 /////////////////////////////////////////////////////////////////////////// 3 ///////////////////////////////////////////////////////////////////////////
4 // 4 //
5 // A joke module for Corrade Eggdrop. 5 // A joke module for Corrade Eggdrop.
6 // 6 //
7 /////////////////////////////////////////////////////////////////////////// 7 ///////////////////////////////////////////////////////////////////////////
8   8  
9 /////////////////////////////////////////////////////////////////////////// 9 ///////////////////////////////////////////////////////////////////////////
10 // Copyright (C) 2014 Wizardry and Steamworks - License: GNU GPLv3 // 10 // Copyright (C) 2014 Wizardry and Steamworks - License: GNU GPLv3 //
11 /////////////////////////////////////////////////////////////////////////// 11 ///////////////////////////////////////////////////////////////////////////
12 string wasKeyValueGet(string k, string data) { 12 string wasKeyValueGet(string k, string data) {
13 if(llStringLength(data) == 0) return ""; 13 if(llStringLength(data) == 0) return "";
14 if(llStringLength(k) == 0) return ""; 14 if(llStringLength(k) == 0) return "";
15 list a = llParseString2List(data, ["&", "="], []); 15 list a = llParseString2List(data, ["&", "="], []);
16 integer i = llListFindList(a, [ k ]); 16 integer i = llListFindList(a, [ k ]);
17 if(i != -1) return llList2String(a, i+1); 17 if(i != -1) return llList2String(a, i+1);
18 return ""; 18 return "";
19 } 19 }
20 20
21 /////////////////////////////////////////////////////////////////////////// 21 ///////////////////////////////////////////////////////////////////////////
22 // Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3 // 22 // Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3 //
23 /////////////////////////////////////////////////////////////////////////// 23 ///////////////////////////////////////////////////////////////////////////
24 string wasKeyValueEncode(list data) { 24 string wasKeyValueEncode(list data) {
25 list k = llList2ListStrided(data, 0, -1, 2); 25 list k = llList2ListStrided(data, 0, -1, 2);
26 list v = llList2ListStrided(llDeleteSubList(data, 0, 0), 0, -1, 2); 26 list v = llList2ListStrided(llDeleteSubList(data, 0, 0), 0, -1, 2);
27 data = []; 27 data = [];
28 do { 28 do {
29 data += llList2String(k, 0) + "=" + llList2String(v, 0); 29 data += llList2String(k, 0) + "=" + llList2String(v, 0);
30 k = llDeleteSubList(k, 0, 0); 30 k = llDeleteSubList(k, 0, 0);
31 v = llDeleteSubList(v, 0, 0); 31 v = llDeleteSubList(v, 0, 0);
32 } while(llGetListLength(k) != 0); 32 } while(llGetListLength(k) != 0);
33 return llDumpList2String(data, "&"); 33 return llDumpList2String(data, "&");
34 } 34 }
35   35  
36 /////////////////////////////////////////////////////////////////////////// 36 ///////////////////////////////////////////////////////////////////////////
37 // Copyright (C) 2011 Wizardry and Steamworks - License: GNU GPLv3 // 37 // Copyright (C) 2011 Wizardry and Steamworks - License: GNU GPLv3 //
38 /////////////////////////////////////////////////////////////////////////// 38 ///////////////////////////////////////////////////////////////////////////
39 // http://was.fm/secondlife/wanderer 39 // http://was.fm/secondlife/wanderer
40 vector wasCirclePoint(float radius) { 40 vector wasCirclePoint(float radius) {
41 float x = llPow(-1, 1 + (integer) llFrand(2)) * llFrand(radius*2); 41 float x = llPow(-1, 1 + (integer) llFrand(2)) * llFrand(radius*2);
42 float y = llPow(-1, 1 + (integer) llFrand(2)) * llFrand(radius*2); 42 float y = llPow(-1, 1 + (integer) llFrand(2)) * llFrand(radius*2);
43 if(llPow(x,2) + llPow(y,2) <= llPow(radius,2)) 43 if(llPow(x,2) + llPow(y,2) <= llPow(radius,2))
44 return <x, y, 0>; 44 return <x, y, 0>;
45 return wasCirclePoint(radius); 45 return wasCirclePoint(radius);
46 } 46 }
47   47  
48 /////////////////////////////////////////////////////////////////////////// 48 ///////////////////////////////////////////////////////////////////////////
49 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 // 49 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 //
50 /////////////////////////////////////////////////////////////////////////// 50 ///////////////////////////////////////////////////////////////////////////
51 // escapes a string in conformance with RFC1738 51 // escapes a string in conformance with RFC1738
52 string wasURLEscape(string i) { 52 string wasURLEscape(string i) {
53 string o = ""; 53 string o = "";
54 do { 54 do {
55 string c = llGetSubString(i, 0, 0); 55 string c = llGetSubString(i, 0, 0);
56 i = llDeleteSubString(i, 0, 0); 56 i = llDeleteSubString(i, 0, 0);
57 if(c == "") jump continue; 57 if(c == "") jump continue;
58 if(c == " ") { 58 if(c == " ") {
59 o += "+"; 59 o += "+";
60 jump continue; 60 jump continue;
61 } 61 }
62 if(c == "\n") { 62 if(c == "\n") {
63 o += "%0D" + llEscapeURL(c); 63 o += "%0D" + llEscapeURL(c);
64 jump continue; 64 jump continue;
65 } 65 }
66 o += llEscapeURL(c); 66 o += llEscapeURL(c);
67 @continue; 67 @continue;
68 } while(i != ""); 68 } while(i != "");
69 return o; 69 return o;
70 } 70 }
71   71  
72 /////////////////////////////////////////////////////////////////////////// 72 ///////////////////////////////////////////////////////////////////////////
73 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 // 73 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 //
74 /////////////////////////////////////////////////////////////////////////// 74 ///////////////////////////////////////////////////////////////////////////
75 list wasCSVToList(string csv) { 75 list wasCSVToList(string csv) {
76 list l = []; 76 list l = [];
77 list s = []; 77 list s = [];
78 string m = ""; 78 string m = "";
79 do { 79 do {
80 string a = llGetSubString(csv, 0, 0); 80 string a = llGetSubString(csv, 0, 0);
81 csv = llDeleteSubString(csv, 0, 0); 81 csv = llDeleteSubString(csv, 0, 0);
82 if(a == ",") { 82 if(a == ",") {
83 if(llList2String(s, -1) != "\"") { 83 if(llList2String(s, -1) != "\"") {
84 l += m; 84 l += m;
85 m = ""; 85 m = "";
86 jump continue; 86 jump continue;
87 } 87 }
88 m += a; 88 m += a;
89 jump continue; 89 jump continue;
90 } 90 }
91 if(a == "\"" && llGetSubString(csv, 0, 0) == a) { 91 if(a == "\"" && llGetSubString(csv, 0, 0) == a) {
92 m += a; 92 m += a;
93 csv = llDeleteSubString(csv, 0, 0); 93 csv = llDeleteSubString(csv, 0, 0);
94 jump continue; 94 jump continue;
95 } 95 }
96 if(a == "\"") { 96 if(a == "\"") {
97 if(llList2String(s, -1) != a) { 97 if(llList2String(s, -1) != a) {
98 s += a; 98 s += a;
99 jump continue; 99 jump continue;
100 } 100 }
101 s = llDeleteSubList(s, -1, -1); 101 s = llDeleteSubList(s, -1, -1);
102 jump continue; 102 jump continue;
103 } 103 }
104 m += a; 104 m += a;
105 @continue; 105 @continue;
106 } while(csv != ""); 106 } while(csv != "");
107 // postcondition: length(s) = 0 107 // postcondition: length(s) = 0
108 return l + m; 108 return l + m;
109 } 109 }
110   110  
111 /////////////////////////////////////////////////////////////////////////// 111 ///////////////////////////////////////////////////////////////////////////
112 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 // 112 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 //
113 /////////////////////////////////////////////////////////////////////////// 113 ///////////////////////////////////////////////////////////////////////////
114 string wasListToCSV(list l) { 114 string wasListToCSV(list l) {
115 list v = []; 115 list v = [];
116 do { 116 do {
117 string a = llDumpList2String( 117 string a = llDumpList2String(
118 llParseStringKeepNulls( 118 llParseStringKeepNulls(
119 llList2String( 119 llList2String(
120 l, 120 l,
121 0 121 0
122 ), 122 ),
123 ["\""], 123 ["\""],
124 [] 124 []
125 ), 125 ),
126 "\"\"" 126 "\"\""
127 ); 127 );
128 if(llParseStringKeepNulls( 128 if(llParseStringKeepNulls(
129 a, 129 a,
130 [" ", ",", "\n", "\""], [] 130 [" ", ",", "\n", "\""], []
131 ) != 131 ) !=
132 (list) a 132 (list) a
133 ) a = "\"" + a + "\""; 133 ) a = "\"" + a + "\"";
134 v += a; 134 v += a;
135 l = llDeleteSubList(l, 0, 0); 135 l = llDeleteSubList(l, 0, 0);
136 } while(l != []); 136 } while(l != []);
137 return llDumpList2String(v, ","); 137 return llDumpList2String(v, ",");
138 } 138 }
139   139  
140 /////////////////////////////////////////////////////////////////////////// 140 ///////////////////////////////////////////////////////////////////////////
141 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 // 141 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 //
142 /////////////////////////////////////////////////////////////////////////// 142 ///////////////////////////////////////////////////////////////////////////
143 // unescapes a string in conformance with RFC1738 143 // unescapes a string in conformance with RFC1738
144 string wasURLUnescape(string i) { 144 string wasURLUnescape(string i) {
145 return llUnescapeURL( 145 return llUnescapeURL(
146 llDumpList2String( 146 llDumpList2String(
147 llParseString2List( 147 llParseString2List(
148 llDumpList2String( 148 llDumpList2String(
149 llParseString2List( 149 llParseString2List(
150 i, 150 i,
151 ["+"], 151 ["+"],
152 [] 152 []
153 ), 153 ),
154 " " 154 " "
155 ), 155 ),
156 ["%0D%0A"], 156 ["%0D%0A"],
157 [] 157 []
158 ), 158 ),
159 "\n" 159 "\n"
160 ) 160 )
161 ); 161 );
162 } 162 }
163   163  
164 // configuration data 164 // configuration data
165 string configuration = ""; 165 string configuration = "";
166 // callback URL 166 // callback URL
167 string URL = ""; 167 string URL = "";
168 // store message over state. 168 // store message over state.
169 string data = ""; 169 string data = "";
170   170  
171 // Notecard reading. 171 // Notecard reading.
172 key nQuery = NULL_KEY; 172 key nQuery = NULL_KEY;
173 integer nLine = 0; 173 string joke = "";
174 list nList = []; 174 list q = [ ];
-   175  
-   176 ///////////////////////////////////////////////////////////////////////////
-   177 // Copyright (C) 2011 Wizardry and Steamworks - License: GNU GPLv3 //
-   178 ///////////////////////////////////////////////////////////////////////////
-   179 // Requires: a limit.
-   180 // Provides: true random number between [0, max) or (-max, 0].
-   181 //////////////////////////////////////////////////////////
-   182 integer wasFPSrand(integer max) {
-   183 integer r = (integer)(llGetRegionFPS() * 10000000.0) % max;
-   184 if(max > 0) return r; else return -r;
-   185 }
175   186  
176 default { 187 default {
177 state_entry() { 188 state_entry() {
178 llOwnerSay("[Joke] Starting module..."); 189 llOwnerSay("[Joke] Starting module...");
179 llSetTimerEvent(10); 190 llSetTimerEvent(10);
180 } 191 }
181 link_message(integer sender, integer num, string message, key id) { 192 link_message(integer sender, integer num, string message, key id) {
182 if(id != "configuration") return; 193 if(id != "configuration") return;
183 llOwnerSay("[Joke] Got configuration..."); 194 llOwnerSay("[Joke] Got configuration...");
184 configuration = message; 195 configuration = message;
185 state read_jokes; 196 state count_jokes;
186 } 197 }
187 timer() { 198 timer() {
188 llOwnerSay("[Joke] Requesting configuration..."); 199 llOwnerSay("[Joke] Requesting configuration...");
189 llMessageLinked(LINK_THIS, 0, "configuration", NULL_KEY); 200 llMessageLinked(LINK_THIS, 0, "configuration", NULL_KEY);
190 } 201 }
191 on_rez(integer num) { 202 on_rez(integer num) {
192 llResetScript(); 203 llResetScript();
193 } 204 }
194 changed(integer change) { 205 changed(integer change) {
195 if((change & CHANGED_INVENTORY) || 206 if((change & CHANGED_INVENTORY) ||
196 (change & CHANGED_REGION_START) || 207 (change & CHANGED_REGION_START) ||
197 (change & CHANGED_OWNER)) { 208 (change & CHANGED_OWNER)) {
198 llResetScript(); 209 llResetScript();
199 } 210 }
200 } 211 }
201 state_exit() { 212 state_exit() {
202 llSetTimerEvent(0); 213 llSetTimerEvent(0);
203 } 214 }
204 } 215 }
205   216  
206 state read_jokes { 217 state count_jokes {
-   218 state_entry() {
-   219 // Build a list of dataserver queries and retrieve the number of lines.
-   220 joke = (string)llGetInventoryNumber(INVENTORY_NOTECARD);
207 state_entry() { 221 integer i = (integer)joke - 1;
208 // DEBUG 222 do {
209 llOwnerSay("[Joke] Reading jokes..."); 223 string card = llGetInventoryName(INVENTORY_NOTECARD, i);
210 if(llGetInventoryType("Joke") != INVENTORY_NOTECARD) { 224 // Filter notecards containing the "jokes" configuration key value.
-   225 if(llSubStringIndex(card, wasKeyValueGet("jokes", configuration)) == -1) {
211 llOwnerSay("[Joke] Failed to find a notecard named Joke in the primitive's inventory."); 226 joke = (string)((integer)joke - 1);
212 return; 227 jump continue;
213 } 228 }
-   229 q = llListInsertList(q, [ llGetNumberOfNotecardLines(card) ], 0);
-   230 @continue;
-   231 } while(--i >= -1);
214 nQuery = llGetNotecardLine("Joke", nLine); 232 q += NULL_KEY;
215 } 233 }
216 dataserver(key id, string data) { 234 dataserver(key id, string data) {
217 if(id != nQuery) return; 235 // Find the query in the query list.
218 if(data == EOF) { 236 integer i = llListFindList(q, [ id ]);
-   237 if(i == -1) return;
-   238
-   239 // Replace the query by the number of notecard lines (lists are covariant).
219 // DEBUG 240 q = llListReplaceList(q, [ (integer) data ], i, i);
-   241 joke = (string)((integer)joke - 1);
220 llOwnerSay("[Joke] Read jokes..."); 242 if((integer)joke == 0)
221 state listen_group; 243 state listen_group;
222 } -  
223 if(data == "") jump continue; -  
224 nList += data; -  
225 @continue; -  
226 nQuery = llGetNotecardLine("Joke", ++nLine); -  
227 } 244 }
228 on_rez(integer num) { 245 on_rez(integer num) {
229 llResetScript(); 246 llResetScript();
230 } 247 }
231 changed(integer change) { 248 changed(integer change) {
232 if((change & CHANGED_INVENTORY) || 249 if((change & CHANGED_INVENTORY) ||
233 (change & CHANGED_REGION_START) || 250 (change & CHANGED_REGION_START) ||
234 (change & CHANGED_OWNER)) { 251 (change & CHANGED_OWNER)) {
235 llResetScript(); 252 llResetScript();
236 } 253 }
237 } 254 }
238 } 255 }
239   256  
240 state listen_group { 257 state listen_group {
241 state_entry() { 258 state_entry() {
242 // DEBUG 259 // DEBUG
243 llOwnerSay("[Joke] Waiting for group messages..."); 260 llOwnerSay("[Joke] Waiting for group messages...");
244 } 261 }
245 link_message(integer sender, integer num, string message, key id) { 262 link_message(integer sender, integer num, string message, key id) {
246 // We only care about notifications now. 263 // We only care about notifications now.
247 if(id != "notification") 264 if(id != "notification")
248 return; 265 return;
249 266
250 // This script only processes group notifications. 267 // This script only processes group notifications.
251 if(wasKeyValueGet("type", message) != "group") 268 if(wasKeyValueGet("type", message) != "group")
252 return; 269 return;
253 270
254 // Get the sent message. 271 // Get the sent message.
255 data = wasURLUnescape( 272 data = wasURLUnescape(
256 wasKeyValueGet( 273 wasKeyValueGet(
257 "message", 274 "message",
258 message 275 message
259 ) 276 )
260 ); 277 );
261 278
262 // Check if this is an eggdrop command. 279 // Check if this is an eggdrop command.
263 if(llGetSubString(data, 0, 0) != 280 if(llGetSubString(data, 0, 0) !=
264 wasKeyValueGet("command", configuration)) 281 wasKeyValueGet("command", configuration))
265 return; 282 return;
266 283
267 // Check if the command matches the current module. 284 // Check if the command matches the current module.
268 list command = llParseString2List(data, 285 list command = llParseString2List(data, [" "], []);
269 [wasKeyValueGet("command", configuration), " "], ["@"]); 286 if(llList2String(command, 0) !=
270 if(llList2String(command, 0) != "joke") 287 wasKeyValueGet("command", configuration) + "joke")
271 return; 288 return;
272 289
273 list range = wasCSVToList( 290 // Remove command.
274 wasKeyValueGet("roll range", configuration) -  
-   291 command = llDeleteSubList(command, 0, 0);
-   292
-   293 state read_joke;
-   294 }
-   295 on_rez(integer num) {
-   296 llResetScript();
-   297 }
-   298 changed(integer change) {
-   299 if((change & CHANGED_INVENTORY) ||
275 ); 300 (change & CHANGED_REGION_START) ||
-   301 (change & CHANGED_OWNER)) {
-   302 llResetScript();
-   303 }
-   304 }
-   305 }
-   306  
-   307 state read_joke {
-   308 state_entry() {
-   309 // DEBUG
-   310 llOwnerSay("[Joke] Reading a joke...");
-   311
-   312 integer i = llGetInventoryNumber(INVENTORY_NOTECARD) - 1;
-   313 list c = [];
-   314 do {
-   315 string card = llGetInventoryName(INVENTORY_NOTECARD, i);
-   316 if(llSubStringIndex(card, wasKeyValueGet("jokes", configuration)) == -1)
-   317 jump continue;
-   318 c = llListInsertList(c, [ i ], 0);
-   319 @continue;
-   320 } while(--i >= -1);
-   321
-   322 i = (integer)llFrand(llGetListLength(c));
-   323 nQuery = llGetNotecardLine(
-   324 llGetInventoryName(
276 325 INVENTORY_NOTECARD,
277 data = llList2String( 326 llList2Integer(c, i)
-   327 ),
278 nList, 328 (integer)
279 (integer) 329 (
-   330 llFrand(
-   331 llList2Integer(
-   332 q,
-   333 i
280 llFrand( 334 )
281 llGetListLength(nList) 335 )
282 ) 336 )
-   337 );
-   338 }
-   339 dataserver(key id, string data) {
283 ); 340 if(id != nQuery) return;
284 341 joke = data;
285 state tell; 342 state tell;
286 } 343 }
287 on_rez(integer num) { 344 on_rez(integer num) {
288 llResetScript(); 345 llResetScript();
289 } 346 }
290 changed(integer change) { 347 changed(integer change) {
291 if((change & CHANGED_INVENTORY) || 348 if((change & CHANGED_INVENTORY) ||
292 (change & CHANGED_REGION_START) || 349 (change & CHANGED_REGION_START) ||
293 (change & CHANGED_OWNER)) { 350 (change & CHANGED_OWNER)) {
294 llResetScript(); 351 llResetScript();
295 } 352 }
296 } 353 }
297 } 354 }
298   355  
299 state tell { 356 state tell {
300 state_entry() { 357 state_entry() {
301 // DEBUG 358 // DEBUG
302 llOwnerSay("[Joke] Sending to group."); 359 llOwnerSay("[Joke] Sending to group.");
303 llInstantMessage( 360 llInstantMessage(
304 wasKeyValueGet( 361 wasKeyValueGet(
305 "corrade", 362 "corrade",
306 configuration 363 configuration
307 ), 364 ),
308 wasKeyValueEncode( 365 wasKeyValueEncode(
309 [ 366 [
310 "command", "tell", 367 "command", "tell",
311 "group", wasURLEscape( 368 "group", wasURLEscape(
312 wasKeyValueGet( 369 wasKeyValueGet(
313 "group", 370 "group",
314 configuration 371 configuration
315 ) 372 )
316 ), 373 ),
317 "password", wasURLEscape( 374 "password", wasURLEscape(
318 wasKeyValueGet( 375 wasKeyValueGet(
319 "password", 376 "password",
320 configuration 377 configuration
321 ) 378 )
322 ), 379 ),
323 "entity", "group", 380 "entity", "group",
324 "message", wasURLEscape(data) 381 "message", wasURLEscape(joke)
325 ] 382 ]
326 ) 383 )
327 ); 384 );
-   385
-   386 // GC
-   387 joke = "";
-   388
328 state listen_group; 389 state listen_group;
329 } 390 }
330 } 391 }
331   392