Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from Roll20:master #104

Merged
merged 8 commits into from
Jan 16, 2025
Merged

[pull] master from Roll20:master #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7451544
Made corrections to the readme, to... well it make more readable
boli32 Jan 15, 2025
b6c48d9
Merge branch 'Roll20:master' into master
boli32 Jan 15, 2025
89b28d2
Fix for Wildshape
boli32 Jan 15, 2025
1e7cfcb
Fix for adding Relationships
boli32 Jan 16, 2025
693b5d8
removed erroring } which was present in some relationship iterations.
boli32 Jan 16, 2025
e8403cc
removed debugging log()
boli32 Jan 16, 2025
632f075
Merge pull request #2006 from boli32/WildshapeFix
NBrooks-Roll20 Jan 16, 2025
b6542c3
Merge pull request #2005 from boli32/master
NBrooks-Roll20 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalenderData/script.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"script": "CalenderData.js",
"version": "1.0",
"previousversions": [],
"description": "This is a script which doesnt do anything by itself, but defines the following state variables, which are used by other programs, specifically QuestTracker. state.CalenderData.CALENDARS & state.CalenderData.WEATHER.",
"description": "This is a script which doesnt do anything by itself, but defines the following state variables, which are used by other programs, specifically **QuestTracker**. \r\r Yes, I am fully aware I have spelt 'Calendar' wrong; but it's too late to change this.\r\r## More Information?\r [See the README](https://github.com/Roll20/roll20-api-scripts/blob/master/QuestTracker/README.md) \r ## Contributing \r Contributions are welcome! Please submit pull requests or report issues on the GitHub repository: [GitHub Repository](https://github.com/Roll20/roll20-api-scripts/issues)",
"authors": "Boli",
"roll20userid": "3714078",
"useroptions": [],
Expand Down
10 changes: 5 additions & 5 deletions QuestTracker/1.0/QuestTracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3196,7 +3196,7 @@ var QuestTracker = QuestTracker || (function () {
<a style="${styles.questlink}" href="!qt-menu action=quest|id=${condition}">${H.getQuestName(condition)}</a>
</td>
<td style="${styles.smallButtonContainer}">
<a style="${styles.button} ${styles.smallButton}" href="!qt-questrelationship currentquest=${questId}|oldquest=${condition}|action=update|type=${indent ? `group|groupnum=${currentGroupNum}` : `single`}|quest=?{Choose Quest|${H.buildDropdownString(questId, condition)}}">c</a>
<a style="${styles.button} ${styles.smallButton}" href="!qt-questrelationship currentquest=${questId}|oldquest=${condition}|action=update|type=${indent ? `group|groupnum=${currentGroupNum}` : `single`}|quest=${H.buildDropdownString(questId, condition)}">c</a>
</td>
<td style="${styles.smallButtonContainer}">
<a style="${styles.button} ${styles.smallButton}" href="!qt-questrelationship currentquest=${questId}|action=remove|type=${indent ? `group|groupnum=${currentGroupNum}|confirmation=DELETE` : `single`}|quest=${condition}">-</a>
Expand All @@ -3209,7 +3209,7 @@ var QuestTracker = QuestTracker || (function () {
<small>Add Relationship</small>
</td>
<td style="${styles.smallButtonContainer}">
<${spanOrAnchor} href="!qt-questrelationship currentquest=${questId}|action=add|type=group|groupnum=${currentGroupNum}|quest=?{Choose Quest|${H.buildDropdownString(questId)}}" style="${renderButtonStyle} ${styles.smallButton}">+</a>
<${spanOrAnchor} href="!qt-questrelationship currentquest=${questId}|action=add|type=group|groupnum=${currentGroupNum}|quest=${H.buildDropdownString(questId)}" style="${renderButtonStyle} ${styles.smallButton}">+</a>
</td>
</tr>
` : ''}
Expand All @@ -3219,7 +3219,7 @@ var QuestTracker = QuestTracker || (function () {
<small>Add Relationship</small>
</td>
<td style="${styles.smallButtonContainer}">
<${spanOrAnchor} href="!qt-questrelationship currentquest=${questId}|action=add|type=single|quest=?{Choose Quest|${H.buildDropdownString(questId)}}" style="${renderButtonStyle} ${styles.smallButton}">+</a>
<${spanOrAnchor} href="!qt-questrelationship currentquest=${questId}|action=add|type=single|quest=${H.buildDropdownString(questId)}" style="${renderButtonStyle} ${styles.smallButton}">+</a>
</td>
</tr>
` : ''}
Expand All @@ -3235,7 +3235,7 @@ var QuestTracker = QuestTracker || (function () {
<small>Add Relationship</small>
</td>
<td style="${styles.smallButtonContainer}">
<${spanOrAnchor} href="!qt-questrelationship currentquest=${questId}|action=add|type=single|quest=?{Choose Quest|${H.buildDropdownString(questId)}}" style="${renderButtonStyle} ${styles.smallButton}">+</a>
<${spanOrAnchor} href="!qt-questrelationship currentquest=${questId}|action=add|type=single|quest=${H.buildDropdownString(questId)}" style="${renderButtonStyle} ${styles.smallButton}">+</a>
</td>
</tr>`;
}
Expand Down Expand Up @@ -3270,7 +3270,7 @@ var QuestTracker = QuestTracker || (function () {
}
},
getQuestName: (questId) => {
return QUEST_TRACKER_globalQuestData[questId]?.name || 'Unnamed Quest';
return QUEST_TRACKER_globalQuestData[questId]?.name.replace(/[{}|&?]/g, '') || 'Unnamed Quest';
},
relationshipMenu: (questId) => {
const quest = QUEST_TRACKER_globalQuestData[questId];
Expand Down
2 changes: 1 addition & 1 deletion QuestTracker/script.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"script": "QuestTracker.js",
"version": "1.0",
"previousversions": [],
"description": "# Quest Tracker Quest Tracker is a comprehensive tool for managing quests, rumors, and events in a tabletop RPG setting. It integrates seamlessly with Roll20 to provide detailed tracking and visualization of game elements, making it ideal for GMs and players who want to streamline their campaigns. ### Features - **Quest Management:** - Create, edit, and remove quests. - Track quest statuses (e.g., \"Started\", \"Completed\", \"Failed\"). - Group quests into logical categories. - **Rumor Handling:** - Add and manage rumors by location or quest. - Generate rumors dynamically. - Associate rumors with quest progression. - **Event Scheduling:** - Schedule events with repeatable options. - Adjust events based on in-game calendars. - **Weather and Climate Integration:** - Dynamic weather generation based on in-game conditions. - Detailed descriptions of current weather conditions. - **Calender Integration:** - Track Leap years - Different Calander types, e.g. Harpto, Gregorian etc. - **Visual Quest Tree:** - Display quests and relationships as a tree diagram. - Automatically handle mutually exclusive relationships. ### Getting Started - Access all features through an intuitive graphical user interface. simply type **!qt** into chat. - Navigate through menus to manage quests, rumors, and events seamlessly. ## More Information? [See the README](https://github.com/Roll20/roll20-api-scripts/blob/master/QuestTracker/README.md) ## Contributing Contributions are welcome! Please submit pull requests or report issues on the GitHub repository: [GitHub Repository](https://github.com/boli32/QuestTracker) ## Credits - **Author:** Steven Wrighton (Boli) - **Contact:** [Roll20 Profile](https://app.roll20.net/users/3714078/boli) - **License:** MIT",
"description": "# Quest Tracker\r Quest Tracker is a comprehensive tool for managing quests, rumors, and events in a tabletop RPG setting. It integrates seamlessly with Roll20 to provide detailed tracking and visualization of game elements, making it ideal for GMs and players who want to streamline their campaigns.\r\r ## Features\r\r ### Quest Management \r * Create, edit, and remove quests.\r * Track quest statuses (e.g., \"Started\", \"Completed\", \"Failed\").\r * Group quests into logical categories.\r\r ### Rumor Handling \r * Add and manage rumors by location or quest.\r * Generate rumors dynamically.\r * Associate rumors with quest progression.\r\r ### Event Scheduling:**\r * Schedule events with repeatable options.\r * Adjust events based on in-game calendars.\r\r ### Weather and Climate Integration:**\r * Dynamic weather generation based on in-game conditions.\r * Detailed descriptions of current weather conditions.\r\r ### Calender Integration:**\r * Track Leap years\r * Different Calander types, e.g. Harpto, Gregorian etc.\r\r ### Visual Quest Tree:**\r * Display quests and relationships as a tree diagram.\r * Automatically handle mutually exclusive relationships.\r\r ## Getting Started - Access all features through an intuitive graphical user interface. simply type `!qt` into chat. Navigate through menus to manage quests, rumors, and events seamlessly. \r\r ## More Information?\r [See the README](https://github.com/Roll20/roll20-api-scripts/blob/master/QuestTracker/README.md) \r ## Contributing \r Contributions are welcome! Please submit pull requests or report issues on the GitHub repository: [GitHub Repository](https://github.com/Roll20/roll20-api-scripts/issues)\r",
"authors": "Boli",
"roll20userid": "3714078",
"useroptions": [],
Expand Down
2 changes: 1 addition & 1 deletion WildShape/1.4.3/WildShape.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,7 +2366,7 @@ var WildShape = WildShape || (function() {
log(WS_API.NAME + ' v' + WS_API.VERSION + " Ready! WildUtils v" + UTILS.VERSION);

// Chat message only appears on debug mode.
UTILS.debugChat("API v" + WS_API.VERSION + " Ready! command: " + WS_API.CMD.ROOT
UTILS.debugChat("API v" + WS_API.VERSION + " Ready! command: " + WS_API.CMD.ROOT);
}

return {
Expand Down
Loading