Prone move mode #46750

J-Cieplinski · 2021-01-14T22:52:43Z

Summary

Features "Added prone move mode"

Purpose of change

Prompted by #45817

Describe the solution

Added lying down to the game and sleeping makes you automatically lie down at the beginning.
Decreased movement and sound made when prone.
Decreased creature visibility when prone
Added "CRUTCHES" flag for weapons
Added Crutches item (need to be balanced for the game)
Added "CRUTCHES" flag to walking cane weapon
If both of player's legs are broken and he has no crutches equipped movement causes character to go prone

Testing

In-game testing

Additional context

Unless it is possible to modify(decrease) the eyesight/eye-level of character when lying down then I think it ready for merge.

… down, sleep action automatically puts in lie down mode

src/activity_actor.cpp

anothersimulacrum · 2021-01-15T00:52:02Z

How about prone, instead of lying down?

data/json/move_modes.json

Xaleth · 2021-01-15T04:03:50Z

It would be cleaner if the variables were renamed to "prone" instead of lying down, IMO.

And also would there be a greater penalty moving onto furniture while prone?

Qrox · 2021-01-15T07:22:16Z

Also, acid should hurt your whole body when you're prone.

Co-authored-by: Binrui Dong <[email protected]>

J-Cieplinski · 2021-01-15T12:23:39Z

Also, acid should hurt your whole body when you're prone.

it is already done by

bool Character::is_on_ground() const
{
    return get_working_leg_count() < 2 || has_effect( effect_downed ) || is_lying_down();
}

J-Cieplinski · 2021-01-15T12:40:34Z

And also would there be a greater penalty moving onto furniture while prone?

From what I'm seeing it isn't currently supported even for crouching. Each furniture has a specified in json move cost that comes from it and that's it. I think adding it would be out of scope for this PR

J-Cieplinski · 2021-01-15T13:17:39Z

How about prone, instead of lying down?

Done

ghost · 2021-01-15T23:20:00Z

Both legs broken, w/out splints, should also result in prone move mode by default.

… no splints

J-Cieplinski · 2021-01-16T20:16:22Z

Both legs broken, w/out splints, should also result in prone move mode by default.

Done

actual-nh · 2021-01-16T20:50:57Z

You might want to do a search in the code for "downed". For instance, this indicates a need to take a look at player::pause (in player.cpp), which checks for the downed effect if the player is on fire. Another is player::throw_item (in ranged.cpp), although soldiers are trained to throw grenades while prone IIRC, so only checking for the (involuntary) downed effect may be fine. A third is Character::on_hit (in character.cpp) - if you're already prone, having on roller blades/whatever should't really matter for the effects of hitting you.

J-Cieplinski · 2021-01-16T21:08:18Z

You might want to do a search in the code for "downed". For instance, this indicates a need to take a look at player::pause (in player.cpp), which checks for the downed effect if the player is on fire. Another is player::throw_item (in ranged.cpp), although soldiers are trained to throw grenades while prone IIRC, so only checking for the (involuntary) downed effect may be fine. A third is Character::on_hit (in character.cpp) - if you're already prone, having on roller blades/whatever should't really matter for the effects of hitting you.

Ok I see. Although I wonder why Character::on_hit would use has_effect explicitly when Character::is_on_ground() exists. Same with being on fire

J-Cieplinski · 2021-01-16T21:22:28Z

@actual-nh are you also suggesting to (in some cases) change creature current move mode to prone upon being downed? Taking a quick look I think it would be doable unless Character::try_remove_downed is not a method that removes these kinds of downed effects add_effect( effect_downed, 2_turns, false, 0, true );

actual-nh · 2021-01-16T21:32:13Z

@actual-nh are you also suggesting to (in some cases) change creature current move mode to prone upon being downed? Taking a quick look I think it would be doable unless Character::try_remove_downed is not a method that removes these kinds of downed effects add_effect( effect_downed, 2_turns, false, 0, true );

I was more making a general suggestion that "downed" and "prone" should have something to do with one another, but that is indeed one way to do it - although keeping in mind "downed", as an involuntary status, does appear to imply a greater degree of immobility (e.g., dodge should be reduced but not eliminated by being prone - rolling). Character::try_remove_downed looks to (try to) remove anything considered "downed".

actual-nh · 2021-01-16T21:34:36Z

