@opfr/services 1.7.0 → 1.8.0

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import { Schema as c, models as d, model as l, connect as Qe, Types as Ye } from "mongoose";
-import { QuestStatus as q, DEFAULT_FACTION as Ge, EFFECT_KEYS as We, EQUIPMENT_SLOT as Ie, CHARACTERISTICS as Ve, getComputedCharacteristicValue as Xe, getCurrentLevel as Je, HP_PER_VITALITY as Ze, DEFAULT_MAX_HP as et, transformToDBBuff as tt, RANK_IDS_WITHOUT_BASIC as ge, STORY_MESSAGE_ARGS as nt, STORY_ACTION_TYPES as rt, STORY_STEP_TYPES as at, STORY_SPEAKER_TYPES as st, chapterOne as oe, speakers as it } from "@opfr/definitions";
+import { QuestStatus as A, DEFAULT_FACTION as Ge, EFFECT_KEYS as We, EQUIPMENT_SLOT as Ie, CHARACTERISTICS as Ve, getComputedCharacteristicValue as Xe, getCurrentLevel as Je, HP_PER_VITALITY as Ze, DEFAULT_MAX_HP as et, transformToDBBuff as tt, RANK_IDS_WITHOUT_BASIC as ge, STORY_MESSAGE_ARGS as nt, STORY_ACTION_TYPES as rt, STORY_STEP_TYPES as at, STORY_SPEAKER_TYPES as st, chapterOne as oe, speakers as it } from "@opfr/definitions";
 import ut from "node-cache";
 import * as Ue from "events";
 import { filterNullAndUndefined as L, recordToArray as B, arrayToRecord as Te, mergeObjects as Q, seededRandom as ct, sortBy as pe, randomBetween as Ee, hasExpire as de, isString as ot, capitalizeAllWords as dt, pickNthByOdds as Se, pickFrom as lt, sameDay as Oe, yesterday as Y, exclude as P } from "@opfr/utils-lang";
@@ -52,14 +52,14 @@ class f extends y {
     }), r;
   }
 }
-const De = new Ue.EventEmitter(), S = (n, e, t) => {
+const De = new Ue.EventEmitter(), g = (n, e, t) => {
   De.emit(n, e, t);
 }, La = (n) => {
   for (const [e, t] of Object.entries(n))
     De.on(e, (r, a) => {
       t(r, a);
     });
-}, w = {
+}, S = {
   USER: "middleware/quest/USER",
   USER_INVENTORY: "middleware/quest/USER_INVENTORY",
   USER_META: "middleware/quest/USER_META",
@@ -84,20 +84,20 @@ const De = new Ue.EventEmitter(), S = (n, e, t) => {
       required: !0,
       index: !0
     },
-    status: { type: String, default: q.IN_PROGRESS, index: 1 },
+    status: { type: String, default: A.IN_PROGRESS, index: 1 },
     lastCompletionDate: Date,
     streak: Number
   },
   { minimize: !1 }
 );
 ve.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_QUEST,
+  n && g(
+    S.USER_QUEST,
     n.user._id,
     n
   );
 });
