diff --git a/alchemy/alchemy.go b/alchemy/alchemy.go index 582c66c..1e4339f 100644 --- a/alchemy/alchemy.go +++ b/alchemy/alchemy.go @@ -156,7 +156,7 @@ func (a Alchemy) SelectIngredient(str ingredient.Ingredient) { a.mouse.Move(-2560, -1440) a.sleep(100) - // fmt.Printf("Selecting %s at %dx%d\n", str.Name(), x, y) + fmt.Printf("Selecting %s at %dx%d\n", str.Name(), x, y) a.mouse.Move(int32(x), int32(y)) a.sleep(50) diff --git a/ingredient/ingredient.go b/ingredient/ingredient.go index 501f96c..3eb66a5 100644 --- a/ingredient/ingredient.go +++ b/ingredient/ingredient.go @@ -33,6 +33,7 @@ var ( ElderberryLeaves Ingredient = Ingredient{"Elderberry Leaves", TopShelf} Eyebright Ingredient = Ingredient{"Eyebright", TopShelf} Feverfew Ingredient = Ingredient{"Feverfew", TopShelf} + Ginger Ingredient = Ingredient{"Ginger", TopShelf} Henbane Ingredient = Ingredient{"Henbane", TopShelf} HerbParis Ingredient = Ingredient{"Herb Paris", TopShelf} Marigold Ingredient = Ingredient{"Marigold", TopShelf} @@ -50,7 +51,6 @@ var ( BoarsTusk Ingredient = Ingredient{"Boar's Tusk", BottomShelf} Cobweb Ingredient = Ingredient{"Cobweb", BottomShelf} Charcoal Ingredient = Ingredient{"Charcoal", BottomShelf} - Ginger Ingredient = Ingredient{"Ginger", BottomShelf} LeachedCoal Ingredient = Ingredient{"Leached Coal", BottomShelf} Saltpetre Ingredient = Ingredient{"Saltpetre", BottomShelf} Sulphur Ingredient = Ingredient{"Sulphur", BottomShelf} diff --git a/main.go b/main.go index 6b46f77..a18dbc6 100644 --- a/main.go +++ b/main.go @@ -21,10 +21,10 @@ import ( var s embed.FS type Config struct { - X int `cfg:"{'name':'x','desc':'x offset','default':0}"` - Y int `cfg:"{'name':'y','desc':'y offset','default':0}"` - Width int `cfg:"{'name':'width','desc':'search area width','default':2560}"` - Height int `cfg:"{'name':'height','desc':'search area height','default':1440}"` + X int `cfg:"{'name':'x','desc':'x offset','default':0,'short':'x'}"` + Y int `cfg:"{'name':'y','desc':'y offset','default':0,'short':'y'}"` + Width int `cfg:"{'name':'width','desc':'search area width','default':2560,'short':'w'}"` + Height int `cfg:"{'name':'height','desc':'search area height','default':1440,'short':'h'}"` Save bool `cfg:"{'name':'save','desc':'save ocr image as output.png','default':false}"` List bool `cfg:"{'name':'list','desc':'list all recipes','default':false,'short':'l'}"` Recipe string `cfg:"{'name':'recipe','desc':'specific recipe to make','short':'r','default':''}"` diff --git a/recipes.txt b/recipes.txt index eece6f7..274f478 100644 --- a/recipes.txt +++ b/recipes.txt @@ -448,3 +448,35 @@ Recipe: Add 2 Sage to the mortar, grind, and pour into the cauldron. Boil for 1 turn using bellows. Prepare phial and distill. + +-- + +Anti-inflammatory Potion + +Liquid Base: Water + +Ingredients: Nettle x1, Valerian x2, Ginger x1 + +Recipe: + Add 1 Nettle to the mortar, grind, and pour into the cauldron. + Boil for 1 turn using bellows. + Add 2 Valerian to the cauldron. + Boil for 2 turns. + Add 1 Ginger to the mortar, grind, and pour into the cauldron. + Pour into phial. + +-- + +Essential Oil + +Liquid Base: Oil + +Ingredients: Sage x1, Valerian x1, Chamomile x3 + +Recipe: + Add 3 Chamomile to the Cauldron. + Boil for 3 turns. + Add 1 Sage to the mortar, grind, and pour into the cauldron. + Boil for 1 turn. + Add 1 Valerian to the mortar, grind, and pour into the cauldron. + Pour into phial.