feat(combat): implement CombatAction data model with 19 properties #328

Merged

freemo merged 5 commits from feature/m4-combat-action into master 2026-04-01 20:36:33 +00:00

Conversation 0 Commits 5 Files changed 12 +2143 -69

freemo commented 2026-03-23 05:29:25 +00:00

Owner

Copy link

Summary

Implements Issue #269: CombatAction data model as a frozen value object with all 19 properties defined in the Deterministic Combat System specification.

Changes

• Created lib/aethyr/core/combat/combat_action.rb with CombatAction class
• All 19 properties implemented with proper types and validation:
  • id (String, required)
  • action_type (Symbol, required)
  • actor_id (String, required)
  • target_id (String, optional)
  • body_zone (Symbol, optional)
  • damage_type (Symbol, optional)
  • base_damage (Integer, default 0)
  • ap_cost (Integer, default 1)
  • reach (Integer, default 1)
  • telegraph_rounds (Integer, default 0)
  • cooldown_rounds (Integer, default 0)
  • stamina_cost (Integer, default 0)
  • requires_weapon (Boolean, default false)
  • requires_shield (Boolean, default false)
  • combo_chain (Array, default [])
  • status_effects (Array, default [])
  • animation_id (String, optional)
  • sound_id (String, optional)
  • metadata (Hash, default {})
• Immutable design with freeze after initialization
• Type validation with descriptive error messages
• Factory method CombatAction.build for convenient construction
• Full BDD test coverage with Cucumber/Gherkin

Testing

• 67 unit test scenarios (198 steps) - ALL PASSING
• 3 integration test scenarios (10 steps) - ALL PASSING
• RuboCop passes with no new violations

Closes

Closes #269

## Summary Implements Issue #269: CombatAction data model as a frozen value object with all 19 properties defined in the Deterministic Combat System specification. ## Changes - Created `lib/aethyr/core/combat/combat_action.rb` with CombatAction class - All 19 properties implemented with proper types and validation: - id (String, required) - action_type (Symbol, required) - actor_id (String, required) - target_id (String, optional) - body_zone (Symbol, optional) - damage_type (Symbol, optional) - base_damage (Integer, default 0) - ap_cost (Integer, default 1) - reach (Integer, default 1) - telegraph_rounds (Integer, default 0) - cooldown_rounds (Integer, default 0) - stamina_cost (Integer, default 0) - requires_weapon (Boolean, default false) - requires_shield (Boolean, default false) - combo_chain (Array, default []) - status_effects (Array, default []) - animation_id (String, optional) - sound_id (String, optional) - metadata (Hash, default {}) - Immutable design with `freeze` after initialization - Type validation with descriptive error messages - Factory method `CombatAction.build` for convenient construction - Full BDD test coverage with Cucumber/Gherkin ## Testing - 67 unit test scenarios (198 steps) - ALL PASSING - 3 integration test scenarios (10 steps) - ALL PASSING - RuboCop passes with no new violations ## Closes Closes #269

freemo added this to the v1.3.0 milestone 2026-03-23 05:29:25 +00:00

freemo added the

Type/Feature

label 2026-03-23 05:29:25 +00:00

freemo referenced this pull request 2026-03-23 05:29:35 +00:00

Implement CombatAction data model with 19 properties #269

freemo force-pushed feature/m4-combat-action from 9911e6aa5d to c6b1d7a4e2 2026-03-24 17:25:08 +00:00 Compare

freemo force-pushed feature/m4-combat-action from c6b1d7a4e2 to bf634a417d 2026-03-31 03:25:20 +00:00 Compare

freemo force-pushed feature/m4-combat-action from bf634a417d to deea54cc22 2026-03-31 19:36:34 +00:00 Compare

freemo force-pushed feature/m4-combat-action from deea54cc22 to 599df2cc97 2026-03-31 21:13:40 +00:00 Compare

freemo force-pushed feature/m4-combat-action from 599df2cc97 to 6b4284319e 2026-04-01 00:21:20 +00:00 Compare

freemo force-pushed feature/m4-combat-action from 6b4284319e to 1f3419f051 2026-04-01 01:18:04 +00:00 Compare

freemo force-pushed feature/m4-combat-action from 1f3419f051 to f65e9f9943 2026-04-01 01:53:27 +00:00 Compare

freemo added 1 commit 2026-04-01 04:47:55 +00:00

fix: restore config.yaml and preserve Combat namespace in test stubs ... e5fc1befe8

- Revert config.yaml address from '7' to 127.0.0.1 (fixes server startup)
- Revert config.yaml log_level and start_room to master values
- Fix Combat namespace stubbing in test step definitions to preserve
  existing module contents (CombatAction, ShieldResolver, etc.)
  instead of replacing Aethyr::Core::Combat with an empty stub
- Affected files: slash_steps, kick_command_steps, punch_command_steps,
  simple_block_steps, simple_dodge_steps

freemo added 1 commit 2026-04-01 05:30:26 +00:00

fix: guard against duplicate ParameterType registration in shield_moves_steps ... a47d298725

The shield_moves_steps.rb and lifecycle_hooks_steps.rb both define
a 'symbol' ParameterType. Wrap the definitions in begin/rescue to
handle the case where another step file has already registered them.

freemo merged commit a47d298725 into master 2026-04-01 20:36:33 +00:00

freemo deleted branch feature/m4-combat-action 2026-04-01 20:36:34 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Blocked

Cannot proceed, depends on unresolved issue

  

Duplicate

Issue is a duplicate of an existing one

  

MoSCoW/Could Have

Desirable but not necessary, included if time permits

  

MoSCoW/Must Have

Essential, project cannot ship without it

  

MoSCoW/Should Have

Important but not strictly essential

  

Points/1

Estimated effort: 1 story points

  

Points/13

Estimated effort: 13 story points

  

Points/2

Estimated effort: 2 story points

  

Points/21

Estimated effort: 21 story points

  

Points/3

Estimated effort: 3 story points

  

Points/5

Estimated effort: 5 story points

  

Points/8

Estimated effort: 8 story points

  

Priority/Backlog

Not yet prioritized

  

Priority/Critical

Must be addressed immediately

  

Priority/High

Important, should be completed soon

  

Priority/Low

Nice to have, not time-sensitive

  

Priority/Medium

Normal priority, valid and should be addressed

  

State/Completed

Issue resolved and all PRs merged

  

State/In progress

Someone is actively working on this issue

  

State/In review

Implementation complete, PR submitted for review

  

State/Paused

Work temporarily suspended, typically blocked

  

State/Unverified

Issue created but not yet reviewed by a maintainer

  

State/Verified

Maintainer confirmed valid and actionable

  

State/Wont Do

Deliberate decision not to address this issue

  

Type/Bug

A defect in existing functionality

  

Type/Epic

Large body of work broken into multiple issues

  

Type/Feature

A new capability or user story

  

Type/Legendary

Major strategic pillar composed of multiple Epics

  

Type/Task

Technical or administrative work (not bug or feature)

  

Type/Testing

Test-only work item (TDD, test infrastructure, coverage)

No labels

Blocked

Duplicate

MoSCoW/Could Have

MoSCoW/Must Have

MoSCoW/Should Have

Points/1

Points/13

Points/2

Points/21

Points/3

Points/5

Points/8

Priority/Backlog

Priority/Critical

Priority/High

Priority/Low

Priority/Medium

State/Completed

State/In progress

State/In review

State/Paused

State/Unverified

State/Verified

State/Wont Do

Type/Bug

Type/Epic

Type/Feature

Type/Legendary

Type/Task

Type/Testing

Milestone

Clear milestone

No items

No milestone

v1.3.0

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

aethyr/Aethyr!328

No description provided.