summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--app/controllers/game_controller.rb2
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa5e02f..529bf6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ amenities, etc that are added unless they are special in some way.
- New items: bluster powder, mudtub mash, midoras spice, midoras mudtub mash
- New title: Aspirant, gained by reaching 100 total level
+### Fixed
+- No blank line was being added to combat activity results if the activity was stopped due to being too wounded.
+
## [0.1.5] - 2021-06-03
### Added
diff --git a/app/controllers/game_controller.rb b/app/controllers/game_controller.rb
index f8b9973..9574f31 100644
--- a/app/controllers/game_controller.rb
+++ b/app/controllers/game_controller.rb
@@ -195,6 +195,7 @@ class GameController < ApplicationController
current_char.stop_activity
@results.replace([{ type: "error",
message: "You can't fight in your condition. You'll have to heal a wound." }])
+ @results.push({ type: "br" })
end
private
@@ -253,6 +254,7 @@ class GameController < ApplicationController
unless char.can_fight?
@results.push({ type: "error",
message: "You can't fight in your condition. You'll have to heal a wound." })
+ @results.push({ type: "br" })
char.stop_activity
return
end