Compatibility bugs, small improvements

README.md

@@ -1,3 +1,18 @@
+# Numenera Improved
+The orginal plugin had mutiple incompatibility with Foundry v9 so I did a few fixes. Besides the popular little improvements to make it more compatible with the system language (Extra effort -> Assets, Cypher -> Numenera). I had trouble trying to make this as an update to the current version so I have renamed it to Numenera Improved. It is compatible with Numenera shared compendiums so you can migrate your games over easily.
+
+## How to use this?
+Go into you Foundry Setup > Install System. 
+
+Enter this URL on the manifest field: https://raw.githubusercontent.com/rommie-nunes/Numenera-FoundryVTT/master/system.json 
+
+Done, you have the Numenera-Improved system installed.
+
+Note: This will not override your current Numenera system.
+
+## Enjoying it?
+[![Coffee](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://buymeacoffee.com/rommienunes)
+
 # Cypher System for the Foundry VTT
 
 Do you enjoy using the system? Then support my harmful caffeine intake habits and buy me some beans!

lang/de.json

@@ -54,7 +54,7 @@
 
     "NUMENERA.pcActorSheet.tab.skills": "Fertigkeiten",
     "NUMENERA.pcActorSheet.tab.abilities": "Sonderfähigkeiten",
-    "NUMENERA.pcActorSheet.tab.cyphers": "Cypher",
+    "NUMENERA.pcActorSheet.tab.cyphers": "Numenera",
     "NUMENERA.pcActorSheet.tab.strange": "Strange",
     "NUMENERA.pcActorSheet.tab.recursion": "Recursions",
     "NUMENERA.pcActorSheet.tab.equipment": "Ausrüstung",

lang/en.json

@@ -29,7 +29,7 @@
     "NUMENERA.effort.title": "Effort",
     "NUMENERA.effort.againstTaskLevel": "against task level",
     "NUMENERA.effort.failAutomatically": "Automatic Failure",
-    "NUMENERA.effort.other": "Other Enhancements",
+    "NUMENERA.effort.other": "Assets",
     "NUMENERA.effort.confirmUnspentTitle": "Confirm: Unspent Points",
     "NUMENERA.effort.confirmUnspent": "You have unspent points are your pools are not full yet. Do you really want to exit? These points will be lost.",
     "NUMENERA.effort.cost": "Cost",
@@ -111,7 +111,7 @@
 
     "NUMENERA.pcActorSheet.tab.skills": "Skills",
     "NUMENERA.pcActorSheet.tab.abilities": "Abilities",
-    "NUMENERA.pcActorSheet.tab.cyphers": "Cyphers",
+    "NUMENERA.pcActorSheet.tab.cyphers": "Numenera",
     "NUMENERA.pcActorSheet.tab.strange": "Strange",
     "NUMENERA.pcActorSheet.tab.recursion": "Recursions",
     "NUMENERA.pcActorSheet.tab.equipment": "Equipment",

lang/es.json

@@ -54,7 +54,7 @@
 
     "NUMENERA.pcActorSheet.tab.skills": "Habilidades",
     "NUMENERA.pcActorSheet.tab.abilities": "Capacidades",
-    "NUMENERA.pcActorSheet.tab.cyphers": "Cypher",
+    "NUMENERA.pcActorSheet.tab.cyphers": "Numenera",
     "NUMENERA.pcActorSheet.tab.strange": "Strange",
     "NUMENERA.pcActorSheet.tab.recursion": "Recursiones",
     "NUMENERA.pcActorSheet.tab.equipment": "Equipo",

lang/fr.json

@@ -111,7 +111,7 @@
 
     "NUMENERA.pcActorSheet.tab.skills": "Compétences",
     "NUMENERA.pcActorSheet.tab.abilities": "Aptitudes",
-    "NUMENERA.pcActorSheet.tab.cyphers": "Cypher",
+    "NUMENERA.pcActorSheet.tab.cyphers": "Numenera",
     "NUMENERA.pcActorSheet.tab.strange": "Étrange",
     "NUMENERA.pcActorSheet.tab.recursion": "Récursion",
     "NUMENERA.pcActorSheet.tab.equipment": "Équipement",

lang/pt-BR.json

@@ -41,7 +41,7 @@
   "NUMENERA.pcActorSheet.advancement.xp": "XP",
   "NUMENERA.pcActorSheet.tab.skills": "Perícias",
   "NUMENERA.pcActorSheet.tab.abilities": "Habilidades Especiais",
-  "NUMENERA.pcActorSheet.tab.cyphers": "Cifras",
+  "NUMENERA.pcActorSheet.tab.cyphers": "Numenera",
   "NUMENERA.pcActorSheet.tab.strange": "Estranho",
   "NUMENERA.pcActorSheet.tab.recursion": "Recursos",
   "NUMENERA.pcActorSheet.tab.equipment": "Equipamento",

module/actor/NumeneraPCActor.js

@@ -136,7 +136,7 @@ export class NumeneraPCActor extends Actor {
     rollData.enhancements = enhancements;
 
     const roll = rollData.getRoll();
-    roll.roll();
+    roll.roll({async:false});
 
     let flavor = game.i18n.localize("NUMENERA.rolling") + " " + skill.data.data.name;
 
@@ -561,7 +561,7 @@ export class NumeneraPCActor extends Actor {
               //TODO move all of this BEFORE the item creation
 
               //Try the formula as is first
-              itemData.level = new Roll(itemData.levelDie).roll().total;
+              itemData.level = new Roll(itemData.levelDie).roll({async:false}).total;
 
             } catch (Error) {
               try {

module/actor/sheets/NumeneraCommunityActorSheet.js

@@ -40,9 +40,6 @@ export class NumeneraCommunityActorSheet extends ActorSheet {
   getData() {
     const sheetData = super.getData();
 
-    //lol? https://discord.com/channels/170995199584108546/670336275496042502/836066464388743188
-    //TODO remove condition when removing support for 0.7
-    if (game.data.version.startsWith("0.8."))
       sheetData.data = sheetData.data.data;
 
     if (this.actor.getUserLevel() < CONST.ENTITY_PERMISSIONS.OBSERVER)

module/actor/sheets/NumeneraNPCActorSheet.js

@@ -52,10 +52,7 @@ export class NumeneraNPCActorSheet extends ActorSheet {
   getData() {
     const sheetData = super.getData();
 
-    //lol? https://discord.com/channels/170995199584108546/670336275496042502/836066464388743188
-    //TODO remove condition when removing support for 0.7
-    if (game.data.version.startsWith("0.8."))
-      sheetData.data = sheetData.data.data;
+    sheetData.data = sheetData.data.data;
 
     sheetData.ranges = NUMENERA.ranges.map(r => game.i18n.localize(r));
 

module/actor/sheets/NumeneraPCActorSheet.js

@@ -779,7 +779,7 @@ export class NumeneraPCActorSheet extends ActorSheet {
     if (!depletion.isDepleting || !depletion.die || !depletion.threshold)
       return;
 
-    const roll = new Roll(depletion.die).roll();
+    const roll = new Roll(depletion.die).roll({async:false});
 
     roll.toMessage({
       speaker: ChatMessage.getSpeaker(),

module/apps/RecoveryDialog.js

@@ -1,5 +1,6 @@
 import { NumeneraPCActor } from "../actor/NumeneraPCActor.js";
 import { NUMENERA } from "../config.js";
+import { RollData } from '../dice/RollData.js';
 
 export class RecoveryDialog extends FormApplication {
 
@@ -139,9 +140,9 @@ export class RecoveryDialog extends FormApplication {
           "data.recoveries": this.object.recoveriesLeft
         });
 
-        ChatMessage.create({
-          content: `<h3>${this.object.actor.data.name} ${game.i18n.localize("NUMENERA.recoveries.resetDialog.confirmation")}</h3>`,
-        });
+          ChatMessage.create({
+            content: `<h3>${this.object.actor.data.name} ${game.i18n.localize("NUMENERA.recoveries.resetDialog.confirmation")}</h3>`,
+          });
 
         this.render();
       }
@@ -165,10 +166,13 @@ export class RecoveryDialog extends FormApplication {
       return;
     }
 
-    const roll = new Roll(this._getFormula(nbDice, this.object.tempBonus)).roll();
+    const formula = this._getFormula(nbDice, this.object.tempBonus);
+    const roll = new Roll(formula);
+    roll.evaluate({async:false});
     roll.toMessage({
       speaker: ChatMessage.getSpeaker(),
-      flavor: `${this.object.actor.data.name} rolls for Recovery`,
+      messageData: "recovery test",
+      flavor: `${this.object.actor.data.name} rolls for Recovery`, 
     });
 
     this.object.unspentRecoveryPoints += roll.total;

module/combat.js

@@ -31,7 +31,7 @@ export async function rollInitiative(ids, {formula=null, updateTurn=true, messag
       const rollData = c.actor ? c.actor.getRollData() : {};
 
       const cf = formula || this._getInitiativeFormula(c);
-      const roll = new Roll(cf, rollData).roll();
+      const roll = new Roll(cf, rollData).roll({async:false});
       updates.push({ _id: id, initiative: roll.total });
 
       // In Numenera, initiative is fixed for NPCs so don't spam the chat with constant values!

module/dice/RollData.js

@@ -239,7 +239,7 @@ export function numeneraRoll(topic) {
   const rollData = new RollData();
   rollData.topic = topic;
 
-  const roll = rollData.getRoll().roll();
+  const roll = rollData.getRoll().roll({async:false});
 
   roll.toMessage({
     speaker: ChatMessage.getSpeaker(),

module/item/sheets/NumeneraAbilityItemSheet.js

@@ -27,7 +27,6 @@ export class NumeneraAbilityItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
             sheetData.data = sheetData.data.data;
 
         sheetData.data.ranges = NUMENERA.optionalRanges;

module/item/sheets/NumeneraArmorItemSheet.js

@@ -27,7 +27,6 @@ export class NumeneraArmorItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
             sheetData.data = sheetData.data.data;
 
             sheetData.weightClasses = NUMENERA.weightClasses;

module/item/sheets/NumeneraArtifactItemSheet.js

@@ -24,7 +24,6 @@ export class NumeneraArtifactItemSheet extends ItemSheet {
     getData() {
       const sheetData = super.getData();
 
-      if (game.data.version.startsWith("0.8."))
         sheetData.data = sheetData.data.data;
 
       //Is it The Strange?

module/item/sheets/NumeneraCypherItemSheet.js

@@ -32,8 +32,7 @@ export class NumeneraCypherItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
-            sheetData.data = sheetData.data.data;   
+        sheetData.data = sheetData.data.data;   
 
         const flavor = NumeneraCypherItem.cypherTypeFlavor;
         const useCypherTypes = !!flavor;

module/item/sheets/NumeneraEquipmentItemSheet.js

@@ -30,7 +30,6 @@ export class NumeneraEquipmentItemSheet extends ItemSheet {
         getData() {
             const sheetData = super.getData();
 
-            if (game.data.version.startsWith("0.8."))
                 sheetData.data = sheetData.data.data;
 
             return sheetData;

module/item/sheets/NumeneraOddityItemSheet.js

@@ -25,7 +25,6 @@ export class NumeneraOddityItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
             sheetData.data = sheetData.data.data;
 
         return sheetData;

module/item/sheets/NumeneraPowerShiftItemSheet.js

@@ -27,7 +27,6 @@ export class NumeneraPowerShiftItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
             sheetData.data = sheetData.data.data;
 
         sheetData.effects = NUMENERA.powerShiftEffects;

module/item/sheets/NumeneraSkillItemSheet.js

@@ -27,8 +27,7 @@ export class NumeneraSkillItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
-            sheetData.data = sheetData.data.data;
+        sheetData.data = sheetData.data.data;
 
         sheetData.data.stats = NUMENERA.stats;
 

module/item/sheets/NumeneraWeaponItemSheet.js

@@ -27,7 +27,6 @@ export class NumeneraWeaponItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
             sheetData.data = sheetData.data.data;
 
         sheetData.ranges = NUMENERA.ranges;

module/item/sheets/StrangeRecursionItemSheet.js

@@ -27,7 +27,6 @@ export class StrangeRecursionItemSheet extends ItemSheet {
     getData() {
         const sheetData = super.getData();
 
-        if (game.data.version.startsWith("0.8."))
             sheetData.data = sheetData.data.data;
 
         return sheetData;