Fix/float weight pickweight

.github/workflows/deploy.yml

@@ -6,24 +6,32 @@ permissions:
   contents: write
 jobs:
   build-and-deploy:
-    concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
+    concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout 🛎️
+      - name: 🛎️ Checkout
         uses: actions/checkout@v4
 
-      - name: Install pnpm
+      - name: 🛠️ Install Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: 🛠️ Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10
+          version: latest
+
+      - name: 📦 Install Dependencies
+        run: pnpm install
 
-      - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
-        run: |
-          pnpm install
-          pnpm xlsx2json
-          pnpm build
+      - name: 🏗️ Build data
+        run: bun build:data
+
+      - name: 🏗️ Build web
+        run: bun build:web
 
-      - name: Deploy 🚀
+      - name: 🚀 Deploy
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: template # The folder the action should deploy.
+          folder: apps/web/dist # The folder the action should deploy.

.vscode/launch.json

@@ -4,6 +4,12 @@
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Launch Editor Browser",
+            "request": "launch",
+            "type": "editor-browser",
+            "url": "http://localhost:5173",
+        },
         {
             "type": "node",
             "request": "launch",

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "js/ts.experimental.useTsgo": true
+}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 神戸小鳥
+Copyright (c) 2021-2026 神戸小鳥 and 神户小德
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README-zh_CN.md

@@ -1,56 +1,19 @@
-# Life Restart
+# 人生重开模拟器
 
 <a href="https://discord.gg/U3qrf49NMQ"><img src="https://img.shields.io/discord/883382868427014255?color=%23FEE75C&label=Discord&logo=discord&logoColor=white&style=for-the-badge" /></a>
 
 [English](./README.md) | 简体中文
 
-## 简介
+## 开发环境
 
-- Game Life Restart
+包管理: `pnpm`
+运行时: `bun`
 
 ## 使用
 
-<details>
-<summary><strong>网页版</strong></summary>
-<br />
+### 开发
 
 ```bash
-# 1. 下载项目代码
-git clone https://github.com/VickScarlet/lifeRestart.git my-project
-
-# 2. 进入目录安装依赖
-cd my-project
-pnpm install
-
-# 3. 转换XLSX表
-pnpm xlsx2json
-
-# 4. 启动本地开发服务器
+pnpm build:data
 pnpm dev
-```
-
-启动完成后打开浏览器访问 [http://localhost:5173](http://localhost:5173)。
-
-</details>
-
-<details>
-<summary><strong>控制台版本</strong></summary>
-<br />
-
-```bash
-node repl
-```
-
-</details>
-
-## 其他版本
-
-<details>
-<summary><strong>版本列表</strong></summary>
-<br />
-
-- Cocos版：[gameall3d/LifeRestart_Cocos](https://github.com/gameall3d/LifeRestart_Cocos)
-
-</details>
-
-> 更多信息请参考 [官网文档](https://liferestart.syaro.io/)。
+```

README.md

@@ -1,56 +1,19 @@
-# Life Restart
+# Remake
 
 <a href="https://discord.gg/U3qrf49NMQ"><img src="https://img.shields.io/discord/883382868427014255?color=%23FEE75C&label=Discord&logo=discord&logoColor=white&style=for-the-badge" /></a>
 
 English | [简体中文](./README-zh_CN.md)
 
-## Introduction
+## Environment
 
-- Game Life Restart
+Package Manager: `pnpm`
+Runtime: `bun`
 
 ## Usage
 
-<details>
-<summary><strong>Web Version</strong></summary>
-<br />
-
+### Dev
 
 ```bash
-# 1. Clone project code.
-git clone git@github.com:VickScarlet/lifeRestart.git my-project
-cd my-project
-
-# 2. Installation dependence.
-pnpm install
-
-# 3. Transform XLSX
-pnpm xlsx2json
-
-# 4. Start local dev server.
+pnpm build:data
 pnpm dev
-```
-
-After the startup is complete, open a browser and visit [http://localhost:5173](http://localhost:5173).
-</details>
-
-<details>
-<summary><strong>Command Line Version</strong></summary>
-<br />
-
-```bash
-node repl
-```
-
-</details>
-
-## Other Version
-
-<details>
-<summary><strong>Versions</strong></summary>
-<br />
-
-- Cocos Ver: [gameall3d/LifeRestart_Cocos](https://github.com/gameall3d/LifeRestart_Cocos)
-
-</details>
-
-> More instructions at [documentation](https://liferestart.syaro.io/).
+```

repl/app.js → apps/console/app.ts

@@ -4,8 +4,8 @@ import { dirname } from 'path'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 import { readFile } from 'fs/promises'
-import Life from '../src/modules/life.js'
-import $lang from '../src/i18n/zh-cn.js'
+import Life from '../srco/modules/life.js'
+import $lang from '../srco/i18n/zh-cn.js'
 globalThis.$lang = $lang
 
 globalThis.json = async fileName =>
@@ -235,7 +235,7 @@ class App {
         this.#talentExtend = localStorage.talentExtend
         await this.#life.initial(
             dataSet => json(`${this.#language}/${dataSet}`),
-            json
+            json,
         )
         this.output(
             `\rLoading Complete.
@@ -244,14 +244,14 @@ class App {
 
 键入 \x1B[4m/remake\x1B[24m 开始游戏
 键入 \x1B[4m/help\x1B[24m 获取帮助`,
-            true
+            true,
         )
         $$on('achievement', ({ name }) =>
             this.output(`
 -------------------------
     解锁成就【${name}】
 -------------------------
-`)
+`),
         )
     }
 
@@ -561,19 +561,19 @@ class App {
             if (this.#talentSelected.has(s)) continue
             if (this.#talentSelected.size == 3)
                 return warn(
-                    '你只能选3个天赋。请使用 \x1B[4m/unselect\x1B[24m 取消选择你不想要的天赋'
+                    '你只能选3个天赋。请使用 \x1B[4m/unselect\x1B[24m 取消选择你不想要的天赋',
                 )
 
             const exclusive = this.#life.exclude(
                 Array.from(this.#talentSelected).map(({ id }) => id),
-                s.id
+                s.id,
             )
 
             if (exclusive != null)
                 for (const { name, id } of this.#talentSelected)
                     if (id == exclusive)
                         return warn(
-                            `天赋【${s.name}】与已选择的天赋【${name}】冲突`
+                            `天赋【${s.name}】与已选择的天赋【${name}】冲突`,
                         )
 
             this.#talentSelected.add(s)
@@ -628,8 +628,8 @@ class App {
                     `grade${talent.grade}b`,
                     `${check(talent) ? '√' : ' '} ${i} ${talent.name}（${
                         talent.description
-                    }）`
-                )
+                    }）`,
+                ),
             ),
         ]
             .flat()
@@ -645,7 +645,7 @@ class App {
                     return warn(this.list(), `请选择 3 个天赋`)
                 this.#step = this.Steps.PROPERTY
                 this.#life.remake(
-                    Array.from(this.#talentSelected).map(({ id }) => id)
+                    Array.from(this.#talentSelected).map(({ id }) => id),
                 )
                 this.#propertyAllocation.total = this.#life.getPropertyPoints()
                 return this.prop()
@@ -673,15 +673,18 @@ class App {
                 this.#interval = null
                 this.#auto = false
             } else if (this.#auto) {
-                this.#interval = setInterval(() => {
-                    const trajectory = this.next()
-                    if (this.#isEnd && this.#interval) {
-                        clearInterval(this.#interval)
-                        this.#interval = null
-                    }
-                    if (!this.#isEnd) return this.output(`${trajectory}\n`)
-                    return this.output(trajectory, true)
-                }, Number(this.#auto) || 1000)
+                this.#interval = setInterval(
+                    () => {
+                        const trajectory = this.next()
+                        if (this.#isEnd && this.#interval) {
+                            clearInterval(this.#interval)
+                            this.#interval = null
+                        }
+                        if (!this.#isEnd) return this.output(`${trajectory}\n`)
+                        return this.output(trajectory, true)
+                    },
+                    Number(this.#auto) || 1000,
+                )
                 return
             }
         }
@@ -835,7 +838,7 @@ class App {
                 return this.prop()
             case this.Steps.SUMMARY:
                 this.#talentExtend = Array.from(this.#talentSelected).sort(
-                    () => Math.random() - 0.5
+                    () => Math.random() - 0.5,
                 )[0].id
                 return this.list()
         }
@@ -847,7 +850,7 @@ class App {
             const { judge, grade, value } = summaryData[type]
             return this.style(
                 `grade${grade}b`,
-                `${name}：${value} ${$lang[judge]}`
+                `${name}：${value} ${$lang[judge]}`,
             )
         }
 

apps/console/package.json

@@ -0,0 +1,15 @@
+{
+    "name": "@remake/console",
+    "type": "module",
+    "version": "3.0.0",
+    "author": "Vick Scarlet <vick@syaro.io>",
+    "scripts": {
+        "start": "bun run src/index.ts",
+        "lint": "bunx --bun eslint .",
+        "test": "bun test"
+    },
+    "dependencies": {
+        "@remake/core": "workspace:*",
+        "@remake/data": "workspace:*"
+    }
+}

apps/console/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": ["**/*"]
+}

apps/web/eslint.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from 'eslint/config'
+import react from 'eslint-plugin-react'
+import reactHooks from 'eslint-plugin-react-hooks'
+import defaultConfig from '../../eslint.config.ts'
+
+export default defineConfig([
+    defaultConfig,
+    { ignores: ['dist/**', 'node_modules/**'] },
+    {
+        ...react.configs.flat.recommended!,
+        settings: { react: { version: '19' } },
+    },
+    react.configs.flat['jsx-runtime']!,
+    reactHooks.configs.flat.recommended,
+])