Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sweeping Melee Attacks #21025

Merged
merged 35 commits into from
Mar 24, 2024

Conversation

SapphicOverload
Copy link
Contributor

@SapphicOverload SapphicOverload commented Dec 2, 2023

Document the changes in your pull request

This adds the ability for some weapons to attack in an arc instead of a precise hit, when clicking on a non-adjacent tile on HARM intent, and wielded if the weapon is two-handed. Sweeping attacks have a 50% longer attack cooldown than precise hits, and blunt weapons can't hit more than one target at once.

List of weapons with sweeping attacks, with their arc size in degrees:

  • claymore (90)
  • holy claymore (90)
  • possessed blade (90)
  • energy sword (90)
  • katana (90)
  • cutlass (90)
  • officer sabre (90)
  • large crowbar (90)
  • baseball bat (90)
  • vibro sword (90)
  • brass sword (90)
  • brass hammer (90)
  • comically large spoon (90)
  • scythe (180)
  • all axes (180)
  • sledgehammer (180)
  • vxtvul hammer (180)
  • singularity hammer (180)
  • bo staff/monk's staff (180)
  • dual energy sword (360, lol, lmao even)

Why is this good for the game?

This adds more depth to melee combat, making it less of just spam clicking while flailing around in random directions. It's also just really fun to use.

Testing

90 degrees:

sweep_test.mp4

180 degrees:

sweep_test_180.mp4

360 degrees:

sweep_test_360.mp4

Wiki Documentation

This will be very important to mention on the guide to combat, see above sections for details

Changelog

🆑
rscadd: some weapons can now swing in an arc when using harm intent
/:cl:

@Yogbot-13 Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game labels Dec 2, 2023
@PibeCantina
Copy link
Contributor

Maybe add hydrogen metal axe too?

@Yarinoi
Copy link
Contributor

Yarinoi commented Dec 2, 2023

@SapphicOverload
Copy link
Contributor Author

Maybe add hydrogen metal axe too?

Already does, it's a subtype of fire axe so it inherits the component

@Yarinoi
Copy link
Contributor

Yarinoi commented Dec 2, 2023

jokes aside i dont see sledgehammers acting as a weapon you can hit multiple people with, more of a single target type of deal imo
still cool though, but im worried they might make these weapons a bit too strong, but i dunno

@SapphicOverload
Copy link
Contributor Author

jokes aside i dont see sledgehammers acting as a weapon you can hit multiple people with, more of a single target type of deal imo still cool though, but im worried they might make these weapons a bit too strong, but i dunno

Fair enough, I'll make the arc stop after the first person hit for sledgehammers and stuff like that

@RG4ORDR
Copy link
Contributor

RG4ORDR commented Dec 2, 2023

Is it possible to make the Desword front 3 tiles and just 1 tile to the rear? Leave their sides exposed

@cowbot92
Copy link
Contributor

cowbot92 commented Dec 2, 2023

Could you make two double energy swords 720?

@neeshacark
Copy link
Contributor

can you apply a nice arc to the chap's bo staff? it's kinda shit given it only does like 16 stam a hit

@SapphicOverload
Copy link
Contributor Author

can you apply a nice arc to the chap's bo staff? it's kinda shit given it only does like 16 stam a hit

Done

code/datums/components/cleave_attack.dm Outdated Show resolved Hide resolved
code/datums/components/cleave_attack.dm Outdated Show resolved Hide resolved
code/datums/components/cleave_attack.dm Outdated Show resolved Hide resolved
@ynot01 ynot01 added the Balance Council Approved This PR was approved by the Balance Council. label Dec 2, 2023
@SapphicOverload SapphicOverload requested a review from a team as a code owner December 2, 2023 09:19
@github-actions github-actions bot added the Sprites This PR has spriting changes label Dec 2, 2023
@Yarinoi
Copy link
Contributor

Yarinoi commented Dec 2, 2023

can you apply a nice arc to the chap's bo staff? it's kinda shit given it only does like 16 stam a hit

i wanted to make a null rod with a wide arc as an excuse to add the batter's bat
oh well..

@JamieD1
Copy link
Contributor

JamieD1 commented Dec 6, 2023

I think it would be so much better if it just always swung when you clicked the tile and then there was a cooldown depending on the weapon "weight" so then people dont need to click the shitter sprite whos dodging up and down and can just swing when they want on the tile.

Yogbot-13 added a commit that referenced this pull request Mar 19, 2024
Yogbot-13 added a commit that referenced this pull request Mar 20, 2024
Yogbot-13 added a commit that referenced this pull request Mar 20, 2024
Yogbot-13 added a commit that referenced this pull request Mar 21, 2024
Yogbot-13 added a commit that referenced this pull request Mar 21, 2024
Yogbot-13 added a commit that referenced this pull request Mar 21, 2024
Yogbot-13 added a commit that referenced this pull request Mar 21, 2024
Yogbot-13 added a commit that referenced this pull request Mar 22, 2024
Yogbot-13 added a commit that referenced this pull request Mar 22, 2024
Yogbot-13 added a commit that referenced this pull request Mar 22, 2024
Yogbot-13 added a commit that referenced this pull request Mar 23, 2024
Yogbot-13 added a commit that referenced this pull request Mar 23, 2024
@Moltijoe Moltijoe removed the DO NOT MERGE Should not be merged without express approval from a Head Dev label Mar 23, 2024
Copy link
Contributor

@JohnFulpWillard JohnFulpWillard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea we good

code/datums/components/cleave_attack.dm Outdated Show resolved Hide resolved
@JohnFulpWillard JohnFulpWillard merged commit 160d68a into yogstation13:master Mar 24, 2024
13 checks passed
Yogbot-13 added a commit that referenced this pull request Mar 24, 2024
@SapphicOverload SapphicOverload deleted the sweeping-melee branch March 24, 2024 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting - Action - HD Awaiting action from Jamie Balance Council Approved This PR was approved by the Balance Council. DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Purgatory pr limbo, Jamie look at this Sprites This PR has spriting changes Test Merge - Requested This PR is waiting for a test merge to be scheduled Test Merge - Scheduled This PR is waiting to be test merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.