Skip to content

Commit

Permalink
Emco improvements (#53)
Browse files Browse the repository at this point in the history
* Make logging consoles log in plaintext properly. Add cmd line toggles to emco. Change odd/even table names to 1/2 for ease of changing
* Bump version
  • Loading branch information
demonnic committed Mar 11, 2023
1 parent 7cf4469 commit a0fa022
Show file tree
Hide file tree
Showing 15 changed files with 711 additions and 655 deletions.
12 changes: 6 additions & 6 deletions doc_table_template
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
-- </thead>
-- <tbody>
-- <tr>
-- <td class="tg-odd"></td>
-- <td class="tg-odd"></td>
-- <td class="tg-odd"></td>
-- <td class="tg-1"></td>
-- <td class="tg-1"></td>
-- <td class="tg-1"></td>
-- </tr>
-- <tr>
-- <td class="tg-even"></td>
-- <td class="tg-even"></td>
-- <td class="tg-even"></td>
-- <td class="tg-2"></td>
-- <td class="tg-2"></td>
-- <td class="tg-2"></td>
-- </tr>
--</tbody>
--</table>
4 changes: 2 additions & 2 deletions ldoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -311,5 +311,5 @@ pre .url { color: #272fc2; text-decoration: underline; }
font-family:Arial, sans-serif;font-size:14px;overflow:hidden;padding:10px 5px;word-break:normal;}
.tg th{background-color:#000000;border-color:#ccc;border-style:solid;border-width:1px;color:#FFF;
font-family:Arial, sans-serif;font-size:14px;font-weight:normal;overflow:hidden;padding:10px 5px;word-break:normal;}
.tg .tg-even{background-color:#797979;border-color:inherit;text-align:left;vertical-align:top;color:#DDD}
.tg .tg-odd{background-color:#8b8b8b;border-color:#ccc;border-style:solid;border-width:1px;color:#000;text-align:left;vertical-align:top}
.tg .tg-2{background-color:#797979;border-color:inherit;text-align:left;vertical-align:top;color:#DDD}
.tg .tg-1{background-color:#8b8b8b;border-color:#ccc;border-style:solid;border-width:1px;color:#000;text-align:left;vertical-align:top}
2 changes: 1 addition & 1 deletion mfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"package": "MDK",
"version": "2.8.1",
"version": "2.8.2",
"author": "Demonnic",
"title": "Collection of useful objects/classes",
"icon": "computer.png",
Expand Down
54 changes: 27 additions & 27 deletions src/resources/chyron.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,49 +30,49 @@ local Chyron = {
-- </thead>
-- <tbody>
-- <tr>
-- <td class="tg-odd">text</td>
-- <td class="tg-odd">The text to scroll on the label</td>
-- <td class="tg-odd">""</td>
-- <td class="tg-1">text</td>
-- <td class="tg-1">The text to scroll on the label</td>
-- <td class="tg-1">""</td>
-- </tr>
-- <tr>
-- <td class="tg-even">updateTime</td>
-- <td class="tg-even">Milliseconds between movements (one letter shift)</td>
-- <td class="tg-even">200</td>
-- <td class="tg-2">updateTime</td>
-- <td class="tg-2">Milliseconds between movements (one letter shift)</td>
-- <td class="tg-2">200</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">displayWidth</td>
-- <td class="tg-odd">How many chars wide to display the text</td>
-- <td class="tg-odd">28</td>
-- <td class="tg-1">displayWidth</td>
-- <td class="tg-1">How many chars wide to display the text</td>
-- <td class="tg-1">28</td>
-- </tr>
-- <tr>
-- <td class="tg-even">delimiter</td>
-- <td class="tg-even">This character will be inserted with a space either side to mark the stop/start of the message</td>
-- <td class="tg-even">"|"</td>
-- <td class="tg-2">delimiter</td>
-- <td class="tg-2">This character will be inserted with a space either side to mark the stop/start of the message</td>
-- <td class="tg-2">"|"</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">enabled</td>
-- <td class="tg-odd">Should the chyron scroll?</td>
-- <td class="tg-odd">true</td>
-- <td class="tg-1">enabled</td>
-- <td class="tg-1">Should the chyron scroll?</td>
-- <td class="tg-1">true</td>
-- </tr>
-- <tr>
-- <td class="tg-even">font</td>
-- <td class="tg-even">What font to use for the Chyron? Available in Geyser.Label but we define a default.</td>
-- <td class="tg-even">"Bitstream Vera Sans Mono"</td>
-- <td class="tg-2">font</td>
-- <td class="tg-2">What font to use for the Chyron? Available in Geyser.Label but we define a default.</td>
-- <td class="tg-2">"Bitstream Vera Sans Mono"</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">fontSize</td>
-- <td class="tg-odd">What font size to use for the Chyron? Available in Geyser.Label but we define a default.</td>
-- <td class="tg-odd">9</td>
-- <td class="tg-1">fontSize</td>
-- <td class="tg-1">What font size to use for the Chyron? Available in Geyser.Label but we define a default.</td>
-- <td class="tg-1">9</td>
-- </tr>
-- <tr>
-- <td class="tg-even">autoWidth</td>
-- <td class="tg-even">Should the Chyron resize to just fit the text?</td>
-- <td class="tg-even">true</td>
-- <td class="tg-2">autoWidth</td>
-- <td class="tg-2">Should the Chyron resize to just fit the text?</td>
-- <td class="tg-2">true</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">alignment</td>
-- <td class="tg-odd">What alignment(left/right/center) to use for the Chyron text? Available in Geyser.Label but we define a default.</td>
-- <td class="tg-odd">"center"</td>
-- <td class="tg-1">alignment</td>
-- <td class="tg-1">What alignment(left/right/center) to use for the Chyron text? Available in Geyser.Label but we define a default.</td>
-- <td class="tg-1">"center"</td>
-- </tr>
-- </tbody>
-- </table>
Expand Down
84 changes: 42 additions & 42 deletions src/resources/demontools.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1104,29 +1104,29 @@ end
-- </thead>
-- <tbody>
-- <tr>
-- <td class="tg-odd">format</td>
-- <td class="tg-odd">What format to return the text as? 'h' for html, 'c' for cecho, 'a' for ansi, 'd' for decho, and 'x' for hecho</td>
-- <td class="tg-odd">"d"</td>
-- <td class="tg-1">format</td>
-- <td class="tg-1">What format to return the text as? 'h' for html, 'c' for cecho, 'a' for ansi, 'd' for decho, and 'x' for hecho</td>
-- <td class="tg-1">"d"</td>
-- </tr>
-- <tr>
-- <td class="tg-even">win</td>
-- <td class="tg-even">what console/window to dump the buffer of?</td>
-- <td class="tg-even">"main"</td>
-- <td class="tg-2">win</td>
-- <td class="tg-2">what console/window to dump the buffer of?</td>
-- <td class="tg-2">"main"</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">start_line</td>
-- <td class="tg-odd">What line to start dumping the buffer from?</td>
-- <td class="tg-odd">0</td>
-- <td class="tg-1">start_line</td>
-- <td class="tg-1">What line to start dumping the buffer from?</td>
-- <td class="tg-1">0</td>
-- </tr>
-- <tr>
-- <td class="tg-even">end_line</td>
-- <td class="tg-even">What line to stop dumping the buffer on?</td>
-- <td class="tg-even">Last line of the console</td>
-- <td class="tg-2">end_line</td>
-- <td class="tg-2">What line to stop dumping the buffer on?</td>
-- <td class="tg-2">Last line of the console</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">includeHtmlWrapper</td>
-- <td class="tg-odd">If the format is html, should it include the front and back portions required to make it a functioning html page?</td>
-- <td class="tg-odd">true</td>
-- <td class="tg-1">includeHtmlWrapper</td>
-- <td class="tg-1">If the format is html, should it include the front and back portions required to make it a functioning html page?</td>
-- <td class="tg-1">true</td>
-- </tr>
-- </tbody>
-- </table>
Expand All @@ -1146,49 +1146,49 @@ end
-- </thead>
-- <tbody>
-- <tr>
-- <td class="tg-odd">cols</td>
-- <td class="tg-odd">Number of columsn wide to display the colors in</td>
-- <td class="tg-odd">4</td>
-- <td class="tg-1">cols</td>
-- <td class="tg-1">Number of columsn wide to display the colors in</td>
-- <td class="tg-1">4</td>
-- </tr>
-- <tr>
-- <td class="tg-even">search</td>
-- <td class="tg-even">If not the empty string, will check colors against string.find using this property.<br>IE if set to "blue" only colors which include the word 'blue' would be listed</td>
-- <td class="tg-even">""</td>
-- <td class="tg-2">search</td>
-- <td class="tg-2">If not the empty string, will check colors against string.find using this property.<br>IE if set to "blue" only colors which include the word 'blue' would be listed</td>
-- <td class="tg-2">""</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">sort</td>
-- <td class="tg-odd">If true, sorts alphabetically. Otherwise sorts based on the color value</td>
-- <td class="tg-odd">false</td>
-- <td class="tg-1">sort</td>
-- <td class="tg-1">If true, sorts alphabetically. Otherwise sorts based on the color value</td>
-- <td class="tg-1">false</td>
-- </tr>
-- <tr>
-- <td class="tg-even">echoOnly</td>
-- <td class="tg-even">If true, colors will not be clickable links</td>
-- <td class="tg-even">false</td>
-- <td class="tg-2">echoOnly</td>
-- <td class="tg-2">If true, colors will not be clickable links</td>
-- <td class="tg-2">false</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">window</td>
-- <td class="tg-odd">What window/console to echo the colors out to.</td>
-- <td class="tg-odd">"main"</td>
-- <td class="tg-1">window</td>
-- <td class="tg-1">What window/console to echo the colors out to.</td>
-- <td class="tg-1">"main"</td>
-- </tr>
-- <tr>
-- <td class="tg-even">removeDupes</td>
-- <td class="tg-even">If true, will remove snake_case entries and 'gray' in favor of 'grey'</td>
-- <td class="tg-even">true</td>
-- <td class="tg-2">removeDupes</td>
-- <td class="tg-2">If true, will remove snake_case entries and 'gray' in favor of 'grey'</td>
-- <td class="tg-2">true</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">columnSort</td>
-- <td class="tg-odd">If true, will print top-to-bottom, then left-to-right. false is like showColors</td>
-- <td class="tg-odd">true</td>
-- <td class="tg-1">columnSort</td>
-- <td class="tg-1">If true, will print top-to-bottom, then left-to-right. false is like showColors</td>
-- <td class="tg-1">true</td>
-- </tr>
-- <tr>
-- <td class="tg-even">justText</td>
-- <td class="tg-even">If true, will echo the text in the color and leave the background black.<br>If false, the background will be the colour(like showColors).</td>
-- <td class="tg-even">false</td>
-- <td class="tg-2">justText</td>
-- <td class="tg-2">If true, will echo the text in the color and leave the background black.<br>If false, the background will be the colour(like showColors).</td>
-- <td class="tg-2">false</td>
-- </tr>
-- <tr>
-- <td class="tg-odd">color_table</td>
-- <td class="tg-odd">Table of colors to display. If you provide your own table, it must be in the same format as Mudlet's own color_table</td>
-- <td class="tg-odd">color_table</td>
-- <td class="tg-1">color_table</td>
-- <td class="tg-1">Table of colors to display. If you provide your own table, it must be in the same format as Mudlet's own color_table</td>
-- <td class="tg-1">color_table</td>
-- </tr>
-- </tbody>
-- </table>
Expand Down
Loading

0 comments on commit a0fa022

Please sign in to comment.