Update

API/constants/calendar.js

@@ -224,6 +224,15 @@ const eventTimes = {
       },
     ],
   },
+  HOPPITY_HUNT: {
+    name: "Hoppity's Hunt",
+    times: [
+      {
+        start: getOffset("Early Spring", 1),
+        end: getOffset("Late Spring", 31),
+      },
+    ],
+  },
 };
 
 function buildSkyblockCalendar(events, from, to, years, stopAtYearEnd = true) {

API/functions/getCalendar.js

@@ -11,9 +11,9 @@ function getSkyblockCalendar() {
       false,
     );
 
-    return { status: 200, data: calendar };
+    return calendar;
   } catch (error) {
-    return { status: 404, reason: error };
+    return null;
   }
 }
 

API/stats/talismans.js

@@ -40,10 +40,9 @@ module.exports = async (profile) => {
         if (!names.includes(talisman.tag.ExtraAttributes.id)) {
           if (talisman.tag.ExtraAttributes.id === "ABICASE") {
             output.magicPower += Math.floor(profile.nether_island_player_data.abiphone.active_contacts.length / 2);
+            output.magicPower += power[getRarity(talisman.tag.display.Lore)]
           } else if (talisman.tag.ExtraAttributes.id === "HEGEMONY_ARTIFACT") {
             output.magicPower += power[getRarity(talisman.tag.display.Lore)] * 2;
-          } else if (talisman.tag.ExtraAttributes.id === "RIFT_PRISM") {
-            output.magicPower += 11;
           } else {
             output.magicPower += power[getRarity(talisman.tag.display.Lore)];
           }
@@ -67,6 +66,9 @@ module.exports = async (profile) => {
           output.enriched++;
         }
       }
+      if(profile.rift.access.consumed_prism === true) {
+        output.magicPower += 11
+      }
 
       return output;
     } else {

config.json

@@ -42,7 +42,8 @@
         "NEW_YEAR_CELEBRATION": true,
         "SEASON_OF_JERRY": true,
         "SPOOKY_FESTIVAL": true,
-        "TRAVELING_ZOO": true
+        "TRAVELING_ZOO": true,
+        "HOPPITY_HUNT": true
       },
       "customTime": {
         "2": ["BANK_INTEREST", "DARK_AUCTION", "JACOBS_CONTEST"]
@@ -92,6 +93,7 @@
       "logChannelTicket": "",
       "logChannelDefaultService": "",
       "logChannelCarrierService": "",
+      "logChannelCandidatureService": "",
       "catégorieslayer": "",
       "catégoriefloor": "",
       "catégoriemaster": "",
@@ -138,7 +140,8 @@
     }
   },
   "other": {
-    "logToFiles": true
+    "logToFiles": true,
+    "autoLimbo": true
   },
   "database": {
     "uri": ""

package.json

@@ -45,7 +45,7 @@
     "fs": "^0.0.1-security",
     "fs-promise": "^2.0.3",
     "got": "^14.2.1",
-    "hypixel-api-reborn": "^11.1.0",
+    "hypixel-api-reborn": "^11.2.0",
     "imgur": "^2.3.0",
     "lilyweight": "^2.7.2",
     "lodash": "^4.17.21",
@@ -58,7 +58,7 @@
     "node-schedule": "^2.1.1",
     "prismarine-nbt": "^2.2.1",
     "request": "^2.88.2",
-    "skyhelper-networth": "1.18.7",
+    "skyhelper-networth": "1.21.0",
     "sourcebin_js": "^0.0.3-ignore",
     "util": "^0.12.5",
     "winston": "^3.13.0"

src/discord/commands/candidature.js

@@ -0,0 +1,54 @@
+const {
+  ActionRowBuilder,
+  ButtonBuilder,
+  ButtonStyle,
+  EmbedBuilder,
+} = require("discord.js");
+const config = require("../../../config.json");
+const messages = require("../../../messages.json");
+
+module.exports = {
+  name: "candidatureembed",
+  description: `Commande pour les embeds des candidature`,
+
+  execute: async (interaction, client) => {
+    // Si l'utilisateur n'a pas la permission d'utiliser la commande
+    if (
+      !(
+        await interaction.guild.members.fetch(interaction.user)
+      ).roles.cache.has(config.discord.commands.adminRole)
+    ) {
+      return await interaction.reply({
+        content: `${messages.permissionInsuffisante}`,
+        ephemeral: true,
+      });
+    }
+    const candidature = new EmbedBuilder()
+      .setDescription("# Demandes de recrutement")
+      .addFields({
+        name: "\u200b",
+        value:
+          "French Legacy possède deux guildes. La guilde principale (French Legacy) et la deuxième guilde (French Legacy II). Si vous souhaitez postuler pour l'une des guildes, réagissez ci-dessous pour créer un ticket.\n\n* Requirements\nFrench Legacy : Skyblock Level 310\nFrench Legacy II : Skyblock Level 230\n\nPour vérifier votre niveau, rendez-vous dans le salon <#953370740827254834> et écrivez /level <Pseudo>. N'ouvrez pas un ticket juste pour vérifier votre niveau. Cela pourrait entraîner des sanctions telles que l'interdiction de postuler à nouveau.",
+      })
+      .setFooter({
+        text: "FrenchLegacy",
+        iconURL: `https://media.discordapp.net/attachments/1073744026454466600/1076983462403264642/icon_FL_finale.png`,
+      });
+
+    interaction.channel.send({
+      embeds: [candidature],
+      components: [
+        new ActionRowBuilder().addComponents(
+          new ButtonBuilder()
+            .setCustomId("candidature-v1")
+            .setLabel("French Legacy")
+            .setStyle(ButtonStyle.Success),
+          new ButtonBuilder()
+            .setCustomId("candidature-v2")
+            .setLabel("French Legacy II")
+            .setStyle(ButtonStyle.Success),
+        ),
+      ],
+    });
+  },
+};

src/discord/commands/helpCommand.js

@@ -90,7 +90,15 @@ module.exports = {
         );
       }
 
-      const description = `${command.description}\n\n${
+      const description = `${
+        command.aliases
+          ? `\nAliases: ${command.aliases
+              .map((aliase) => {
+                return `\`${config.minecraft.bot.prefix}${aliase}\``;
+              })
+              .join(", ")}\n\n`
+          : ""
+      }${command.description}\n\n${
         command.options
           ?.map(({ name, required, description }) => {
             const optionString = required ? `(${name})` : `[${name}]`;