You might want to do a search in the code for "downed". For instance, this indicates a need to take a look at player::pause (in player.cpp), which checks for the downed effect if the player is on fire. Another is player::throw_item (in ranged.cpp), although soldiers are trained to throw grenades while prone IIRC, so only checking for the (involuntary) downed effect may be fine. A third is Character::on_hit (in character.cpp) - if you're already prone, having on roller blades/whatever should't really matter for the effects of hitting you.

Ok I see. Although I wonder why Character::on_hit would use has_effect explicitly when Character::is_on_ground() exists. Same with being on fire

I agree Character::on_hit should probably be using Character::is_on_ground(). Being on fire may be a different case - a broken leg is not going to be a help in rolling around - but this actually may argue for only being prone (not "downed") affecting putting out a fire.

J-Cieplinski · 2021-01-16T22:37:44Z

@actual-nh are you also suggesting to (in some cases) change creature current move mode to prone upon being downed? Taking a quick look I think it would be doable unless Character::try_remove_downed is not a method that removes these kinds of downed effects add_effect( effect_downed, 2_turns, false, 0, true );

I was more making a general suggestion that "downed" and "prone" should have something to do with one another, but that is indeed one way to do it - although keeping in mind "downed", as an involuntary status, does appear to imply a greater degree of immobility (e.g., dodge should be reduced but not eliminated by being prone - rolling). Character::try_remove_downed looks to (try to) remove anything considered "downed".

From what I'm seeing and from the given examples(ie being on fire) "downed" is used rather universally. It fulfilled the role of indicator that character was just lying down, that got swept of their feet, got knocked down etc. Wide range from "just sitting" to "incapacitated". Dunno if i want to get into that

src/melee.cpp

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>

Kelenius · 2021-01-28T12:39:13Z

Added lying down to the game and sleeping makes you automatically lie down at the beginning.

Do you get up when you wake up automatically as well?

J-Cieplinski · 2021-01-29T00:11:05Z

Added lying down to the game and sleeping makes you automatically lie down at the beginning.

Do you get up when you wake up automatically as well?

Discussed previously, added in yesterday's commit

int-ua · 2021-01-29T13:50:11Z

Translating the PR Validator message into English: the SUMMARY: part should be removed from the summary line, the format was updated recently.

WilliamtheCardboardBox · 2021-03-12T18:09:14Z

I'm not sure if this PR is good to cover this, but proning through broken glass should more than likely mess the player up. Perhaps we could check if the player has any uncovered limbs and apply bleeding/brute damage when a move is made into broken glass? Essentially the same principle as acid damaging the player's body when prone.

data/json/items/melee/bludgeons.json

src/avatar_action.cpp

Night-Pryanik · 2021-03-12T19:22:35Z

src/avatar_action.cpp

+        !you.is_prone() ) {
+        you.set_movement_mode( move_mode_id( "prone" ) );
+        you.add_msg_if_player( m_bad,
+                               _( "Your broken legs can't hold your weight and you fall down in pain." ) );


If there's pain mentioned in message, maybe then actually add some pain on this event?

Night-Pryanik · 2021-03-12T19:24:51Z

src/melee.cpp

+            add_msg_if_player( m_bad, _( "Your broken legs cannot hold you and you fall down." ) );
+            set_movement_mode( move_mode_id( "prone" ) );
+        } else if( is_on_ground() ) {
+            add_msg_if_player( m_warning, _( "You cannot fight while on the ground." ) );


Maybe in the future we should allow fighting (defending only?) while lying down, if your arms ain't broken.

src/move_mode.cpp

Fosheze · 2021-03-12T19:42:55Z

I'm not sure how difficult it would be to add in or if it is out of scope but weapon bipods should work while prone anywhere. It would be nice to not have to dig an embankment every time I want to use a bipod.

Co-authored-by: Anton Burmistrov <[email protected]>

J-Cieplinski · 2021-03-12T20:34:14Z

I'm not sure how difficult it would be to add in or if it is out of scope but weapon bipods should work while prone anywhere. It would be nice to not have to dig an embankment every time I want to use a bipod.

Definitely out of scope :)

Co-authored-by: Anton Burmistrov <[email protected]>

data/json/items/melee/bludgeons.json

Co-authored-by: Anton Burmistrov <[email protected]>

