Enhance attack system with armor, weapons, and configurable loot #4313
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
This comment has been minimized.
This comment has been minimized.
|
You have run out of free Bugbot PR reviews for this billing cycle. This will reset on January 11. To receive reviews on all of your PRs, visit the Cursor dashboard to activate Pro and start your 14-day free trial. |
|
Looks like there are a few issues preventing this PR from being merged!
If you'd like me to help, just leave a comment, like Feel free to include any additional details that might help me get this PR into a better state. You can manage your notification settings |
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
20578b4 to
6d4c201
Compare
daveey
changed the base branch from
graphite-base/4313
to
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
Contributor
Author
|
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
This was referenced Dec 16, 2025
daveey
force-pushed
the
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
branch
from
2825fe3 to
f7d72ce
Compare
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
6d4c201 to
4497545
Compare
This was referenced Dec 16, 2025
Closed
daveey
changed the title
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
4497545 to
670fe9a
Compare
daveey
force-pushed
the
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
branch
from
2543691 to
c44cd44
Compare
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
a0e5c88 to
8c37079
Compare
daveey
force-pushed
the
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
branch
from
c44cd44 to
dc87b1d
Compare
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
8c37079 to
2d77cf2
Compare
This was referenced Dec 22, 2025
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
2d77cf2 to
8a849ed
Compare
daveey
force-pushed
the
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
branch
from
39544d8 to
abfd8d9
Compare
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
2 times, most recently
from
0883f93 to
dc3fc68
Compare
daveey
force-pushed
the
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
branch
from
abfd8d9 to
3587ab3
Compare
This was referenced Dec 25, 2025
daveey
force-pushed
the
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
branch
from
3587ab3 to
5b8809f
Compare
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
dc3fc68 to
3a2f74d
Compare
This extracts the enhanced attack system from the daveey-cvc-arena branch: - armor_resources: Target resources that reduce incoming damage (weighted) - weapon_resources: Attacker resources that increase damage (weighted) - loot: Configurable list of resources to steal (or steal all, or steal nothing) - Vibe-based bonus: Vibing a resource gives +1 effective armor for that type Defense calculation: weapon_power = sum(attacker_inventory[item] * weapon_weight) armor_power = sum(target_inventory[item] * armor_weight) damage_bonus = max(weapon_power - armor_power, 0) cost_to_defend = defense_resources + damage_bonus Also includes unit tests for the enhanced attack system.
- Shorten loot field description to fit within 120 char limit - Apply ruff formatting to mettagrid_c_config.py
Two issues fixed: 1. initial_vibe not passed to CppAgentConfig - The initial_vibe field from Python AgentConfig was not being passed to the C++ config, causing the vibe armor bonus test to fail since agents always had vibe=0 regardless of initial_vibe setting. 2. Empty defense_resources bug (PR review) - When defense_resources was empty but armor_resources/weapon_resources were configured, attacks would always be blocked for free because the loop over empty defense_resources returned true immediately. Fixed by requiring defense_resources to be non-empty before checking defense capability. Armor/weapon resources only modify the defense cost, they don't enable defense by themselves.
AttackActionConfig now requires armor_resources and weapon_resources parameters after the enhanced attack system changes.
daveey
force-pushed
the
claude/extract-attack-system-013Fd6xd9xPLzvsNNDpAspZ5
branch
from
3a2f74d to
c4847af
Compare
daveey
force-pushed
the
claude/extract-vibe-actions-01MfWh6jg2PF1rWY8G2f8P71
branch
from
5b8809f to
bbccc06
Compare
This was referenced Dec 29, 2025
Draft
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Enhanced Attack System
Defense calculation:
weapon_power = sum(attacker_inventory[item] * weapon_weight)
armor_power = sum(target_inventory[item] * armor_weight)
damage_bonus = max(weapon_power - armor_power, 0)
cost_to_defend = defense_resources + damage_bonus
Also includes unit tests for the enhanced attack system.