diff --git a/bescort.lic b/bescort.lic index dd1bc19ddc..3d305c8a85 100644 --- a/bescort.lic +++ b/bescort.lic @@ -389,9 +389,9 @@ class Bescort else path.each do |movement| move(movement) - waitrt - fput('collect rock') - waitrt + waitrt? + collect('rock') + waitrt? end end end @@ -681,4 +681,4 @@ class Bescort end end -Bescort.new +Bescort.new \ No newline at end of file diff --git a/common.lic b/common.lic index 1a9603be5d..73b02a78db 100644 --- a/common.lic +++ b/common.lic @@ -93,6 +93,17 @@ module DRC end true end + + def collect(item) + case bput("collect #{item}",'You manage to collect a pile', 'The room is too cluttered') + when 'The room is too cluttered' + fput('kick pile') + fput('kick pile') + fput('kick pile') + fput("collect #{item}") + waitrt? + end + end def kick_pile?(item = 'pile') fix_standing diff --git a/crossing-training.lic b/crossing-training.lic index 9c0c1628e3..26d10a0d8f 100644 --- a/crossing-training.lic +++ b/crossing-training.lic @@ -576,12 +576,12 @@ class CrossingTraining end def train_outdoorsmanship - if DRSkill.getrank('Outdoorsmanship') < 30 + if DRSkill.getrank('Outdoorsmanship') < 20 forage?('rock') dispose_trash 'rock' else item = @settings.forage_item || 'rock' - bput("collect #{item}", 'You manage to collect', 'The room is too cluttered to find anything here') + collect(item) waitrt? kick_pile? unless kick_pile?("#{item}s") end