Night-Pryanik · 2021-07-11T05:28:51Z

@J-Cieplinski could you please resolve conflicts?

J-Cieplinski · 2021-07-11T08:23:11Z

@Night-Pryanik I've resolved using git functionality as I don't have a project set up on my machine right now.

However I think that activate_crouch_mode is a bit redundant now and I can't really do deep dive in the code to find and replace it with toggle function.

src/handle_action.cpp

src/avatar.cpp

Ivan-Shestakov · 2021-08-09T06:43:59Z

Wow, playing with UndeadPeople tileset, and it missing an indication my char is prone messed with me several times last night.
They don't move to walking after sleep, and after emerging from home basement - suddenly get attacked by flash-speed zomboes - not nice.
@J-Cieplinski I see you mention very early in this pr discussion you're handling this, please recheck that it isn't lost in git-merge somewhere.

ZhilkinSerg · 2021-08-09T07:40:37Z

Wow, playing with UndeadPeople tileset, and it missing an indication my char is prone messed with me several times last night.
They don't move to walking after sleep, and after emerging from home basement - suddenly get attacked by flash-speed zomboes - not nice.
@J-Cieplinski I see you mention very early in this pr discussion you're handling this, please recheck that it isn't lost in git-merge somewhere.

Did tileset author/maintainer add overlay for new move mode?

{ "id": [ "overlay_male_prone", "overlay_female_prone" ], "fg": 1234567890 },

Ivan-Shestakov · 2021-08-09T09:56:57Z

Not yet, as far as I can see... @SomeDeadGuy I hope you get to it, when possible...

J-Cieplinski added 3 commits January 14, 2021 22:28

Added lying down on the ground, is_on_ground() returns true for lying…

1a5c01b

… down, sleep action automatically puts in lie down mode

Merge branch 'master' into proneSleep

7ca6a4a

astyle run

51393c8

BrettDong reviewed Jan 15, 2021

View reviewed changes

src/activity_actor.cpp Outdated Show resolved Hide resolved

Night-Pryanik reviewed Jan 15, 2021

View reviewed changes

data/json/move_modes.json Outdated Show resolved Hide resolved

