diff --git a/init.lua b/init.lua index d36fa4a..9fc9b1b 100644 --- a/init.lua +++ b/init.lua @@ -112,6 +112,31 @@ local FMT = { arrow = "image_button[%f,%f;0.8,0.8;%s;%s;;;false;%s]", } +local styles = fmt([[ + style[filter;border=false] + style_type[label,field;font_size=16] + style_type[image_button;border=false] + style_type[button;border=false;font=bold;font_size=18] + style_type[item_image_button;border=false;bgimg_hovered=%s;bgimg_pressed=%s] + style[search;fgimg=%s;fgimg_hovered=%s] + style[clear;fgimg=%s;fgimg_hovered=%s] + style[prev_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] + style[next_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] + style[prev_recipe;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] + style[next_recipe;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] + style[prev_usage;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] + style[next_usage;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] +]], +PNG.selected, PNG.selected, +PNG.search, PNG.search_hover, +PNG.clear, PNG.clear_hover, +PNG.prev, PNG.prev_hover, PNG.prev_hover, +PNG.next, PNG.next_hover, PNG.next_hover, +PNG.prev, PNG.prev_hover, PNG.prev_hover, +PNG.next, PNG.next_hover, PNG.next_hover, +PNG.prev, PNG.prev_hover, PNG.prev_hover, +PNG.next, PNG.next_hover, PNG.next_hover) + local function get_lang_code(name) local info = get_player_info(name) return info and info.lang_code @@ -1153,13 +1178,6 @@ local function get_rcp_lbl(lang_code, show_usages, unum, rnum, fs, panel, spacin local x_arrow = XOFFSET + (sfinv_only and 1.7 or 1) local y_arrow = YOFFSET + (sfinv_only and 3.3 or 1.4 + spacing) - fs[#fs + 1] = fmt([[ - style[%s;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] - style[%s;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] - ]], - prev_name, PNG.prev, PNG.prev_hover, PNG.prev_hover, - next_name, PNG.next, PNG.next_hover, PNG.next_hover) - fs[#fs + 1] = fmt(mul_elem(FMT.arrow, 2), x_arrow - shift, y_arrow, PNG.prev, prev_name, "", x_arrow + 1.8, y_arrow, PNG.next, next_name, "") @@ -1290,30 +1308,15 @@ local function make_fs(data) 9 - 0.9, LINES + 0.4, PNG.bg_full, 10) end + fs[#fs + 1] = styles + fs[#fs + 1] = fmt([[ - style[filter;border=false] field[0.4,0.2;2.6,1;filter;;%s] field_close_on_enter[filter;false] box[0,0;2.5,0.6;#bababa25] ]], ESC(data.filter)) - fs[#fs + 1] = fmt([[ - style_type[label,field;font_size=16] - style_type[image_button;border=false] - style_type[button;border=false;font=bold;font_size=18] - style_type[item_image_button;border=false;bgimg_hovered=%s;bgimg_pressed=%s] - style[search;fgimg=%s;fgimg_hovered=%s] - style[clear;fgimg=%s;fgimg_hovered=%s] - style[prev_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] - style[next_page;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s] - ]], - PNG.selected, PNG.selected, - PNG.search, PNG.search_hover, - PNG.clear, PNG.clear_hover, - PNG.prev, PNG.prev_hover, PNG.prev_hover, - PNG.next, PNG.next_hover, PNG.next_hover) - fs[#fs + 1] = fmt(mul_elem(FMT.image_button, 2), 2.6, -0.06, 0.85, 0.85, "", "search", "", 3.3, -0.06, 0.85, 0.85, "", "clear", "") diff --git a/textures/craftguide_arrow.png b/textures/craftguide_arrow.png index 7171e82..5dae758 100644 Binary files a/textures/craftguide_arrow.png and b/textures/craftguide_arrow.png differ diff --git a/textures/craftguide_bg.png b/textures/craftguide_bg.png index 2d046a7..383d532 100644 Binary files a/textures/craftguide_bg.png and b/textures/craftguide_bg.png differ diff --git a/textures/craftguide_bg_full.png b/textures/craftguide_bg_full.png index 5ff095c..9b29903 100644 Binary files a/textures/craftguide_bg_full.png and b/textures/craftguide_bg_full.png differ diff --git a/textures/craftguide_book.png b/textures/craftguide_book.png index e46cd38..69855fd 100644 Binary files a/textures/craftguide_book.png and b/textures/craftguide_book.png differ diff --git a/textures/craftguide_clear_icon.png b/textures/craftguide_clear_icon.png index 9244264..dadcc0d 100644 Binary files a/textures/craftguide_clear_icon.png and b/textures/craftguide_clear_icon.png differ diff --git a/textures/craftguide_clear_icon_hover.png b/textures/craftguide_clear_icon_hover.png index dccf373..df965d0 100644 Binary files a/textures/craftguide_clear_icon_hover.png and b/textures/craftguide_clear_icon_hover.png differ diff --git a/textures/craftguide_fav.png b/textures/craftguide_fav.png index aa5d265..c659ad4 100644 Binary files a/textures/craftguide_fav.png and b/textures/craftguide_fav.png differ diff --git a/textures/craftguide_fav_off.png b/textures/craftguide_fav_off.png index 8d42a87..cffbf9f 100644 Binary files a/textures/craftguide_fav_off.png and b/textures/craftguide_fav_off.png differ diff --git a/textures/craftguide_fire_anim.png b/textures/craftguide_fire_anim.png index 487ec3a..22dc40a 100644 Binary files a/textures/craftguide_fire_anim.png and b/textures/craftguide_fire_anim.png differ diff --git a/textures/craftguide_furnace_anim.png b/textures/craftguide_furnace_anim.png index 40ce21a..472c382 100644 Binary files a/textures/craftguide_furnace_anim.png and b/textures/craftguide_furnace_anim.png differ diff --git a/textures/craftguide_mesepick.png b/textures/craftguide_mesepick.png index f9e63d1..1531c3f 100644 Binary files a/textures/craftguide_mesepick.png and b/textures/craftguide_mesepick.png differ diff --git a/textures/craftguide_next_icon.png b/textures/craftguide_next_icon.png index 82cf3d3..a00b3e2 100644 Binary files a/textures/craftguide_next_icon.png and b/textures/craftguide_next_icon.png differ diff --git a/textures/craftguide_next_icon_hover.png b/textures/craftguide_next_icon_hover.png index 449d3d2..a1e36c6 100644 Binary files a/textures/craftguide_next_icon_hover.png and b/textures/craftguide_next_icon_hover.png differ diff --git a/textures/craftguide_no.png b/textures/craftguide_no.png index 14d7f6b..703f16b 100644 Binary files a/textures/craftguide_no.png and b/textures/craftguide_no.png differ diff --git a/textures/craftguide_search_icon.png b/textures/craftguide_search_icon.png index 4c4dd41..116fb79 100644 Binary files a/textures/craftguide_search_icon.png and b/textures/craftguide_search_icon.png differ diff --git a/textures/craftguide_search_icon_hover.png b/textures/craftguide_search_icon_hover.png index dd30668..9a83c42 100644 Binary files a/textures/craftguide_search_icon_hover.png and b/textures/craftguide_search_icon_hover.png differ diff --git a/textures/craftguide_selected.png b/textures/craftguide_selected.png index 753589d..b5212d5 100644 Binary files a/textures/craftguide_selected.png and b/textures/craftguide_selected.png differ diff --git a/textures/craftguide_shapeless.png b/textures/craftguide_shapeless.png index 8d68863..75a4e03 100644 Binary files a/textures/craftguide_shapeless.png and b/textures/craftguide_shapeless.png differ diff --git a/textures/craftguide_sign.png b/textures/craftguide_sign.png index b049526..b4394ec 100644 Binary files a/textures/craftguide_sign.png and b/textures/craftguide_sign.png differ diff --git a/textures/craftguide_steelpick.png b/textures/craftguide_steelpick.png index 76c561a..7764446 100644 Binary files a/textures/craftguide_steelpick.png and b/textures/craftguide_steelpick.png differ