(Testing phase only!) Removes click combat, adds swing combat, Removes RNG block, adds active block #76928

MrMelbert · 2023-07-17T20:08:37Z

About The Pull Request

2023-05-22.17-02-07.mp4

Implements swing combat as according to the following document.

Gameplay changes:

All attacking require combat mode now.
Clicking on a guy will no longer attack them. Instead, you will swing at their turf.
- This means existing combat skills carry over 1:1. Successfully clicking a guy will attack.
- You can click on a turf far away from you to swing in that direction.
- For a majority of weapons, a swing at a turf affects just that turf, making weapons behave as they did before.
Some weapons now have larger swing arcs. A baseball bat swings at three turfs in front of you, for example.
- Many wielded weapons, such as fire axes or spears now require wielding to enact their swing.
RNG block is removed. All blocking is done via active blocking by holding down "resist".
- You can block with pretty much everything, but it is likely not a good idea.
- Blocking an attack will stop all side effects of the attack and change the damage you would have taken into stamina damage.
- The amount of stamina damage you take is applied with a multiplier. This multiplier depends on the ability of the weapon.
  - Shields are good at blocking most attacks.
  - Energy swords can handily block all laser or energy projectiles with no stamina damage taken.
- Hulks cannot block but are better at breaking an opponents block (their attacks confer more stamina damage).
Punches are also swings. As are hugs, grabs, and disarms.

Code changes:

Massive amount of click chain, combat, and defense refactoring.
- Removed a ton of mob implementations of attack_x. It's all handled by swings. This makes combat a ton more consistent.

Todo:

Fixes #72812

Why It's Good For The Game

As outlined in the document, this aims to make melee combat much more dynamic and accessible.

Melee weapon variety will (ideally) be a lot less static and a lot more varied - rather than always opting for the highest force and greatest block chance, you may want to opt for a different weapon type depending on where you're fighting or what you're fighting.

Pixel hunting is massively reduced, reducing the passive advantage of having smaller sprites / advantage of having larger sprites, while also making it much more accessible to newer players.

This can also amend the staleless of melee combat being entirely focused on "who stuns first" - being able to block a hit before being floored may result in more drawn out duels.

Changelog

This needs to be filled out a bit more later.

🆑 Melbert
add: Adds swing combat.
del: Removes click combat.
add: Adds active blocking by holding "resist".
del: Removes RNG block.
/:cl:

This reverts commit 8042f6b.

… a wrapper for more consistent calls.

Sightld2 · 2023-09-28T04:22:37Z

Janitor cyborg can't wet their mop in their bucket apparently

AtomTheProphet · 2023-09-28T04:34:11Z

The knock heretic cannot unlock airlocks, consoles or lockers. The rust heretic cannot rust airlocks, consoles, or lockers either but everything else works.

DefinitelyNotATraitor · 2023-09-28T05:04:33Z

