Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"ignorePaths": [
"**/node_modules/**",
"**/vscode-extension/**",
"**/.git/**",
"**/.pnpm-lock.json",
".vscode",
"megalinter",
"package-lock.json",
"report"
],
"language": "en",
"noConfigSearch": true,
"words": ["megalinter", "oxsecurity"],
"version": "0.2"
}
226 changes: 226 additions & 0 deletions .github/workflows/mega-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
# MegaLinter GitHub Action configuration file
# More info at https://megalinter.io
---
name: MegaLinter

# Trigger mega-linter at every push. Action will also be visible from
# Pull Requests to main
on:
# Comment this line to trigger action only on pull-requests
# (not recommended if you don't pay for GH Actions)
push:

pull_request:
branches:
- main
- master

# Comment env block if you do not want to apply fixes
env:
# Apply linter fixes configuration
#
# When active, APPLY_FIXES must also be defined as environment variable
# (in github/workflows/mega-linter.yml or other CI tool)
APPLY_FIXES: none

# Decide which event triggers application of fixes in a commit or a PR
# (pull_request, push, all)
APPLY_FIXES_EVENT: pull_request

# If APPLY_FIXES is used, defines if the fixes are directly committed (commit)
# or posted in a PR (pull_request)
APPLY_FIXES_MODE: commit

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

permissions: {}

jobs:
megalinter:
name: MegaLinter
runs-on: ubuntu-latest

# Give the default GITHUB_TOKEN write permission to commit and push, comment
# issues, and post new Pull Requests; remove the ones you do not need
permissions:
contents: write
issues: write
pull-requests: write

steps:
# Git Checkout
- name: Checkout Code
uses: actions/checkout@v6
with:
# SECURITY NOTE: Using a Personal Access Token (PAT) is NOT
# recommended. Open-source projects have been heavily targeted by
# supply-chain attacks in recent months, and a leaked PAT can give
# attackers broad write access to your repository — better safe
# than sorry! If you only need workflows to re-trigger after
# MegaLinter applies fixes, prefer one of these safer alternatives:
# - Manually re-run the workflow from the GitHub Actions tab, or
# - Push another commit on the branch to trigger workflows again.
# Only define `secrets.PAT` if you fully understand the trade-off.
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
persist-credentials: false # Comment this line and uncomment the next one if you use APPLY_FIXES
# persist-credentials: true # zizmor: ignore[artipacked]

# If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to
# improve performance
fetch-depth: 0

# MegaLinter
- name: MegaLinter

# You can override MegaLinter flavor used to have faster performances
# More info at https://megalinter.io/latest/flavors/
uses: oxsecurity/megalinter/flavors/javascript@v9

id: ml

# All available variables are described in documentation
# https://megalinter.io/latest/config-file/
env:
# Validates all source when push on main, else just the git diff with
# main. Override with true if you always want to lint all sources
#
# To validate the entire codebase, set to:
# VALIDATE_ALL_CODEBASE: true
#
# To validate only diff with main, set to:
# VALIDATE_ALL_CODEBASE: >-
# ${{
# github.event_name == 'push' &&
# github.ref == 'refs/heads/main'
# }}
VALIDATE_ALL_CODEBASE: true

# Disable LLM Advisor for bot PRs (dependabot, renovate, etc.)
LLM_ADVISOR_ENABLED: >-
${{
github.event_name != 'pull_request' ||
(github.event.pull_request.user.login != 'dependabot[bot]' &&
github.event.pull_request.user.login != 'renovate[bot]' &&
github.event.pull_request.user.login != 'github-actions[bot]' &&
!startsWith(github.event.pull_request.user.login, 'dependabot') &&
!startsWith(github.event.pull_request.user.login, 'renovate'))
}}

GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Uncomment to use ApiReporter (Grafana)
# API_REPORTER: true
# API_REPORTER_URL: ${{ secrets.API_REPORTER_URL }}
# API_REPORTER_BASIC_AUTH_USERNAME: ${{ secrets.API_REPORTER_BASIC_AUTH_USERNAME }}
# API_REPORTER_BASIC_AUTH_PASSWORD: ${{ secrets.API_REPORTER_BASIC_AUTH_PASSWORD }}
# API_REPORTER_METRICS_URL: ${{ secrets.API_REPORTER_METRICS_URL }}
# API_REPORTER_METRICS_BASIC_AUTH_USERNAME: ${{ secrets.API_REPORTER_METRICS_BASIC_AUTH_USERNAME }}
# API_REPORTER_METRICS_BASIC_AUTH_PASSWORD: ${{ secrets.API_REPORTER_METRICS_BASIC_AUTH_PASSWORD }}
# API_REPORTER_DEBUG: false

