Merge pull request #2828 from Thorium-Sim/develop

2.6.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "thorium",
-  "version": "2.6.1",
+  "version": "2.6.2-beta1",
   "description": "Starship Simulator Controls",
   "private": true,
   "repository": {
@@ -225,14 +225,14 @@
     "fuse.js": "^3.4.5",
     "googleapis": "^44.0.0",
     "graphql": "^14.5.8",
+    "graphql-bigint": "^1.0.0",
     "graphql-type-json": "^0.3.0",
     "graphql.macro": "^1.4.2",
     "immer": "^5.3.6",
     "lodash": "^4.17.15",
     "lodash.clonedeep": "^4.5.0",
     "lodash.flowright": "^3.5.0",
     "lodash.merge": "^4.6.2",
-    "logrocket": "^1.0.6",
     "luxon": "^1.19.3",
     "mkdirp": "^0.5.1",
     "motu-control": "1.0.4",

public/electron/helpers/freakout.js

@@ -1,5 +1,4 @@
 // var robot = require("robotjs");
-// //console.log(process.version);
 // module.exports = function() {
 //   var screenSize = robot.getScreenSize();
 //   var height = screenSize.height;

server/classes/Countermeasure.ts

@@ -265,7 +265,8 @@ export class Countermeasures extends System {
 
       // Remove all of the unused materials from the countermeasure modules
       countermeasure.modules.forEach(m => {
-        const usedMaterialValue = m.buildProgress;
+        // Half the build progress so at least some materials are recycled.
+        const usedMaterialValue = m.buildProgress * 0.5;
         Object.entries(m.resourceRequirements).forEach(([key, value]) => {
           this.storedMaterials[key] = Math.round(
             this.storedMaterials[key] - usedMaterialValue * value,
@@ -310,6 +311,15 @@ export class Countermeasures extends System {
   configureCountermeasureModule(slot, id, config) {
     this.slots[slot]?.configureModule(id, config);
   }
+  setSlotActivation(slot, active) {
+    this.slots[slot]?.setActive(active);
+  }
+  setFDNote(id, note) {
+    const cm =
+      this.launched.find(l => l.id === id) ||
+      Object.values(this.slots).find(s => s?.id === id);
+    cm?.setNote(note);
+  }
 }
 
 interface CountermeasureParams {
@@ -320,6 +330,7 @@ interface CountermeasureParams {
   active?: boolean;
   building?: boolean;
   totalPowerUsed?: number;
+  note?: string;
 }
 class Countermeasure {
   id: string;
@@ -329,6 +340,7 @@ class Countermeasure {
   active: boolean;
   building: boolean;
   totalPowerUsed: number;
+  note: string;
   constructor(params: CountermeasureParams) {
     this.id = params.id || uuid.v4();
     this.name = params.name || "Countermeasure";
@@ -340,6 +352,7 @@ class Countermeasure {
     this.active = params.active || false;
     this.building = params.building || false;
     this.totalPowerUsed = params.totalPowerUsed || 0;
+    this.note = params.note || "";
   }
 
   get readyToLaunch() {
@@ -384,7 +397,9 @@ class Countermeasure {
   build() {
     this.building = true;
   }
-
+  setActive(tf) {
+    this.active = tf;
+  }
   addModule(moduleType) {
     if (!this.building) {
       const mod = moduleTypes.find(
@@ -410,4 +425,7 @@ class Countermeasure {
   activateModule(id) {
     this.modules.find(m => m.id === id)?.activate();
   }
+  setNote(note) {
+    this.note = note;
+  }
 }

server/classes/targeting.js

@@ -6,21 +6,35 @@ class TargetClass {
     this.id = params.id || uuid.v4();
     this.systemId = systemId || params.systemId || "";
     this.name = params.name || "Target";
-    this.size = params.size || 1;
+    this.size = params.size ?? 1;
     this.icon = params.icon || "/Sensor Contacts/Icons/Default.svg";
     this.picture = params.picture || "/Sensor Contacts/Pictures/Default.png";
-    this.speed = params.speed || 1;
-    this.moving = params.moving || true;
+    this.speed = params.speed ?? 1;
+    this.moving = params.moving ?? true;
+    this.clickToTarget = params.clickToTarget || false;
     this.quadrant = params.quadrant || 1;
   }
-  update({name, size, system, icon, picture, speed, quadrant, moving, count}) {
+  update({
+    name,
+    size,
+    system,
+    icon,
+    picture,
+    speed,
+    quadrant,
+    moving,
+    clickToTarget,
+    count,
+  }) {
     if (name) this.name = name;
     if (size) this.size = size;
     if (system) this.system = system;
     if (icon) this.icon = icon;
     if (picture) this.picture = picture;
     if (speed) this.speed = speed;
     if (moving || moving === false) this.moving = moving;
+    if (clickToTarget || clickToTarget === false)
+      this.clickToTarget = clickToTarget;
     if (quadrant) this.quadrant = quadrant;
   }
 }

server/classes/universe/components/appearance.ts

@@ -1,12 +1,28 @@
 import {registerComponent} from "../component";
 import {immerable} from "immer";
+
+enum MeshTypeEnum {
+  sphere = "sphere",
+  cube = "cube",
+  model = "model",
+  sprite = "sprite",
+}
 export class Appearance {
   [immerable] = true;
   static class = "Appearance";
   class = "Appearance";
+  color: string;
+  meshType: MeshTypeEnum;
   modelAsset: string;
-  constructor({modelAsset}) {
+  materialMapAsset: string;
+  scale: number;
+
+  constructor({meshType, modelAsset, materialMapAsset, color, scale = 1}) {
+    this.meshType = meshType;
     this.modelAsset = modelAsset;
+    this.materialMapAsset = materialMapAsset;
+    this.color = color;
+    this.scale = scale;
   }
 }
 

server/events/Countermeasures.ts

@@ -52,6 +52,22 @@ App.on("countermeasuresLaunchCountermeasure", ({id, slot}) => {
     sys.launchCountermeasure(slot);
   });
 });
+App.on("countermeasuresActivateCountermeasure", ({id, slot}) => {
+  performAction(id, sys => {
+    sys.setSlotActivation(slot, true);
+  });
+});
+App.on("countermeasuresDeactivateCountermeasure", ({id, slot}) => {
+  performAction(id, sys => {
+    sys.setSlotActivation(slot, false);
+  });
+});
+App.on("countermeasuresSetFDNote", ({id, countermeasureId, note}) => {
+  performAction(id, sys => {
+    sys.setFDNote(countermeasureId, note);
+  });
+});
+
 App.on("countermeasuresLaunchUnlockedCountermeasures", ({id}) => {
   performAction(id, sys => {
     let count = 0;

server/events/simulator.js

@@ -239,7 +239,6 @@ App.on("triggerMacros", ({simulatorId, macros}) => {
       if (!noCancelOnReset) flight.timeouts.push(timeout);
     },
   );
-  pubsub.publish("simulatorsUpdate", App.simulators);
 });
 
 App.on("autoAdvance", ({simulatorId, prev}) => {

server/imports/missions/import/index.js

@@ -27,7 +27,8 @@ export default function ImportMission(filepath, cb) {
   console.log("Importing mission");
   yauzl.open(filepath, {lazyEntries: true}, function(err, importZip) {
     if (err) {
-      throw err;
+      //Eat the error
+      return;
     }
     importZip.on("close", function() {
       cb(null);

server/processes/crew.js

@@ -40,16 +40,16 @@ function moveCrew() {
         // Start with moving team members
         const teamCrewNeedingMoving = teams.reduce((prev, next) => {
           const location =
-            App.rooms.find(d => d.id === next.location) ||
-            App.decks.find(d => d.id === next.location);
+            App.rooms.find(d => d.id === next?.location) ||
+            App.decks.find(d => d.id === next?.location);
           const deck = App.decks.find(
-            d => d.id === (location ? location.deckId : next.location),
+            d => d.id === (location ? location.deckId : next?.location),
           );
           if (!deck) return prev;
           if (allowedDecks.indexOf(deck.id) === -1) return prev;
           next.officers.forEach(o => {
             const c = crew.find(cc => cc.id === o);
-            if (c.location !== deck.id) {
+            if (c?.location !== deck.id) {
               prev.push({deck: deck.id, officer: c});
             }
           });

server/processes/crm.js

@@ -89,10 +89,10 @@ function crmContactMove() {
             };
 
             // Check collisions
-            if (t.destroyed) return;
+            if (t?.destroyed) return;
             const collisions = allFighters.filter(f => {
               return (
-                !f.destroyed &&
+                !f?.destroyed &&
                 t.fighterId !== f.id &&
                 distance3d(f.position, t.position) < 5
               );
@@ -110,7 +110,7 @@ function crmContactMove() {
               f.hit(t.strength * crm[strengthKey]);
               pubsub.publish("crmFighterUpdate", f);
 
-              if (f.destroyed) {
+              if (f?.destroyed) {
                 triggerUpdate = true;
                 // Get the fighter that fired it
                 fragFighter.frags += 1;
@@ -128,14 +128,14 @@ function crmContactMove() {
 
               if (f.phaserLevel > 0) {
                 const t = allFighters.find(e => e.id === f.phaserTarget);
-                if (!t.destroyed && distance3d(f.position, t.position) < 150) {
+                if (!t?.destroyed && distance3d(f.position, t.position) < 150) {
                   const strengthKey =
                     f.type === "fighter" ? "fighterStrength" : "enemyStrength";
                   t.hit(f.phaserStrength * crm[strengthKey]);
                   if (tick % 10 === 0) {
                     pubsub.publish("crmFighterUpdate", t);
                   }
-                  if (t.destroyed) {
+                  if (t?.destroyed) {
                     f.frags += 1;
                     triggerUpdate = true;
                   }
@@ -172,7 +172,7 @@ function crmEnemyDogfight() {
             if (e.shieldRaise === false && e.shield > 0) {
               e.setShield(true);
             }
-            if (!crm.attacking || e.destroyed) return;
+            if (!crm.attacking || e?.destroyed) return;
             // Enemies can perform four actions
             // 1. Charge Phasers
             // 2. Load a torpedo
@@ -190,7 +190,7 @@ function crmEnemyDogfight() {
               actions.push("loadTorpedo");
             const targets = crm.fighters.filter(
               f =>
-                !f.destroyed &&
+                !f?.destroyed &&
                 !f.docked &&
                 distance3d(e.position, f.position) < 100,
             );

server/typeDefs/countermeasures.ts

@@ -37,6 +37,7 @@ const schema = gql`
     powerUsage: Float!
     availablePower: Float!
     buildPercentage: Float!
+    note: String!
   }
   type CountermeasureResources {
     copper: Float!
@@ -99,6 +100,14 @@ const schema = gql`
       id: ID!
       slot: CountermeasureSlotEnum!
     ): String
+    countermeasuresActivateCountermeasure(
+      id: ID!
+      slot: CountermeasureSlotEnum!
+    ): String
+    countermeasuresDeactivateCountermeasure(
+      id: ID!
+      slot: CountermeasureSlotEnum!
+    ): String
     countermeasuresLaunchUnlockedCountermeasures(id: ID!): String
     countermeasuresBuildCountermeasure(
       id: ID!
@@ -125,6 +134,11 @@ const schema = gql`
       resource: String!
       value: Float!
     ): String
+    countermeasuresSetFDNote(
+      id: ID!
+      countermeasureId: ID!
+      note: String!
+    ): String
   }
   extend type Subscription {
     countermeasuresUpdate(simulatorId: ID!): Countermeasures

server/typeDefs/scalars.js

@@ -1,11 +1,12 @@
 import App from "../app";
 import {gql} from "apollo-server-express";
 import GraphQLJSON from "graphql-type-json";
-
+import BigInt from "graphql-bigint";
 // We define a schema that encompasses all of the types
 // necessary for the functionality in this file.
 const schema = gql`
   scalar JSON
+  scalar BigInt
   extend type Mutation {
     snapshot: String
     test(key: String): String
@@ -14,6 +15,7 @@ const schema = gql`
 
 const resolver = {
   JSON: GraphQLJSON,
+  BigInt: BigInt,
   Mutation: {
     snapshot() {
       App.snapshot(true);

server/typeDefs/targeting.js

@@ -48,6 +48,7 @@ const schema = gql`
     speed: Float
     quadrant: Int
     moving: Boolean
+    clickToTarget: Boolean
   }
 
   input TargetClassInput {
@@ -59,6 +60,7 @@ const schema = gql`
     speed: Float
     quadrant: Int
     moving: Boolean
+    clickToTarget: Boolean
   }
 
   type TargetingContact {
@@ -74,6 +76,7 @@ const schema = gql`
     quadrant: Int
     destroyed: Boolean
     moving: Boolean
+    clickToTarget: Boolean
   }
   extend type Query {
     targeting(id: ID, simulatorId: ID): [Targeting]
@@ -177,6 +180,9 @@ const resolver = {
     moving(rootValue) {
       return getClassValue({...rootValue, key: "moving"});
     },
+    clickToTarget(rootValue) {
+      return getClassValue({...rootValue, key: "clickToTarget"});
+    },
   },
   Query: {
     targeting(root, {id, simulatorId}) {

server/typeDefs/thrusters.js

@@ -26,14 +26,14 @@ const schema = gql`
     movementSpeed: Float
   }
   type Coordinates {
-    x: Float!
-    y: Float!
-    z: Float!
+    x: Float
+    y: Float
+    z: Float
   }
   input CoordinatesInput {
-    x: Float!
-    y: Float!
-    z: Float!
+    x: Float
+    y: Float
+    z: Float
   }
   type Rotation {
     yaw: Float