feat(combat): implement shield sweep blocking system #329

Merged

freemo merged 4 commits from feature/m4-shield-sweep into master 2026-04-01 20:36:56 +00:00

Conversation 0 Commits 4 Files changed 16 +671 -27

freemo commented 2026-03-23 05:37:01 +00:00

Owner

Copy link

Summary

• Implements ShieldResolver class for shield sweep blocking mechanics
• Shield sweeps trace a path and block strikes on any cell traversed
• Shield resolution runs before attack resolution
• Updates shield hand position after sweep

Changes

• Added lib/aethyr/core/combat/shield_resolver.rb
• Added unit tests: tests/unit/shield_sweep.feature (12 scenarios)
• Added integration tests: tests/integration/shield_sweep.feature (7 scenarios)

Testing

All tests pass:

• Unit tests: 12 scenarios, 91 steps
• Integration tests: 7 scenarios, 55 steps
• RuboCop: No offenses detected

Closes #271

## Summary - Implements ShieldResolver class for shield sweep blocking mechanics - Shield sweeps trace a path and block strikes on any cell traversed - Shield resolution runs before attack resolution - Updates shield hand position after sweep ## Changes - Added `lib/aethyr/core/combat/shield_resolver.rb` - Added unit tests: `tests/unit/shield_sweep.feature` (12 scenarios) - Added integration tests: `tests/integration/shield_sweep.feature` (7 scenarios) ## Testing All tests pass: - Unit tests: 12 scenarios, 91 steps - Integration tests: 7 scenarios, 55 steps - RuboCop: No offenses detected Closes #271

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

freemo added the

Type/Feature

label 2026-03-23 05:37:01 +00:00

freemo added 1 commit 2026-03-23 05:37:02 +00:00

feat(combat): implement shield sweep blocking system 24edf8d719

freemo force-pushed feature/m4-shield-sweep from 24edf8d719 to 73b64dd960 2026-03-31 19:47:33 +00:00 Compare

freemo added 1 commit 2026-03-31 20:09:54 +00:00

fix: resolve lint and Sorbet errors for shield-sweep PR dd0f623dd5

freemo force-pushed feature/m4-shield-sweep from dd0f623dd5 to 00789f1d29 2026-03-31 21:13:45 +00:00 Compare

freemo force-pushed feature/m4-shield-sweep from 00789f1d29 to 47cfe3f60b 2026-04-01 00:40:31 +00:00 Compare

freemo force-pushed feature/m4-shield-sweep from 47cfe3f60b to 2c8ec16039 2026-04-01 01:18:08 +00:00 Compare

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

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

- 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 merged commit 801cbed2cf into master 2026-04-01 20:36:56 +00:00

freemo deleted branch feature/m4-shield-sweep 2026-04-01 20:36:56 +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#329

No description provided.