openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fix the minmax calls on success chance printing

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-09-04 17:18:42 -05:00
parent 33e1ec5938
commit bd898f8d19
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/boe.party.cpp
View File

@@ -1394,7 +1394,7 @@ void cast_town_spell(location where) {
}else{
total_modifier = -5 * adj + 5 * univ.town.door_diff_adjust() + univ.scenario.ter_types[ter].flag2 * 7;
r1 = get_ran(1,1,100) + total_modifier;
success_chance = minmax(min_fail_roll - 1 - total_modifier, 0, 100);
success_chance = minmax(0, 100, min_fail_roll - 1 - total_modifier);
}
if(r1 < min_fail_roll) {
add_string_to_buf(" Door unlocked.");
@@ -1416,7 +1416,7 @@ void cast_town_spell(location where) {
if(univ.town.is_fire_barr(where.x,where.y))
total_modifier -= 8;
short min_fail_roll = (120 - combat_percent[min(19,level)]);
short success_chance = minmax(min_fail_roll - 1 - total_modifier, 0, 100);
short success_chance = minmax(0, 100, min_fail_roll - 1 - total_modifier);
r1 = get_ran(1,1,100) + total_modifier;
if(r1 < min_fail_roll) {
add_string_to_buf(" Barrier broken.");

4
src/game/boe.town.cpp
View File

@@ -1165,7 +1165,7 @@ void pick_lock(location where,short pc_num) {
short success_chance = 0;
short max_success_roll = (unlock_adjust * 15 + 30);
if(unlock_adjust < 5){
success_chance = minmax(max_success_roll - total_modifier, 0, 100);
success_chance = minmax(0, 100, max_success_roll - total_modifier);
}
if((unlock_adjust >= 5) || (r1 > max_success_roll)) {
add_string_to_buf(" Didn't work. (" + std::to_string(success_chance) + "\% chance)");
@@ -1203,7 +1203,7 @@ void bash_door(location where,short pc_num) {
r1 = get_ran(1,1,100) + total_modifier;
bool success_chance = 0;
if(unlock_adjust < 5 && univ.scenario.ter_types[terrain].flag3 == 1){
success_chance = minmax(max_success_roll - total_modifier, 0, 100);
success_chance = minmax(0, 100, max_success_roll - total_modifier);
}
if(unlock_adjust >= 5 || r1 > max_success_roll || univ.scenario.ter_types[terrain].flag3 != 1) {
add_string_to_buf(" Didn't work. (" + std::to_string(success_chance) + "\% chance)");