From 629542aa0e3ad63ea1426571cb7dcae6e5da973d Mon Sep 17 00:00:00 2001
From: David Gay <david@davidgay.org>
Date: Wed, 26 May 2021 19:39:05 -0400
Subject: Show level, xp, xptnl on timer

---
 app/views/activities/_timer.html.erb | 7 +++++++
 data/activities.yml                  | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/views/activities/_timer.html.erb b/app/views/activities/_timer.html.erb
index 46e0eb0..c7d881c 100644
--- a/app/views/activities/_timer.html.erb
+++ b/app/views/activities/_timer.html.erb
@@ -5,5 +5,12 @@
        class="text-center">
     <span data-timer-target="timer" class="text-3xl"></span>
   </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>
+
   <%= button_to "Stop", stop_activity_path %>
 <% end %>
diff --git a/data/activities.yml b/data/activities.yml
index 338da3c..6a0f4c4 100644
--- a/data/activities.yml
+++ b/data/activities.yml
@@ -243,7 +243,7 @@ craft_manadross_tincture:
         xp:
           - gid: "fluxseethe"
             value: 15
-quarry_floret_mines:
+planequarry_floret_mines:
   name: "Quarry Floret Mines"
   description: "Planequarry at the Floret Mines."
   location: "floret_region"
@@ -309,7 +309,7 @@ quarry_floret_mines:
             xp:
               - gid: "planequarry"
                 value: 50
-hunt_killing_fields:
+beastslay_killing_fields:
   name: "Hunt The Killing Fields"
   description: "Hunt monsters in The Killing Fields."
   location: "floret_region"
@@ -332,7 +332,7 @@ hunt_killing_fields:
             score: 0.50
           - gid: "lesser_trodgeathomp"
             score: 0.95
-reap_twil_woods:
+wealdreap_twil_woods:
   name: "Reap Twil Woods"
   description: "Wealdreap within Twil Woods."
   location: "floret_region"
-- 
cgit v1.2.3