From 95ac3ad0a80344728b6a48be7f3c61add7a8e874 Mon Sep 17 00:00:00 2001 From: MikeLC-hub Date: Sat, 26 Oct 2024 21:33:53 -0500 Subject: [PATCH 1/5] Update herb-stock.lic Added Riverhaven and Ratha as hometown options. Set athletics minimum for Riverhaven hometown as 150. --- herb-stock.lic | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/herb-stock.lic b/herb-stock.lic index b4ad501311..65523b85f3 100644 --- a/herb-stock.lic +++ b/herb-stock.lic @@ -19,14 +19,16 @@ class HerbStock herbs_override_herbstock = @settings.herbs_override_herbstock user_herbs = @settings.herbs - if @hometown == 'Riverhaven' && DRSkill.getrank('Athletics') > 140 - @hometown = 'Crossing' - end - - if (@hometown != 'Crossing' && @hometown != 'Shard') && !(herbs_override_herbstock && user_herbs) - echo 'Only Crossing, Riverhaven (with over 140 Athletics), and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' - echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' - exit + if @hometown == 'Riverhaven' && DRSkill.getrank('Athletics') < 150 + echo "Cannot swim the Jantspyre River." + echo "You are athletic enough to handle herb shopping in Therengia." + exit + end + + if (@hometown != 'Crossing' && @hometown != 'Shard' && @hometown != 'Riverhaven' && @hometown != 'Ratha') && !(herbs_override_herbstock && user_herbs) + echo 'Only Crossing, Riverhaven (150+ athletics), Ratha, and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' + echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' + exit end @settings.storage_containers.each { |container| fput("open my #{container}") } From c8f1043cebfbbcb62881dcec139d61ee93cd910d Mon Sep 17 00:00:00 2001 From: MikeLC-hub Date: Sun, 27 Oct 2024 01:35:29 -0500 Subject: [PATCH 2/5] Update herb-stock.lic Fixed the indentation from the last update submit. --- herb-stock.lic | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/herb-stock.lic b/herb-stock.lic index 65523b85f3..ffb27860a6 100644 --- a/herb-stock.lic +++ b/herb-stock.lic @@ -20,15 +20,15 @@ class HerbStock user_herbs = @settings.herbs if @hometown == 'Riverhaven' && DRSkill.getrank('Athletics') < 150 - echo "Cannot swim the Jantspyre River." - echo "You are athletic enough to handle herb shopping in Therengia." - exit - end + echo "Cannot swim the Jantspyre River." + echo "You are athletic enough to handle herb shopping in Therengia." + exit + end if (@hometown != 'Crossing' && @hometown != 'Shard' && @hometown != 'Riverhaven' && @hometown != 'Ratha') && !(herbs_override_herbstock && user_herbs) echo 'Only Crossing, Riverhaven (150+ athletics), Ratha, and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' - exit + exit end @settings.storage_containers.each { |container| fput("open my #{container}") } From 9ac4c8848702490dc98090804da3db7f6a023e16 Mon Sep 17 00:00:00 2001 From: MikeLC-hub Date: Sun, 27 Oct 2024 01:40:59 -0500 Subject: [PATCH 3/5] Update herb-stock.lic --- herb-stock.lic | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/herb-stock.lic b/herb-stock.lic index ffb27860a6..5db6dff3ad 100644 --- a/herb-stock.lic +++ b/herb-stock.lic @@ -20,15 +20,15 @@ class HerbStock user_herbs = @settings.herbs if @hometown == 'Riverhaven' && DRSkill.getrank('Athletics') < 150 - echo "Cannot swim the Jantspyre River." - echo "You are athletic enough to handle herb shopping in Therengia." - exit - end + echo "Cannot swim the Jantspyre River." + echo "You are athletic enough to handle herb shopping in Therengia." + exit + end if (@hometown != 'Crossing' && @hometown != 'Shard' && @hometown != 'Riverhaven' && @hometown != 'Ratha') && !(herbs_override_herbstock && user_herbs) echo 'Only Crossing, Riverhaven (150+ athletics), Ratha, and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' - exit + exit end @settings.storage_containers.each { |container| fput("open my #{container}") } From 3598b044551e9d74f739ab629c3ff89ee72b3e75 Mon Sep 17 00:00:00 2001 From: MikeLC-hub Date: Sun, 27 Oct 2024 01:43:23 -0500 Subject: [PATCH 4/5] Update herb-stock.lic --- herb-stock.lic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/herb-stock.lic b/herb-stock.lic index 5db6dff3ad..a791b33b70 100644 --- a/herb-stock.lic +++ b/herb-stock.lic @@ -27,8 +27,8 @@ class HerbStock if (@hometown != 'Crossing' && @hometown != 'Shard' && @hometown != 'Riverhaven' && @hometown != 'Ratha') && !(herbs_override_herbstock && user_herbs) echo 'Only Crossing, Riverhaven (150+ athletics), Ratha, and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' - echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' - exit + echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' + exit end @settings.storage_containers.each { |container| fput("open my #{container}") } From ecf909a71e6f5b3fa8369f648a8dec79fe2eb12a Mon Sep 17 00:00:00 2001 From: MikeLC-hub Date: Sun, 27 Oct 2024 01:45:04 -0500 Subject: [PATCH 5/5] Update herb-stock.lic --- herb-stock.lic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/herb-stock.lic b/herb-stock.lic index a791b33b70..434e5fcb6e 100644 --- a/herb-stock.lic +++ b/herb-stock.lic @@ -28,7 +28,7 @@ class HerbStock if (@hometown != 'Crossing' && @hometown != 'Shard' && @hometown != 'Riverhaven' && @hometown != 'Ratha') && !(herbs_override_herbstock && user_herbs) echo 'Only Crossing, Riverhaven (150+ athletics), Ratha, and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' - exit + exit end @settings.storage_containers.each { |container| fput("open my #{container}") }