updated blocking constant + add romain stupid but funny suggestion #2273

DraftBot-A-Discord-Adventure · Jan 13, 2025 · a59fad4 · a59fad4
1 parent c157fc3
commit a59fad4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/Core/src/commands/player/FightCommand.ts b/Core/src/commands/player/FightCommand.ts
@@ -86,7 +86,7 @@ export default class FightCommand {
 			},
 			endCallback
 		)
-			.block(player.id, BlockingConstants.REASONS.FIGHT)
+			.block(player.id, BlockingConstants.REASONS.FIGHT_CONFIRMATION)
 			.build();
 
 		response.push(collectorPacket);

diff --git a/Discord/src/commands/player/FightCommand.ts b/Discord/src/commands/player/FightCommand.ts
@@ -16,11 +16,14 @@ import {
 } from "../../../../Lib/src/packets/commands/CommandFightPacket";
 import {ReactionCollectorFightData} from "../../../../Lib/src/packets/interaction/ReactionCollectorFight";
 import {KeycloakUser} from "../../../../Lib/src/keycloak/KeycloakUser";
+import {RandomUtils} from "../../../../Lib/src/utils/RandomUtils";
+import {FightConstants} from "../../../../Lib/src/constants/FightConstants";
 
 export async function createFightCollector(packet: ReactionCollectorCreationPacket, context: PacketContext): Promise<void> {
 	const interaction = DiscordCache.getInteraction(context.discord!.interaction)!;
 	await interaction.deferReply();
 	const data = packet.data.data as ReactionCollectorFightData;
+	const subTextKey = RandomUtils.draftbotRandom.bool(FightConstants.RARE_SUB_TEXT_INTRO) ? "rare" : "common"
 	const embed = new DraftBotEmbed().formatAuthor(i18n.t("commands:fight.title", {
 		lng: interaction.userLanguage,
 		pseudo: interaction.user.displayName
@@ -29,6 +32,9 @@ export async function createFightCollector(packet: ReactionCollectorCreationPack
 			i18n.t("commands:fight.confirmDesc", {
 				lng: interaction.userLanguage,
 				pseudo: interaction.user.displayName,
+				confirmSubText: i18n.t("commands:fight.confirmSubTexts."+ subTextKey, {
+					lng: interaction.userLanguage
+				}),
 				glory: i18n.t("commands:fight:information.glory", {
 					lng: interaction.userLanguage,
 					gloryPoints: data.playerStats.fightRanking.glory

diff --git a/Lang/fr/commands.json b/Lang/fr/commands.json
@@ -726,7 +726,11 @@
   "fight": {
     "title": "{{pseudo}}, vous êtes sur le point de démarrer un combat",
     "canceledTitle": "{{pseudo}}, vous avez annulé la recherche",
-    "confirmDesc": ":crossed_swords: | **{{pseudo}}**, vous souhaitez lancer une recherche de combat ? Pour accepter, cliquez sur le bouton ci-dessous.\n\n:crossed_swords: | **Combattant : {{pseudo}}** | {{glory}} | {{className}}\n\n{{stats}}",
+    "confirmDesc": ":crossed_swords: | **{{pseudo}}**{{confirmSubText}}\n\n:crossed_swords: | **Combattant : {{pseudo}}** | {{glory}} | {{className}}\n\n{{stats}}",
+    "confirmSubTexts": {
+      "common": ", vous souhaitez lancer une recherche de combat ?",
+      "rare": ", voudriez-vous participer à la recherche d'un combattant adéquat à votre puissance personnelle afin d'effectuer le duel subséquent ?"
+    },
     "canceledDesc": "Vous avez refusé la recherche de combat.",
     "information": {
       "glory": ":sparkles: {{gloryPoints}}",

diff --git a/Lang/fr/error.json b/Lang/fr/error.json
@@ -11,6 +11,7 @@
     "descriptionEdit": "édition de la description de guilde",
     "drink": "choix de boire une potion ou non",
     "fight": "combat",
+    "fightConfirmation": "choix de débuter un combat ou non",
     "fightPetChoose": "choix d'une action pour le combat de familier",
     "gobletChoose": "choix d'un gobelet",
     "guildCreate": "création d'une guilde",

diff --git a/Lib/src/constants/BlockingConstants.ts b/Lib/src/constants/BlockingConstants.ts
@@ -6,6 +6,7 @@ export abstract class BlockingConstants {
 		CLASS: "class",
 		DRINK: "drink",
 		FIGHT: "fight",
+		FIGHT_CONFIRMATION: "fightConfirmation",
 		GOBLET_CHOOSE: "gobletChoose",
 		WITCH_CHOOSE: "witchChoose",
 		FIGHT_PET_CHOOSE: "fightPetChoose",

diff --git a/Lib/src/constants/FightConstants.ts b/Lib/src/constants/FightConstants.ts
@@ -1,4 +1,6 @@
 export abstract class FightConstants {
+	static readonly  RARE_SUB_TEXT_INTRO = 0.001 // chance of having rare subtext (1=100%)
+
 	static readonly MAX_TURNS = 24;
 
 	static readonly REQUIRED_LEVEL = 8;