Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Liminal be sensitive to overillumination/overdarkening #6749

Merged
merged 1 commit into from
Jun 5, 2022
Merged

Make Liminal be sensitive to overillumination/overdarkening #6749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/actions/attack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/tod_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
Expand Down
2 changes: 1 addition & 1 deletion src/tod_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down