feat(combat): implement 9 shield defensive and offensive moves #334

Merged

freemo merged 3 commits from feature/m4-shield-moves into master

2026-04-01 01:51:56 +00:00

freemo commented

2026-03-23 05:58:51 +00:00

Owner

Summary

Implements Issue #277: Add 9 shield defensive and offensive combat moves to the Aethyr combat system.

Shield Moves Added

Basic Repositions (1 AP, Skill Level 1)

Block High - Raise shield to block high attacks
Block Low - Lower shield to block low attacks
Block Right - Shift shield right to block attacks
Block Left - Shift shield left to block attacks

Intermediate Techniques (2 AP)

Full Guard (Skill 5) - 2x2 area block
Shield Bash (Skill 10) - 4 blunt damage with knockback, 1 delay
Shield Sweep Right (Skill 10) - Horizontal sweep-block path
Shield Sweep Up (Skill 10) - Vertical sweep-block path

Advanced Technique (3 AP)

Bulwark (Skill 20) - 3x2 area block

Implementation Details

CombatAction class with all 19 required properties per specification
Shield module with move lookup by name (multiple formats supported)
Helper methods for categorizing moves (defensive, offensive, sweep, area_block, reposition)
Skill level and AP cost filtering

Testing

30 unit test scenarios (146 steps) - all passing
9 integration test scenarios (52 steps) - all passing

Closes #277

## Summary Implements Issue #277: Add 9 shield defensive and offensive combat moves to the Aethyr combat system. ### Shield Moves Added **Basic Repositions (1 AP, Skill Level 1)** - Block High - Raise shield to block high attacks - Block Low - Lower shield to block low attacks - Block Right - Shift shield right to block attacks - Block Left - Shift shield left to block attacks **Intermediate Techniques (2 AP)** - Full Guard (Skill 5) - 2x2 area block - Shield Bash (Skill 10) - 4 blunt damage with knockback, 1 delay - Shield Sweep Right (Skill 10) - Horizontal sweep-block path - Shield Sweep Up (Skill 10) - Vertical sweep-block path **Advanced Technique (3 AP)** - Bulwark (Skill 20) - 3x2 area block ### Implementation Details - CombatAction class with all 19 required properties per specification - Shield module with move lookup by name (multiple formats supported) - Helper methods for categorizing moves (defensive, offensive, sweep, area_block, reposition) - Skill level and AP cost filtering ### Testing - 30 unit test scenarios (146 steps) - all passing - 9 integration test scenarios (52 steps) - all passing Closes #277