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.

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

Ungent->unguent fix #6803

Merged
merged 5 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions craft.lic
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,14 @@ class Craft
DRCI.dispose_trash('salve', @worn_trashcan, @worn_trashcan_verb)
elsif rank <= 425 # Tier 6 - Somewhat Challenging
# Buy plovik leaves
recipe = get_data('recipes').crafting_recipes.find { |each_recipe| each_recipe['name'] =~ /some chest ungent/ }
recipe = get_data('recipes').crafting_recipes.find { |each_recipe| each_recipe['name'] =~ /some chest unguent/ }
DRCM.ensure_copper_on_hand(4000, @settings)
DRCT.order_item(crafting_data['remedies'][@hometown]['stock-room'], recipe['herb1_stock'])
DRCC.stow_crafting_item(DRC.right_hand, @bag, @belt)
DRCC.stow_crafting_item(DRC.left_hand, @bag, @belt)
DRCT.walk_to(@training_room)
DRC.wait_for_script_to_complete('remedy', ['remedies', recipe['chapter'], recipe['name'], recipe['herb1'], 'na', crafting_data['remedies'][@hometown]['catalyst'], recipe['container'], recipe['noun']])
DRCI.dispose_trash('ungent', @worn_trashcan, @worn_trashcan_verb)
DRCI.dispose_trash('unguent', @worn_trashcan, @worn_trashcan_verb)
elsif rank <= 550 # Tier 7 - Challenging
# Buy riolur leaves
recipe = get_data('recipes').crafting_recipes.find { |each_recipe| each_recipe['name'] =~ /some neck tonic/ }
Expand Down
28 changes: 14 additions & 14 deletions data/base-recipes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8419,62 +8419,62 @@ crafting_recipes:
container: mortar
herb1: jadice
herb1_stock: 5
- name: some neck ungent
noun: ungent
- name: some neck unguent
noun: unguent
volume: 1
type: remedies
work_order: true
chapter: 3
container: mortar
herb1: georin
herb1_stock: 7
- name: some abdominal ungent
noun: ungent
- name: some abdominal unguent
noun: unguent
volume: 1
type: remedies
work_order: true
chapter: 3
container: mortar
herb1: nilos
herb1_stock: 6
- name: some chest ungent
noun: ungent
- name: some chest unguent
noun: unguent
volume: 1
type: remedies
work_order: true
chapter: 3
container: mortar
herb1: plovik
herb1_stock: 4
- name: some back ungent
noun: ungent
- name: some back unguent
noun: unguent
volume: 1
type: remedies
work_order: false
chapter: 3
container: mortar
herb1: hulnik
herb1_stock:
- name: some eye ungent
noun: ungent
- name: some eye unguent
noun: unguent
volume: 1
type: remedies
work_order: false
chapter: 3
container: mortar
herb1: sufil
herb1_stock:
- name: some skin ungent
noun: ungent
- name: some skin unguent
noun: unguent
volume: 1
type: remedies
work_order: false
chapter: 3
container: mortar
herb1: aloe
herb1_stock:
- name: some limb ungent
noun: ungent
- name: some limb unguent
noun: unguent
volume: 1
type: remedies
work_order: true
Expand Down
2 changes: 1 addition & 1 deletion data/base-sorting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ herbs:
- (?:dried|crushed) yelith

remedies:
- (?:salve|ungent|poultices|ointment|potion|tonic|elixir|draught)
- (?:salve|unguent|poultices|ointment|potion|tonic|elixir|draught)

scroll_keepers:
- poke .*
Expand Down
10 changes: 5 additions & 5 deletions heal-remedy.lic
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def remedy_apply_wounds(body_part)
rem_wounds.each do |remedy|
if DRCI.get_item?(remedy, @remedy_container)
case remedy
when /salve/, /ungent/, /poultices/, /ointment/
when /salve/, /unguent/, /poultices/, /ointment/
DRC.bput("rub my #{remedy}", 'You')
when /potion/, /tonic/, /elixir/, /draught/
drink_remedy?(remedy)
Expand All @@ -124,7 +124,7 @@ def remedy_apply_scars(body_part)
rem_scars.each do |remedy|
if DRCI.get_item?(remedy, @remedy_container)
case remedy
when /salve/, /ungent/, /poultices/, /ointment/
when /salve/, /unguent/, /poultices/, /ointment/
DRC.bput("rub my #{remedy}", 'You')
when /potion/, /tonic/, /elixir/, /draught/
drink_remedy?(remedy)
Expand All @@ -146,7 +146,7 @@ def remedy_apply_general_scar(body_part)
rem_scars_general.each do |remedy|
if DRCI.get_item?(remedy, @remedy_container)
case remedy
when /salve/, /ungent/, /poultices/, /ointment/
when /salve/, /unguent/, /poultices/, /ointment/
DRC.bput("rub my #{remedy}", 'You')
when /potion/, /tonic/, /elixir/, /draught/
drink_remedy?(remedy)
Expand All @@ -170,7 +170,7 @@ def herb_apply_wounds(body_part)
DRC.bput("rub my #{remedy}", 'You', 'Rub what?') unless $nohands_mode
DRCI.put_away_item?(remedy, @remedy_container) unless $nohands_mode
@wounds_applied = true
when /ungent/, /poultices/, /ointment/
when /unguent/, /poultices/, /ointment/
DRCI.get_item?(remedy, @remedy_container) unless $nohands_mode
DRC.bput("rub my #{remedy}", 'You', 'Rub what?')
DRCI.put_away_item?(remedy, @remedy_container) unless $nohands_mode
Expand All @@ -191,7 +191,7 @@ def herb_apply_scars(body_part)
DRC.message("rem_scars: #{rem_scars}") if $debug_mode_hr
rem_scars.each do |remedy|
case remedy
when /salve/, /ungent/, /poultices/, /ointment/, /sap/
when /salve/, /unguent/, /poultices/, /ointment/, /sap/
DRC.bput("rub my #{remedy}", 'You', 'Rub what?')
when /tonic/, /draught/, /qun/
drink_remedy?(remedy)
Expand Down
4 changes: 2 additions & 2 deletions remedy.lic
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ class Remedy
{ name: 'herb2', regex: /\w+/i, variable: true, description: 'Prepared herb, wrap in double quotes if this is multiple words. Put none for none.' },
{ name: 'catalyst', regex: /\w+/i, variable: true, description: 'Type of catalyst.' },
{ name: 'container', regex: /\w+/i, variable: true, description: 'Type of container for creating.' },
{ name: 'noun', regex: /\w+/i, variable: true, options: %w[cream salve wash balm ungent potion tonic ointment elixir poultices draught], description: 'End product' }
{ name: 'noun', regex: /\w+/i, variable: true, options: %w[cream salve wash balm unguent potion tonic ointment elixir poultices draught], description: 'End product' }
],
[
{ name: 'continue', regex: /continue/i, variable: true },
{ name: 'herb2', regex: /\w+/i, variable: true, description: 'Prepared herb, wrap in double quotes if this is multiple words. Put none for none.' },
{ name: 'catalyst', regex: /\w+/i, variable: true, description: 'Type of catalyst.' },
{ name: 'container', regex: /\w+/i, variable: true, description: 'Type of container for creating.' },
{ name: 'noun', regex: /\w+/i, variable: true, options: %w[cream salve wash balm ungent potion tonic ointment elixir poultices draught], description: 'End product' }
{ name: 'noun', regex: /\w+/i, variable: true, options: %w[cream salve wash balm unguent potion tonic ointment elixir poultices draught], description: 'End product' }
]
]

Expand Down
Loading