-const C = d?.UserQuest || l("UserQuest", ve), pt = new c({
+const R = d?.UserQuest || l("UserQuest", ve), pt = new c({
   user: {
     type: c.Types.ObjectId,
     required: !0,
@@ -173,15 +173,15 @@ const C = d?.UserQuest || l("UserQuest", ve), pt = new c({
   { minimize: !1 }
 );
 Me.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_INVENTORY,
+  n && g(
+    S.USER_INVENTORY,
     n.user._id,
     n
   );
 });
 const Z = d?.UserInventory || l("UserInventory", Me), ht = new Ue.EventEmitter(), gt = (n, e) => {
   ht.emit(n, e);
-}, M = {
+}, v = {
   multiplier: { type: Number, default: 0 },
   origin: String,
   expireAt: { type: Date, default: null },
@@ -208,33 +208,33 @@ const Z = d?.UserInventory || l("UserInventory", Me), ht = new Ue.EventEmitter()
   buffs: {
     cooldown: {
       casino: {
-        type: [M],
+        type: [v],
         default: []
       },
       work: {
-        type: [M],
+        type: [v],
         default: []
       }
     },
     berry: {
       work: {
-        type: [M],
+        type: [v],
         default: []
       },
       global: {
-        type: [M],
+        type: [v],
         default: []
       }
     },
     drop: {
       work: {
-        type: [M],
+        type: [v],
         default: []
       }
     },
     xp: {
       global: {
-        type: [M],
+        type: [v],
         default: []
       }
     }
@@ -261,13 +261,13 @@ const Z = d?.UserInventory || l("UserInventory", Me), ht = new Ue.EventEmitter()
   }
 });
 xe.post("findOneAndUpdate", async function(n) {
-  n && (S(
-    w.USER_META,
+  n && (g(
+    S.USER_META,
     n.user._id,
     n
   ), n.hp <= 0 && gt("death", n.user._id));
 });
-const v = d?.UserMeta || l("UserMeta", xe), qe = new c({
+const D = d?.UserMeta || l("UserMeta", xe), Ae = new c({
   user: {
     type: c.Types.ObjectId,
     required: !0,
@@ -284,14 +284,14 @@ const v = d?.UserMeta || l("UserMeta", xe), qe = new c({
   unlockedBags: { type: [String], default: ["default"] },
   selectedBag: { type: String, default: "default" }
 });
-qe.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_ORNAMENT,
+Ae.post("findOneAndUpdate", function(n) {
+  n && g(
+    S.USER_ORNAMENT,
     n.user._id,
     n
   );
 });
-const ee = d?.UserOrnament || l("UserOrnament", qe), St = new c({
+const ee = d?.UserOrnament || l("UserOrnament", Ae), St = new c({
   user: {
     type: c.Types.ObjectId,
     required: !0,
@@ -310,7 +310,7 @@ const ee = d?.UserOrnament || l("UserOrnament", qe), St = new c({
       default: /* @__PURE__ */ new Map()
     }
   }
-}), F = d?.UserSettings || l("UserSettings", St), Ae = new c({
+}), F = d?.UserSettings || l("UserSettings", St), qe = new c({
   user: {
     type: c.Types.ObjectId,
     required: !0,
@@ -345,14 +345,14 @@ const ee = d?.UserOrnament || l("UserOrnament", qe), St = new c({
     guessInOneTryCount: { type: Number, default: 0 }
   }
 });
-Ae.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_CASINO,
+qe.post("findOneAndUpdate", function(n) {
+  n && g(
+    S.USER_STATS_CASINO,
     n.user._id,
     n
   );
 });
-const A = d?.UserStatsCasino || l("UserStatsCasino", Ae), ke = new c({
+const q = d?.UserStatsCasino || l("UserStatsCasino", qe), ke = new c({
   user: {
     type: c.Types.ObjectId,
     required: !0,
@@ -363,8 +363,8 @@ const A = d?.UserStatsCasino || l("UserStatsCasino", Ae), ke = new c({
   totalSpentInShop: { type: Number, default: 0 }
 });
 ke.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_ECONOMY,
+  n && g(
+    S.USER_STATS_ECONOMY,
     n.user._id,
     n
   );
@@ -382,8 +382,8 @@ const te = d?.UserStatsEconomy || l("UserStatsEconomy", ke), Re = new c({
   writeDifferentChatIds: { type: [String], default: [] }
 });
 Re.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_ENGAGEMENT,
+  n && g(
+    S.USER_STATS_ENGAGEMENT,
     n.user._id,
     n
   );
@@ -411,13 +411,13 @@ const ne = d?.UserStatsEngagement || l(
   }
 });
 Ce.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_FLAGS,
+  n && g(
+    S.USER_STATS_FLAGS,
     n.user._id,
     n
   );
 });
-const re = d?.UserStatsFlags || l("UserStatsFlags", Ce), _e = new c({
+const re = d?.UserStatsFlags || l("UserStatsFlags", Ce), Be = new c({
   user: {
     type: c.Types.ObjectId,
     required: !0,
@@ -429,17 +429,17 @@ const re = d?.UserStatsFlags || l("UserStatsFlags", Ce), _e = new c({
     lastTimeRead: { type: Date, default: /* @__PURE__ */ new Date(), index: !0 }
   }
 });
-_e.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_FREQUENCY,
+Be.post("findOneAndUpdate", function(n) {
+  n && g(
+    S.USER_STATS_FREQUENCY,
     n.user._id,
     n
   );
 });
-const D = d?.UserStatsFrequency || l(
+const O = d?.UserStatsFrequency || l(
   "UserStatsFrequency",
-  _e
-), Be = new c({
+  Be
+), _e = new c({
   user: {
     type: c.Types.ObjectId,
     required: !0,
@@ -466,16 +466,16 @@ const D = d?.UserStatsFrequency || l(
     totalCrafted: { type: Number, default: 0 }
   }
 });
-Be.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_INVENTORY,
+_e.post("findOneAndUpdate", function(n) {
+  n && g(
+    S.USER_STATS_INVENTORY,
     n.user._id,
     n
   );
 });
 const k = d?.UserStatsInventory || l(
   "UserStatsInventory",
-  Be
+  _e
 ), ye = new c({
   discordId: { type: String, required: !0, unique: !0 },
   scam: { type: Boolean, default: !1 },
@@ -485,20 +485,20 @@ const k = d?.UserStatsInventory || l(
   canChooseFaction: { type: Boolean, default: !1 }
 });
 ye.post("findOneAndUpdate", function(n) {
-  n && S(w.USER, n._id, n);
+  n && g(S.USER, n._id, n);
 });
 ye.post("deleteOne", async function() {
   const n = this.getQuery()._id;
-  await W.deleteOne({ user: n }), await V.deleteOne({ user: n }), await X.deleteOne({ user: n }), await J.deleteOne({ user: n }), await Z.deleteOne({ user: n }), await v.deleteOne({ user: n }), await ee.deleteOne({ user: n }), await C.deleteMany({ user: n }), await F.deleteOne({ user: n }), await A.deleteOne({ user: n }), await te.deleteOne({ user: n }), await ne.deleteOne({ user: n }), await re.deleteOne({ user: n }), await D.deleteOne({ user: n }), await k.deleteOne({ user: n });
+  await W.deleteOne({ user: n }), await V.deleteOne({ user: n }), await X.deleteOne({ user: n }), await J.deleteOne({ user: n }), await Z.deleteOne({ user: n }), await D.deleteOne({ user: n }), await ee.deleteOne({ user: n }), await R.deleteMany({ user: n }), await F.deleteOne({ user: n }), await q.deleteOne({ user: n }), await te.deleteOne({ user: n }), await ne.deleteOne({ user: n }), await re.deleteOne({ user: n }), await O.deleteOne({ user: n }), await k.deleteOne({ user: n });
 });
-const b = d?.User || l("User", ye);
+const w = d?.User || l("User", ye);
 class wt extends f {
   getByObjectId(e) {
     return this.update({ _id: e }, {});
   }
   getNextBirthdays() {
     const e = /* @__PURE__ */ new Date(), t = e.getFullYear();
-    return b.aggregate([
+    return w.aggregate([
       {
         $match: {
           birthday: { $ne: null }
@@ -549,7 +549,7 @@ class wt extends f {
     ]);
   }
   getFactionRanking(e) {
-    return b.aggregate([
+    return w.aggregate([
       { $match: { faction: e } },
       {
         $lookup: {
@@ -572,7 +572,7 @@ class wt extends f {
     ]);
   }
   getGlobalRanking() {
-    return b.aggregate([
+    return w.aggregate([
       {
         $lookup: {
           from: "usermetas",
@@ -594,7 +594,7 @@ class wt extends f {
     ]);
   }
   getBerryRanking() {
-    return b.aggregate([
+    return w.aggregate([
       {
         $lookup: {
           from: "usermetas",
@@ -616,10 +616,10 @@ class wt extends f {
     ]);
   }
   getQuestRanking() {
-    return C.aggregate([
+    return R.aggregate([
       {
         $match: {
-          status: q.COMPLETED
+          status: A.COMPLETED
         }
       },
       {
@@ -663,7 +663,7 @@ class wt extends f {
   }
   getTodayAllBirthday() {
     const e = /* @__PURE__ */ new Date();
-    return b.aggregate([
+    return w.aggregate([
       { $match: { birthday: { $ne: null } } },
       {
         $addFields: {
@@ -710,14 +710,14 @@ class wt extends f {
     );
   }
 }
-const bt = (n, e) => b.find(n, {}, e).lean(), p = (n) => n.toObject({ flattenMaps: !0, flattenObjectIds: !1 }), $t = (n) => b.create({
+const bt = (n, e) => w.find(n, {}, e).lean(), p = (n) => n.toObject({ flattenMaps: !0, flattenObjectIds: !1 }), $t = (n) => w.create({
   discordId: n
 });
 async function It(n, { upsert: e = !0, ...t }) {
-  const r = await b.findOne({ discordId: n }, {}, t).lean();
+  const r = await w.findOne({ discordId: n }, {}, t).lean();
   return !r && e ? p(await $t(n)) : r;
 }
-const Ut = (n, e) => b.findOneAndUpdate(n, e, {
+const Ut = (n, e) => w.findOneAndUpdate(n, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -789,11 +789,11 @@ class Mt extends f {
 function xt(n, e) {
   return N.find(n, {}, e).lean();
 }
-async function qt(n) {
+async function At(n) {
   const e = await N.findOne(n).lean();
   return e || null;
 }
-async function At(n, e, t) {
+async function qt(n, e, t) {
   return N.findOneAndUpdate(n, e, {
     ...t,
     returnDocument: "after"
@@ -813,13 +813,13 @@ class kt extends Mt {
     return `${e.toString()}/${t}`;
   }
   fetchFromDb(e) {
-    return qt(e);
+    return At(e);
   }
   fetchManyFromDb(e, t) {
     return xt(e, t);
   }
   updateInDb(e, t, r = { upsert: !1 }) {
-    return At(e, t, r);
+    return qt(e, t, r);
   }
 }
 const Rt = new kt(), Ct = new c(
@@ -836,7 +836,7 @@ const Rt = new kt(), Ct = new c(
     halfBonus: c.Types.Mixed
   },
   { minimize: !1 }
-), K = d?.Panoplies || l("Panoplies", Ct), _t = (n, e) => K.find(n, {}, e).lean(), Bt = async (n, e) => K.find(n, {}, e).populate("equipments");
+), K = d?.Panoplies || l("Panoplies", Ct), Bt = (n, e) => K.find(n, {}, e).lean(), _t = async (n, e) => K.find(n, {}, e).populate("equipments");
 async function Ft(n) {
   const e = await K.findOne({ panoplyId: n }).lean();
   return e || null;
@@ -844,7 +844,7 @@ async function Ft(n) {
 const Nt = async (n) => K.findOne(n).populate("equipments");
 class Kt extends f {
   getAllPopulated() {
-    return Bt({}, {});
+    return _t({}, {});
   }
   getPopulated(e) {
     return Nt({ panoplyId: e });
@@ -889,10 +889,10 @@ class Pt extends Kt {
     return Ft(e);
   }
   fetchManyFromDb(e, t) {
-    return _t(e, t);
+    return Bt(e, t);
   }
 }
-const R = new Pt(), jt = new c(
+const _ = new Pt(), jt = new c(
   {
     type: {
       type: String,
@@ -930,9 +930,9 @@ const R = new Pt(), jt = new c(
     type: Object
   },
   panoply: String
-}), _ = d?.Entities || l("Entities", zt), Yt = _.discriminator("item", Lt);
-_.discriminator("equipment", Qt);
-const Gt = async (n, e) => _.find(n, {}, e).lean(), Wt = async (n, e) => Yt.find(n, {}, e).lean();
+}), C = d?.Entities || l("Entities", zt), Yt = C.discriminator("item", Lt);
+C.discriminator("equipment", Qt);
+const Gt = async (n, e) => C.find(n, {}, e).lean(), Wt = async (n, e) => Yt.find(n, {}, e).lean();
 class Vt extends f {
   isEntity(e) {
     return !!e && "entityId" in e;
@@ -992,7 +992,7 @@ class Vt extends f {
       intelligence: 0,
       wisdom: 0
     };
-    const r = await R.getAllPopulated();
+    const r = await _.getAllPopulated();
     for (const a of Ie) {
       const s = e[a];
       s && (t = Q(
@@ -1002,7 +1002,7 @@ class Vt extends f {
       ));
     }
     for (const a of r) {
-      const s = R.hasPanoply(e, a);
+      const s = _.hasPanoply(e, a);
       s && !("target" in s) && (t = Q(
         t,
         s,
@@ -1055,14 +1055,14 @@ class Vt extends f {
     );
   }
 }
-const Xt = async (n) => await _.create({
+const Xt = async (n) => await C.create({
   ...n
 });
 async function Jt(n) {
-  const e = await _.findOne({ entityId: n }).lean();
+  const e = await C.findOne({ entityId: n }).lean();
   return e || null;
 }
-const Zt = (n, e) => _.findOneAndUpdate(n, e, {
+const Zt = (n, e) => C.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
 class en extends Vt {
@@ -1088,7 +1088,7 @@ class en extends Vt {
     return e.entityId;
   }
 }
-const m = new en();
+const U = new en();
 class tn extends y {
   hasAlreadyFoundEntity(e, t) {
     return e.encyclopedia.includes(t);
@@ -1142,7 +1142,7 @@ class un extends y {
       const a = e.equippedItems?.[r];
       if (!a)
         continue;
-      const s = await m.fromDBToEquipableEquipment(a);
+      const s = await U.fromDBToEquipableEquipment(a);
       t = Q(
         t,
         s.characteristics,
@@ -1165,17 +1165,23 @@ class un extends y {
     return (await this.get(e)).itemList;
   }
   async calcMinStreakForWorkLoot(e) {
-    const t = await this.get(e), r = (await R.getPanoplyBonus(t.equippedItems)).find(
+    const t = await this.get(e), r = (await _.getPanoplyBonus(t.equippedItems)).find(
       ([a, s]) => a.panoplyId === "marine" && s !== null
     );
     return r && r[1] === "full" ? 10 : r && r[1] === "half" ? 20 : 1 / 0;
   }
   async hasRevolutionaryBuff(e) {
     const t = await this.get(e);
-    return (await R.getPanoplyBonus(t.equippedItems)).find(
+    return (await _.getPanoplyBonus(t.equippedItems)).find(
       ([a, s]) => a.panoplyId === "revolutionary" && s !== null
     )?.[1] ?? null;
   }
+  async hasRecipe(e, t) {
+    return (await this.get(e)).recipes.includes(t);
+  }
+  async getRecipes(e) {
+    return (await this.get(e)).recipes;
+  }
   /*
    ** UPDATES
    */
@@ -1240,7 +1246,7 @@ class un extends y {
     r?.equipmentSave[t] && await this.equip(e, r.equipmentSave[t]);
   }
   async equip(e, t) {
-    const r = await O.getMaxHp(e), a = Object.fromEntries(
+    const r = await E.getMaxHp(e), a = Object.fromEntries(
       B(t).map(([s, i]) => [
         `equippedItems.${s}`,
         i
@@ -1248,33 +1254,26 @@ class un extends y {
     );
     await this.update(e, {
       $set: a
-    }), await O.updateHp(e, r);
+    }), await E.updateHp(e, r);
   }
   async unequip(e, t) {
-    const r = await O.getMaxHp(e);
+    const r = await E.getMaxHp(e);
     await this.update(e, {
       $set: {
         [`equippedItems.${t}`]: null
       }
-    }), await O.updateHp(e, r);
+    }), await E.updateHp(e, r);
   }
   async craftItem(e, t, r, a) {
     for (const { entityId: u, size: o } of t.entities)
-      await this.removeItem(e, u, o * r);
+      await this.removeItem(e, u, (o ?? 1) * r);
     const { entityId: s, size: i } = t.result;
-    await m.isEntityId(s, m.isEquipment) ? await this.addEquipments(e, [{ entityId: s, seed: a }]) : await m.isEntityId(s, m.isItem) && await this.addItem(e, s, i * r);
-  }
-  async dismantleEntity(e, t, r, a, s) {
-    m.isEquipment(t) ? await this.removeEquipment(e, t.entityId, s) : m.isItem(t) && await this.removeItem(e, t.entityId, a);
-    for (const { entityId: i, quantity: u } of r)
-      await m.isEntityId(i, m.isItem) && await this.addItem(e, i, a * u);
-    await this.removeItem(e, "tools", 1);
-  }
-  async enchantItem(e, t, r, a, s) {
-    await this.removeItem(e, t, s * 4), await this.removeItem(e, a, s), await this.addItem(e, r, s);
+    await U.isEntityId(s, U.isEquipment) ? await this.addEquipments(e, [{ entityId: s, seed: a }]) : await U.isEntityId(s, U.isItem) && await this.addItem(e, s, (i ?? 1) * r);
   }
   async unlockRecipe(e, t) {
-    await this.update(e, { $addToSet: { recipes: t } });
+    await this.hasRecipe(e, t) || await this.update(e, {
+      $push: { recipes: t }
+    });
   }
 }
 const cn = (n) => Z.create({
@@ -1305,7 +1304,7 @@ class ln extends un {
     return dn(e, t);
   }
 }
-const E = new ln();
+const M = new ln();
 class pn extends f {
   async getTotalCharacteristics(e) {
     const { characteristics: t, scrolls: r } = await this.get(e);
@@ -1364,7 +1363,7 @@ class pn extends f {
       t.booster ? 0.25 : 0
     );
     return a + s + t.buffs.xp.global.reduce(
-      (i, { expireAt: u, startAt: o, multiplier: h }) => o && o > /* @__PURE__ */ new Date() || u && de(u) ? i : i + h,
+      (i, { expireAt: u, startAt: o, multiplier: m }) => o && o > /* @__PURE__ */ new Date() || u && de(u) ? i : i + m,
       0
     );
   }
@@ -1386,12 +1385,12 @@ class pn extends f {
   }
   async calcBuffMultiplier(e, t, r) {
     return (await this.get(e)).buffs[t][r].reduce(
-      (i, { expireAt: u, startAt: o, multiplier: h }) => i + (/* @__PURE__ */ new Date() >= (o ?? /* @__PURE__ */ new Date()) && (!u || !de(u)) ? h : 0),
+      (i, { expireAt: u, startAt: o, multiplier: m }) => i + (/* @__PURE__ */ new Date() >= (o ?? /* @__PURE__ */ new Date()) && (!u || !de(u)) ? m : 0),
       1
     );
   }
   async getMaxHp(e) {
-    const t = await E.get(e), { vitality: r } = await this.getTotalCharacteristics(e), a = await E.getUserEquipmentsCharacteristics(
+    const t = await M.get(e), { vitality: r } = await this.getTotalCharacteristics(e), a = await M.getUserEquipmentsCharacteristics(
       t
     );
     return (r + a.vitality) * Ze + et;
@@ -1401,7 +1400,7 @@ class pn extends f {
     return Math.min(t.hp / r, 1);
   }
   async hasCharacteristicRequirement(e, t) {
-    const r = await E.get(e), a = await E.getUserEquipmentsCharacteristics(
+    const r = await M.get(e), a = await M.getUserEquipmentsCharacteristics(
       r
     ), s = Q(
       await this.getTotalCharacteristics(e),
@@ -1578,15 +1577,15 @@ class pn extends f {
     });
   }
   async updatePanoplyBuff(e, t, r, a) {
-    const s = await m.fromDBToEquipableEquipment(t), i = L(Object.values(r)), o = (await R.getAllPopulated()).find(
-      (g) => g.panoplyId === s.panoply
+    const s = await U.fromDBToEquipableEquipment(t), i = L(Object.values(r)), o = (await _.getAllPopulated()).find(
+      (h) => h.panoplyId === s.panoply
     );
     if (!o)
       return;
-    const h = o.equipments.filter(
-      (g) => (i.find(($) => g.entityId === $.entityId) || !a && s.entityId === g.entityId) && (a ? s.entityId !== g.entityId : !0)
-    ).length, I = h === o.equipments.length ? o.fullBonus : h >= o.equipments.length / 2 ? o.halfBonus : void 0;
-    o.halfBonus && "target" in o.halfBonus && await this.removeBuff(e, o.halfBonus), o.fullBonus && "target" in o.fullBonus && await this.removeBuff(e, o.fullBonus), I && "target" in I && await this.updateBuff(e, I);
+    const m = o.equipments.filter(
+      (h) => (i.find((b) => h.entityId === b.entityId) || !a && s.entityId === h.entityId) && (a ? s.entityId !== h.entityId : !0)
+    ).length, $ = m === o.equipments.length ? o.fullBonus : m >= o.equipments.length / 2 ? o.halfBonus : void 0;
+    o.halfBonus && "target" in o.halfBonus && await this.removeBuff(e, o.halfBonus), o.fullBonus && "target" in o.fullBonus && await this.removeBuff(e, o.fullBonus), $ && "target" in $ && await this.updateBuff(e, $);
   }
   async gainHp(e, t) {
     const r = await this.get(e), s = await this.getMaxHp(e) - r.hp;
@@ -1691,14 +1690,14 @@ class pn extends f {
     return await this.addBerry(e, a), a;
   }
 }
-const yn = (n) => v.find(n).lean(), fn = async (n) => await v.create({
+const yn = (n) => D.find(n).lean(), fn = async (n) => await D.create({
   user: n
 });
 async function mn(n) {
-  const e = await v.findOne({ user: n }).lean();
+  const e = await D.findOne({ user: n }).lean();
   return e || p(await fn(n));
 }
-const hn = (n, e) => v.findOneAndUpdate({ user: n }, e, {
+const hn = (n, e) => D.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
@@ -1722,7 +1721,7 @@ class gn extends pn {
     return hn(e, t);
   }
 }
-const O = new gn();
+const E = new gn();
 class Sn extends f {
   async updateSendDailyQuest(e, t) {
     await this.update(e, { $set: { sendDailyQuest: t } });
@@ -1783,7 +1782,7 @@ class Tn extends y {
       $set: {
         lockUserCommand: new Date(Date.now() + 2 * 3600 * 1e3)
       }
-    }), await O.gainHp(e, 1);
+    }), await E.gainHp(e, 1);
   }
   async useCommand(e, t, r) {
     const { reminder: a } = await Fe.get(e);
@@ -1920,8 +1919,8 @@ const xn = new c(
     strength: Number
   },
   { minimize: !1 }
-), fe = d?.Ornaments || l("Ornaments", xn), qn = async (n, e) => fe.find(n, {}, e).lean();
-async function An(n) {
+), fe = d?.Ornaments || l("Ornaments", xn), An = async (n, e) => fe.find(n, {}, e).lean();
+async function qn(n) {
   const e = await fe.findOne({ ornamentId: n }).lean();
   return e || null;
 }
@@ -1936,10 +1935,10 @@ class Rn extends Mn {
     return kn(e, t);
   }
   fetchFromDb(e) {
-    return An(e);
+    return qn(e);
   }
   fetchManyFromDb(e, t) {
-    return qn(e, t);
+    return An(e, t);
   }
   getKey(e) {
     return e.ornamentId;
@@ -1948,13 +1947,13 @@ class Rn extends Mn {
     return e;
   }
 }
-const U = new Rn();
+const I = new Rn();
 class Cn extends y {
   async unlockTitle(e, t) {
-    await U.isOrnamentIds([t], U.isTitle) && await this.update(e, { $addToSet: { unlockedTitles: t } });
+    await I.isOrnamentIds([t], I.isTitle) && await this.update(e, { $addToSet: { unlockedTitles: t } });
   }
   async unlockTitles(e, t) {
-    await U.isOrnamentIds(t, U.isTitle) && await this.update(e, {
+    await I.isOrnamentIds(t, I.isTitle) && await this.update(e, {
       $addToSet: { unlockedTitles: { $each: t } }
     });
   }
@@ -1962,17 +1961,17 @@ class Cn extends y {
     await this.update(e, { $set: { selectedTitle: t } });
   }
   async unlockBackground(e, t) {
-    await U.isOrnamentIds(
+    await I.isOrnamentIds(
       [t],
-      U.isBackground
+      I.isBackground
     ) && await this.update(e, {
       $addToSet: { unlockedBackgrounds: t }
     });
   }
   async unlockBackgrounds(e, t) {
-    await U.isOrnamentIds(
+    await I.isOrnamentIds(
       t,
-      U.isBackground
+      I.isBackground
     ) && await this.update(e, {
       $addToSet: { unlockedBackgrounds: { $each: t } }
     });
@@ -2018,12 +2017,12 @@ class Cn extends y {
     });
   }
 }
-const _n = async (n) => await ee.create({
+const Bn = async (n) => await ee.create({
   user: n
 });
-async function Bn(n) {
+async function _n(n) {
   const e = await ee.findOne({ user: n }).lean();
-  return e || p(await _n(n));
+  return e || p(await Bn(n));
 }
 const Fn = async (n, e) => ee.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
@@ -2040,7 +2039,7 @@ class Nn extends Cn {
     return e;
   }
   fetchFromDb(e) {
-    return Bn(e);
+    return _n(e);
   }
   updateInDb(e, t) {
     return Fn(e, t);
@@ -2063,7 +2062,7 @@ class Kn extends f {
     return await this.isStreaking(e, t) ? 1 + Math.min(2, (r.streak ?? 0) / 10) : 1;
   }
   async getCompletedCount(e) {
-    return (await this.getMany({ user: e, status: q.COMPLETED })).length;
+    return (await this.getMany({ user: e, status: A.COMPLETED })).length;
   }
   async completeQuest(e, t = !1) {
     const r = Y();
@@ -2089,7 +2088,7 @@ class Kn extends f {
               }
             } : {},
             lastCompletionDate: /* @__PURE__ */ new Date(),
-            status: q.COMPLETED
+            status: A.COMPLETED
           }
         }
       ],
@@ -2098,17 +2097,17 @@ class Kn extends f {
   }
 }
 function Hn(n) {
-  return C.find(n).lean();
+  return R.find(n).lean();
 }
-const Pn = async (n) => await C.create({
+const Pn = async (n) => await R.create({
   ...n
 });
 async function jn(n) {
-  const e = await C.findOne(n).lean();
+  const e = await R.findOne(n).lean();
   return e || p(await Pn(n));
 }
 function zn(n, e, t) {
-  return C.findOneAndUpdate(n, e, {
+  return R.findOneAndUpdate(n, e, {
     upsert: !0,
     ...t,
     returnDocument: "after"
@@ -2189,9 +2188,9 @@ class Vn extends Qn {
 const $e = new Vn();
 class Xn extends y {
   async updateDailyReport(e) {
-    const t = await O.get(e), r = await we.get(e), a = await be.getMany({
+    const t = await E.get(e), r = await we.get(e), a = await be.getMany({
       user: e,
-      status: q.COMPLETED
+      status: A.COMPLETED
     }), s = await $e.get(e);
     await this.update(e, {
       $set: {
@@ -2214,14 +2213,14 @@ class Xn extends y {
       xpYesterday: a,
       berryYesterday: s,
       previousMessageSent: i
-    } = await this.get(e), u = await O.get(e), o = await be.getMany({
+    } = await this.get(e), u = await E.get(e), o = await be.getMany({
       user: e,
-      status: q.COMPLETED
-    }), h = await we.get(e), I = await $e.get(e), { berry: g, xp: $ } = u, { voice: he, amount: He } = $, { unlockedBadges: Pe, unlockedBackgrounds: je, unlockedTitles: ze } = h;
+      status: A.COMPLETED
+    }), m = await we.get(e), $ = await $e.get(e), { berry: h, xp: b } = u, { voice: he, amount: He } = b, { unlockedBadges: Pe, unlockedBackgrounds: je, unlockedTitles: ze } = m;
     return {
-      berry: g - s,
+      berry: h - s,
       xp: He - a,
-      message: I.messageSent - i,
+      message: $.messageSent - i,
       voice: Oe(he.lastConnection, Y()) ? he.minutesInVoiceToday : 0,
       quest: P(
         o.map(({ questId: Le }) => Le),
@@ -2350,7 +2349,7 @@ const Ga = new ir(), ur = new c({
 }), x = d?.UserRank || l("UserRank", ur);
 class cr extends y {
   async computeAllXpRanks() {
-    const t = (await v.aggregate([
+    const t = (await D.aggregate([
       {
         $setWindowFields: {
           sortBy: { "xp.amount": -1 },
@@ -2368,7 +2367,7 @@ class cr extends y {
     t.length > 0 && await x.bulkWrite(t), this.clearAll();
   }
   async computeAllBerryRanks() {
-    const t = (await v.aggregate([
+    const t = (await D.aggregate([
       {
         $setWindowFields: {
           sortBy: { berry: -1 },
@@ -2386,7 +2385,7 @@ class cr extends y {
     t.length > 0 && await x.bulkWrite(t), this.clearAll();
   }
   async computeAllFactionRanks() {
-    const t = (await b.aggregate([
+    const t = (await w.aggregate([
       {
         $lookup: {
           from: "usermetas",
@@ -2632,18 +2631,18 @@ const H = d?.UserStory || l("UserStory", Ke), Er = async (n, e, t, r, a) => awai
       continue;
     }
     if (o.actionType === "button") {
-      const I = e.find(
-        ($) => $.chapterId === t && $.sceneId === r && $.stepId === u
+      const $ = e.find(
+        (b) => b.chapterId === t && b.sceneId === r && b.stepId === u
       );
-      if (!I) {
+      if (!$) {
         s.push({ step: o });
         break;
       }
-      const g = o.payload.find(
-        ($) => $.actionId === I.value
+      const h = o.payload.find(
+        (b) => b.actionId === $.value
       );
-      if (!g || (s.push({ step: o, selectedAction: g }), u === a)) break;
-      u = g.next;
+      if (!h || (s.push({ step: o, selectedAction: h }), u === a)) break;
+      u = h.next;
       continue;
     }
     if (s.push({ step: o }), u === a) break;
@@ -2667,13 +2666,13 @@ class Mr extends f {
     if (!u) return null;
     const o = u.scenes[a];
     if (!o) return null;
-    const h = s.status === "in_progress" && s.currentChapterId === r && s.currentSceneId === a;
+    const m = s.status === "in_progress" && s.currentChapterId === r && s.currentSceneId === a;
     return vr(
       o,
       s.choices,
       r,
       a,
-      h ? s.currentStepId : void 0
+      m ? s.currentStepId : void 0
     );
   }
   async start(e, t) {
@@ -2800,7 +2799,7 @@ class Mr extends f {
     );
   }
 }
-const xr = (n, e = {}) => H.find(n, null, e).lean(), qr = (n, e) => H.findOne({ user: n, storyId: e }).lean(), Ar = (n, e) => H.findOneAndUpdate(n, e, {
+const xr = (n, e = {}) => H.find(n, null, e).lean(), Ar = (n, e) => H.findOne({ user: n, storyId: e }).lean(), qr = (n, e) => H.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
 class kr extends Mr {
@@ -2814,13 +2813,13 @@ class kr extends Mr {
     return { user: e.user, storyId: e.storyId };
   }
   fetchFromDb(e) {
-    return qr(e.user, e.storyId);
+    return Ar(e.user, e.storyId);
   }
   fetchManyFromDb(e, t) {
     return xr(e, t);
   }
   updateInDb(e, t) {
-    return Ar(e, t);
+    return qr(e, t);
   }
 }
 const Va = new kr();
@@ -2851,7 +2850,7 @@ class Rr extends y {
     const t = Y();
     t.setHours(0, 0, 0, 0);
     const r = /* @__PURE__ */ new Date();
-    r.setHours(0, 0, 0, 0), await A.updateOne(
+    r.setHours(0, 0, 0, 0), await q.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -2860,7 +2859,7 @@ class Rr extends y {
         }
       },
       { $inc: { "bet666.count": 1 }, $set: { "bet666.last": /* @__PURE__ */ new Date() } }
-    ), await A.updateOne(
+    ), await q.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -2903,14 +2902,14 @@ class Rr extends y {
     await this.update(e, { $inc: { "dice.drawWithDoubleSixCount": 1 } });
   }
 }
-const Cr = async (n) => await A.create({
+const Cr = async (n) => await q.create({
   user: n
 });
-async function _r(n) {
-  const e = await A.findOne({ user: n }).lean();
+async function Br(n) {
+  const e = await q.findOne({ user: n }).lean();
   return e || p(await Cr(n));
 }
-const Br = (n, e) => A.findOneAndUpdate({ user: n }, e, {
+const _r = (n, e) => q.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -2925,10 +2924,10 @@ class Fr extends Rr {
     return e;
   }
   fetchFromDb(e) {
-    return _r(e);
+    return Br(e);
   }
   updateInDb(e, t) {
-    return Br(e, t);
+    return _r(e, t);
   }
 }
 const Xa = new Fr();
@@ -3036,7 +3035,7 @@ const Za = new Gr();
 class Wr extends y {
   async readEdito(e) {
     const t = /* @__PURE__ */ new Date();
-    t.setHours(0, 0, 0, 0), await D.updateOne(
+    t.setHours(0, 0, 0, 0), await O.updateOne(
       {
         user: e,
         "edito.lastTimeRead": {
@@ -3047,7 +3046,7 @@ class Wr extends y {
         $inc: { "edito.readToday": 1 },
         $set: { "edito.lastTimeRead": /* @__PURE__ */ new Date() }
       }
-    ), await D.updateOne(
+    ), await O.updateOne(
       {
         user: e,
         "edito.lastTimeRead": {
@@ -3061,7 +3060,7 @@ class Wr extends y {
   }
   async getTotalEditoReadToday() {
     const e = /* @__PURE__ */ new Date();
-    return e.setHours(0, 0, 0, 0), (await D.aggregate([
+    return e.setHours(0, 0, 0, 0), (await O.aggregate([
       {
         $match: {
           "edito.lastTimeRead": { $gte: e },
@@ -3072,14 +3071,14 @@ class Wr extends y {
     ]))[0]?.total ?? 0;
   }
 }
-const Vr = async (n) => await D.create({
+const Vr = async (n) => await O.create({
   user: n
 });
 async function Xr(n) {
-  const e = await D.findOne({ user: n }).lean();
+  const e = await O.findOne({ user: n }).lean();
   return e || p(await Vr(n));
 }
-const Jr = (n, e) => D.findOneAndUpdate({ user: n }, e, {
+const Jr = (n, e) => O.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -3103,8 +3102,8 @@ class Zr extends Wr {
 const es = new Zr();
 class ea extends y {
   async updateCraftStats(e, t, r) {
-    const a = await m.get(r);
-    !a || !m.isItem(a) || await this.update(e, {
+    const a = await U.get(r);
+    !a || !U.isItem(a) || await this.update(e, {
       $inc: {
         "crafts.totalCrafted": t
       }
@@ -3190,59 +3189,48 @@ class aa extends ea {
 const ts = new aa();
 class sa extends f {
   async maxCraftQuantity(e, t) {
-    const r = await E.get(e);
+    const r = await M.get(e);
     let a = 1 / 0;
     for (const s of t)
       a = Math.min(
         a,
         Math.floor(
-          (r.itemList[s.entityId] ?? 0) / s.size
+          (r.itemList[s.entityId] ?? 0) / (s.size ?? 1)
         )
       );
     return a;
   }
   async hasEnoughItemsForRecipe(e, t, r) {
-    const a = await E.get(e);
+    const a = await M.get(e);
     for (const s of t.entities)
-      if ((a.itemList[s.entityId] ?? 0) < s.size * r)
+      if ((a.itemList[s.entityId] ?? 0) < (s.size ?? 1) * r)
         return !1;
     return !0;
   }
-  decodeCraftId(e) {
-    return e.split(";").map((t, r) => ({
-      entityId: t === "null" ? null : t,
-      index: r
-    }));
-  }
-  encodeCraftId(e) {
-    return e.map(({ entityId: t }) => `${t}`).join(";");
-  }
   async isValidRecipe(e) {
-    return !!(await this.getAll()).find((r) => r.craftId === e);
+    return !!(await this.getAll()).find((r) => r.recipeId === e);
   }
   async getRecipeResult(e, t) {
-    const r = await E.get(e), a = (await R.getPanoplyBonus(r.equippedItems)).find(
-      ([s, i]) => s.panoplyId === "little_blacksmith" && i !== null
-    );
-    return a?.[1] === "full" && t === "chest_3" ? "chest_blacksmith_3" : a?.[1] === "half" && t === "chest_2" ? "chest_blacksmith_2" : a?.[1] === "half" && t === "chest_1" ? "chest_blacksmith_1" : t;
+    return t;
   }
 }
 const ia = new c(
   {
     entityId: { type: String, required: !0 },
-    size: { type: Number, required: !0 }
+    size: { type: Number, default: 1 }
   },
   { _id: !1 }
 ), ua = new c(
   {
     entityId: { type: String, required: !0 },
-    size: { type: Number, required: !0 }
+    size: { type: Number }
   },
   { _id: !1 }
 ), ca = new c(
   {
-    craftId: { type: String, unique: !0, required: !0 },
-    name: { type: String, required: !0 },
+    recipeId: { type: String, unique: !0, required: !0 },
+    rankId: String,
+    type: { type: String, required: !0 },
     entities: { type: [ia], required: !0 },
     result: { type: ua, required: !0 }
   },
@@ -3251,7 +3239,7 @@ const ia = new c(
   ...n
 }), da = async (n, e) => se.find(n, {}, e).lean();
 async function la(n) {
-  const e = await se.findOne({ craftId: n }).lean();
+  const e = await se.findOne({ recipeId: n }).lean();
   return e || null;
 }
 const pa = (n, e) => se.findOneAndUpdate(n, e, {
@@ -3277,7 +3265,7 @@ class ya extends sa {
     return e;
   }
   getKey(e) {
-    return e.craftId;
+    return e.recipeId;
   }
 }
 const ns = new ya(), fa = new c({
@@ -3492,10 +3480,10 @@ const Ma = new c({
   }
 }), me = d?.Settings || l("Settings", Ma), xa = (n) => me.create({
   guildId: n
-}), qa = async (n) => {
+}), Aa = async (n) => {
   const e = await me.findOne({ guildId: n }).lean();
   return e || p(await xa(n));
-}, Aa = (n, e) => me.findOneAndUpdate(n, e, {
+}, qa = (n, e) => me.findOneAndUpdate(n, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -3510,10 +3498,10 @@ class ka extends va {
     return e;
   }
   fetchFromDb(e) {
-    return qa(e);
+    return Aa(e);
   }
   updateInDb(e, t) {
-    return Aa(e, t);
+    return qa(e, t);
   }
 }
 const ss = new ka(), Ra = new c({
@@ -3521,9 +3509,9 @@ const ss = new ka(), Ra = new c({
   authorId: String,
   date: { type: Date, default: Date.now() },
   reason: { type: String, default: null }
-}), ce = d?.Warn || l("Warn", Ra), Ca = (n) => ce.countDocuments(n), _a = (n) => ce.create({
+}), ce = d?.Warn || l("Warn", Ra), Ca = (n) => ce.countDocuments(n), Ba = (n) => ce.create({
   ...n
-}), Ba = (n) => ce.findByIdAndDelete(n).lean();
+}), _a = (n) => ce.findByIdAndDelete(n).lean();
 class Fa extends f {
   getUserWarns(e) {
     return this.getMany({ warnedUserId: e });
@@ -3532,10 +3520,10 @@ class Fa extends f {
     return Ca({ warnedUserId: e });
   }
   async createWarn(e) {
-    await _a(e);
+    await Ba(e);
   }
   async deleteWarn(e) {
-    const t = await Ba(e);
+    const t = await _a(e);
     return t && this.invalidate(this.getKey(t)), t;
   }
 }
@@ -3567,14 +3555,14 @@ class cs extends Ye.ObjectId {
 }
 export {
   cs as ObjectId,
-  w as QUEST_MIDDLEWARE_EVENT_NAME,
+  S as QUEST_MIDDLEWARE_EVENT_NAME,
   rs as banService,
   us as connectToServices,
-  S as emitQuestMiddlewareEvent,
-  m as entityService,
+  g as emitQuestMiddlewareEvent,
+  U as entityService,
   as as invitationService,
-  U as ornamentService,
-  R as panoplyService,
+  I as ornamentService,
+  _ as panoplyService,
   ns as recipeService,
   La as registerQuestMiddlewareEvents,
   Rt as reminderService,
@@ -3584,8 +3572,8 @@ export {
   Ya as userDailyReportService,
   le as userEncyclopediaService,
   Ga as userGamesService,
-  E as userInventoryService,
-  O as userMetaService,
+  M as userInventoryService,
+  E as userMetaService,
   we as userOrnamentService,
   be as userQuestService,
   Wa as userRankService,