aethyr/Aethyr
2
0
Fork 0
Code Issues 281 Pull requests Projects Releases Packages Wiki Activity Actions

feat(combat): implement 7 two-handed weapon attack actions #331

Merged
freemo merged 4 commits from feature/m4-twohanded-attacks into master 2026-04-01 20:37:23 +00:00
Conversation 0 Commits 4 Files changed 16 +386 -27
freemo commented 2026-03-23 05:46:55 +00:00
Owner
Copy link

Summary

  • Implements 7 two-handed weapon attack actions for the combat system
  • Actions include: Heavy Slash R, Heavy Overhead, Sweep Low, Cleave, Pommel Strike, Staff Sweep, Spear Thrust
  • Each action follows the CombatAction structure with all 19 required properties
  • Includes unit and integration tests

Related Issue

Closes #275

## Summary - Implements 7 two-handed weapon attack actions for the combat system - Actions include: Heavy Slash R, Heavy Overhead, Sweep Low, Cleave, Pommel Strike, Staff Sweep, Spear Thrust - Each action follows the CombatAction structure with all 19 required properties - Includes unit and integration tests ## Related Issue Closes #275
freemo added this to the v1.3.0 milestone 2026-03-23 05:46:55 +00:00
feat(combat): implement 7 two-handed weapon attack actions
Some checks failed
CI / integration_tests (pull_request) Failing after 16m6s
Details
CI / type_check (pull_request) Failing after 25m43s
Details
CI / lint (pull_request) Failing after 25m44s
Details
CI / unit_tests (pull_request) Failing after 25m52s
Details
CI / build (pull_request) Has been skipped
Details
0f2998808d
freemo force-pushed feature/m4-twohanded-attacks from 0f2998808d to b1dcbf2e4c 2026-03-31 19:55:00 +00:00 Compare
freemo force-pushed feature/m4-twohanded-attacks from b1dcbf2e4c to 1379e6f126 2026-03-31 21:13:49 +00:00 Compare
freemo force-pushed feature/m4-twohanded-attacks from 1379e6f126 to 8c9962cebc 2026-04-01 00:51:29 +00:00 Compare
freemo force-pushed feature/m4-twohanded-attacks from 8c9962cebc to 52dc8d977f 2026-04-01 01:18:09 +00:00 Compare
fix: restore config.yaml and preserve Combat namespace in test stubs
All checks were successful
CI / lint (pull_request) Successful in 32m29s
Details
CI / type_check (pull_request) Successful in 32m31s
Details
CI / integration_tests (pull_request) Successful in 35m49s
Details
CI / unit_tests (pull_request) Successful in 54m42s
Details
CI / build (pull_request) Successful in 41s
Details
79ad1fc9ce 
- 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 6582b72e0d into master 2026-04-01 20:37:23 +00:00
freemo deleted branch feature/m4-twohanded-attacks 2026-04-01 20:37:23 +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
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#331
No description provided.
Delete branch "feature/m4-twohanded-attacks"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?