Merge branch 'main' into openhands-fix-issue-391

MathiasGruber · Feb 24, 2025 · febe83e · febe83e
2 parents fcc5109 + 22bf950
commit febe83e
Show file tree

Hide file tree

Showing 35 changed files with 8,348 additions and 118 deletions.
diff --git a/.github/workflows/nextjs_bundle_analysis.yml b/.github/workflows/nextjs_bundle_analysis.yml
@@ -21,11 +21,23 @@ permissions:
   pull-requests: write # for comments
 
 jobs:
+  secret-check:
+    runs-on: ubuntu-latest
+    outputs:
+      HAS_CLERK_KEY: ${{ steps.check-secret.outputs.hasSecret }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Check secret
+        id: check-secret
+        env:
+          CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY != '' }}
+        run: echo hasSecret=$CLERK_SECRET_KEY >> $GITHUB_OUTPUT
+
   analyze:
     runs-on: ubuntu-latest
-    env:
-      HAS_CLERK_KEY: ${{ secrets.CLERK_SECRET_KEY != '' }}
-    if: env.HAS_CLERK_KEY == 'true'
+    needs: secret-check
+    if: needs.secret-check.outputs.HAS_CLERK_KEY != ''
+
     steps:
       - uses: actions/checkout@v3
 

diff --git a/app/drizzle/constants.ts b/app/drizzle/constants.ts
@@ -227,6 +227,7 @@ export const JutsuTypes = [
   "EVENT",
   "AI",
 ] as const;
+export type JutsuType = (typeof JutsuTypes)[number];
 
 export const UserStatNames = [
   "ninjutsuOffence",
@@ -442,6 +443,15 @@ export const COST_REROLL_ELEMENT = 20;
 export const MAX_EXTRA_JUTSU_SLOTS = 2;
 export const BLOODLINE_ROLL_TYPES = ["NATURAL", "ITEM"] as const;
 
+// Jutsu level transfer config
+export const JUTSU_TRANSFER_DAYS = 20;
+export const JUTSU_TRANSFER_COST = 20;
+export const JUTSU_TRANSFER_MAX_LEVEL = 20;
+export const JUTSU_TRANSFER_FREE_AMOUNT = 2;
+export const JUTSU_TRANSFER_FREE_NORMAL = 3;
+export const JUTSU_TRANSFER_FREE_SILVER = 4;
+export const JUTSU_TRANSFER_FREE_GOLD = 5;
+
 // Village config
 export const VILLAGE_LEAVE_REQUIRED_RANK = "CHUNIN";
 export const VILLAGE_REDUCED_GAINS_DAYS = 7;
@@ -782,16 +792,15 @@ export const IMG_LAYOUT_USERSBANNER_BOTTOM =
 export const IMG_AVATAR_DEFAULT =
   "https://utfs.io/f/630cf6e7-c152-4dea-a3ff-821de76d7f5a_default.webp";
 export const IMG_WALLPAPER_WINTER =
-  "https://tnr-storage-cdn.b-cdn.net/wallpaper-winter-compressed.webp";
-// "https://utfs.io/f/Hzww9EQvYURJTUQ6Nm5IU29dZYJPoOKSh5vmlqatMub3EigH";
+  "https://tnr-storage-cdn.b-cdn.net/wallpaper-winter.webp";
 export const IMG_WALLPAPER_SPRING =
-  "https://utfs.io/f/Hzww9EQvYURJYq2fE0OMAlNnPZ41ev6fCGcFK3hmjX9I8W7d";
+  "https://tnr-storage-cdn.b-cdn.net/wallpaper-spring.webp";
 export const IMG_WALLPAPER_SUMMER =
-  "https://utfs.io/f/Hzww9EQvYURJ1HIpcx6bo95WClq4K0wxZUmJcvThgdVenO3P";
+  "https://tnr-storage-cdn.b-cdn.net/wallpaper-summer.webp";
 export const IMG_WALLPAPER_FALL =
-  "https://utfs.io/f/Hzww9EQvYURJ8B1Blddkkp45TvAnoIBa0rtCf1lbyXYjVKQ2";
+  "https://tnr-storage-cdn.b-cdn.net/wallpaper-fall.webp";
 export const IMG_WALLPAPER_HALLOWEEN =
-  "https://utfs.io/f/Hzww9EQvYURJACVJVzoZUC4muiGcQNzjfEndY5y1w20B8hTW";
+  "https://tnr-storage-cdn.b-cdn.net/wallpaper-halloween.webp";
 export const IMG_LAYOUT_BUTTONDECOR =
   "https://utfs.io/f/Hzww9EQvYURJYectQDOMAlNnPZ41ev6fCGcFK3hmjX9I8W7d";
 export const IMG_LAYOUT_NAVBAR =

diff --git a/app/drizzle/migrations/0197_blushing_tombstone.sql b/app/drizzle/migrations/0197_blushing_tombstone.sql
@@ -0,0 +1 @@
+ALTER TABLE `Village` ADD `wallpaperOverwrite` varchar(191);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE `Village` ADD `wallpaperOverwrite` varchar(191);