# ADD YOUR CUSTOM ENV VARIABLES HERE TO OVERRIDE VALUES OF
# .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY

# Upload MegaLinter artifacts
- name: Archive production artifacts
uses: actions/upload-artifact@v7
if: success() || failure()
with:
name: MegaLinter reports
include-hidden-files: "true"
path: |
megalinter-reports
mega-linter.log

# Create pull request if applicable
# (for now works only on PR from same repository, not from forks)
- name: Create Pull Request with applied fixes
uses: peter-evans/create-pull-request@v7
id: cpr
if: >-
steps.ml.outputs.has_updated_sources == 1 &&
(
env.APPLY_FIXES_EVENT == 'all' ||
env.APPLY_FIXES_EVENT == github.event_name
) &&
env.APPLY_FIXES_MODE == 'pull_request' &&
(
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == github.repository
) &&
!contains(github.event.head_commit.message, 'skip fix')
with:
# SECURITY NOTE: see the warning on the checkout step above —
# using `secrets.PAT` is NOT recommended for security reasons.
# Prefer manually re-running the workflow or pushing another
# commit on the branch to trigger workflows again.
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
commit-message: "[MegaLinter] Apply linters automatic fixes"
title: "[MegaLinter] Apply linters automatic fixes"
labels: bot

- name: Create PR output
if: >-
steps.ml.outputs.has_updated_sources == 1 &&
(
env.APPLY_FIXES_EVENT == 'all' ||
env.APPLY_FIXES_EVENT == github.event_name
) &&
env.APPLY_FIXES_MODE == 'pull_request' &&
(
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == github.repository
) &&
!contains(github.event.head_commit.message, 'skip fix')
env:
PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}
PR_URL: ${{ steps.cpr.outputs.pull-request-url }}
run: |
echo "PR Number - ${PR_NUMBER}"
echo "PR URL - ${PR_URL}"

# Push new commit if applicable
# (for now works only on PR from same repository, not from forks)
- name: Prepare commit
if: >-
steps.ml.outputs.has_updated_sources == 1 &&
(
env.APPLY_FIXES_EVENT == 'all' ||
env.APPLY_FIXES_EVENT == github.event_name
) &&
env.APPLY_FIXES_MODE == 'commit' &&
github.ref != 'refs/heads/main' &&
(
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == github.repository
) &&
!contains(github.event.head_commit.message, 'skip fix')
run: sudo chown -Rc $UID .git/

- name: Commit and push applied linter fixes
uses: stefanzweifel/git-auto-commit-action@v7
if: >-
steps.ml.outputs.has_updated_sources == 1 &&
(
env.APPLY_FIXES_EVENT == 'all' ||
env.APPLY_FIXES_EVENT == github.event_name
) &&
env.APPLY_FIXES_MODE == 'commit' &&
github.ref != 'refs/heads/main' &&
(
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == github.repository
) &&
!contains(github.event.head_commit.message, 'skip fix')
with:
branch: >-
${{
github.event.pull_request.head.ref ||
github.head_ref ||
github.ref
}}
commit_message: "[MegaLinter] Apply linters fixes"
commit_user_name: megalinter-bot
commit_user_email: 129584137+megalinter-bot@users.noreply.github.com
15 changes: 15 additions & 0 deletions .jscpd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"threshold": 0,
"reporters": ["html", "markdown"],
"ignore": [
"**/node_modules/**",
"**/.git/**",
"**/.rbenv/**",
"**/.venv/**",
"**/*cache*/**",
"**/.github/**",
"**/.idea/**",
"**/report/**",
"**/*.svg"
]
}
24 changes: 24 additions & 0 deletions .mega-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Configuration file for MegaLinter
#
# See all available variables at https://megalinter.io/latest/config-file/ and in
# linters documentation
---
# all, none, or list of linter keys
APPLY_FIXES: none

# If you use ENABLE variable, all other languages/formats/tooling-formats will
# be disabled by default
# ENABLE:

# If you use ENABLE_LINTERS variable, all other linters will be disabled by
# default
# ENABLE_LINTERS:

# DISABLE:
# - COPYPASTE # Uncomment to disable checks of excessive copy-pastes
# - SPELL # Uncomment to disable checks of spelling mistakes

SHOW_ELAPSED_TIME: true

