diff --git a/task-forage.lic b/task-forage.lic index 25bc624db1..049b309bf1 100644 --- a/task-forage.lic +++ b/task-forage.lic @@ -1,3 +1,5 @@ +# frozen_string_literal: true + custom_require.call(%w[common common-items common-travel]) class TaskForage @@ -27,101 +29,101 @@ class TaskForage end @shard_path = { - 2544 => ['s'], - 2550 => ['sw'], - 2556 => ['sw'], - 2557 => ['sw'], - 2558 => ['w'], - 2559 => ['w'], - 2560 => ['w'], - 2561 => ['w'], - 2562 => ['nw'], - 2522 => ['nw'], + 2544 => ['s'], + 2550 => ['sw'], + 2556 => ['sw'], + 2557 => ['sw'], + 2558 => ['w'], + 2559 => ['w'], + 2560 => ['w'], + 2561 => ['w'], + 2562 => ['nw'], + 2522 => ['nw'], 19_287 => ['nw'], - 2517 => ['n'], - 2516 => ['n'], - 2518 => ['ne'], - 2520 => ['ne'], - 2521 => ['ne'], - 2523 => ['e'], - 2524 => ['e'], - 2525 => ['s'], - 2526 => ['s'], - 2527 => ['s'], - 2528 => ['s'], - 2529 => ['s'], - 2536 => ['s'], - 2537 => ['s'], - 2538 => ['go gate'], - 2611 => ['s'], - 2503 => ['w'], - 2502 => ['sw'], - 2501 => ['s'], - 2496 => ['w'], - 2497 => ['w'], - 2498 => ['go brid', 'w'], - 2511 => ['w'], - 2512 => ['w'], - 2513 => ['w'], - 2514 => ['w'], - 2515 => ['e', 'e', 'e', 'e', 'go brid', 'e', 'e', 'e', 's'], - 2499 => ['se'], - 2500 => ['e'], - 2581 => ['s'], - 2596 => ['go gate'], - 2575 => ['s'], - 2573 => ['s'], - 2570 => ['s'], - 2567 => ['s'], - 2565 => ['s'], - 2566 => ['s'], - 2564 => ['s'], - 2563 => ['s', 'e', 'e', 'ne', 'go brid'], - 2582 => ['nw'], - 2585 => ['nw'], - 2586 => ['nw'], - 2589 => ['nw'], - 2597 => %w[nw nw e], - 2598 => ['ne'], - 2599 => ['n'], - 2600 => ['e'], - 2601 => ['e'], - 2612 => ['go brid'], - 2607 => ['e'], - 2549 => ['e'], - 2548 => ['e'], - 2547 => ['e'], - 2545 => ['e'], - 2621 => ['e', 'w', 'w', 'w', 'w', 'w', 'go wrens', 'nw', 'sw'], - 2613 => ['ne'], - 2608 => ['ne'], - 2617 => ['ne'], - 2633 => ['ne'], - 2632 => ['ne'], - 2631 => %w[sw sw sw sw sw sw nw], - 2504 => ['nw'], - 2505 => ['nw'], - 2506 => ['nw'], - 2507 => ['nw'], - 2508 => ['nw'], - 2509 => ['go brid', 'ne', 'e', 'e', 'e', 'e', 'se'], - 2574 => ['nw'], - 2540 => ['w'], - 2539 => %w[e se se], - 2541 => ['se'], - 2543 => ['nw', 'nw', 'go brid', 'sw', 'sw', 'sw', 'sw', 'sw', 'sw', 'e'], - 2603 => ['se'], - 2602 => %w[s s sw w sw], - 2583 => ['sw'], - 2584 => ['sw'], - 2592 => ['sw'], - 2593 => ['sw'], - 2594 => ['sw'], - 2595 => ['go brid', 'se', 'e', 'e', 'n', 'n', 'n', 'n', 'n', 'w'], - 2571 => ['sw'], - 2572 => ['s'], - 2569 => ['se'], - 2568 => %w[e s s s s e e ne ne ne n] + 2517 => ['n'], + 2516 => ['n'], + 2518 => ['ne'], + 2520 => ['ne'], + 2521 => ['ne'], + 2523 => ['e'], + 2524 => ['e'], + 2525 => ['s'], + 2526 => ['s'], + 2527 => ['s'], + 2528 => ['s'], + 2529 => ['s'], + 2536 => ['s'], + 2537 => ['s'], + 2538 => ['go gate'], + 2611 => ['s'], + 2503 => ['w'], + 2502 => ['sw'], + 2501 => ['s'], + 2496 => ['w'], + 2497 => ['w'], + 2498 => ['go brid', 'w'], + 2511 => ['w'], + 2512 => ['w'], + 2513 => ['w'], + 2514 => ['w'], + 2515 => ['e', 'e', 'e', 'e', 'go brid', 'e', 'e', 'e', 's'], + 2499 => ['se'], + 2500 => ['e'], + 2581 => ['s'], + 2596 => ['go gate'], + 2575 => ['s'], + 2573 => ['s'], + 2570 => ['s'], + 2567 => ['s'], + 2565 => ['s'], + 2566 => ['s'], + 2564 => ['s'], + 2563 => ['s', 'e', 'e', 'ne', 'go brid'], + 2582 => ['nw'], + 2585 => ['nw'], + 2586 => ['nw'], + 2589 => ['nw'], + 2597 => %w[nw nw e], + 2598 => ['ne'], + 2599 => ['n'], + 2600 => ['e'], + 2601 => ['e'], + 2612 => ['go brid'], + 2607 => ['e'], + 2549 => ['e'], + 2548 => ['e'], + 2547 => ['e'], + 2545 => ['e'], + 2621 => ['e', 'w', 'w', 'w', 'w', 'w', 'go wrens', 'nw', 'sw'], + 2613 => ['ne'], + 2608 => ['ne'], + 2617 => ['ne'], + 2633 => ['ne'], + 2632 => ['ne'], + 2631 => %w[sw sw sw sw sw sw nw], + 2504 => ['nw'], + 2505 => ['nw'], + 2506 => ['nw'], + 2507 => ['nw'], + 2508 => ['nw'], + 2509 => ['go brid', 'ne', 'e', 'e', 'e', 'e', 'se'], + 2574 => ['nw'], + 2540 => ['w'], + 2539 => %w[e se se], + 2541 => ['se'], + 2543 => ['nw', 'nw', 'go brid', 'sw', 'sw', 'sw', 'sw', 'sw', 'sw', 'e'], + 2603 => ['se'], + 2602 => %w[s s sw w sw], + 2583 => ['sw'], + 2584 => ['sw'], + 2592 => ['sw'], + 2593 => ['sw'], + 2594 => ['sw'], + 2595 => ['go brid', 'se', 'e', 'e', 'n', 'n', 'n', 'n', 'n', 'w'], + 2571 => ['sw'], + 2572 => ['s'], + 2569 => ['se'], + 2568 => %w[e s s s s e e ne ne ne n] } @move_regex = [/The flower peddler gathers her skirts and glides (north|south|east|west|northeast|southeast|southwest|northwest)\./] @@ -129,7 +131,7 @@ class TaskForage 'begins to advance on you!') Flags.add('giver-move', *@move_regex) - @task_givers = { 'shard' => { 'npc' => 'peddler', 'location' => @shard_path }, + @task_givers = { 'shard' => { 'npc' => 'peddler', 'location' => @shard_path }, 'crossing' => { 'npc' => 'Mags', 'location' => '954' } } UserVars.task_forage = {} if UserVars.task_forage.nil? @@ -427,7 +429,7 @@ class TaskForage def known_item? echo 'known_item?' if @debug if @foraging_data.any? { |item| item['item'] == @item } - @item = @item # no change necessary + # no change necessary elsif @foraging_data.any? { |item| item['item'] == @item.chomp('s') } @item = @item.chomp('s') elsif @foraging_data.any? { |item| item['item'] == @item.gsub('leaves', 'leaf') }