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

Various bodytemp and frostbite fixes #8457

Merged
merged 3 commits into from Aug 7, 2014

Conversation

Projects
None yet
3 participants
@Shoes01
Copy link
Contributor

commented Aug 6, 2014

Fixed a typo where the right foot was called left foot.
Fixed an overlooked change when add_disease functions were changed.

  • Player will no longer get warm body parts instead of frostbite.
  • Feet, hands and mouth are susceptible to cold again.

Added a sanity check to remove hot/cold diseases if the player is not hot/cold.
Fixed frostbite message spam.
Fixed frostbite happening too soon; it now takes 2 hours for frostnip to set in and 4 hours for frostbite to set in instead of 0.2 and 0.4 hours respectively.
Torso and head no longer warm up/cool down faster than other body parts (expected torso/head to stay warmer, when in fact they got colder fast as well).
Lying down now uses floor tiles for warmth in the same way sleeping does (suggested in #8351).

@Shoes01 Shoes01 referenced this pull request Aug 6, 2014

Closed

Extremely painful weather #8402

@KA101 KA101 self-assigned this Aug 6, 2014

// If you're standing in deep water, you approach convergeant temp fast
// If you're standing in shallow water, only your feet and legs converge faster
if ((ter_at_pos == t_water_dp) ||
((ter_at_pos == t_water_sh || ter_at_pos == t_sewage) &&

This comment has been minimized.

Copy link
@KA101

KA101 Aug 6, 2014

Contributor

t_water_pool, too. It's considered Deep and Swimmable, and is the stuff in Mansion pools.

This comment has been minimized.

Copy link
@BevapDin

BevapDin Aug 6, 2014

Contributor

There is a terrain flag "SWIMMABLE" that is used for swimming. It's currently set for t_water_sh, t_water_dp, t_swater_sh, t_swater_dp, t_water_pool and t_sewage. Could this be used as a simpler and generalized way to check this? Otherwise you should include t_swater_sh and t_swater_dp (salt water).

This comment has been minimized.

Copy link
@KA101

KA101 Aug 7, 2014

Contributor

Not really, because it includes both shallow and deep equally. One or the other type would need to be tested explicitly.

@Shoes01

This comment has been minimized.

Copy link
Contributor Author

commented Aug 6, 2014

Added the t_water_pool! Thanks.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Aug 6, 2014

Now that I think of it, I forgot the saltwater terrains too. t_swater_sh and t_swater_dp. :-/

(Marshes, not immediately apparent to the player but getting water from 'em returns salt water rather than fresh.)

@KA101

This comment has been minimized.

Copy link
Contributor

commented Aug 6, 2014

Bump for pulling. I'll add the saltwater in the merge.

@KA101 KA101 merged commit a560114 into CleverRaven:master Aug 7, 2014

1 check passed

default
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.