Flip direction of crafting guide arrow

This commit is contained in:
Wuzzy 2017-02-06 00:32:14 +01:00
parent f48b34e3ca
commit e7f49a54f2
2 changed files with 12 additions and 10 deletions

View File

@ -103,6 +103,7 @@ function craftguide:get_recipe(iY, xoffset, tooltip, item, recipe_num, recipes)
local items = recipes[recipe_num].items local items = recipes[recipe_num].items
local width = recipes[recipe_num].width local width = recipes[recipe_num].width
local cooking_time = 10
local is_shapeless = false local is_shapeless = false
if recipe_type == "normal" and width == 0 then if recipe_type == "normal" and width == 0 then
is_shapeless = true is_shapeless = true
@ -114,17 +115,17 @@ function craftguide:get_recipe(iY, xoffset, tooltip, item, recipe_num, recipes)
end end
if recipe_type == "cooking" then if recipe_type == "cooking" then
cooking_time = width
width = 1
formspec = formspec.. formspec = formspec..
"image["..(xoffset-0.8)..","..(iY+1).. "image["..(xoffset-0.8)..","..(iY+1)..
".5;0.5,0.5;default_furnace_front_active.png]" ".5;0.5,0.5;default_furnace_front_active.png]"
elseif is_shapeless then elseif is_shapeless then
formspec = formspec.. formspec = formspec..
"image["..(xoffset-0.8)..","..(iY+1).. "image["..(xoffset-0.8)..","..(iY+1)..
".5;0.5,0.5;craftguide_shapeless.png^[transformFX]" ".5;0.5,0.5;craftguide_shapeless.png]"
end end
-- TODO: Make “crafting arrow” point to the right, not to the left
local rows = ceil(maxn(items) / width) local rows = ceil(maxn(items) / width)
local btn_size, craftgrid_limit = 1, 5 local btn_size, craftgrid_limit = 1, 5
@ -136,13 +137,14 @@ function craftguide:get_recipe(iY, xoffset, tooltip, item, recipe_num, recipes)
width.."x"..rows..")]" width.."x"..rows..")]"
else else
for i, v in pairs(items) do for i, v in pairs(items) do
local X = (i-1) % width + xoffset local X = (i-1) % width + xoffset - 4 + (3 - max(1, width))
local Y = ceil(i / width + iY+2 - min(2, rows)) local Y = ceil(i / width + iY+2 - min(2, rows))
if recipe_type == "normal" and if recipe_type == "normal" and
width > 3 or rows > 3 then width > 3 or rows > 3 then
btn_size = width > 3 and 3 / width or 3 / rows btn_size = width > 3 and 3 / width or 3 / rows
X = btn_size * (i % width) + xoffset X = btn_size * (i % width) + xoffset - 4 + (3 - max(1, width))
Y = btn_size * floor((i-1) / width) + iY+3 - Y = btn_size * floor((i-1) / width) + iY+3 -
min(2, rows) min(2, rows)
end end
@ -151,7 +153,7 @@ function craftguide:get_recipe(iY, xoffset, tooltip, item, recipe_num, recipes)
local label = groups and "\nG" or "" local label = groups and "\nG" or ""
local item_r = self:group_to_item(v) local item_r = self:group_to_item(v)
local tltip = self:get_tooltip( local tltip = self:get_tooltip(
item_r, recipe_type, width, groups) item_r, recipe_type, cooking_time, groups)
formspec = formspec.. formspec = formspec..
"item_image_button["..X..","..Y..";".. "item_image_button["..X..","..Y..";"..
@ -163,7 +165,7 @@ function craftguide:get_recipe(iY, xoffset, tooltip, item, recipe_num, recipes)
return formspec.. return formspec..
"image["..(xoffset-1)..","..(iY+2).. "image["..(xoffset-1)..","..(iY+2)..
".12;0.9,0.7;craftguide_arrow.png]".. ".12;0.9,0.7;craftguide_arrow.png]"..
"item_image_button["..(xoffset-2)..","..(iY+2)..";1,1;".. "item_image_button["..(xoffset)..","..(iY+2)..";1,1;"..
output..";"..item..";]"..tooltip output..";"..item..";]"..tooltip
end end
@ -199,7 +201,7 @@ function craftguide:get_formspec(player_name, is_fuel)
mt.formspec_escape(data.filter).."]" mt.formspec_escape(data.filter).."]"
local even_num = data.iX % 2 == 0 local even_num = data.iX % 2 == 0
local xoffset = data.iX / 2 + (even_num and 0.5 or 0) local xoffset = data.iX / 2 + (even_num and 0.5 or 0) + 2
if not next(data.items) then if not next(data.items) then
formspec = formspec.. formspec = formspec..
@ -226,9 +228,9 @@ function craftguide:get_formspec(player_name, is_fuel)
formspec = formspec.. formspec = formspec..
"image["..(xoffset-1)..","..(iY+2).. "image["..(xoffset-1)..","..(iY+2)..
".12;0.9,0.7;craftguide_arrow.png]".. ".12;0.9,0.7;craftguide_arrow.png]"..
"item_image_button["..xoffset..","..(iY+2).. "item_image_button["..(xoffset-2)..","..(iY+2)..
";1,1;"..data.item..";"..data.item..";]".. ";1,1;"..data.item..";"..data.item..";]"..
tooltip.."image["..(xoffset-2)..",".. tooltip.."image["..(xoffset)..","..
(iY+1.98)..";1,1;craftguide_fire.png]" (iY+1.98)..";1,1;craftguide_fire.png]"
else else
formspec = formspec..self:get_recipe( formspec = formspec..self:get_recipe(

Binary file not shown.

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 202 B