feat(combat): implement unarmed combat attack actions #333

Merged

freemo merged 4 commits from feature/m4-unarmed-attacks into master 2026-04-03 18:19:40 +00:00

Conversation 0 Commits 4 Files changed 14 +493 -374

freemo commented 2026-03-23 05:52:16 +00:00

Owner

Copy link

Summary

• Implement 13 unarmed combat actions for the deterministic combat system
• Actions include Jab, Hook, Punch, Kick, Uppercut, Knee Strike, Roundhouse Kick, Elbow Strike, Flurry, Headbutt, Grapple, Grab, Push
• Each action uses CombatAction with all 19 properties
• Includes unit and integration tests

Resolves #279

## Summary - Implement 13 unarmed combat actions for the deterministic combat system - Actions include Jab, Hook, Punch, Kick, Uppercut, Knee Strike, Roundhouse Kick, Elbow Strike, Flurry, Headbutt, Grapple, Grab, Push - Each action uses CombatAction with all 19 properties - Includes unit and integration tests Resolves #279

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

freemo added the

Type/Feature

label 2026-03-23 05:52:16 +00:00

freemo added 1 commit 2026-03-23 05:52:17 +00:00

feat(combat): implement unarmed combat attack actions ... 239e1f8371

Implement 13 unarmed combat actions for the deterministic combat system:
- Basic strikes (Level 1): Jab, Hook, Punch, Kick, Grab, Push
- Power strikes (Level 5): Uppercut, Knee Strike
- Advanced strikes (Level 10): Roundhouse Kick, Elbow Strike
- Expert techniques (Level 15): Flurry, Headbutt
- Master techniques (Level 20): Grapple

Each action uses the CombatAction class with all 19 properties including:
- AP costs (1-3), delays (0-1), damage values
- Pattern-based movement on the body grid
- Skill level requirements (unarmed 1-20)
- Equipment requirements (empty hands)
- Tags for categorization (attack, multi_strike, reposition)

Includes unit and integration tests covering:
- Action property verification
- Skill-gated availability
- Multi-strike behavior (sustained vs interrupted momentum)
- Pattern projection

Resolves #279

freemo force-pushed feature/m4-unarmed-attacks from 239e1f8371 to 4b4475e8f4 2026-03-31 19:49:16 +00:00 Compare

freemo force-pushed feature/m4-unarmed-attacks from 4b4475e8f4 to c8584672a0 2026-03-31 21:13:49 +00:00 Compare

freemo force-pushed feature/m4-unarmed-attacks from c8584672a0 to a41dabae58 2026-04-01 00:53:34 +00:00 Compare

freemo force-pushed feature/m4-unarmed-attacks from a41dabae58 to f3f516f29a 2026-04-01 01:18:12 +00:00 Compare

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

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

- 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:58:54 +00:00

fix: add CombatAction unit and integration tests for coverage ... c1bb788509

The unarmed.rb module requires combat_action.rb (718 lines), which
needs dedicated test coverage to meet the 97% unit test threshold.
Add the CombatAction feature and step definitions to ensure coverage.

freemo added 1 commit 2026-04-01 06:07:07 +00:00

fix: resolve duplicate step definition in integration tests ... 13d7839718

Rename 'the deserialized action should match the original' to
'the deserialized unarmed action should match the original' in
unarmed integration tests to avoid conflict with combat_action steps.

freemo force-pushed feature/m4-unarmed-attacks from 13d7839718 to a03fc752fa 2026-04-01 21:58:01 +00:00 Compare

freemo added 1 commit 2026-04-02 02:55:34 +00:00

fix: resolve CombatAction class conflicts, duplicate steps, and coverage warmup gaps ... 77f693b57f

- Remove duplicate CombatAction class definitions from one_handed.rb,
  two_handed.rb that conflicted with the canonical combat_action.rb class
- Rename shield.rb's CombatAction to ShieldAction to avoid namespace collision
- Update unarmed.rb to use fully qualified Aethyr::Core::Combat::CombatAction
- Add max_damage method to canonical CombatAction for two_handed test compat
- Fix 3x duplicate 'the combat system is initialized' Cucumber step definitions
  across integration tests (multi_strike, two_handed, unarmed)
- Expand SimpleCov warmup in env.rb to cover ~100 additional files that were
  loaded before SimpleCov started, fixing coverage tracking from 73.95% to 97.36%

All CI gates now pass:
- lint (standardrb): exit 0
- type_check (srb tc): no errors
- unit_tests: 4274 scenarios passed, 97.36% coverage (>97% threshold)
- integration_tests: 158 scenarios passed, 45.53% coverage (>35% threshold)

freemo added 1 commit 2026-04-02 05:42:21 +00:00

fix: correct array alignment in env.rb for StandardRB lint compliance ... 73f7938236

Multi-line %w[] arrays must use bracket-style alignment (opening %w[
on its own line) to satisfy Layout/ArrayAlignment cop.

freemo added 1 commit 2026-04-02 07:48:58 +00:00

ci: retrigger CI run (integration test flaky failure) 6a07827965

freemo merged commit 6a07827965 into master 2026-04-03 18:19:40 +00:00

freemo deleted branch feature/m4-unarmed-attacks 2026-04-03 18:19:41 +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#333

No description provided.