battles: reimagined boss battles, reward loot on strike, better ui

GGonryun · Aug 15, 2024 · aa37106 · aa37106
1 parent c7c4bd8
commit aa37106
Show file tree

Hide file tree

Showing 108 changed files with 2,919 additions and 2,308 deletions.
diff --git a/apps/charity/pages/api/cron/find-expired-battles.ts b/apps/charity/pages/api/cron/find-expired-battles.ts
diff --git a/apps/charity/pages/api/cron/spawn-raffle.ts b/apps/charity/pages/api/cron/spawn-raffle.ts
@@ -69,6 +69,12 @@ const prizes = {
     numWinners: [5, 7, 10],
     imageUrl: undefined,
   },
+  '1000': {
+    itemId: '1000',
+    premium: false,
+    numWinners: [5, 10],
+    imageUrl: undefined,
+  },
   '4': {
     itemId: '4',
     premium: true,
@@ -98,7 +104,7 @@ const generateRaffle = (): Prisma.RaffleUncheckedCreateInput => {
 
   const maxEntries = [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100];
 
-  const dropChance: PrizeId[] = ['5', '5', '8', '4', '4', '4', '4', '4'];
+  const dropChance: PrizeId[] = ['5', '8', '1000', '4', '4', '4', '4'];
 
   const prizeId = randomArrayElement(dropChance);
   const prize = prizes[prizeId];

diff --git a/apps/charity/pages/api/jobs/[...path].tsx b/apps/charity/pages/api/jobs/[...path].tsx
@@ -1,9 +1,13 @@
 import { TRPCError } from '@trpc/server';
 import { prisma } from '@worksheets/prisma';
+import { routes } from '@worksheets/routes';
+import { MobsService } from '@worksheets/services/mobs';
+import { NotificationsService } from '@worksheets/services/notifications';
 import { TasksService } from '@worksheets/services/tasks';
 import { createBackgroundJob } from '@worksheets/util/jobs';
+import { retryTransaction } from '@worksheets/util/prisma';
 
-export default createBackgroundJob(async (path, body) => {
+export default createBackgroundJob(async (path, body, _req, res) => {
   console.info('Executing job', path, body);
 
   const job = path.join('/');
@@ -39,8 +43,34 @@ export default createBackgroundJob(async (path, body) => {
     return true;
   } else if (job === 'leaderboard/score') {
     const tasks = new TasksService(prisma);
-
     await tasks.trackLeaderboardAction(body);
+  } else if (job === 'battle/completed') {
+    const { mvp, battle, loot, spawned } = await retryTransaction(
+      prisma,
+      async (tx) => {
+        const mobs = new MobsService(tx);
+        return mobs.processCompletedBattle(body.battleId);
+      }
+    );
+    const notifications = new NotificationsService(prisma);
+    await notifications.send('battle-mvp-awarded', {
+      userId: mvp.participant.user.id,
+      battle,
+      loot,
+    });
+    await notifications.send('battle-completed', {
+      userIds: battle.participation
+        .map((p) => p.user.id)
+        .filter((id) => id !== mvp.participant.user.id),
+      battle,
+    });
+    await res.revalidate(
+      routes.battle.path({
+        params: {
+          battleId: spawned.battleId,
+        },
+      })
+    );
   } else {
     throw new TRPCError({
       code: 'NOT_FOUND',

diff --git a/apps/charity/pages/help/accounts.tsx b/apps/charity/pages/help/accounts.tsx
@@ -1,9 +1,6 @@
+import { helpAccounts } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpAccounts,
-  helpPageJson,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/contributions.tsx b/apps/charity/pages/help/contributions.tsx
@@ -1,9 +1,6 @@
+import { helpContributions } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpContributions,
-  helpPageJson,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/emails.tsx b/apps/charity/pages/help/emails.tsx
@@ -1,9 +1,6 @@
+import { helpEmails } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpEmails,
-  helpPageJson,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/friends.tsx b/apps/charity/pages/help/friends.tsx
@@ -1,9 +1,6 @@
+import { helpFriends } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpFriends,
-  helpPageJson,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/integrations.tsx b/apps/charity/pages/help/integrations.tsx
@@ -1,9 +1,6 @@
+import { helpIntegrations } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpIntegrations,
-  helpPageJson,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/inventory.tsx b/apps/charity/pages/help/inventory.tsx
@@ -1,9 +1,6 @@
+import { helpInventory } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpInventory,
-  helpPageJson,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/mobs.tsx b/apps/charity/pages/help/mobs.tsx
@@ -1,5 +1,6 @@
+import { helpMobs } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import { helpMobs, helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/notifications.tsx b/apps/charity/pages/help/notifications.tsx
@@ -1,9 +1,6 @@
+import { helpNotifications } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpNotifications,
-  helpPageJson,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/playing-games.tsx b/apps/charity/pages/help/playing-games.tsx
@@ -1,9 +1,6 @@
+import { helpPlayingGames } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpPageJson,
-  helpPlayingGames,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/prizes.tsx b/apps/charity/pages/help/prizes.tsx
@@ -1,9 +1,6 @@
+import { helpPrizes } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpPageJson,
-  helpPrizes,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/quests.tsx b/apps/charity/pages/help/quests.tsx
@@ -1,9 +1,6 @@
+import { helpQuests } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpPageJson,
-  helpQuests,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/referrals.tsx b/apps/charity/pages/help/referrals.tsx
@@ -1,9 +1,6 @@
+import { helpReferrals } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpPageJson,
-  helpReferrals,
-  HelpScreen,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/tokens.tsx b/apps/charity/pages/help/tokens.tsx
@@ -1,9 +1,6 @@
+import { helpTokens } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import {
-  helpPageJson,
-  HelpScreen,
-  helpTokens,
-} from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';
 

diff --git a/apps/charity/pages/help/vip.tsx b/apps/charity/pages/help/vip.tsx
@@ -1,5 +1,6 @@
+import { helpVip } from '@worksheets/ui/components/help';
 import { AppLayoutContainer } from '@worksheets/ui/layout';
-import { helpPageJson, HelpScreen, helpVip } from '@worksheets/ui/pages/help';
+import { helpPageJson, HelpScreen } from '@worksheets/ui/pages/help';
 import { NextPageWithLayout } from '@worksheets/util-next';
 import { FAQPageJsonLd, NextSeo } from 'next-seo';