feat: new campaign: joinMemberOnBoat

mission in between the 15th and the previous 16th
DraftBot-A-Discord-Adventure · Oct 17, 2023 · ee6bd05 · ee6bd05
1 parent c363ec5
commit ee6bd05
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/resources/text/campaign.json b/resources/text/campaign.json
@@ -120,6 +120,14 @@
 			"xpToWin": 25,
 			"moneyToWin": 0
 		},
+		{
+			"missionId": "joinMemberOnBoat",
+			"missionVariant": 0,
+			"missionObjective": 1,
+			"gemsToWin": 3,
+			"xpToWin": 100,
+			"moneyToWin": 0
+		},
 		{
 			"missionId": "spendGems",
 			"missionVariant": 0,

diff --git a/resources/text/missions/joinMemberOnBoat.json b/resources/text/missions/joinMemberOnBoat.json
@@ -0,0 +1,11 @@
+{
+	"translations": {
+		"fr": {
+			"desc": "Rejoindre un membre sur l'île via la commande {command:joinboat}"
+		},
+		"en": {
+			"desc": "Join a member on the island via the {command:joinboat} command"
+		}
+	},
+	"campaignOnly": true
+}
diff --git a/src/commands/player/JoinBoatCommand.ts b/src/commands/player/JoinBoatCommand.ts
@@ -15,6 +15,7 @@ import {EffectsConstants} from "../../core/constants/EffectsConstants";
 import {PVEConstants} from "../../core/constants/PVEConstants";
 import {LogsReadRequests} from "../../core/database/logs/LogsReadRequests";
 import {DraftBotEmbed} from "../../core/messages/DraftBotEmbed";
+import {MissionsController} from "../../core/missions/MissionsController";
 
 /**
  * Displays information about the profile of the player who sent the command
@@ -53,7 +54,12 @@ async function executeCommand(interaction: CommandInteraction, language: string,
 				reactionMessage: confirmMessage,
 				embed: new DraftBotEmbed().formatAuthor(tr.get("confirmedTitle"), interaction.user),
 				tr
-			},":ferry:", price, guildOnBoat[0]).then();
+			}, ":ferry:", price, guildOnBoat[0]).then(async (hasJoinedBoat) => {
+				await MissionsController.update(player, interaction.channel, language, {
+					missionId: "joinMemberOnBoat",
+					set: hasJoinedBoat
+				});
+			});
 		}
 	);
 	await interaction.deferReply();

diff --git a/src/core/database/game/GameDatabaseUtils.ts b/src/core/database/game/GameDatabaseUtils.ts
@@ -5,7 +5,7 @@ import {QueryInterface} from "sequelize";
  */
 export async function addCampaignMission(context: QueryInterface, position: number): Promise<void> {
 	await context.sequelize.query(`UPDATE draftbot_game.player_missions_info SET campaignProgression = campaignProgression + 1 WHERE campaignProgression > ${position}`);
-	await context.sequelize.query(`UPDATE draftbot_game.player_missions_info SET campaignBlob = CONCAT(SUBSTR(campaignBlob, 0, ${position - 1}), "0", SUBSTR(campaignBlob, ${position}))`);
+	await context.sequelize.query(`UPDATE draftbot_game.player_missions_info SET campaignBlob = CONCAT(SUBSTR(campaignBlob, 1, ${position - 1}), "0", SUBSTR(campaignBlob, ${position}))`);
 }
 
 /**
@@ -22,7 +22,7 @@ export async function addCampaignMissionList(context: QueryInterface, positions:
  */
 export async function removeCampaignMission(context: QueryInterface, position: number): Promise<void> {
 	await context.sequelize.query(`UPDATE draftbot_game.player_missions_info SET campaignProgression = campaignProgression - 1 WHERE campaignProgression >= ${position}`);
-	await context.sequelize.query(`UPDATE draftbot_game.player_missions_info SET campaignBlob = CONCAT(SUBSTR(campaignBlob, 0, ${position - 1}), SUBSTR(campaignBlob, ${position + 1}))`);
+	await context.sequelize.query(`UPDATE draftbot_game.player_missions_info SET campaignBlob = CONCAT(SUBSTR(campaignBlob, 1, ${position - 1}), SUBSTR(campaignBlob, ${position + 1}))`);
 }
 
 /**

diff --git a/src/core/database/game/migrations/018-newCampaignMission.ts b/src/core/database/game/migrations/018-newCampaignMission.ts
@@ -0,0 +1,10 @@
+import {QueryInterface} from "sequelize";
+import {addCampaignMissionList, removeCampaignMissionList} from "../GameDatabaseUtils";
+
+export async function up({context}: { context: QueryInterface }): Promise<void> {
+	await addCampaignMissionList(context, [16]);
+}
+
+export async function down({context}: { context: QueryInterface }): Promise<void> {
+	await removeCampaignMissionList(context, [16]);
+}
diff --git a/src/core/smallEvents/goToPVEIslandSmallEvent.ts b/src/core/smallEvents/goToPVEIslandSmallEvent.ts
@@ -30,13 +30,15 @@ export async function confirmationCallback(
 	emote: string,
 	price: number,
 	anotherMemberOnBoat: Player = null
-): Promise<void> {
+): Promise<boolean> {
+	let isGoneOnIsland = false;
 	if (messageData.reactionMessage.isValidated()) {
 		const missionInfo = await PlayerMissionsInfos.getOfPlayer(player.id);
 		if (missionInfo.gems < price) {
 			messageData.embed.setDescription(`${emote} ${messageData.tr.get("notEnoughGems")}`);
 		}
 		else {
+			isGoneOnIsland = true;
 			await TravelTime.removeEffect(player, NumberChangeReason.SMALL_EVENT);
 			await Maps.startTravel(
 				player,
@@ -55,6 +57,7 @@ export async function confirmationCallback(
 		embeds: [messageData.embed]
 	});
 	BlockingUtils.unblockPlayer(player.discordUserId, BlockingConstants.REASONS.PVE_ISLAND);
+	return isGoneOnIsland;
 }
 
 export const smallEvent: SmallEvent = {