seems like, when using the crusher as a miner on lavaland, trophies do not drop when swing combat. goliaths and legions attack much faster than they should; goliaths do not telegraph their sped up attacks. Blood-Drunk is incapable of hitting in melee combat (You avoid the blood-drunk miner's nuzzle!)

isotope436 · 2023-09-28T05:09:05Z

makes it basically impossible to fight in groups and makes accidental hitting 100x for common (especially in medbay)

DefinitelyNotATraitor · 2023-09-28T06:55:12Z

you can't emag borgs with swing combat.

Angustmeta · 2023-09-28T08:20:15Z

  In fact, trying to click on the wallmount instead hits yourself.

To add to this.

Punching buttons (light switches, fire alarms) diagonally does weird animation and permanently makes you unable to move. Breaks/disconnects client repeatedly.
Punching vendor opens its menu.

2023-09-28.10-08-28.Swing.test.bugs.mp4

Runtimes:

[09:30:58] Runtime in garbage.dm,433: /datum/light_source destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic
proc name: qdel (/proc/qdel)
usr: Angust/(Gus Banner)
usr.loc: (Shared Engineering Storage (124,72,4))
src: null
call stack:
qdel(/datum/light_source (/datum/light_source), 0)
the light switch (/obj/machinery/light_switch/directional/north): update light()
the light switch (/obj/machinery/light_switch/directional/north): set light(0, null, -99999, null, null, null)
the light switch (/obj/machinery/light_switch/directional/north): update icon state()
the light switch (/obj/machinery/light_switch/directional/north): update icon(16777215)
the light switch (/obj/machinery/light_switch/directional/north): update appearance(16777215)
the light switch (/obj/machinery/light_switch/directional/north): update appearance(16777215)
the light switch (/obj/machinery/light_switch/directional/north): update appearance(16777215)
the light switch (/obj/machinery/light_switch/directional/north): set lights(1)
the light switch (/obj/machinery/light_switch/directional/north): interact(Gus Banner (/mob/living/carbon/human))
...
Gus Banner (/mob/living/carbon/human): click on without item(the light switch (/obj/machinery/light_switch/directional/north), 1, null)
/datum/component/redirect_atta... (/datum/component/redirect_attack_hand_from_turf): on attack hand(the reinforced wall (123,73,4) (/turf/closed/wall/r_wall), Gus Banner (/mob/living/carbon/human), null)
the reinforced wall (123,73,4) (/turf/closed/wall/r_wall): attack hand(Gus Banner (/mob/living/carbon/human), null)
the reinforced wall (123,73,4) (/turf/closed/wall/r_wall): attack hand(Gus Banner (/mob/living/carbon/human), null)
/datum/attack_style/unarmed/ge... (/datum/attack_style/unarmed/generic_damage/limb_based/punch): collide with solid atom(the reinforced wall (123,73,4) (/turf/closed/wall/r_wall), the human left arm (/obj/item/bodypart/arm/left), Gus Banner (/mob/living/carbon/human))
/datum/attack_style/unarmed/ge... (/datum/attack_style/unarmed/generic_damage/limb_based/punch): execute attack(Gus Banner (/mob/living/carbon/human), the human left arm (/obj/item/bodypart/arm/left), /list (/list), the reinforced plasma window (/obj/structure/window/reinforced/plasma/fulltile), 0)
/datum/attack_style/unarmed/ge... (/datum/attack_style/unarmed/generic_damage/limb_based/punch): process attack(Gus Banner (/mob/living/carbon/human), the human left arm (/obj/item/bodypart/arm/left), the reinforced plasma window (/obj/structure/window/reinforced/plasma/fulltile), 0)
Gus Banner (/mob/living/carbon/human): click on without item at range(the reinforced plasma window (/obj/structure/window/reinforced/plasma/fulltile), /list (/list))
the reinforced plasma window (/obj/structure/window/reinforced/plasma/fulltile): Click(the plating (120,74,4) (/turf/open/floor/plating), "mapwindow.map", "icon-x=26;icon-y=32;left=1;but...")
Angust (/client): Click(the reinforced plasma window (/obj/structure/window/reinforced/plasma/fulltile), the plating (120,74,4) (/turf/open/floor/plating), "mapwindow.map", "icon-x=26;icon-y=32;left=1;but...")

[[09:30:58] Runtime in garbage.dm, line 433: /datum/light_source destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic]

Higgin · 2023-09-28T09:25:35Z

Putting a spraycan into a mortar or grinder no longer works and appears to be trying to paint the object (I suspect it's treated as a reagent container or thing like a syringe dropper, but haven't duplicated with any other items like it.

Rags/soap cannot be used to clean microwaves.

Using rag/soap on a storage item tries to wash instead of putting it in.

Deathfox666 · 2023-09-28T11:14:49Z

drake can attack you in the lava trap move so you just die if you have to stand next to them

* Convert attack telegraph to a style component rather than a mob component Change some mob click keybindings * Reapply basic mob melee cooldown * Don't shoot and melee in the same click

Mechanelize · 2023-10-04T23:20:11Z

wearing krav maga gloves breaks shoves among other issues

github-actions · 2023-10-13T00:05:23Z

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

MrMelbert · 2023-10-13T23:15:58Z

I'm closing the first round of testing now. I'm unhappy with the scale of the PR and the code quality at the moment, and I'd like to work on other refactors, primarily involving the attack chain, to make this easier & less buggy to accomplish going forward.

(Also the Holidays are coming up and I'm not going to be able to keep this updated and merge-conflict-free during then.)

I'll be back in, I dunno, 4 months? Unless something bad happens.

LemonInTheDark · 2023-10-14T22:46:11Z

literally in tears

TetrakoHateThis · 2024-04-07T12:09:43Z

Lost to time, never to return.

nikothedude · 2024-04-07T16:02:17Z

IT WILL COME BACK.....

Rex9001 · 2024-04-09T06:36:25Z

Necrroooo

MrMelbert added 30 commits April 3, 2023 22:30

Attack styles

eab91e8

Adds some weapons

0a4225a

Oh god afterattacks

15a2347

Special handling

37ac527

Safety

6f0239e

Reverts this. Attack chain lives today

45af5b3

Abandon attack chian

083f631

Unarmed attack system. Lots of stuff to unpack.

61c852c

Finalizes unarmed stuff

ed96f9b

Adjustments

f254299

Let's start with attack chain again

27ba7c6

Merge branch 'master' into swing_music

29c03b8

This is CBT, I will come back to this

899bf16

Hold up

9496fa9

Adds blocking

603a997

Converting attack chain

8042f6b

Revert "Converting attack chain"

808f72f

This reverts commit 8042f6b.

Leave the chain alone

63728ff

Abandon Attack Chain

dabf040

Click thing

b367b23

Missed a right click call

4c1f297

Bugfix

1c44257

Experiment: Instead of changing attack chain, just change attack. Use…

a7acb8f

… a wrapper for more consistent calls.

Attack setup finalized

bbc0fa5

Moving back to unarmed

f692210

Reverting unarmed damage to limbs

ad70468

Huge amount of work on unarmed, puts it in a much better state

335e383

Initial tests

4415164

Missed this

fe8783b

Renames some core click code procs (on the fence about this one.)

d0c5362

Merge branch 'master' into swing_music

62d7deb

tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Sep 27, 2023

MrMelbert added 4 commits September 27, 2023 18:57

Compiles

9db8b86

AHHHH

18bda6c

AHHHH

c8744bb

Bugfixing

b3f442e

More bugfixing and todos

ed2b702

Basic mob attack style cleanup (#2)

2bc3868

* Convert attack telegraph to a style component rather than a mob component Change some mob click keybindings * Reapply basic mob melee cooldown * Don't shoot and melee in the same click

tgstation-server added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Oct 2, 2023

MrMelbert added 2 commits October 3, 2023 15:31

Merge branch 'master' into swing_music

6fe3be2

Fixes Fixes Fixes

ef8dbe5

tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Oct 3, 2023

Better fix?

6ebcae8

github-actions bot added the Stale Even the uncaring universe rejects you, why even go on label Oct 13, 2023

MrMelbert closed this Oct 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(Testing phase only!) Removes click combat, adds swing combat, Removes RNG block, adds active block #76928

(Testing phase only!) Removes click combat, adds swing combat, Removes RNG block, adds active block #76928

MrMelbert commented Jul 17, 2023 •

edited

Sightld2 commented Sep 28, 2023

AtomTheProphet commented Sep 28, 2023 •

edited

DefinitelyNotATraitor commented Sep 28, 2023

isotope436 commented Sep 28, 2023

DefinitelyNotATraitor commented Sep 28, 2023

Angustmeta commented Sep 28, 2023

Higgin commented Sep 28, 2023 •

edited

Deathfox666 commented Sep 28, 2023

Mechanelize commented Oct 4, 2023

github-actions bot commented Oct 13, 2023

MrMelbert commented Oct 13, 2023 •

edited

LemonInTheDark commented Oct 14, 2023

TetrakoHateThis commented Apr 7, 2024

nikothedude commented Apr 7, 2024

Rex9001 commented Apr 9, 2024

(Testing phase only!) Removes click combat, adds swing combat, Removes RNG block, adds active block #76928

(Testing phase only!) Removes click combat, adds swing combat, Removes RNG block, adds active block #76928

Conversation

MrMelbert commented Jul 17, 2023 • edited

About The Pull Request

Why It's Good For The Game

Changelog

Sightld2 commented Sep 28, 2023

AtomTheProphet commented Sep 28, 2023 • edited

DefinitelyNotATraitor commented Sep 28, 2023

isotope436 commented Sep 28, 2023

DefinitelyNotATraitor commented Sep 28, 2023

Angustmeta commented Sep 28, 2023

Higgin commented Sep 28, 2023 • edited

Deathfox666 commented Sep 28, 2023

Mechanelize commented Oct 4, 2023

github-actions bot commented Oct 13, 2023

MrMelbert commented Oct 13, 2023 • edited

LemonInTheDark commented Oct 14, 2023

TetrakoHateThis commented Apr 7, 2024

nikothedude commented Apr 7, 2024

Rex9001 commented Apr 9, 2024

MrMelbert commented Jul 17, 2023 •

edited

AtomTheProphet commented Sep 28, 2023 •

edited

Higgin commented Sep 28, 2023 •

edited

MrMelbert commented Oct 13, 2023 •

edited