diff --git a/.github/workflows/README.md b/.github/workflows/README.md deleted file mode 100644 index 2bca1b21..00000000 --- a/.github/workflows/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Workflows - -Replacing [Travis CI](https://travis-ci.org/) as this project's primary CI/CD tool, -[GitHub Actions](https://help.github.com/en/actions) uses workflows to perform operations -when specific events within the repository occur. -Workflows are specified in YAML and can utilize shared components -from other GitHub Actions to form expansive pipelines. - -These workflows should appear within pull requests as status indicators -that denote "pending”, “success”, “failure”, or “error", -and should contain detail links to view the workflows and their individual steps therein. -Additionally, these workflow runs should be visible by clicking -the [Actions](https://github.com/kshman/cactbot-build/actions) tab -in the repository's menu at the top of the repository's main page. diff --git a/.github/workflows/update-branches.yml b/.github/workflows/branches.yml similarity index 98% rename from .github/workflows/update-branches.yml rename to .github/workflows/branches.yml index 168d3019..c764b009 100644 --- a/.github/workflows/update-branches.yml +++ b/.github/workflows/branches.yml @@ -1,4 +1,4 @@ -name: 업데이트-브랜치 +name: 브랜치 on: push: diff --git a/.github/workflows/build-release.yml b/.github/workflows/build.yml similarity index 99% rename from .github/workflows/build-release.yml rename to .github/workflows/build.yml index 4a8ce6db..68e6ebb1 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: 빌드-릴리즈 +name: 빌드 on: push: diff --git a/.github/workflows/lint-doc.yml b/.github/workflows/lint-doc.yml deleted file mode 100644 index ba03a424..00000000 --- a/.github/workflows/lint-doc.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: 검사-문서 - -on: - push: - branches: - - master - paths: - - '*.json' - - '**/*.css' - - '**/*.md' - - '.github/workflows/css-lint.yml' - - '.github/workflows/markdown-lint.yml' - - '.github/actions/setup-js-env/' - -jobs: - stylelint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-js-env - - - name: Add Custom Problem Matcher - run: | - echo "::add-matcher::.github/matchers/${{ github.job }}.json" - - - name: npm run stylelint - run: | - npm run stylelint - markdownlint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-js-env - - - name: Add Custom Problem Matcher - run: | - echo "::add-matcher::.github/matchers/${{ github.job }}.json" - - - name: npm run markdownlint - run: | - npm run markdownlint diff --git a/.github/workflows/lint-script.yml b/.github/workflows/lint-script.yml deleted file mode 100644 index e49b9c8d..00000000 --- a/.github/workflows/lint-script.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: 검사-스크립트 - -on: - push: - branches: - - master - paths: - - '**/*.js' - - '**/*.ts' - - '**/*.cjs' - - '**/*.mjs' - - '**/*.json' - - '.github/workflows/script-lint.yml' - - '.github/actions/setup-js-env/' - -jobs: - eslint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-js-env - - - name: TypeScript checking - run: | - npm run tsc-no-emit - - - name: npm run lint - run: | - npm run lint diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml deleted file mode 100644 index e048a349..00000000 --- a/.github/workflows/lint-test.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: 검사-테스트 - -on: - push: - branches: - - master - paths: - - '**/*.js' - - '**/*.ts' - - '**/*.py' - - 'package*.json' - - 'ui/raidboss/**' - - '.github/workflows/test.yml' - - '.github/workflows/test-sync-files.yml' - - '.github/actions/setup-js-env/' - - 'package.json' - -jobs: - syncfiles: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-js-env - - - name: npm run sync-files - run: | - npm run sync-files - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: ./.github/actions/setup-js-env - - - name: npm test - run: | - npm test diff --git a/.github/workflows/lint-version.yml b/.github/workflows/lint-version.yml deleted file mode 100644 index fea5c51e..00000000 --- a/.github/workflows/lint-version.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: 검사-버전 - -on: - push: - branches: - - master - paths: - - 'plugin/**' - - '.github/workflows/lint-version.yml' - - 'package.json' - pull_request: - paths: - - 'plugin/**' - - '.github/workflows/lint-version.yml' - - 'package.json' - -jobs: - main: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-js-env - - - name: npm run validate-versions - run: | - npm run validate-versions diff --git a/package.json b/package.json index 8fa6a48f..90dab9e2 100644 --- a/package.json +++ b/package.json @@ -1,169 +1,169 @@ -{ - "name": "cactbot-build", - "version": "99.158.0", - "license": "Apache-2.0", - "type": "module", - "types": "./types", - "repository": { - "type": "git", - "url": "https://github.com/kshman/cactbot-build" - }, - "files": [ - "./ui", - "./types", - "./util", - "./resources", - "package.json" - ], - "scripts": { - "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --progress --config webpack/webpack.prod.ts", - "build-gh-pages": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --config webpack/webpack.ghpages.ts", - "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --config webpack/webpack.dev.ts", - "fetch-deps": "node --loader=ts-node/esm ./util/fetch_deps.ts", - "tsc-no-emit": "tsc --noEmit", - "lint": "run-s lint:**", - "lint:dprint": "dprint check", - "lint:eslint": "eslint --max-warnings=0 ./", - "lintfix": "run-s lintfix:**", - "lintfix:dprint": "dprint fmt", - "lintfix:eslint": "eslint --max-warnings=0 --fix ./", - "stylelint": "stylelint \"resources/**/*.css\" \"ui/**/*.css\" \"user/**/*.css\" \"test/**/*.css\" \"util/**/*.css\"", - "stylelintfix": "stylelint --fix \"resources/**/*.css\" \"ui/**/*.css\" \"user/**/*.css\" \"test/**/*.css\" \"util/**/*.css\"", - "markdownlint": "markdownlint . --ignore node_modules --ignore publish --ignore plugin/ThirdParty", - "workflowlint": "yamllint -c .yamllint.yml .github/workflows/ && node .github/scripts/lint-workflow.cjs", - "test": "mocha", - "sync-files": "node --loader=ts-node/esm util/sync_files.ts && git diff --exit-code", - "lint-staged": "lint-staged", - "coverage-report": "node --loader=ts-node/esm util/gen_coverage_report.ts", - "util": "node --loader=ts-node/esm util/index.ts", - "find-translations": "npm run util -- findTranslations", - "translate-timeline": "npm run util -- translateTimeline", - "generate": "npm run util -- generate", - "query": "npm run util -- query", - "process-triggers": "node --loader=ts-node/esm util/process_triggers_folder.ts", - "generate-log-guide": "node --loader=ts-node/esm util/gen_log_guide.ts", - "update-logdefs": "node --loader=ts-node/esm util/update_logdefs.ts", - "validate-versions": "node --loader=ts-node/esm util/validate_versions.ts", - "release": "node --loader=ts-node/esm util/do_release.ts", - "version": "node --loader=ts-node/esm util/bump_version.ts" - }, - "devDependencies": { - "@actions/core": "^1.10.1", - "@actions/exec": "^1.1.1", - "@actions/github": "^6.0.1", - "@actions/http-client": "^1.0.11", - "@babel/core": "^7.14.5", - "@babel/preset-env": "^7.14.5", - "@babel/preset-typescript": "^7.14.5", - "@dprint/json": "^0.16.0", - "@dprint/typescript": "^0.75.0", - "@octokit/core": "^6.1.3", - "@octokit/plugin-paginate-rest": "^11.4.0", - "@types/argparse": "^1.0.38", - "@types/chai": "^4.3.1", - "@types/inquirer": "^9.0.7", - "@types/inquirer-fuzzy-path": "^2.3.9", - "@types/is-ci": "^3.0.0", - "@types/lodash": "^4.14.170", - "@types/markdown-magic": "^1.0.1", - "@types/mini-css-extract-plugin": "^1.4.3", - "@types/mocha": "^9.1.1", - "@types/node": "^20.14.12", - "@types/node-fetch": "^2.5.10", - "@types/tar-fs": "^2.0.0", - "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^7.11.0", - "@typescript-eslint/parser": "^7.11.0", - "@typescript-eslint/utils": "^7.11.0", - "babel-loader": "^8.2.2", - "chai": "^4.3.6", - "chalk": "^2.4.2", - "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^10.2.4", - "cross-env": "^7.0.3", - "css-loader": "^6.5.1", - "css-minimizer-webpack-plugin": "^3.4.1", - "dprint": "^0.40.2", - "eslint": "^8.56.0", - "eslint-config-google": "^0.14.0", - "eslint-import-resolver-typescript": "^3.5.2", - "eslint-plugin-deprecation": "^2.0.0", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-prefer-arrow": "^1.2.3", - "eslint-plugin-rulesdir": "^0.2.1", - "eslint-plugin-tsc": "^2.0.0", - "eslint-plugin-unicorn": "^44.0.2", - "fast-levenshtein": "^3.0.0", - "fork-ts-checker-webpack-plugin": "^9.0.2", - "fs-extra": "^10.1.0", - "html-webpack-plugin": "^5.5.0", - "husky": "^4.2.5", - "is-ci": "^3.0.1", - "jsdom-global": "^3.0.2", - "json5": "^2.2.2", - "jszip": "^3.7.1", - "lint-staged": "^10.0.8", - "markdown-magic": "^2.5.2", - "markdownlint-cli": "^0.31.1", - "mini-css-extract-plugin": "^1.6.0", - "mocha": "^11.7.1", - "node-fetch": "^3.2.10", - "npm-run-all": "^4.1.5", - "postcss": "^8.3.5", - "proxy-agent": "^6.5.0", - "recast": "^0.20.4", - "simple-git": "^3.27.0", - "style-loader": "^3.3.1", - "stylelint": "^14.8.2", - "stylelint-config-standard": "^25.0.0", - "tar-fs": "^2.1.1", - "ts-loader": "^9.3.0", - "ts-node": "^10.9.2", - "tsconfig-paths": "^3.9.0", - "typescript": "^5.1.6", - "webpack": "^5.101.0", - "webpack-cli": "^4.10.0", - "webpack-dev-server": "^5.2.1", - "webpack-merge": "^5.8.0" - }, - "engines": { - "node": ">=20.10.0" - }, - "stylelint": { - "extends": "stylelint-config-standard" - }, - "husky": { - "hooks": { - "pre-commit": "npm run lint-staged" - } - }, - "lint-staged": { - "*.css": "stylelint", - "*.{ts,js,cjs,mjs,json}": [ - "dprint check" - ], - "*.{js,cjs,mjs}": [ - "eslint" - ], - "*.ts": [ - "eslint --max-warnings=0 --plugin tsc --rule 'tsc/config: [2, {configFile: \"./tsconfig.eslint.json\"}]'" - ], - "*.md": "markdownlint", - "ui/(raidboss|oopsyraidsy)/data/**": [ - "node --loader=ts-node/esm test/test_data_files.ts" - ] - }, - "dependencies": { - "@fast-csv/parse": "^4.3.6", - "argparse": "^1.0.10", - "dexie": "^3.0.3", - "dexie-export-import": "^1.0.0", - "eventemitter3": "^4.0.7", - "inquirer": "^8.1.1", - "inquirer-fuzzy-path": "^2.3.0", - "lodash": "^4.14.170" - }, - "publishConfig": { - "access": "public" - } -} +{ + "name": "cactbot-build", + "version": "99.159.0", + "license": "Apache-2.0", + "type": "module", + "types": "./types", + "repository": { + "type": "git", + "url": "https://github.com/kshman/cactbot-build" + }, + "files": [ + "./ui", + "./types", + "./util", + "./resources", + "package.json" + ], + "scripts": { + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --progress --config webpack/webpack.prod.ts", + "build-gh-pages": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --config webpack/webpack.ghpages.ts", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --config webpack/webpack.dev.ts", + "fetch-deps": "node --loader=ts-node/esm ./util/fetch_deps.ts", + "tsc-no-emit": "tsc --noEmit", + "lint": "run-s lint:**", + "lint:dprint": "dprint check", + "lint:eslint": "eslint --max-warnings=0 ./", + "lintfix": "run-s lintfix:**", + "lintfix:dprint": "dprint fmt", + "lintfix:eslint": "eslint --max-warnings=0 --fix ./", + "stylelint": "stylelint \"resources/**/*.css\" \"ui/**/*.css\" \"user/**/*.css\" \"test/**/*.css\" \"util/**/*.css\"", + "stylelintfix": "stylelint --fix \"resources/**/*.css\" \"ui/**/*.css\" \"user/**/*.css\" \"test/**/*.css\" \"util/**/*.css\"", + "markdownlint": "markdownlint . --ignore node_modules --ignore publish --ignore plugin/ThirdParty", + "workflowlint": "yamllint -c .yamllint.yml .github/workflows/ && node .github/scripts/lint-workflow.cjs", + "test": "mocha", + "sync-files": "node --loader=ts-node/esm util/sync_files.ts && git diff --exit-code", + "lint-staged": "lint-staged", + "coverage-report": "node --loader=ts-node/esm util/gen_coverage_report.ts", + "util": "node --loader=ts-node/esm util/index.ts", + "find-translations": "npm run util -- findTranslations", + "translate-timeline": "npm run util -- translateTimeline", + "generate": "npm run util -- generate", + "query": "npm run util -- query", + "process-triggers": "node --loader=ts-node/esm util/process_triggers_folder.ts", + "generate-log-guide": "node --loader=ts-node/esm util/gen_log_guide.ts", + "update-logdefs": "node --loader=ts-node/esm util/update_logdefs.ts", + "validate-versions": "node --loader=ts-node/esm util/validate_versions.ts", + "release": "node --loader=ts-node/esm util/do_release.ts", + "version": "node --loader=ts-node/esm util/bump_version.ts" + }, + "devDependencies": { + "@actions/core": "^1.10.1", + "@actions/exec": "^1.1.1", + "@actions/github": "^6.0.1", + "@actions/http-client": "^1.0.11", + "@babel/core": "^7.14.5", + "@babel/preset-env": "^7.14.5", + "@babel/preset-typescript": "^7.14.5", + "@dprint/json": "^0.16.0", + "@dprint/typescript": "^0.75.0", + "@octokit/core": "^6.1.3", + "@octokit/plugin-paginate-rest": "^11.4.0", + "@types/argparse": "^1.0.38", + "@types/chai": "^4.3.1", + "@types/inquirer": "^9.0.7", + "@types/inquirer-fuzzy-path": "^2.3.9", + "@types/is-ci": "^3.0.0", + "@types/lodash": "^4.14.170", + "@types/markdown-magic": "^1.0.1", + "@types/mini-css-extract-plugin": "^1.4.3", + "@types/mocha": "^9.1.1", + "@types/node": "^20.14.12", + "@types/node-fetch": "^2.5.10", + "@types/tar-fs": "^2.0.0", + "@types/webpack": "^5.28.0", + "@typescript-eslint/eslint-plugin": "^7.11.0", + "@typescript-eslint/parser": "^7.11.0", + "@typescript-eslint/utils": "^7.11.0", + "babel-loader": "^8.2.2", + "chai": "^4.3.6", + "chalk": "^2.4.2", + "clean-webpack-plugin": "^4.0.0", + "copy-webpack-plugin": "^10.2.4", + "cross-env": "^7.0.3", + "css-loader": "^6.5.1", + "css-minimizer-webpack-plugin": "^3.4.1", + "dprint": "^0.40.2", + "eslint": "^8.56.0", + "eslint-config-google": "^0.14.0", + "eslint-import-resolver-typescript": "^3.5.2", + "eslint-plugin-deprecation": "^2.0.0", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-prefer-arrow": "^1.2.3", + "eslint-plugin-rulesdir": "^0.2.1", + "eslint-plugin-tsc": "^2.0.0", + "eslint-plugin-unicorn": "^44.0.2", + "fast-levenshtein": "^3.0.0", + "fork-ts-checker-webpack-plugin": "^9.0.2", + "fs-extra": "^10.1.0", + "html-webpack-plugin": "^5.5.0", + "husky": "^4.2.5", + "is-ci": "^3.0.1", + "jsdom-global": "^3.0.2", + "json5": "^2.2.2", + "jszip": "^3.7.1", + "lint-staged": "^10.0.8", + "markdown-magic": "^2.5.2", + "markdownlint-cli": "^0.31.1", + "mini-css-extract-plugin": "^1.6.0", + "mocha": "^11.7.1", + "node-fetch": "^3.2.10", + "npm-run-all": "^4.1.5", + "postcss": "^8.3.5", + "proxy-agent": "^6.5.0", + "recast": "^0.20.4", + "simple-git": "^3.27.0", + "style-loader": "^3.3.1", + "stylelint": "^14.8.2", + "stylelint-config-standard": "^25.0.0", + "tar-fs": "^2.1.1", + "ts-loader": "^9.3.0", + "ts-node": "^10.9.2", + "tsconfig-paths": "^3.9.0", + "typescript": "^5.1.6", + "webpack": "^5.101.0", + "webpack-cli": "^4.10.0", + "webpack-dev-server": "^5.2.1", + "webpack-merge": "^5.8.0" + }, + "engines": { + "node": ">=20.10.0" + }, + "stylelint": { + "extends": "stylelint-config-standard" + }, + "husky": { + "hooks": { + "pre-commit": "npm run lint-staged" + } + }, + "lint-staged": { + "*.css": "stylelint", + "*.{ts,js,cjs,mjs,json}": [ + "dprint check" + ], + "*.{js,cjs,mjs}": [ + "eslint" + ], + "*.ts": [ + "eslint --max-warnings=0 --plugin tsc --rule 'tsc/config: [2, {configFile: \"./tsconfig.eslint.json\"}]'" + ], + "*.md": "markdownlint", + "ui/(raidboss|oopsyraidsy)/data/**": [ + "node --loader=ts-node/esm test/test_data_files.ts" + ] + }, + "dependencies": { + "@fast-csv/parse": "^4.3.6", + "argparse": "^1.0.10", + "dexie": "^3.0.3", + "dexie-export-import": "^1.0.0", + "eventemitter3": "^4.0.7", + "inquirer": "^8.1.1", + "inquirer-fuzzy-path": "^2.3.0", + "lodash": "^4.14.170" + }, + "publishConfig": { + "access": "public" + } +} diff --git a/plugin/CactbotEventSource/Properties/AssemblyInfo.cs b/plugin/CactbotEventSource/Properties/AssemblyInfo.cs index 54fda7f5..cc078ecc 100644 --- a/plugin/CactbotEventSource/Properties/AssemblyInfo.cs +++ b/plugin/CactbotEventSource/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ // - Revision // GitHub has only 3 version components, so Revision should always be 0. // CactbotOverlay and CactbotEventSource version should match. -[assembly: AssemblyVersion("99.158.0.0")] -[assembly: AssemblyFileVersion("99.158.0.0")] +[assembly: AssemblyVersion("99.159.0.0")] +[assembly: AssemblyFileVersion("99.159.0.0")] diff --git a/plugin/CactbotOverlay/Properties/AssemblyInfo.cs b/plugin/CactbotOverlay/Properties/AssemblyInfo.cs index c50553d8..78a19df7 100644 --- a/plugin/CactbotOverlay/Properties/AssemblyInfo.cs +++ b/plugin/CactbotOverlay/Properties/AssemblyInfo.cs @@ -20,5 +20,5 @@ // - Build Number // - Revision // GitHub has only 3 version components, so Revision should always be 0. -[assembly: AssemblyVersion("99.158.0.0")] -[assembly: AssemblyFileVersion("99.158.0.0")] +[assembly: AssemblyVersion("99.159.0.0")] +[assembly: AssemblyFileVersion("99.159.0.0")] diff --git a/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts b/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts index feb04e9c..edd9aae3 100644 --- a/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts +++ b/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts @@ -1234,17 +1234,21 @@ const triggerSet: TriggerSet = { // 5 bombs drop, and then a 6th later. // They all drop on one half of the arena, and then 3 on one half and 2 on the other. // e.g. all 5 drop on north half, 3 on west half, 2 on east half. - const numDir = [0, 0, 0, 0]; // north, east, south, west + let n0 = 0; + let n1 = 0; + let n2 = 0; + let n3 = 0; for (const bomb of bombs) { if (bomb.y < centerY) - numDir[0]++; + n0++; else - numDir[2]++; + n2++; if (bomb.x < centerX) - numDir[3]++; + n3++; else - numDir[1]++; + n1++; } + const numDir = [n0, n1, n2, n3]; // north, east, south, west for (let idx = 0; idx < numDir.length; ++idx) { if (numDir[idx] !== 5)