Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

task-forage #6700

Merged
merged 6 commits into from
Sep 21, 2023
Merged

task-forage #6700

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
065e770
task-forage
urbaj-dr Sep 20, 2023
f070286
base-forage upload
urbaj-dr Sep 20, 2023
04dab80
Update base.yaml
urbaj-dr Sep 20, 2023
c3d8122
rubocop task-forage.lic
urbaj-dr Sep 20, 2023
bb771c4
Update task-forage.lic
urbaj-dr Sep 21, 2023
f3332f0
Update task-forage.lic
urbaj-dr Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 52 additions & 59 deletions task-forage.lic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# frozen_string_literal: true

custom_require.call(%w[common common-items common-travel])

class TaskForage
Expand Down Expand Up @@ -164,9 +162,7 @@ class TaskForage

while determine_task_necessary
find_giver
until get_task
# loop until we have an appropriate foraging task
end
get_task
gather_items
find_giver
complete_task
Expand Down Expand Up @@ -249,7 +245,7 @@ class TaskForage

def check_giver
echo 'check_giver' if @debug
return false unless in_room?(@task_giver)
return false unless DRRoom.npcs.include?(@task_giver)

echo 'Found the task giver' if @debug
Flags.reset('giver-move')
Expand Down Expand Up @@ -297,36 +293,37 @@ class TaskForage
end

def get_task
echo 'get_task' if @debug
result = DRC.bput("ask #{@task_giver} for task", /I need (\d+) ([^.]+)/, /You are already on a task/,
/I am sorry, you must wait/, /I have a small item that needs/, /To whom are you speaking?/)
case result
when /I need (\d+) ([^.]+)/
@number = Regexp.last_match(1).to_i
@item = Regexp.last_match(2)
echo "Gathering #{@number} of #{@item}" if @debug
return false unless evaluate_item

accept_task
true

when /To whom are you speaking?/
echo 'Task giver wandered away' if @debug
find_giver
false
when /I have a small item that needs/
echo 'Wrong task type' if @debug
decline_task
kill_time(2)
false
when /I am sorry, you must wait/
kill_time(1)
false
when /You are already on a task/
echo 'Already on a task. Canceling it' if @debug
cancel_task
kill_time(2)
false
loop do
echo 'get_task' if @debug
result = DRC.bput("ask #{@task_giver} for task", /I need (\d+) ([^.]+)/, /You are already on a task/,
/I am sorry, you must wait/, /I have a small item that needs/, /To whom are you speaking?/)
case result
when /I need (\d+) ([^.]+)/
@number = Regexp.last_match(1).to_i
@item = Regexp.last_match(2)
echo "Gathering #{@number} of #{@item}" if @debug
next unless evaluate_item

accept_task
break
when /To whom are you speaking?/
echo 'Task giver wandered away' if @debug
find_giver
next
when /I have a small item that needs/
echo 'Wrong task type' if @debug
decline_task
kill_time(2)
next
when /I am sorry, you must wait/
kill_time(1)
next
when /You are already on a task/
echo 'Already on a task. Canceling it' if @debug
cancel_task
kill_time(2)
next
end
end
end

Expand Down Expand Up @@ -371,29 +368,25 @@ class TaskForage

def use_boosts
echo 'use_boosts' if @debug
fput('info') # Check to see if a boost is already active
pause 0.25

lines = reget(50).reverse
lines.each do |line|
case line
when / +Task Master, expiring /
echo 'Already boosted' if @debug
# Check to see if a boost is already active
case DRC.bput('info', ' +Task Master, expiring ', ' +Encumbrance :', { 'timeout' => 0.5, 'suppress_no_match' => true })
urbaj-dr marked this conversation as resolved.
Show resolved Hide resolved
when / +Task Master, expiring /
echo 'Already boosted' if @debug
@boosted = true
return true
when / +Encumbrance :/
echo 'Not boosted' if @debug
case DRC.bput('boost task', 'You\'ve activated the Task Master boost',
'You don\'t have enough credits for the Task Master boost')
when /You've activated the Task Master boost/
echo 'Boost now activated' if @debug
@boosted = true
return true
when / +Encumbrance :/
echo 'Not boosted' if @debug
case DRC.bput('boost task', 'You\'ve activated the Task Master boost',
'You don\'t have enough credits for the Task Master boost')
when /You've activated the Task Master boost/
echo 'Boost now activated' if @debug
@boosted = true
return true
when /You don't have enough credits for the Task Master boost/
echo 'Can\'t boost' if @debug
@boosted = false
return false
end
when /You don't have enough credits for the Task Master boost/
echo 'Can\'t boost' if @debug
@boosted = false
return false
end
end
end
Expand All @@ -405,7 +398,7 @@ class TaskForage
use_boosts if @use_boosts && @boosted.nil?

# No need to kill time if we're using a boost
return if [email protected]? && @boosted
return if @boosted

safe_exit if @never_wait

Expand Down Expand Up @@ -464,7 +457,7 @@ class TaskForage
def mapped_item?
echo 'mapped_item?' if @debug
rooms = @foraging_data.find { |item| item['item'] == @item }['rooms']
return false if rooms.empty? || rooms == ' '
return false if rooms.empty?

echo 'mapped = true' if @debug
true
Expand All @@ -473,7 +466,7 @@ class TaskForage
# Check if the item is off of a failure cooldown
def ready_item?
echo 'ready_item?' if @debug
if !UserVars.task_forage['item_failures'][@item].nil? && Time.now < UserVars.task_forage['item_failures'][@item] + 7_200
if UserVars.task_forage['item_failures'][@item] && Time.now < UserVars.task_forage['item_failures'][@item] + 7_200
return false
end

Expand Down