diff --git a/craft.lic b/craft.lic index e62124c015..481dd866e3 100644 --- a/craft.lic +++ b/craft.lic @@ -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/ } diff --git a/data/base-recipes.yaml b/data/base-recipes.yaml index adfe375948..e5e63ea9fe 100644 --- a/data/base-recipes.yaml +++ b/data/base-recipes.yaml @@ -8419,8 +8419,8 @@ 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 @@ -8428,8 +8428,8 @@ crafting_recipes: 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 @@ -8437,8 +8437,8 @@ crafting_recipes: 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 @@ -8446,8 +8446,8 @@ crafting_recipes: 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 @@ -8455,8 +8455,8 @@ crafting_recipes: 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 @@ -8464,8 +8464,8 @@ crafting_recipes: 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 @@ -8473,8 +8473,8 @@ crafting_recipes: 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 diff --git a/data/base-sorting.yaml b/data/base-sorting.yaml index 409bed17ed..478bbd3cc9 100644 --- a/data/base-sorting.yaml +++ b/data/base-sorting.yaml @@ -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 .* diff --git a/heal-remedy.lic b/heal-remedy.lic index 711b6a13ea..22fd525507 100644 --- a/heal-remedy.lic +++ b/heal-remedy.lic @@ -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) @@ -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) @@ -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) @@ -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 @@ -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) diff --git a/remedy.lic b/remedy.lic index e21bb6897a..9813cdddd1 100644 --- a/remedy.lic +++ b/remedy.lic @@ -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' } ] ]