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

[scripts][forge] Properly handle reinforcing armor #6708

Merged
merged 3 commits into from
Sep 28, 2023
Merged

[scripts][forge] Properly handle reinforcing armor #6708

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5282967
Updated Forge script
Nyt3 Sep 27, 2023
0a30fb0
Updated Forge script
Nyt3 Sep 27, 2023
aeca938
Removed trailing whitespace
Nyt3 Sep 27, 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
8 changes: 4 additions & 4 deletions forge.lic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class Forge
]

args = parse_args(arg_definitions)
Flags.add('forge-assembly', 'another finished \S+ shield (handle)', 'another finished wooden (hilt|haft)', 'another finished (long|short|small|large) leather (cord|backing)', 'another finished (small|large) cloth (padding)', 'another finished (long|short) wooden (pole)')
Flags.add('work-done', 'from the successful .* process', 'shows a slightly reduced weight', 'Applying the final touches', /^The .* was successfully/)
Flags.add('forge-assembly', 'another finished \S+ shield (handle)', 'another finished wooden (hilt|haft)', 'another finished (long|short|small|large) leather (cord|backing)', 'another finished (small|large) cloth (padding)', 'another finished (long|short) wooden (pole)', 'appears ready to be reinforced with some (leather strips)')
Flags.add('work-done', 'from the successful .* process', 'shows a slightly reduced weight', 'shows improved protection', 'Applying the final touches', /^The .* was successfully/)
Flags.add('ingot-restow', /^You realize .* will not require as much metal as you have, and so you split the ingot and leave the portion you won't be using in your (.*)./)

settings = get_settings
Expand Down Expand Up @@ -221,7 +221,7 @@ class Forge
magic_cleanup
exit
end
if /not required/ =~ DRC.bput("assemble my #{@item} with my #{part}", 'affix it securely in place', 'and tighten the pommel to secure it', 'carefully mark where it will attach when you continue crafting', 'is not required to continue crafting')
if /not required/ =~ DRC.bput("assemble my #{@item} with my #{part}", 'affix it securely in place', 'and tighten the pommel to secure it', 'carefully mark where it will attach when you continue crafting', 'You layer the leather strips', 'is not required to continue crafting')
DRC.bput("stow my #{part}")
end
swap_tool(tool) if tool
Expand Down Expand Up @@ -366,7 +366,7 @@ class Forge
when 'not spinning fast enough' # grindstone slowed before we used
spin_grindstone
when 'ready for grinding away of the excess metal', 'now appears ready for grinding and polishing',
'thinning the armor\'s metal at a grindstone', 'The armor is ready to be lightened', 'ready to be ground away' # grindstone time
'thinning the armor\'s metal at a grindstone', 'The armor is ready to be lightened', 'ready to be ground away', 'You think adjusting the armor' # grindstone time
unless DRCI.in_left_hand?(@item)
DRCC.stow_crafting_item(@hammer, @bag, @forging_belt) if DRCI.in_hands?(@hammer)
DRCC.stow_crafting_item('tongs', @bag, @forging_belt) if DRCI.in_hands?('tongs')
Expand Down