@maka/maka-cli 5.1.32 → 5.1.34

package/bundle/typescript/src/commands/game/sideQuest/scenes/scene2.json

@@ -7,6 +7,88 @@
     "carrier": "credstick",
     "authorityRoomTags": ["Vault"]
   },
+  "player": {
+    "name": "Maka",
+    "startLocation": "Barrens Apartment",
+    "lifestyleChoices": [
+      {
+        "type": "residence",
+        "metadata": {
+          "tier": "Street",
+          "location": "Barrens Apartment"
+        }
+      }
+    ],
+    "startingItems": [
+      {
+        "name": "Ares Light Fire 75",
+        "description": "A small, concealable pistol favored by shadowrunners on a budget.",
+        "size": "Small",
+        "category": "RangedWeapon",
+        "shape": "Pistol",
+        "color": "Black",
+        "texture": "Matte",
+        "rating": "Common",
+        "weight": 1.2
+      },
+      {
+        "name": "Armored Jacket",
+        "description": "A rugged armored jacket with built-in smartweave. Offers decent protection without looking too suspicious.",
+        "size": "Large",
+        "category": "Armor",
+        "shape": "Jacket",
+        "color": "Dark Green",
+        "texture": "Kevlar",
+        "rating": "Standard",
+        "weight": 3.5
+      },
+      {
+        "name": "MetaLink Commlink",
+        "description": "A cheap but functional commlink. You hope it doesn't get hacked.",
+        "size": "Tiny",
+        "category": "Commlink",
+        "shape": "Rectangle",
+        "color": "Gray",
+        "texture": "Plastic",
+        "rating": "Common",
+        "weight": 0.1
+      },
+      {
+        "name": "Starter Credstick",
+        "description": "A basic credstick loaded with some nuyen for expenses.",
+        "size": "Small",
+        "category": "Credstick",
+        "shape": "Cylinder",
+        "color": "Silver",
+        "texture": "Smooth",
+        "rating": "Common",
+        "weight": 0.2,
+        "currencyAmount": 250
+      },
+      {
+        "name": "Urban Explorer Boots",
+        "description": "Sturdy street boots with impact gel soles and reinforced toes.",
+        "size": "Medium",
+        "category": "Boots",
+        "shape": "Boots",
+        "color": "Black",
+        "texture": "Rugged",
+        "rating": "Common",
+        "weight": 2.0
+      },
+      {
+        "name": "Knockoff Smart Glasses",
+        "description": "AR overlay glasses with minor signal lag. Still decent for the price.",
+        "size": "Tiny",
+        "category": "Glasses",
+        "shape": "Glasses",
+        "color": "Black",
+        "texture": "Plastic",
+        "rating": "Common",
+        "weight": 0.1
+      }
+    ]
+  },
   "rooms": [
     {
       "name": "Drowned Alley",

package/bundle/typescript/src/commands/game/sideQuest/types/player-equipment.d.ts

@@ -2,42 +2,53 @@ import { Item } from '../models/item.js';
 export type Inventory = Item[];
 export type HeadEquipment = {
     eyes: Item | null;
-    skull: Item | null;
     ears: Item | null;
+    skull: Item | null;
     mouth: Item | null;
     nose: Item | null;
+    commlink: Item | null;
 };
 export type TorsoEquipment = {
+    armorVest: Item | null;
+    armorCoat: Item | null;
     backpack: Item | null;
+    tacticalRig: Item | null;
     leftShoulder: Item | null;
     rightShoulder: Item | null;
     bandolier: Item | null;
 };
 export type LegEquipment = {
+    pants: Item | null;
+    thighRig: Item | null;
     leftHip: Item | null;
     rightHip: Item | null;
-    leftThigh: Item | null;
-    rightThigh: Item | null;
 };
 export type FeetEquipment = {
+    boots: Item | null;
     leftAnkle: Item | null;
     rightAnkle: Item | null;
 };
 export type ArmsEquipment = {
-    leftBicept: Item | null;
-    rightBicept: Item | null;
     leftForearm: Item | null;
     rightForearm: Item | null;
+    leftBicept: Item | null;
+    rightBicept: Item | null;
+    cyberware: Item | null;
 };
 export type GlovesEquipment = {
     leftWrist: Item | null;
     rightWrist: Item | null;
 };
 export type LeftHandEquipment = {
+    weapon: Item | null;
+    shield: Item | null;
     ring: Item | null;
+    device: Item | null;
 };
 export type RightHandEquipment = {
+    weapon: Item | null;
     ring: Item | null;
+    device: Item | null;
 };
 export type PlayerEquipment = {
     head: HeadEquipment | null;

package/bundle/typescript/src/commands/game/sideQuest/types/seed/player-seed.d.ts

@@ -1,6 +1,8 @@
 import { LifestyleChoice } from './lifestyle-seed.js';
+import { IItemSeedJson } from './item-seed.js';
 export interface IPlayerSeedJson {
     name: string;
     startLocation: string;
     lifestyleChoices: LifestyleChoice[];
+    startingItems?: IItemSeedJson[];
 }

package/bundle/typescript/src/commands/game/sideQuest/types/seed/scene-seed.d.ts

@@ -2,6 +2,7 @@ import { IRoomSeedJson } from './room-seed.js';
 import { INPCSeedJson } from './npc-seed.js';
 import { IItemSeedJson } from './item-seed.js';
 import { IPuzzleSeedJson } from './puzzle-seed.js';
+import { IPlayerSeedJson } from './player-seed.js';
 export interface ISceneSeedJson {
     name: string;
     currency: {
@@ -14,4 +15,6 @@ export interface ISceneSeedJson {
     puzzles: IPuzzleSeedJson[];
     residenceTiers: string[];
     story: string;
+    /** The logging-in player who will be actively controlled */
+    player: IPlayerSeedJson;
 }

package/bundle/typescript/src/commands/game/sideQuest/types/shared/item-enum.d.ts

@@ -14,21 +14,56 @@ export declare enum Rating {
 }
 export declare enum Category {
     Weapon = "weapon",
+    MeleeWeapon = "melee weapon",
+    RangedWeapon = "ranged weapon",
+    Ammunition = "ammunition",
+    Explosive = "explosive",
+    BodyArmor = "body armor",
+    Armor = "armor",
     Shield = "shield",
-    Key = "key",
-    Gloves = "gloves",
     Helmet = "helmet",
-    Hat = "hat",
-    Boots = "boots",
-    LegArmor = "leg armor",
     ArmArmor = "arm armor",
-    BodyArmor = "body armor",
-    Book = "book",
-    Cup = "cup",
-    Unknown = "unknown",
-    CurrencyContainer = "currency container",
+    LegArmor = "leg armor",
+    Boots = "boots",
+    Gloves = "gloves",
+    Cyberware = "cyberware",
+    Bioware = "bioware",
+    Nanoware = "nanoware",
+    Geneware = "geneware",
+    Commlink = "commlink",
+    Cyberdeck = "cyberdeck",
+    RCC = "rcc",// Rigger Command Console
+    Drone = "drone",
+    Software = "software",
+    Electronics = "electronics",
+    EyeCyberwere = "eyewear",
+    Focus = "focus",
+    SpellFormula = "spell formula",
+    AlchemicalItem = "alchemical item",
+    MagicalReagent = "magical reagent",
+    Fetish = "fetish",
+    Grimoire = "grimoire",
+    Clothing = "clothing",
+    ArmorClothing = "armor clothing",
     Medical = "medical",
-    Consumable = "consumable",
     Tool = "tool",
-    Vice = "vice"
+    Consumable = "consumable",
+    Sensor = "sensor",
+    SlapPatch = "slap patch",
+    BiometricScanner = "biometric scanner",
+    Hat = "hat",
+    Glasses = "glasses",
+    SIN = "sin",
+    FakeSIN = "fake sin",
+    License = "license",
+    CurrencyContainer = "currency container",
+    Credstick = "credstick",
+    Vice = "vice",
+    Book = "book",
+    Key = "key",
+    Trinket = "trinket",
+    Document = "document",
+    Datachip = "datachip",
+    Badge = "badge",
+    Unknown = "unknown"
 }

package/bundle/typescript/src/commands/game/sideQuest/types/shared/item-enum.js

@@ -16,23 +16,65 @@ export var Rating;
 })(Rating || (Rating = {}));
 export var Category;
 (function (Category) {
+    // Combat
     Category["Weapon"] = "weapon";
+    Category["MeleeWeapon"] = "melee weapon";
+    Category["RangedWeapon"] = "ranged weapon";
+    Category["Ammunition"] = "ammunition";
+    Category["Explosive"] = "explosive";
+    Category["BodyArmor"] = "body armor";
+    Category["Armor"] = "armor";
     Category["Shield"] = "shield";
-    Category["Key"] = "key";
-    Category["Gloves"] = "gloves";
     Category["Helmet"] = "helmet";
-    Category["Hat"] = "hat";
-    Category["Boots"] = "boots";
-    Category["LegArmor"] = "leg armor";
     Category["ArmArmor"] = "arm armor";
-    Category["BodyArmor"] = "body armor";
-    Category["Book"] = "book";
-    Category["Cup"] = "cup";
-    Category["Unknown"] = "unknown";
-    Category["CurrencyContainer"] = "currency container";
+    Category["LegArmor"] = "leg armor";
+    Category["Boots"] = "boots";
+    Category["Gloves"] = "gloves";
+    // Cyberware / Bioware / Augmentations
+    Category["Cyberware"] = "cyberware";
+    Category["Bioware"] = "bioware";
+    Category["Nanoware"] = "nanoware";
+    Category["Geneware"] = "geneware";
+    // Electronics and Matrix
+    Category["Commlink"] = "commlink";
+    Category["Cyberdeck"] = "cyberdeck";
+    Category["RCC"] = "rcc";
+    Category["Drone"] = "drone";
+    Category["Software"] = "software";
+    Category["Electronics"] = "electronics";
+    Category["EyeCyberwere"] = "eyewear";
+    // Magic
+    Category["Focus"] = "focus";
+    Category["SpellFormula"] = "spell formula";
+    Category["AlchemicalItem"] = "alchemical item";
+    Category["MagicalReagent"] = "magical reagent";
+    Category["Fetish"] = "fetish";
+    Category["Grimoire"] = "grimoire";
+    // Gear and Utility
+    Category["Clothing"] = "clothing";
+    Category["ArmorClothing"] = "armor clothing";
     Category["Medical"] = "medical";
-    Category["Consumable"] = "consumable";
     Category["Tool"] = "tool";
+    Category["Consumable"] = "consumable";
+    Category["Sensor"] = "sensor";
+    Category["SlapPatch"] = "slap patch";
+    Category["BiometricScanner"] = "biometric scanner";
+    Category["Hat"] = "hat";
+    Category["Glasses"] = "glasses";
+    // Economy & Identity
+    Category["SIN"] = "sin";
+    Category["FakeSIN"] = "fake sin";
+    Category["License"] = "license";
+    Category["CurrencyContainer"] = "currency container";
+    Category["Credstick"] = "credstick";
+    // Misc and World
     Category["Vice"] = "vice";
+    Category["Book"] = "book";
+    Category["Key"] = "key";
+    Category["Trinket"] = "trinket";
+    Category["Document"] = "document";
+    Category["Datachip"] = "datachip";
+    Category["Badge"] = "badge";
+    Category["Unknown"] = "unknown";
 })(Category || (Category = {}));
 //# sourceMappingURL=item-enum.js.map

package/bundle/typescript/src/commands/game/sideQuest/types/shared/item-enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"item-enum.js","sourceRoot":"","sources":["../../../../../../../../src/commands/game/sideQuest/types/shared/item-enum.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,IAMX;AAND,WAAY,IAAI;IACd,qBAAa,CAAA;IACX,uBAAe,CAAA;IACf,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,gCAAwB,CAAA;AAC5B,CAAC,EANW,IAAI,KAAJ,IAAI,QAMf;AAED,MAAM,CAAN,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,2BAAiB,CAAA;IACf,+BAAqB,CAAA;IACrB,uBAAa,CAAA;IACb,iCAAuB,CAAA;IACvB,0CAAgC,CAAA;AACpC,CAAC,EANW,MAAM,KAAN,MAAM,QAMjB;AAED,MAAM,CAAN,IAAY,QAmBX;AAnBD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACf,6BAAiB,CAAA;IACjB,uBAAW,CAAA;IACX,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,uBAAW,CAAA;IACX,2BAAe,CAAA;IACf,kCAAsB,CAAA;IACtB,kCAAsB,CAAA;IACtB,oCAAwB,CAAA;IACxB,yBAAa,CAAA;IACb,uBAAW,CAAA;IACX,+BAAmB,CAAA;IACnB,oDAAwC,CAAA;IACxC,+BAAmB,CAAA;IACnB,qCAAyB,CAAA;IACzB,yBAAa,CAAA;IACb,yBAAa,CAAA;AACjB,CAAC,EAnBW,QAAQ,KAAR,QAAQ,QAmBnB"}
+{"version":3,"file":"item-enum.js","sourceRoot":"","sources":["../../../../../../../../src/commands/game/sideQuest/types/shared/item-enum.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,IAMX;AAND,WAAY,IAAI;IACd,qBAAa,CAAA;IACX,uBAAe,CAAA;IACf,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,gCAAwB,CAAA;AAC5B,CAAC,EANW,IAAI,KAAJ,IAAI,QAMf;AAED,MAAM,CAAN,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,2BAAiB,CAAA;IACf,+BAAqB,CAAA;IACrB,uBAAa,CAAA;IACb,iCAAuB,CAAA;IACvB,0CAAgC,CAAA;AACpC,CAAC,EANW,MAAM,KAAN,MAAM,QAMjB;AAED,MAAM,CAAN,IAAY,QAmEX;AAnED,WAAY,QAAQ;IAClB,SAAS;IACT,6BAAiB,CAAA;IACjB,wCAA4B,CAAA;IAC5B,0CAA8B,CAAA;IAC9B,qCAAyB,CAAA;IACzB,mCAAuB,CAAA;IACvB,oCAAwB,CAAA;IACxB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,kCAAsB,CAAA;IACtB,kCAAsB,CAAA;IACtB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IAEjB,sCAAsC;IACtC,mCAAuB,CAAA;IACvB,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IAErB,yBAAyB;IACzB,iCAAqB,CAAA;IACrB,mCAAuB,CAAA;IACvB,uBAAW,CAAA;IACX,2BAAe,CAAA;IACf,iCAAqB,CAAA;IACrB,uCAA2B,CAAA;IAC3B,oCAAwB,CAAA;IAExB,QAAQ;IACR,2BAAe,CAAA;IACf,0CAA8B,CAAA;IAC9B,8CAAkC,CAAA;IAClC,8CAAkC,CAAA;IAClC,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IAErB,mBAAmB;IACnB,iCAAqB,CAAA;IACrB,4CAAgC,CAAA;IAChC,+BAAmB,CAAA;IACnB,yBAAa,CAAA;IACb,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;IACjB,oCAAwB,CAAA;IACxB,kDAAsC,CAAA;IACtC,uBAAW,CAAA;IACX,+BAAmB,CAAA;IAEnB,qBAAqB;IACrB,uBAAW,CAAA;IACX,gCAAoB,CAAA;IACpB,+BAAmB,CAAA;IACnB,oDAAwC,CAAA;IACxC,mCAAuB,CAAA;IAEvB,iBAAiB;IACjB,yBAAa,CAAA;IACb,yBAAa,CAAA;IACb,uBAAW,CAAA;IACX,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IACrB,2BAAe,CAAA;IACf,+BAAmB,CAAA;AACrB,CAAC,EAnEW,QAAQ,KAAR,QAAQ,QAmEnB"}

package/bundle/typescript/src/generators/api.js

@@ -113,7 +113,7 @@ Generator.create({
             });
         }
         if (context.withGql) {
-            await this.pkg.checkNpmPackage(['express', '@apollo/server', '@apollo/subgraph', 'graphql-tag', 'express-rate-limit', 'graphql'], { shouldInstall: true });
+            await this.pkg.checkNpmPackage(['express', '@apollo/server', '@apollo/subgraph', 'graphql-tag', 'express-rate-limit', 'graphql', '@as-integrations/express5'], { shouldInstall: true });
             await this.scaffold.template({
                 srcPath: 'api/graphql-api.js',
                 destPath: this.scaffold.pathFromApp({

package/bundle/typescript/src/generators/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/generators/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/generators/api.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/templates/meteor/api/api.js

@@ -6,7 +6,7 @@ const <%= name %>Api = new MakaRest({
   version: '<%= apiVersion %>',
   prettyJson: Meteor.isDevelopment,
   rateLimitOptions: {
-    useRedits: false,
+    useRedis: false,
     points: 2,
     duration: 5, // seconds
   }

package/bundle/typescript/src/templates/meteor/api/api.js.ts

@@ -6,7 +6,7 @@ const <%= name %>Api = new MakaRest({
   version: '<%= apiVersion %>',
   prettyJson: Meteor.isDevelopment,
   rateLimitOptions: {
-    useRedits: false,
+    useRedis: false,
     points: 2,
     duration: 5, // seconds
   }

package/bundle/typescript/src/templates/meteor/api/apollo-gateway.js

@@ -2,7 +2,7 @@ import { ApolloServer } from '@apollo/server';
 import { ApolloGateway, IntrospectAndCompose } from '@apollo/gateway';
 import { WebApp } from 'meteor/webapp';
 import express from 'express';
-import { expressMiddleware } from '@apollo/server/express4';
+import { expressMiddleware } from '@as-integrations/express5';
 import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
 import { Meteor } from 'meteor/meteor';
 

package/bundle/typescript/src/templates/meteor/api/apollo-gateway.js.ts

@@ -2,7 +2,7 @@ import { ApolloServer } from '@apollo/server';
 import { ApolloGateway, IntrospectAndCompose } from '@apollo/gateway';
 import { WebApp } from 'meteor/webapp';
 import express, { Request, Response } from 'express';
-import { expressMiddleware } from '@apollo/server/express4';
+import { expressMiddleware } from '@as-integrations/express5';
 import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
 import { Meteor } from 'meteor/meteor';
 

package/bundle/typescript/src/templates/meteor/api/graphql-api.js

@@ -4,7 +4,7 @@ import { typeDefs } from './graphql/typeDefs';
 import { ApolloServer } from '@apollo/server';
 import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
 import { WebApp } from 'meteor/webapp';
-import { expressMiddleware } from '@apollo/server/express4';
+import { expressMiddleware } from '@as-integrations/express5';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import express from 'express';
 import rateLimit from 'express-rate-limit';

package/bundle/typescript/src/templates/meteor/api/graphql-api.js.ts

@@ -4,7 +4,7 @@ import { typeDefs } from './graphql/typeDefs';
 import { ApolloServer } from '@apollo/server';
 import { ApolloServerPluginUsageReportingDisabled } from '@apollo/server/plugin/disabled';
 import { WebApp } from 'meteor/webapp';
-import { expressMiddleware } from '@apollo/server/express4';
+import { expressMiddleware } from '@as-integrations/express5';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import express, { Request } from 'express';
 import rateLimit from 'express-rate-limit';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.1.32",
+  "version": "5.1.34",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",