BrettDong added [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics labels Jan 15, 2021

Update src/activity_actor.cpp

fd41d6e

Co-authored-by: Binrui Dong <[email protected]>

J-Cieplinski changed the title ~~[CR] Lying down move mode~~ [CR] Prone move mode Jan 15, 2021

changed lying down to prone where appropiate, sound change when prone

a48274d

actual-nh mentioned this pull request Jan 16, 2021

Test/CI builds (intermittently) failing on field, possibly weary tests (unrelated to pull requests) #46256

Closed

J-Cieplinski added 2 commits January 16, 2021 19:52

changes position to prone if trying to move with both legs broken and…

7a04ee8

… no splints

creature should be less visible when prone

50d6fdc

astyle run and value initialization

52dc27a

changed on the ground check for roller blade knockdown and being on fire

e693355

J-Cieplinski changed the title ~~[CR] Prone move mode~~ Prone move mode Jan 17, 2021

Qrox reviewed Jan 28, 2021

View reviewed changes

src/melee.cpp Outdated Show resolved Hide resolved

src/melee.cpp Outdated Show resolved Hide resolved

J-Cieplinski and others added 3 commits January 28, 2021 13:33

Update src/melee.cpp

d6a5b12

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>

Update src/melee.cpp

f99eb17

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>

Update src/avatar_action.cpp

69e7fd9

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>

kevingranade added the 0.F Feature Freeze label Jan 29, 2021

astyle check

cc55bc7

anothersimulacrum added the 0.F String Freeze label Feb 23, 2021

Night-Pryanik reviewed Mar 12, 2021

View reviewed changes

Update src/move_mode.cpp

76d2579

Co-authored-by: Anton Burmistrov <[email protected]>

Update src/avatar_action.cpp

1e35df7

Co-authored-by: Anton Burmistrov <[email protected]>

J-Cieplinski commented Mar 12, 2021

View reviewed changes

data/json/items/melee/bludgeons.json Show resolved Hide resolved

Update data/json/items/melee/bludgeons.json

039765b

Co-authored-by: Anton Burmistrov <[email protected]>

Merge branch 'master' into proneSleep

21f8f35

ZhilkinSerg reviewed Aug 8, 2021

View reviewed changes

src/handle_action.cpp Outdated Show resolved Hide resolved

ZhilkinSerg reviewed Aug 8, 2021

View reviewed changes

src/avatar.cpp Outdated Show resolved Hide resolved

Apply suggestions from code review

b7bc3ef

ZhilkinSerg merged commit 1330146 into CleverRaven:master Aug 8, 2021

schealex mentioned this pull request Aug 8, 2021

Going from run to walk sets my base speed cost to 450 #50612

Closed

satheon49 pushed a commit to satheon49/Cataclysm-DDA that referenced this pull request Aug 14, 2021

Prone move mode (CleverRaven#46750)

04ce65b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prone move mode #46750

Prone move mode #46750

J-Cieplinski commented Jan 14, 2021 •

edited

Loading

anothersimulacrum commented Jan 15, 2021

Xaleth commented Jan 15, 2021

Qrox commented Jan 15, 2021

J-Cieplinski commented Jan 15, 2021

J-Cieplinski commented Jan 15, 2021

J-Cieplinski commented Jan 15, 2021 •

edited

Loading

ghost commented Jan 15, 2021

J-Cieplinski commented Jan 16, 2021

actual-nh commented Jan 16, 2021 •

edited

Loading

J-Cieplinski commented Jan 16, 2021 •

edited

Loading

J-Cieplinski commented Jan 16, 2021

actual-nh commented Jan 16, 2021

actual-nh commented Jan 16, 2021

J-Cieplinski commented Jan 16, 2021

Kelenius commented Jan 28, 2021

J-Cieplinski commented Jan 29, 2021

int-ua commented Jan 29, 2021 •

edited

Loading

WilliamtheCardboardBox commented Mar 12, 2021

Night-Pryanik Mar 12, 2021

Night-Pryanik Mar 12, 2021

Fosheze commented Mar 12, 2021

J-Cieplinski commented Mar 12, 2021

Night-Pryanik commented Jul 11, 2021

J-Cieplinski commented Jul 11, 2021

Ivan-Shestakov commented Aug 9, 2021

ZhilkinSerg commented Aug 9, 2021 •

edited

Loading

Ivan-Shestakov commented Aug 9, 2021

Prone move mode #46750

Prone move mode #46750

Conversation

J-Cieplinski commented Jan 14, 2021 • edited Loading

Summary

Purpose of change

Describe the solution

Testing

Additional context

anothersimulacrum commented Jan 15, 2021

Xaleth commented Jan 15, 2021

Qrox commented Jan 15, 2021

J-Cieplinski commented Jan 15, 2021

J-Cieplinski commented Jan 15, 2021

J-Cieplinski commented Jan 15, 2021 • edited Loading

ghost commented Jan 15, 2021

J-Cieplinski commented Jan 16, 2021

actual-nh commented Jan 16, 2021 • edited Loading

J-Cieplinski commented Jan 16, 2021 • edited Loading

J-Cieplinski commented Jan 16, 2021

actual-nh commented Jan 16, 2021

actual-nh commented Jan 16, 2021

J-Cieplinski commented Jan 16, 2021

Kelenius commented Jan 28, 2021

J-Cieplinski commented Jan 29, 2021

int-ua commented Jan 29, 2021 • edited Loading

WilliamtheCardboardBox commented Mar 12, 2021

Night-Pryanik Mar 12, 2021

Choose a reason for hiding this comment

Night-Pryanik Mar 12, 2021

Choose a reason for hiding this comment

Fosheze commented Mar 12, 2021

J-Cieplinski commented Mar 12, 2021

Night-Pryanik commented Jul 11, 2021

J-Cieplinski commented Jul 11, 2021

Ivan-Shestakov commented Aug 9, 2021

ZhilkinSerg commented Aug 9, 2021 • edited Loading

Ivan-Shestakov commented Aug 9, 2021

J-Cieplinski commented Jan 14, 2021 •

edited

Loading

J-Cieplinski commented Jan 15, 2021 •

edited

Loading

actual-nh commented Jan 16, 2021 •

edited

Loading

J-Cieplinski commented Jan 16, 2021 •

edited

Loading

int-ua commented Jan 29, 2021 •

edited

Loading

ZhilkinSerg commented Aug 9, 2021 •

edited

Loading