# Uncomment if you want MegaLinter to detect errors but not block CI to pass
# DISABLE_ERRORS: true
28 changes: 28 additions & 0 deletions src/classes/components/_equipmentUtils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { CompendiumStore } from '@/features/compendium/store'
import { CompendiumItem } from '../CompendiumItem'
import { MechEquipment } from '../mech/components/equipment/MechEquipment'

export function resolveSpecialEquipment(ids: string[]): CompendiumItem[] {
if (!ids) return []
const res = ids.map(x => {
const w = CompendiumStore().MechWeapons.find(item => item.ID === x)
if (w) return w
const s = CompendiumStore().MechSystems.find(item => item.ID === x)
if (s) return s
const wm = CompendiumStore().WeaponMods.find(item => item.ID === x)
if (wm) return wm
const pg = CompendiumStore().PilotGear.find((item: any) => item.ID === x)
if (pg) return pg
return false
})
return res as CompendiumItem[]
}

export function resolveIntegratedEquipment(ids: string[]): MechEquipment[] {
if (!ids) return []
return ids.map(x => {
const w = CompendiumStore().MechWeapons.find(item => item.ID === x)
if (w) return w as MechEquipment
return CompendiumStore().MechSystems.find(item => item.ID === x) as MechEquipment
}) as MechEquipment[]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { ActiveEffect, IActiveEffectData } from './ActiveEffect'

interface IActiveEffectCallbackData {
on_miss?: string | IActiveEffectData
on_attack?: string | IActiveEffectData
on_hit?: string | IActiveEffectData
on_crit?: string | IActiveEffectData
}

interface IActiveEffectCallbackTarget {
OnMiss?: ActiveEffect
OnAttack?: ActiveEffect
OnHit?: ActiveEffect
OnCrit?: ActiveEffect
}

export function initActiveEffectCallbacks(
data: IActiveEffectCallbackData,
target: IActiveEffectCallbackTarget,
owner: any
): void {
if (data.on_miss) {
if (typeof data.on_miss === 'string')
target.OnMiss = new ActiveEffect({ name: 'On Miss Effect', detail: data.on_miss }, owner)
else target.OnMiss = new ActiveEffect(data.on_miss, owner)
}
if (data.on_attack) {
if (typeof data.on_attack === 'string')
target.OnAttack = new ActiveEffect({ name: 'On Attack Effect', detail: data.on_attack }, owner)
else target.OnAttack = new ActiveEffect(data.on_attack, owner)
}
if (data.on_hit) {
if (typeof data.on_hit === 'string')
target.OnHit = new ActiveEffect({ name: 'On Hit Effect', detail: data.on_hit }, owner)
else target.OnHit = new ActiveEffect(data.on_hit, owner)
}
if (data.on_crit) {
if (typeof data.on_crit === 'string')
target.OnCrit = new ActiveEffect({ name: 'On Crit Effect', detail: data.on_crit }, owner)
else target.OnCrit = new ActiveEffect(data.on_crit, owner)
}
}
22 changes: 2 additions & 20 deletions src/classes/mech/components/equipment/WeaponMod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
ActiveEffect,
IActiveEffectData,
} from '@/classes/components/feature/active_effects/ActiveEffect'
import { initActiveEffectCallbacks } from '@/classes/components/feature/active_effects/_activeEffectUtils'

interface IWeaponModData extends IMechEquipmentData {
allowed_types?: WeaponType[]
Expand Down Expand Up @@ -62,26 +63,7 @@ class WeaponMod extends MechEquipment {

this.AddedRange = data.added_range ? data.added_range.map(x => new Range(x)) : []

if (data.on_miss) {
if (typeof data.on_miss === 'string')
this.OnMiss = new ActiveEffect({ name: 'On Miss Effect', detail: data.on_miss }, this)
else this.OnMiss = new ActiveEffect(data.on_miss, this)
}
if (data.on_attack) {
if (typeof data.on_attack === 'string')
this.OnAttack = new ActiveEffect({ name: 'On Attack Effect', detail: data.on_attack }, this)
else this.OnAttack = new ActiveEffect(data.on_attack, this)
}
if (data.on_hit) {
if (typeof data.on_hit === 'string')
this.OnHit = new ActiveEffect({ name: 'On Hit Effect', detail: data.on_hit }, this)
else this.OnHit = new ActiveEffect(data.on_hit, this)
}
if (data.on_crit) {
if (typeof data.on_crit === 'string')
this.OnCrit = new ActiveEffect({ name: 'On Crit Effect', detail: data.on_crit }, this)
else this.OnCrit = new ActiveEffect(data.on_crit, this)
}
initActiveEffectCallbacks(data, this, this)

this.ItemType = ItemType.WeaponMod
}
Expand Down
Loading