From e19a49798958f56fbbedfdaad53b91da178365a5 Mon Sep 17 00:00:00 2001 From: Cat Stevens Date: Sun, 12 Feb 2023 19:34:42 -0500 Subject: [PATCH] Don't require 10 energy for climbing The infinite climb bug should be fixed by !3792 (Refactor energy and poise regen), so we can safely remove the need for the character to have at least 10 energy to climb. The minimum energy needed to start climbing is now 1 energy. This was suggested by James M#8698. --- CHANGELOG.md | 1 + common/src/states/utils.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72b3084000..74c8e85f23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bats move slower and use a simple proportional controller to maintain altitude - Bats now have less health +- Climbing no longer requires having 10 energy ### Removed diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index fcc5727f55..72b78f63d0 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -748,7 +748,7 @@ pub fn handle_climb(data: &JoinData<'_>, update: &mut StateUpdate) -> bool { .unwrap_or(false) //&& update.vel.0.z < 0.0 && data.body.can_climb() - && update.energy.current() > 10.0 + && update.energy.current() > 1.0 { update.character = CharacterState::Climb(climb::Data::create_adjusted_by_skills(data)); true