diff --git a/athletics.lic b/athletics.lic index 379ead4ab0..ce0e65b1f3 100644 --- a/athletics.lic +++ b/athletics.lic @@ -69,7 +69,7 @@ class Athletics start = Time.now DRCT.walk_to(@outdoorsmanship_rooms.sample) unless @outdoorsmanship_rooms.empty? stow_athletics_items - DRC.wait_for_script_to_complete('outdoorsmanship', [number, "room=#{Room.current.id}", 'collect', 'rock']) + DRC.wait_for_script_to_complete('outdoorsmanship', [number, "room=#{Room.current.id}", 'rock']) remaining_pause = ((number * 15) - (Time.now - start)) pause remaining_pause if remaining_pause > 0 get_athletics_items diff --git a/outdoorsmanship.lic b/outdoorsmanship.lic index 4e6e8a2ed8..2f2f0632c4 100644 --- a/outdoorsmanship.lic +++ b/outdoorsmanship.lic @@ -11,7 +11,6 @@ class Outdoorsmanship { name: 'perception', regex: /perception/, optional: true, description: 'Check Perception skill in place of Outdoorsmanship' }, { name: 'mindstates', regex: /^\d+/, optional: true, description: 'Number of mindstates or collection attempts to perform before exiting. Defaults to 3' }, { name: 'room', regex: /(room=(\d+))/, optional: true, description: 'Specific room to forage in - primarily used to locate a trash bin. Syntax: room=1234' }, - { name: 'forage', regex: /forage|collect/, optional: true, description: 'Default method is collect, specify forage to override. Forage is best used with a trash bin.' }, { name: 'collect_item', regex: /\w+/i, optional: true, description: 'Item to collect. Will use forage_item if not set. Wrap "multiple words" in double quotes.' } ] ] @@ -30,7 +29,7 @@ class Outdoorsmanship @train_method = if DRSkill.getrank('Outdoorsmanship') < 20 'forage' else - args.forage || @settings.outdoors_method + 'collect' end @forage_item = if DRSkill.getrank('Outdoorsmanship') < 20 'rock' @@ -53,25 +52,16 @@ class Outdoorsmanship attempt = 0 # Failsafe counter to prevent an infinite loop if item isn't collectable in the room while (DRSkill.getxp(@skill_name) < @end_exp) && (attempt < @targetxp) if @train_method == 'forage' - DRC.message("#########################################################################") - DRC.message("##############################NOTICE#####################################") - DRC.message("Using FORAGE is going to be deprecated in favor of using COLLECT PRACTICE") - DRC.message("If you are seeing this message, you should remove the line") - DRC.message("outdoors_method: forage") - DRC.message("From your yaml") - DRC.message("This functionality will be completely removed on the 28th of Feb 2024") - DRC.message("#########################################################################") DRCA.crafting_magic_routine(@settings) DRC.forage?(@forage_item) DRCI.dispose_trash(@forage_item, @worn_trashcan, @worn_trashcan_verb) + attempt += 1 else item = @forage_item DRCA.crafting_magic_routine(@settings) DRC.collect(item) waitrt? - DRC.kick_pile? unless DRC.kick_pile?("#{item}") end - attempt += 1 end magic_cleanup end diff --git a/profiles/base.yaml b/profiles/base.yaml index 956a2f1a2d..c52ef78a4d 100644 --- a/profiles/base.yaml +++ b/profiles/base.yaml @@ -747,8 +747,6 @@ crossing_training_requires_movement: performance_pause: 3 # mindstate goal for performance.lic performance_mindstate_goal: 31 -# Define as `forage` to override outdoorsmanship gathering method. -outdoors_method: collect # If you choose forage method, you'll want a room with a trash bin! Leave blank to not set a default room. outdoors_room: # If you choose forage method, you'll want to select a custom item for best learning rate.