Skip to content

Commit

Permalink
Updated town detection logic, updated refill_pick check to nil instea…
Browse files Browse the repository at this point in the history
…d of empty
  • Loading branch information
Nyt3 committed Nov 26, 2023
1 parent ee22cfb commit 99b6bb6
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions pick.lic
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class Pick

@picking_room_id = Room.current.id

@refill_town = @settings.refill_town = @settings.refill_town.to_s
@lockpick_costs = picking_data['lockpick_costs'][@settings.refill_town || @settings.fang_cove_override_town || @settings.hometown]

if @debug
echo "Settings..."
Expand Down Expand Up @@ -134,12 +134,6 @@ class Pick
echo "- assumed_difficulty: #{@assumed_difficulty}"
end

if @refill_town.empty?
@lockpick_costs = picking_data['lockpick_costs'][@settings.fang_cove_override_town || @settings.hometown]
else
@lockpick_costs = picking_data['lockpick_costs'][@settings.refill_town]
end

if args.refill
refill_ring
elsif stop_picking?
Expand Down Expand Up @@ -325,13 +319,13 @@ class Pick
return
end

if @refill_town.empty?
if @refill_town.nil?
DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings)
else
DRCM.ensure_copper_on_hand(cost * lockpicks_needed, @settings, @refill_town)
end

if @refill_town.empty?
if @refill_town.nil?
DRCT.refill_lockpick_container(@settings.lockpick_type, @settings.fang_cove_override_town || @settings.hometown, @lockpick_container, lockpicks_needed)
else
DRCT.refill_lockpick_container(@settings.lockpick_type, @refill_town, @lockpick_container, lockpicks_needed)
Expand Down

0 comments on commit 99b6bb6

Please sign in to comment.