Skip to content

Commit

Permalink
Merge pull request #180 from SolarBear/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
SolarBear authored Mar 4, 2021
2 parents 0c92b53 + 4d9cb76 commit ff7e9ea
Show file tree
Hide file tree
Showing 13 changed files with 17,584 additions and 8,196 deletions.
11 changes: 8 additions & 3 deletions module/dice/RollData.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,16 @@ export class RollData {
* @returns {string}
*/
getRollFormula() {
if (this.taskLevel === null) {
if (this.taskLevel === null)
return "1d20";
}

return `{1d20}cs>=${3 * this.taskLevel}`;
let target;
if (this.taskLevel <= 0)
target = 1; //in Foundry 0.7.9 there is a "bug" (?) where "{1dX}>=0" is always a failure
else
target = 3 * this.taskLevel;

return `{1d20}cs>=${target}`;
}

/**
Expand Down
12 changes: 0 additions & 12 deletions module/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,6 @@ export const registerSystemSettings = function() {
default: true
});

/**
* Configure whether or not to show skill icons
*/
game.settings.register("numenera", "showSkillIcons", {
name: "Skill Icons",
hint: "Enable to show skill icons in player character sheets",
scope: "world",
config: true,
type: Boolean,
default: true
});

/**
* Configure whether or not to show ability icons
*/
Expand Down
9 changes: 9 additions & 0 deletions numenera.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,12 @@ Hooks.once("ready", numeneraSocketListeners);

//Random hooks should go in there
Hooks.once("ready", registerHooks);

//TEMPORARY: deprecation notice for Foundry 0.6 users
Hooks.once("ready", () => {
if (game.data.version.startsWith("0.6."))
ui.notifications.warn(`DEPRECATION NOTICE<br/><br/>It seems you are still using Foundry version 0.6. Please take note that, to keep the system's code base clean as well as
to prepare for the upcoming 0.8 version, version 0.6 support will be removed soon. Please update your Foundry software; if you cannot do so, please contact me via
<a href="https://discord.gg/foundryvtt">Foundry's Discord server</a> (nickname: SolarBear) or <a href="https://github.com/SolarBear/Numenera-FoundryVTT/issues">create an issue on Github so we can discuss the matter.</a>`,
{permanent: true});
});
Loading

0 comments on commit ff7e9ea

Please sign in to comment.