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

feat: Silat revised. Added 1H_HOOKED #4153

Merged

Conversation

KheirFerrum
Copy link
Collaborator

@KheirFerrum KheirFerrum commented Jan 23, 2024

Purpose of change

  • Add weapon categories to more tools #2708 added HOOKED_POLES to several weapons that are a bit too short to be considered polearms. And I think sickles being considered short swords is a bit of a stretch.
  • Someone on the Discord noted that machetes are not usable with silat, this is an oversight.

Describe the solution

Adds 1H_HOOKED category to game, as a catch all for any 1H hooking weapons that don't fall under 1H_HAMMERS or 1H_AXES. Migrated the crowbars and the sickle to it. Adds 1H_HOOKED to fior di battaglia because hooking is literally it's whole schtick.

Adds all versions of machete to silat under special weapons, as SHORT_SWORDS is expansive (including stuff like the wakizashi, cutlass, etc) and because silat already has access to a large repertoire of main weapon categories as is.

Describe alternatives you've considered

  • Tighten tolerances and separate weapon categories more (for sabers, katana/wakizashis, etc)
    • Lot of work, gain is hard to weigh since it increases the number of categories with only 2/3 weapons (discounting fake variants) and essentially loops back to why we created categories to begin with.

Testing

Load game, machete usable by silat. Check that crowbars have One-handed hooking category and are usable by fior, as is the sickle.

Additional context

Would be nice if we could specify hooking attacks that check if a weapon is capable of using them, but that's work that I'm not volunteering for.

Checklist

  • Docs updated

removed SHORT_SWORD from sickle because that honestly makes no sense.

Machetes added to Silat.
@github-actions github-actions bot added docs PRs releated to docs page data PRs related to datas. Won't crash game (probably) labels Jan 23, 2024
@chaosvolt chaosvolt merged commit ac5742f into cataclysmbnteam:main Jan 23, 2024
9 checks passed
@KheirFerrum KheirFerrum deleted the weapon-category-more-tweaks branch February 6, 2024 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably) docs PRs releated to docs page
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants