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

[MIRROR] Rewrites unarmed attacks on fellow humans #1050

Merged
merged 1 commit into from
Sep 21, 2023

Conversation

SierraHelper
Copy link
Collaborator

Оригинальный PR: Baystation12#34055

🆑 emmanuelbassil
tweak: Rewrote unarmed attack code to use the same miss/parry code as melee attacks with weapons.
bugfix: Holo-boxing gloves no longer target the wrong limb 100% of the time.
bugfix: Punching simple animals should make a punching noise again.
bugfix: Fixed cigarette wrapping paper icons, now becomes empty when out of wrapping paper.
bugfix: Rapid pipe deployer no longer creates a pipe as you put it into storage.
/🆑

Let the record state, this initially started as a PR to just fix the trident wrapping paper icons. I don't know how it turned into this.
Extensively tested, numbers haven't been changed much except get_parry_chance which now gets the difference between skill instead of just the skill of the parrier. Past behavior had parry_chance increase by 10, 20, or 30 if trained/experienced/master. Now it checks difference between attacker/defender and increases parry chance by 5 for each difference in level; to a maximum of 20.

The old way it was designed, punches used to get a buff if they were 'accurate'. If so; damage always was 5. And given having a damage of 5 triggers things like a punch knocking you over, dizzying you, dropping your weapon, etc; I did not want to have all punches rand(1,5). I kept that functionality in a more elegant way: If resolve_attack returned a different area than what you're targeting, it's considered an inaccurate attack and damage is from 1 to 5. If you land your punch where you intended, it becomes 4,5 meaning 'glancing' punches are not possible if you're accurate. Also increases the chance of special punches triggering. This is still technically a nerf, as in the past code all accurate attacks returned 5. Although nerf is counter-balanced by better accuracy code in general.
The striked part is now inaccurate. Accurate punches/chance of special attacks will have the exact same chance post-refactor to minimize the number of changes. See comments below.

Also fixed a few bugs in a separate commit.

@SierraHelper SierraHelper requested a review from a team as a code owner September 21, 2023 14:01
@github-actions github-actions bot added the ⛰️ Спрайты PR затрагивает спрайты label Sep 21, 2023
@SierraHelper SierraHelper added the 📜 CL валиден Ченджлог не содержит ошибок label Sep 21, 2023
@SuhEugene SuhEugene merged commit 7fef775 into dev-sierra Sep 21, 2023
10 checks passed
@SuhEugene SuhEugene deleted the upstream-pr-34055 branch September 21, 2023 16:27
SierraHelper added a commit that referenced this pull request Sep 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🪞 MIR ЯОЯ ⛰️ Спрайты PR затрагивает спрайты 📜 CL валиден Ченджлог не содержит ошибок
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants