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

(WIP) Yautja Weapon Gimmicks, Round Two #5392

Closed

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jan 6, 2024

About the pull request

Work on giving Yautja Weapons gimmicks again.

Explain why it's good for the game

Work in Progress. Allows Yautja weapons to have some flair beyond being variably effective sticks.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Yautja weapons now collect blood 'charges' for using their abilites.
add: Combistick now requires two hits to throw instead of one, but can store up to two throws.
add: Scythe now can perform an AOE attack similar to Ravager Eviscerate, after five successful hits.
add: Chainwhip can now bind a target with chains, tying them to within three tiles of the Yautja.
balance: Reduced the probability for combistick blocking from 2/3 hits to 1/3
balance: Repaired the 15% hardcap on yautja mask knock chance.
code: Changed damage variables on smartdisc to use existing defines rather than raw numbers.
/:cl:

To-do:

  • Add binding to chainwhip
  • Make certain abilities decay over time if not used, to prevent hoarding attacks on lesser foes (such as with the chainwhip) for more dangerous opponents.
  • Consider abilities for the sword.

@realforest2001 realforest2001 added this to the Yautja Changes milestone Jan 6, 2024
@github-actions github-actions bot added Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Jan 6, 2024
@RenaRenaRe
Copy link
Contributor

RenaRenaRe commented Jan 6, 2024

Just so you know the block chance you changed only applies to pounces, since that seems to be the only time "combistick" is set to true. For xeno slashes it uses:
if(I.IsShield() && !istype(I, /obj/item/weapon/shield) && (prob(50 - round(damage / 3))))

Keep in mind "damage" is always sent as 0 (at least for xeno slashes) so currently block chance for slashes is 50%, this PR changes specifically changes pounce block chance from 2/3 to 1/3.
Just figured I'd point this out since the changelog says you changed the % of "hits" that it blocks which isn't really true.

@realforest2001 realforest2001 marked this pull request as draft January 6, 2024 19:22
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 7, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 7, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@realforest2001 realforest2001 reopened this Oct 5, 2024
cm13-github added a commit that referenced this pull request Oct 5, 2024
cm13-github added a commit that referenced this pull request Oct 5, 2024
cm13-github added a commit that referenced this pull request Oct 6, 2024
cm13-github added a commit that referenced this pull request Oct 6, 2024
cm13-github added a commit that referenced this pull request Oct 6, 2024
cm13-github added a commit that referenced this pull request Oct 7, 2024
cm13-github added a commit that referenced this pull request Oct 7, 2024
cm13-github added a commit that referenced this pull request Oct 7, 2024
cm13-github added a commit that referenced this pull request Oct 8, 2024
cm13-github added a commit that referenced this pull request Oct 8, 2024
cm13-github added a commit that referenced this pull request Oct 8, 2024
cm13-github added a commit that referenced this pull request Oct 8, 2024
@@ -127,7 +144,7 @@
item_state = "scim"
attack_speed = 5
attack_verb = list("sliced", "slashed", "jabbed", "torn", "gored")
force = MELEE_FORCE_TIER_5
force = MELEE_FORCE_TIER_6
Copy link
Contributor

Choose a reason for hiding this comment

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

the alt skin of scims isnt inheriting the new buff. while we're at it, just delete the redundant code if its the same as it would inherit from parent

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 15, 2024
@cmss13-ci
Copy link
Contributor

cmss13-ci bot commented Oct 27, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@cmss13-ci cmss13-ci bot added the Stale beg a maintainer to review your PR label Oct 27, 2024
@hry-gh
Copy link
Member

hry-gh commented Dec 15, 2024

pr has merge conflicts and hasn't been touched for a couple months, reopen when deconflicted and ready for review

@hry-gh hry-gh closed this Dec 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Code Improvement Make the code longer Feature Feature coder badge Merge Conflict PR can't be merged because it touched too much code Stale beg a maintainer to review your PR
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

7 participants