Skip to content

Added Active as a usage type to CombatStyle #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lector wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added Active as a usage type to CombatStyle #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e22d3d5
Added Active as a usage type
Lector Jun 22, 2026
df7acba
Separated usage type from combatstyle and combatSA
Lector Jun 23, 2026
5d304ed
prettier
Lector Jun 23, 2026
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
1 change: 1 addition & 0 deletions src/types/Locale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,6 +1428,7 @@ export const Locale = DB.Entity(import.meta.url, {
"Aspect": null,
"As chosen": null,
"Passive": null,
"Active": null,

@elyukai elyukai Jun 23, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sehr nice, danke!

"Basic Maneuver": null,
"Special Maneuver": null,
"Volume": null,
Expand Down
16 changes: 15 additions & 1 deletion src/types/_ActivatableCombat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,25 @@ const CombatSpecialAbilityUsageType = DB.Enum(import.meta.url, {
}),
})

export const usage_type = DB.Required({
const CombatStyleUsageType = DB.Enum(import.meta.url, {
name: "CombatSpecialAbilityTypeUsageType",
comment: "The definition of how the combat special ability style can be used in combat.",
values: () => ({
Passive: DB.EnumCase({ type: null }),
Active: DB.EnumCase({ type: null }),
}),
})

export const special_ability_usage_type = DB.Required({
comment: "The definition of how the combat special ability can be used in combat.",
type: DB.IncludeIdentifier(CombatSpecialAbilityUsageType),
})

export const style_usage_type = DB.Required({
comment: "The definition of how the combat style can be used in combat.",
type: DB.IncludeIdentifier(CombatStyleUsageType),
})

const CombatSpecialAbilityType = DB.Enum(import.meta.url, {
name: "CombatSpecialAbilityType",
comment:
Expand Down
4 changes: 2 additions & 2 deletions src/types/specialAbility/AdvancedCombatSpecialAbility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as DB from "tsondb/schema/dsl"
import { input, levels, maximum, name, name_in_library, rules } from "../_Activatable.js"
import { ap_value, ap_value_append, ap_value_l10n } from "../_ActivatableAdventurePointsValue.js"
import { combat_techniques, penalty, usage_type } from "../_ActivatableCombat.js"
import { combat_techniques, penalty, special_ability_usage_type } from "../_ActivatableCombat.js"
import { activatableDisplayNameCustomizer, nameBuilderRules } from "../_ActivatableNames.ts"
import { explicit_select_options, select_options } from "../_ActivatableSelectOptions.js"
import { skill_applications, skill_uses } from "../_ActivatableSkillApplicationsAndUses.js"
Expand All @@ -18,7 +18,7 @@ export const AdvancedCombatSpecialAbility = DB.Entity(import.meta.url, {
DB.Object({
levels,
nameBuilderRules,
usage_type,
special_ability_usage_type,
select_options,
explicit_select_options,
skill_applications,
Expand Down
4 changes: 2 additions & 2 deletions src/types/specialAbility/BrawlingSpecialAbility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as DB from "tsondb/schema/dsl"
import { levels, maximum, name, name_in_library, rules } from "../_Activatable.js"
import { ap_value, ap_value_append, ap_value_l10n } from "../_ActivatableAdventurePointsValue.js"
import { combat_techniques, usage_type } from "../_ActivatableCombat.js"
import { combat_techniques, special_ability_usage_type } from "../_ActivatableCombat.js"
import { activatableDisplayNameCustomizer, nameBuilderRules } from "../_ActivatableNames.ts"
import { explicit_select_options, select_options } from "../_ActivatableSelectOptions.js"
import { GeneralPrerequisites } from "../_Prerequisite.js"
Expand All @@ -16,7 +16,7 @@ export const BrawlingSpecialAbility = DB.Entity(import.meta.url, {
DB.Object({
levels,
nameBuilderRules,
usage_type,
special_ability_usage_type,
select_options,
explicit_select_options,
maximum,
Expand Down
9 changes: 7 additions & 2 deletions src/types/specialAbility/CombatSpecialAbility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import * as DB from "tsondb/schema/dsl"
import { input, levels, maximum, name, name_in_library, rules } from "../_Activatable.js"
import { ap_value, ap_value_append, ap_value_l10n } from "../_ActivatableAdventurePointsValue.js"
import { combat_techniques, penalty, penalty_l10n, usage_type } from "../_ActivatableCombat.js"
import {
combat_techniques,
penalty,
penalty_l10n,
special_ability_usage_type,
} from "../_ActivatableCombat.js"
import { activatableDisplayNameCustomizer, nameBuilderRules } from "../_ActivatableNames.ts"
import { explicit_select_options, select_options } from "../_ActivatableSelectOptions.js"
import { skill_applications, skill_uses } from "../_ActivatableSkillApplicationsAndUses.js"
Expand All @@ -17,7 +22,7 @@ export const CombatSpecialAbility = DB.Entity(import.meta.url, {
DB.Object({
levels,
nameBuilderRules,
usage_type,
special_ability_usage_type,
select_options,
explicit_select_options,
skill_applications,
Expand Down
6 changes: 3 additions & 3 deletions src/types/specialAbility/CombatStyleSpecialAbility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as DB from "tsondb/schema/dsl"
import { levels, maximum, name, name_in_library, rules } from "../_Activatable.js"
import { advanced } from "../_ActivatableAdvanced.js"
import { ap_value, ap_value_append, ap_value_l10n } from "../_ActivatableAdventurePointsValue.js"
import { combat_techniques, penalty, type, usage_type } from "../_ActivatableCombat.js"
import { activatableDisplayNameCustomizer, nameBuilderRules } from "../_ActivatableNames.ts"
import { combat_techniques, penalty, type, style_usage_type } from "../_ActivatableCombat.js"
import { activatableDisplayNameCustomizer, nameBuilderRules } from "../_ActivatableNames.js"
import { explicit_select_options, select_options } from "../_ActivatableSelectOptions.js"
import { skill_applications, skill_uses } from "../_ActivatableSkillApplicationsAndUses.js"
import { AdvancedCombatSpecialAbilityIdentifier } from "../_Identifier.js"
Expand All @@ -19,7 +19,7 @@ export const CombatStyleSpecialAbility = DB.Entity(import.meta.url, {
DB.Object({
levels,
nameBuilderRules,
usage_type,
style_usage_type,
type,
select_options,
explicit_select_options,
Expand Down
4 changes: 2 additions & 2 deletions src/types/specialAbility/CommandSpecialAbility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as DB from "tsondb/schema/dsl"
import { levels, maximum, name, name_in_library, rules } from "../_Activatable.js"
import { ap_value, ap_value_append, ap_value_l10n } from "../_ActivatableAdventurePointsValue.js"
import { combat_techniques, usage_type } from "../_ActivatableCombat.js"
import { combat_techniques, special_ability_usage_type } from "../_ActivatableCombat.js"
import { activatableDisplayNameCustomizer, nameBuilderRules } from "../_ActivatableNames.ts"
import { explicit_select_options, select_options } from "../_ActivatableSelectOptions.js"
import { GeneralPrerequisites } from "../_Prerequisite.js"
Expand All @@ -16,7 +16,7 @@ export const CommandSpecialAbility = DB.Entity(import.meta.url, {
DB.Object({
levels,
nameBuilderRules,
usage_type,
special_ability_usage_type,
select_options,
explicit_select_options,
maximum,
Expand Down
Loading