diff options
| author | David Gay <david@davidgay.org> | 2021-06-04 10:39:28 -0400 |
|---|---|---|
| committer | David Gay <david@davidgay.org> | 2021-06-04 10:39:28 -0400 |
| commit | 0371c5b9a0303d24f043ae84f827f760ac8680ae (patch) | |
| tree | 32268da121df10f80ff522ae86c028551942c530 /app | |
| parent | 8c83a0a78cf9e02de782f46337a686208e0ed7ac (diff) | |
Adjust error message since Rest section has been removed from Character view
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/game_controller.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 181841d..81fb58a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -18,7 +18,7 @@ class ApplicationController < ActionController::Base private def start_activity(activity) if current_char.resting? - flash[:alert] = "You can't do anything while you're resting. Go to the Character page to stop resting." + flash[:alert] = "You can't do anything while you're resting." redirect_to character_path(current_char) and return end queued_actions = params[:actions].present? ? params[:actions].to_i - 1 : nil diff --git a/app/controllers/game_controller.rb b/app/controllers/game_controller.rb index 62ab77b..6205c17 100644 --- a/app/controllers/game_controller.rb +++ b/app/controllers/game_controller.rb @@ -27,8 +27,7 @@ class GameController < ApplicationController activity = current_char.activity if current_char.resting? - @results.replace([{ type: "error", message: "You can't do anything while you're resting. Go to the Character" \ - " page to stop resting." }]) + @results.replace([{ type: "error", message: "You can't do anything while you're resting." }]) current_char.stop_activity return end |