Skip to content

Commit

Permalink
Merge pull request #6756 from vtcifer/fix_use_auto_mana_with_rituals
Browse files Browse the repository at this point in the history
  • Loading branch information
MahtraDR authored Feb 2, 2024
2 parents 17ecce7 + 001cc54 commit eb2f3f6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions common-arcana.lic
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ module DRCA
discern_data['cambrinth'] = nil
else
discern =~ /minimum (\d+) mana streams and you think you can reinforce it with (\d+) more/i
calculate_mana(Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, discern_data, data['cyclic'], settings)
calculate_mana(Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, discern_data, data['cyclic'] || data['ritual'], settings)
end
end
pause 1
Expand All @@ -734,7 +734,7 @@ module DRCA
data
end

def calculate_mana(min, more, discern_data, cyclic, settings)
def calculate_mana(min, more, discern_data, cyclic_or_ritual, settings)
total = min + more
total = (total * settings.prep_scaling_factor).floor
discern_data['mana'] = [(total / 5.0).ceil, min].max
Expand All @@ -759,7 +759,7 @@ module DRCA
discern_data['mana'] = discern_data['mana'] + (remaining - total_cambrinth_cap)
remaining = total - discern_data['mana']
end
if cyclic || total_cambrinth_charges == 0
if cyclic_or_ritual || total_cambrinth_charges == 0
discern_data['cambrinth'] = nil
discern_data['mana'] = discern_data['mana'] + remaining
elsif remaining > 0
Expand Down

0 comments on commit eb2f3f6

Please sign in to comment.