[WIP] [CR] Initial Cardio implementation. #44506

gkarfakis19 · 2020-09-29T18:11:58Z

Summary

SUMMARY: Infrastructure "Adds a cardio modifier to the player character that affects stamina max and regeneration"

Purpose of change

Look at #44370!!
Adds a general purpose Cardio modifier to the player character that affects the max stamina, stamina regeneration and weariness stats. Currently WIP, details of implementation based on issue linked, credit to @I-am-Erk.
I do NOT plan on adding the exercise (cardio_acc) aspect of Cardio in this PR. It will come later.

TODO List:

Describe the solution

Many changes to many files. Old functions refactored to use the Character::get_stamina_max() function and not to read directly from json.

Describe alternatives you've considered

Testing

Currently builds ( a true miracle ), although actual balancing cannot be undertaken until the addition of cardio_acc, which is going to be in a separate PR. Consider all values below to be of totally sedentary humans.

Character with Indefatigable, great health and 10 swimming skill.

Same character, without that trait and with 0 in swimming.

^^ EXTREMELY WIP NUMBERS (traits and skills shouldn't have that big an impact).

Additional context

Currently need comments and a lot of help on the implementation details. I have never attempted such far reaching code changes before. Specifically:

Comments Requested:

How often should update_cardio() be ran? Should it be recalculated after a certain amount of time (far more efficient but slow-to-react), say, every time bmr is recalculated, or should it be recalculated before every single instance of it's use (high performance impact, far more accurate)? Currently being calculated every 10 min.

How should stamina now be modifiable in json? Currently I make use of existing MAX_STAMINA json modifier, and I just use it as the base stamina before adding to it the cardio value, multiplied by another json modifier.

^^ Same question about stamina regen.

Check NPC behavior. Make sure these values don't apply to them.

New athletic proficiency?

CountAlex · 2020-09-29T18:17:22Z

I suggest you also take a look and maybe change heartrate_bpm() at character.cpp as it might give you some ideas and probably should be changed to reflect your work.

src/iuse.cpp

I-am-Erk · 2020-09-29T22:15:05Z

Make sure to note this doesn't actually close #44370, it should say "partially fixes"

Hatfish · 2020-09-30T16:56:32Z

Since this will be affecting the stamina pool, is there any chance that the indefatigable and languorous traits will get reworked to use this system?

gkarfakis19 · 2020-09-30T17:01:52Z

That's the plan.

stale · 2020-11-01T02:53:27Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

I-am-Erk · 2020-11-03T06:20:37Z

Go away stalebot, you're supposed to ignore feature freeze.

TheDjur · 2020-11-26T18:33:54Z

I was just thinking about how to go about this myself (holy hell can i not code), but my idea was to tie it to one or more stats, since I'd assume most people would be using STS or STK

gkarfakis19 · 2020-11-26T18:46:43Z

I was just thinking about how to go about this myself (holy hell can i not code), but my idea was to tie it to one or more stats, since I'd assume most people would be using STS or STK

Please feel free to take this code and improve it. Due to new responsibilities I don't have much time to work on CDDA these days, and I'd hate for my work to be wasted.
However, I'd prefer sticking to the original plan of #44370 for now, unless senior developers change their mind on how it should be implemented. You cannot assume every person is running STS or STK and balance the game that way.

I-am-Erk · 2021-07-16T03:58:52Z

I would very much like this merged, are you still around?

gkarfakis19 · 2021-07-16T08:37:17Z

Hey there. Unfortunately I am unable to dedicate any serious amount of time to modding anymore due to other obligations, but I’d be happy to see this merged, as long as someone else is there to implement the other half of this PR (cardio_acc).

KorGgenT · 2021-07-30T20:08:34Z

src/character.cpp

@@ -8265,9 +8267,12 @@ int Character::get_stamina() const
 int Character::get_stamina_max() const
 {
    static const std::string player_max_stamina( "PLAYER_MAX_STAMINA" );
+    // ^^ this is now base max stamina, name not changed (for now) to avoid code changes.


comments go above the line of code you're referring to, not below.

KorGgenT · 2021-07-30T20:11:21Z

src/character.cpp

+    const int baseStamina = get_option< int >( player_max_stamina );
+    const int staminaMod = get_option< int >( player_cardio_stamina_mod );


Suggested change

const int baseStamina = get_option< int >( player_max_stamina );

const int staminaMod = get_option< int >( player_cardio_stamina_mod );

const int baseStamina = get_option<int>( player_max_stamina );

const int staminaMod = get_option<int>( player_cardio_stamina_mod );

KorGgenT · 2021-07-30T20:18:44Z

src/character.cpp

+int Character::get_cardio() const
+{
+    return cardio;
+}
+
+void Character::set_cardio( int new_cardio )
+{
+    cardio = new_cardio;
+}
+
+void Character::update_cardio()


i would have this be a function that calculates cardio on the fly, instead of updating a cached value.

~~It isn't caching cardio; it's adjusting - actually, simply setting - cardio.~~ OK, I see what you mean.

KorGgenT · 2021-07-30T20:20:32Z

src/character.cpp

+void Character::update_cardio_acc()
+{
+    //WIP- LATER PR
+    cardio_acc = 0;
+}


maybe dont' include this until said later pr

If cardio_acc is 0, that leaves cardio based on half of BMR only.

stale · 2021-09-06T19:18:38Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

wapcaplet · 2021-09-25T19:21:39Z

This pull request is now included in and superseded by #51880

Init

57fa2c8

gkarfakis19 marked this pull request as draft September 29, 2020 18:12

gkarfakis19 added 4 commits September 29, 2020 19:27

stamina regen rate modified

60505ce

Cardio affects weariness and is updated every hour

00a83d1

second stamina regen json modifier

01908f5

Refactor old code to use get_stamina_max() instead of loading from json.

357f9a6

gkarfakis19 commented Sep 29, 2020

View reviewed changes

src/iuse.cpp Show resolved Hide resolved

I-am-Erk requested a review from anothersimulacrum September 29, 2020 22:16

gkarfakis19 added 2 commits September 30, 2020 00:13

small fix

f8e5b73

float conversion

98b08c1

gkarfakis19 added 9 commits September 30, 2020 23:11

Initial implementation of cardio traits

debcbd6

Trait changes

6feafa1

misc

6ded869

float changes

197b868

json clarity

d685440

Highly increased impact of non-bmr factors.

9c415c3

small rebalance

eb2b65c

Update character.cpp

29a5eb3

Update game.cpp

4c159d6

gkarfakis19 changed the title ~~[WIP] [CR] Draft - Initial Cardio implementation.~~ [WIP] [CR] Initial Cardio implementation. Oct 1, 2020

gkarfakis19 marked this pull request as ready for review October 1, 2020 20:50

Update character.cpp

7efb5d9

stale bot added the stale Closed for lack of activity, but still valid. label Nov 1, 2020

stale bot removed the stale Closed for lack of activity, but still valid. label Nov 3, 2020

int-ua mentioned this pull request Dec 24, 2020

None "Replacing WIP in PR title with Drafts GitHub feature" #46292

Merged

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

actual-nh added PUBLIC TEST Come and try this! and removed 0.F Feature Freeze labels Jul 16, 2021

KorGgenT reviewed Jul 30, 2021

View reviewed changes

actual-nh removed the PUBLIC TEST Come and try this! label Jul 30, 2021

KorGgenT mentioned this pull request Jul 30, 2021

[WIP] Create cardio #50339

Closed

stale bot added the stale Closed for lack of activity, but still valid. label Sep 6, 2021

wapcaplet mentioned this pull request Sep 25, 2021

Implement cardio, use cardio for stamina, and adjust cardio fitness over time #51880

Merged

5 tasks

wapcaplet closed this Sep 25, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] [CR] Initial Cardio implementation. #44506

[WIP] [CR] Initial Cardio implementation. #44506

gkarfakis19 commented Sep 29, 2020 •

edited

Loading

CountAlex commented Sep 29, 2020

I-am-Erk commented Sep 29, 2020

Hatfish commented Sep 30, 2020

gkarfakis19 commented Sep 30, 2020

stale bot commented Nov 1, 2020

I-am-Erk commented Nov 3, 2020

TheDjur commented Nov 26, 2020

gkarfakis19 commented Nov 26, 2020

I-am-Erk commented Jul 16, 2021

gkarfakis19 commented Jul 16, 2021

KorGgenT Jul 30, 2021

KorGgenT Jul 30, 2021

KorGgenT Jul 30, 2021

actual-nh Jul 30, 2021 •

edited

Loading

KorGgenT Jul 30, 2021

actual-nh Jul 30, 2021

stale bot commented Sep 6, 2021

wapcaplet commented Sep 25, 2021

		const int baseStamina = get_option< int >( player_max_stamina );
		const int staminaMod = get_option< int >( player_cardio_stamina_mod );

[WIP] [CR] Initial Cardio implementation. #44506

[WIP] [CR] Initial Cardio implementation. #44506

Conversation

gkarfakis19 commented Sep 29, 2020 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Comments Requested:

CountAlex commented Sep 29, 2020

I-am-Erk commented Sep 29, 2020

Hatfish commented Sep 30, 2020

gkarfakis19 commented Sep 30, 2020

stale bot commented Nov 1, 2020

I-am-Erk commented Nov 3, 2020

TheDjur commented Nov 26, 2020

gkarfakis19 commented Nov 26, 2020

I-am-Erk commented Jul 16, 2021

gkarfakis19 commented Jul 16, 2021

KorGgenT Jul 30, 2021

Choose a reason for hiding this comment

KorGgenT Jul 30, 2021

Choose a reason for hiding this comment

KorGgenT Jul 30, 2021

Choose a reason for hiding this comment

actual-nh Jul 30, 2021 • edited Loading

Choose a reason for hiding this comment

KorGgenT Jul 30, 2021

Choose a reason for hiding this comment

actual-nh Jul 30, 2021

Choose a reason for hiding this comment

stale bot commented Sep 6, 2021

wapcaplet commented Sep 25, 2021

gkarfakis19 commented Sep 29, 2020 •

edited

Loading

actual-nh Jul 30, 2021 •

edited

Loading