refactor: update grenade.rs to use bones timer. #740
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zicklag
requested changes
Mar 27, 2023
core/src/elements/grenade.rs
Outdated
| lit.insert( | ||
| entity, | ||
| LitGrenade { | ||
| damage_delay: Timer::new(Duration::from_secs_f32(4.0), TimerMode::Once), |
There was a problem hiding this comment.
This 4.0 should come from the fuse_time out of the grenade meta.
core/src/elements/grenade.rs
Outdated
| @@ -215,7 +224,7 @@ fn update_lit_grenades( | |||
| } | |||
|
|
|||
| // If it's time to explode | |||
| if grenade.age >= *fuse_time { | |||
| if grenade.damage_delay.elapsed_secs() >= *fuse_time { | |||
There was a problem hiding this comment.
Once we set the timer duratino from the fuse_time, we can just do this:
Suggested change
| if grenade.damage_delay.elapsed_secs() >= *fuse_time { | |
| if grenade.damage_delay.is_finished() { |
zicklag
requested changes
Mar 29, 2023
core/src/elements/grenade.rs
Outdated
Comment on lines
20
to
21
| /// How long the grenade has been lit. | ||
| pub age: f32, | ||
| pub damage_delay: Timer, |
There was a problem hiding this comment.
Last change! Could you re-name this to fuse_time, and remove the comment, or update it with a new description.
…ed comment on ln 20
zicklag
changed the title
thanks for the help ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
updated grenade.rs to use bones timer instead of manually setting time to 4.0 seconds
attempts to resolve #739