Merge branch 'Actor-get-items-from-world' into character-generator

module/actor/actor.js

@@ -1,4 +1,4 @@
-import {fromIdUuid} from "../mosh.js";
+import { fromIdUuid } from "../mosh";
 
 /**
  * Extend the base Actor entity by defining a custom roll data structure which is ideal for the Simple system.
@@ -3065,7 +3065,7 @@ export class MothershipActor extends Actor {
     let flavorText = ``;
     let chatId = (game.release.generation >= 12 ? foundry.utils.randomID(): randomID())
     //get item data
-    let itemData = await fromIdUuid(itemId,{type: "Item"});
+    let itemData = await fromIdUuid(itemId,{type:"Item"});
     //add or increase the count of the item, depending on type, if the actor has it
     if (this.items.getName(itemData.name)) {
       //if this is an item, increase the count

module/actor/ship-sheet-sbt.js

@@ -1,4 +1,4 @@
-import {fromIdUuid} from "../mosh.js";
+import { fromIdUuid } from "../mosh";
 
 /**
  * Extend the basic ActorSheet with some very simple modifications

module/mosh.js

@@ -986,9 +986,9 @@ export async function fromIdUuid(id_uuid, options={}){
     //it is a world item.
     switch (type) {
       case "RollTable":
-        return await game.tables.filter(i=> i.id == id_uuid)[0];;
+        return game.tables.filter(i=> i.id == id_uuid)[0];
       case "Item":
-        return await game.items.filter(i=> i.id == id_uuid)[0];;
+        return game.items.filter(i=> i.id == id_uuid)[0];
       default:
         //type is not defined, and we could not find it in a compendium,
         //now we search all world elements.

module/windows/ship-megadamage.js

@@ -1,5 +1,4 @@
-import {fromIdUuid} from "../mosh.js";
-
+import { fromIdUuid } from "../mosh";
 export class DLShipMegaDamage extends FormApplication {
     static get defaultOptions() {
         const options = super.defaultOptions;