summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md5
-rw-r--r--app/views/application/_timer.html.erb8
2 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91ea977..1dcf290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ All notable changes to this project will be documented in this file.
### Items
- New items: pluma moss, laris strand, fine aethermesh, faint weaving haste
- Aethermesh now increases manatrawl speed by 2.
-- Apprentice wand now requires havencast level 5 to equip
+- Apprentice wand now requires havencast level 5 to equip.
### Activities
- Synthsever rusted lockbox base duration reduced from 180 to 120.
@@ -27,6 +27,9 @@ All notable changes to this project will be documented in this file.
- Chat area now shows most recent 200 messages, instead of 100.
- New "History" link shows a chat history of the last 2,000 messages.
+### UI
+- Number of actions remaining is now displayed below timer when a set amount of actions have been queued.
+
## [0.1.12] - 2021-06-23
### General
diff --git a/app/views/application/_timer.html.erb b/app/views/application/_timer.html.erb
index 51d9b81..a18e739 100644
--- a/app/views/application/_timer.html.erb
+++ b/app/views/application/_timer.html.erb
@@ -15,14 +15,18 @@
</div>
</div>
-
<% most_recent_cs = current_char.character_skills.order(:updated_at).last %>
<div class="text-center text-sm">
<div class="text-xs"><%= most_recent_cs.skill.name %> level <%= most_recent_cs.level %></div>
<div><%= most_recent_cs.xp_to_next_level %> XP to next level</div>
</div>
- <div class="text-center my-2">
+ <div class="text-center text-sm my-2">
+ <% if current_char.queued_actions %>
+ <div class="my-1">
+ <%= pluralize(current_char.queued_actions + 1, "action") %> remaining.
+ </div>
+ <% end %>
<%= button_to "Stop", stop_activity_path, class: "text-sm" %>
</div>