summaryrefslogtreecommitdiff
path: root/app/views/characters
diff options
context:
space:
mode:
authorDavid Gay <david@davidgay.org>2021-06-03 21:26:14 -0400
committerDavid Gay <david@davidgay.org>2021-06-03 21:26:14 -0400
commit60c9de4956547d46390c948146aa6e0c865ffcda (patch)
tree7bbde799de9cec589a53a08b8e4dccf98bfdc8e3 /app/views/characters
parent7f129f24e351cafafdb4bc58a44ca0d714e30af6 (diff)
Move timer and results to new game containers which are always visible
Diffstat (limited to 'app/views/characters')
-rw-r--r--app/views/characters/show.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/characters/show.html.erb b/app/views/characters/show.html.erb
index b2e8f94..dda770e 100644
--- a/app/views/characters/show.html.erb
+++ b/app/views/characters/show.html.erb
@@ -19,7 +19,7 @@
<% if @character.active_states.any? %>
<ul>
<% @character.active_states.each do |state| %>
- <ul><%= state.condition.name %> (expires in <%= state.remaining_duration %> seconds)</ul>
+ <ul><%= state.condition.name %> (expires in <%= distance_of_time_in_words_to_now(state.expires_at)%>)</ul>
<% end %>
</ul>
<% else %>
@@ -109,7 +109,7 @@
<div class="my-6">
<h2 class="text-2xl mb-4">Rest</h2>
<p class="mb-4">
- You have <%= @character.rested_duration %> seconds of rested time stored.
+ You have <%= distance_of_time_in_words_to_now(current_char.rested_until) %> of rested time.
<% if current_char.resting? %>
This does not include time from your current rest. That time will be added when you stop resting.
<% end %>