From 9fec79398a34d26be1042e35cae429b88f8b96d0 Mon Sep 17 00:00:00 2001 From: David Gay Date: Wed, 19 May 2021 18:39:35 -0400 Subject: Revise and progress with hearth amenity construction --- app/views/activities/_timer.html.erb | 9 +++++---- app/views/characters/hearth/index.html.erb | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'app/views') diff --git a/app/views/activities/_timer.html.erb b/app/views/activities/_timer.html.erb index 418c378..27d9272 100644 --- a/app/views/activities/_timer.html.erb +++ b/app/views/activities/_timer.html.erb @@ -1,8 +1,9 @@ <% if current_char.activity %> -
- +
- <%= link_to "Stop", location_path(current_char.activity.location) %> + <%= link_to "Stop", character_path(current_char) %> <% end %> diff --git a/app/views/characters/hearth/index.html.erb b/app/views/characters/hearth/index.html.erb index 421d5e6..f087ede 100644 --- a/app/views/characters/hearth/index.html.erb +++ b/app/views/characters/hearth/index.html.erb @@ -1,8 +1,10 @@ +<% foundation = @all_amenities.find_by_gid("foundation") %>

Hearth

-<% if current_char.hearth %> +<% if current_char.hearth.has_amenity?(foundation) %> <% else %>

You haven't built your hearth yet. First, you'll need to start with a foundation.

- <% foundation = @all_amenities.find_by_gid("foundation") %> - <%= link_to "Build #{foundation.name}", "#" %> (requires <%= foundation.build_requirements_string(1) %>) + <% construct_activity = foundation.construct_activity(1) %> + <%= link_to construct_activity.name, start_activity_path(construct_activity), method: :post %> + (costs <%= construct_activity.cost_string %>) <% end %> -- cgit v1.2.3