Fix lminal not affected by overllumination/darkening

wesnoth · Jun 5, 2022 · f55c67d · f55c67d
1 parent 22396f6
commit f55c67d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/actions/attack.cpp b/src/actions/attack.cpp
@@ -1625,7 +1625,7 @@ int generic_combat_modifier(int lawful_bonus, unit_alignments::type alignment, b
 		bonus = -lawful_bonus;
 		break;
 	case unit_alignments::type::liminal:
-		bonus = std::max(0, max_liminal_bonus-std::abs(lawful_bonus));
+		bonus = max_liminal_bonus-std::abs(lawful_bonus);
 		break;
 	default:
 		bonus = 0;

diff --git a/src/tod_manager.cpp b/src/tod_manager.cpp
@@ -55,7 +55,7 @@ tod_manager::tod_manager(const config& scenario_cfg)
 	}
 
 	time_of_day::parse_times(scenario_cfg, times_);
-	liminal_bonus_ = calculate_best_liminal_bonus(times_);
+	liminal_bonus_ = std::max(25, calculate_best_liminal_bonus(times_));
 
 	if(scenario_cfg.has_attribute("liminal_bonus")) {
 		liminal_bonus_ = scenario_cfg["liminal_bonus"].to_int(liminal_bonus_);

diff --git a/src/tod_manager.hpp b/src/tod_manager.hpp
@@ -197,7 +197,7 @@ class tod_manager
 			has_cfg_liminal_bonus_ = true;
 		}
 		void reset_max_liminal_bonus() {
-			liminal_bonus_ = calculate_best_liminal_bonus(times());
+			liminal_bonus_ = std::max(25, calculate_best_liminal_bonus(times()));
 			has_cfg_liminal_bonus_ = false;
 		}
 	private: