Skip to content

Commit 8b37e5f

Browse files
authored
Ordering bug fix (#1326)
* Ordering bug fix * Order bug fix
1 parent bb57ed8 commit 8b37e5f

File tree

17 files changed

+2483
-44
lines changed

17 files changed

+2483
-44
lines changed

APILogic/APILogic.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Name : APILogic
44
GitHub : https://github.com/TimRohr22/Cauldron/tree/master/APILogic
55
Roll20 Contact : timmaugh
6-
Version : 2.0.4
7-
Last Update : 6/28/2021
6+
Version : 2.0.5
7+
Last Update : 7/20/2021
88
=========================================================
99
*/
1010
var API_Meta = API_Meta || {};
@@ -18,9 +18,9 @@ const APILogic = (() => {
1818
// VERSION
1919
// ==================================================
2020
const apiproject = 'APILogic';
21-
API_Meta[apiproject].version = '2.0.4';
21+
API_Meta[apiproject].version = '2.0.5';
2222
const schemaVersion = 0.1;
23-
const vd = new Date(1624887801910);
23+
const vd = new Date(1626810300264);
2424
const versionInfo = () => {
2525
log(`\u0166\u0166 ${apiproject} v${API_Meta[apiproject].version}, ${vd.getFullYear()}/${vd.getMonth() + 1}/${vd.getDate()} \u0166\u0166 -- offset ${API_Meta[apiproject].offset}`);
2626
if (!state.hasOwnProperty(apiproject) || state[apiproject].version !== schemaVersion) {
@@ -715,7 +715,7 @@ const APILogic = (() => {
715715
const handleInput = (msg, msgstate = {}) => {
716716
let funcret = { runloop: false, status: 'unchanged', notes: '' };
717717
if (msg.type !== 'api' || !testConstructs(msg.content)) return funcret;
718-
if (!msgstate && scriptisplugin) return funcret;
718+
if (!Object.keys(msgstate).length && scriptisplugin) return funcret;
719719
let status = [];
720720
let notes = [];
721721
const linebreak = '({&br-al})';

APILogic/script.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "APILogic",
33
"script": "APILogic.js",
4-
"version": "2.0.4",
4+
"version": "2.0.5",
55
"description": "APILogic is a meta-script and part of the Meta-Toolbox. APILogic provides chat input logical constructs for shaping the command line, including IF, ELSEIF, and ELSE. It provides a way to define terms for text-replacment operations, or to name condition sets to re-use later in the logical processing. \r\rFor more information, see the original API forum thread:\r\r[APILogic Forum Thread](https://app.roll20.net/forum/post/9771314/script-apilogic-gives-if-slash-elseif-slash-else-processing-to-other-scripts/)\r\rOr read about the full set of meta-scripts available: \r\r[Meta Toolbox Forum Thread](https://app.roll20.net/forum/post/10005695/script-set-the-meta-toolbox)",
66
"authors": "timmaugh",
77
"roll20userid": "5962076",
@@ -25,6 +25,7 @@
2525
"1.1.3",
2626
"1.2.0",
2727
"1.2.1",
28-
"2.0.3"
28+
"2.0.3",
29+
"2.0.4"
2930
]
3031
}

Fetch/1.0.8/Fetch.js

+718
Large diffs are not rendered by default.

Fetch/Fetch.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Name : Fetch
44
GitHub : https://github.com/TimRohr22/Cauldron/tree/master/Fetch
55
Roll20 Contact : timmaugh
6-
Version : 1.0.7
7-
Last Update : 6/28/2021
6+
Version : 1.0.8
7+
Last Update : 7/20/2021
88
=========================================================
99
*/
1010
var API_Meta = API_Meta || {};
@@ -15,10 +15,10 @@ API_Meta.Fetch = { offset: Number.MAX_SAFE_INTEGER, lineCount: -1 };
1515

1616
const Fetch = (() => {
1717
const apiproject = 'Fetch';
18-
const version = '1.0.7';
18+
const version = '1.0.8';
1919
const schemaVersion = 0.1;
2020
API_Meta[apiproject].version = version;
21-
const vd = new Date(1624887801910);
21+
const vd = new Date(1626810300264);
2222
const versionInfo = () => {
2323
log(`\u0166\u0166 ${apiproject} v${API_Meta[apiproject].version}, ${vd.getFullYear()}/${vd.getMonth() + 1}/${vd.getDate()} \u0166\u0166 -- offset ${API_Meta[apiproject].offset}`);
2424
if (!state.hasOwnProperty(apiproject) || state[apiproject].version !== schemaVersion) {
@@ -525,7 +525,7 @@ const Fetch = (() => {
525525
const handleInput = (msg, msgstate = {}) => {
526526
let funcret = { runloop: false, status: 'unchanged', notes: '' };
527527
if (msg.type !== 'api' || !testConstructs(msg.content)) return funcret;
528-
if (!msgstate && scriptisplugin) return funcret;
528+
if (!Object.keys(msgstate).length && scriptisplugin) return funcret;
529529
let status = [];
530530
let notes = [];
531531

Fetch/script.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Fetch",
33
"script": "Fetch.js",
4-
"version": "1.0.7",
4+
"version": "1.0.8",
55
"description": "Fetch is a meta-script and part of the Meta-Toolbox. Fetch offers a unified syntax to expand the amount of things that can be retrieved with simple token or sheet calls. You can retrieve any token property, character property, sheet attribute, repeating attribute, ability, or macro with syntax that is intentionally very similar to Roll20's own syntax structures.\r\rToken property : @(selected.currentside)\rSheet Attribute: @(selected.Strength)\rSheet Attribute: @(Bob the Hirsute.Strength.max)\rRepeating Attr : *(Englebert Slaptiback.spells.[spell_name~Fireball prepared].spell_roll)\r\rIt also expands the source of the returned sheet item to include 'speaker'.\r\r@(speaker.Strength.max) ... and can return the rowID of a repeating attribute, the row number ($0), or the name of either brand of reference.\r\rNot only do these offer the advantage of not breaking the chat message if they don't exist (the way a standard token or sheet item call would), they also give you the ability to substitute in a default value should the one you are looking for not exist: \r\r@(The President of Burundi.Coffee[default value here]) \r\rFor more information, see the original API forum thread:\r\rhttps://app.roll20.net/forum/post/10005732/meta-script-fetch-retrieve-attributes-repeating-attributes-abilities-or-token-properties)\r\rOr read about the full set of meta-scripts available: \r\r[Meta Toolbox Forum Thread](https://app.roll20.net/forum/post/10005695/script-set-the-meta-toolbox)",
66
"authors": "timmaugh",
77
"roll20userid": "5962076",
@@ -19,7 +19,8 @@
1919
"previousversions": [
2020
"1.0.4",
2121
"1.0.5",
22-
"1.0.6"
22+
"1.0.6",
23+
"1.0.7"
2324
]
2425

2526
}

0 commit comments

Comments
 (0)