From fd30a22c4da4222463965f383af6d6b5c895088e Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 12 Mar 2016 00:48:15 +0100 Subject: [PATCH] Clean up all bad formspec overlappings --- mods/default/init.lua | 8 +++--- mods/default/locale/de.txt | 4 +-- mods/default/locale/template.txt | 6 ++--- mods/default/nodes.lua | 46 ++++++++++++++++---------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mods/default/init.lua b/mods/default/init.lua index 7ab00ce..e7a5660 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -23,7 +23,7 @@ default = {} default.gui_bg = "bgcolor[#080808BB;true]" default.gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]" default.gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]" -default.gui_controls = minetest.formspec_escape(S("[left click]: take/drop stack; [right click]: take half / drop 1; [middle click]: take 10 / drop 10; [Esc] or [I]: Close")) +default.gui_controls = minetest.formspec_escape(S("[Left click]: Take/drop stack\n[Right click]: Take half stack / drop 1 item\n[Middle click]: Take/drop 10 items\n[Esc] or [I]: Close")) function default.get_hotbar_bg(x,y) local out = "" @@ -33,15 +33,15 @@ function default.get_hotbar_bg(x,y) return out end -default.gui_suvival_form = "size[8,8.5]".. +default.gui_suvival_form = "size[8,10]".. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. - "button_exit[-0.1,-0.3;2,1;gotostart;"..minetest.formspec_escape(S("Back to start")).."]".. + "button_exit[-0.1,-0.3;3,1;gotostart;"..minetest.formspec_escape(S("Back to start")).."]".. "label[0,3.75;"..minetest.formspec_escape(S("Player inventory:")).."]".. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. - "label[0,8.4;"..default.gui_controls.."]".. + "label[0,8.5;"..default.gui_controls.."]".. "label[2.75,-0.1;"..minetest.formspec_escape(S("Crafting grid:")).."]".. "list[current_player;craft;2.75,0.5;3,3;]".. "label[6.75,0.9;"..minetest.formspec_escape(S("Output slot:")).."]".. diff --git a/mods/default/locale/de.txt b/mods/default/locale/de.txt index 0f7375f..70c9771 100644 --- a/mods/default/locale/de.txt +++ b/mods/default/locale/de.txt @@ -43,11 +43,11 @@ Active furnace (Flame used: %d%%) (Rightclick to examine) = Aktiver Ofen (Flamme Furnace without fuel (Rightclick to examine) = Ofen ohne Brennstoff (Rechtsklicken zum Untersuchen) # Formspecs -[left click]: take/drop stack; [right click]: take half / drop 1; [middle click]: take 10 / drop 10; [Esc] or [I]: Close = [Linksklick]: Stapel nehmen/weglegen; [Rechtsklick]: nimm Hälfte / 1 ablegen; [Mittelklick]: 10 nehmen/ablegen +[Left click]: Take/drop stack\n[Right click]: Take half stack / drop 1 item\n[Middle click]: Take/drop 10 items\n[Esc] or [I]: Close = [Linksklick]: Stapel nehmen/ablegen\n[Rechtsklick]: Halben Stapel nehmen / 1 Gegenstand ablegen\n[Mittelklick]: 10 Gegenstände nehmen/ablegen\n[Esc] oder [I]: Schließen Chest inventory: = Truheninventar: Player inventory: = Spielerinventar: This furnace is active and constantly burning its fuel. = Der Ofen ist aktiv und verbrennt beständig seinen Brennstoff. -This furnace is inactive. Read the instructions to learn how to activate it. = Dieser Ofen ist inaktiv. Lesen Sie die Anweisungen, um zu erfahren, wie er aktiviert werden kann. +This furnace is inactive. Please read the sign above. = Der Ofen ist inaktiv. Bitte lesen Sie das obige Schild. Back to start = Zurück zum Anfang Crafting grid: = Fertigungsgitter: Output slot: = Resultat: diff --git a/mods/default/locale/template.txt b/mods/default/locale/template.txt index a1a77d3..391576d 100644 --- a/mods/default/locale/template.txt +++ b/mods/default/locale/template.txt @@ -43,12 +43,12 @@ Active furnace (Flame used: %d%%) (Rightclick to examine) Furnace without fuel (Rightclick to examine) # Formspecs -## It is okay to shorten the translation if it does not fit into the formspec -[left click]: take/drop stack; [right click]: take half / drop 1; [middle click]: take 10 / drop 10; [Esc] or [I]: Close +## Make sure this text fits in nicely even on small resolutions. You have 4 lines. +[Left click]: Take/drop stack\n[Right click]: Take half stack / drop 1 item\n[Middle click]: Take/drop 10 items\n[Esc] or [I]: Close Chest inventory: Player inventory: This furnace is active and constantly burning its fuel. -This furnace is inactive. Read the instructions to learn how to activate it. +This furnace is inactive. Please read the sign above. Back to start Crafting grid: Output slot: diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 0cfd84a..033edfa 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -243,7 +243,7 @@ minetest.register_node("default:torch", { function default.chest_formspec() return - "size[8,9.1]".. + "size[8,10.6]".. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. @@ -254,7 +254,7 @@ function default.chest_formspec() "list[current_player;main;0,6.08;8,3;8]".. "listring[current_name;main]".. "listring[current_player;main]".. - "label[0,9;"..default.gui_controls.."]".. + "label[0,9.1;"..default.gui_controls.."]".. default.get_hotbar_bg(0,4.85) end @@ -295,23 +295,23 @@ minetest.register_node("default:chest", { function default.furnace_active(pos, percent, item_percent) local formspec = - "size[8,8.5]".. + "size[8,9.8]".. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. "label[-0.1,-0.3;"..minetest.formspec_escape(S("This furnace is active and constantly burning its fuel.")).."]".. - "label[2.75,0.1;"..minetest.formspec_escape(S("Source:")).."]".. - "list[current_name;src;2.75,0.5;1,1;]".. - "label[2.75,2.5;"..minetest.formspec_escape(S("Fuel:")).."]".. - "list[current_name;fuel;2.75,2.9;1,1;]".. - "label[2.75,1.3;"..minetest.formspec_escape(S("Flame:")).."]".. - "image[2.75,1.7;1,1;default_furnace_fire_bg.png^[lowpart:".. + "label[2.25,0.1;"..minetest.formspec_escape(S("Source:")).."]".. + "list[current_name;src;2.25,0.5;1,1;]".. + "label[2.25,2.5;"..minetest.formspec_escape(S("Fuel:")).."]".. + "list[current_name;fuel;2.25,2.9;1,1;]".. + "label[2.25,1.3;"..minetest.formspec_escape(S("Flame:")).."]".. + "image[2.25,1.7;1,1;default_furnace_fire_bg.png^[lowpart:".. (100-percent)..":default_furnace_fire_fg.png]".. "label[3.75,1.3;"..minetest.formspec_escape(S("Progress:")).."]".. "image[3.75,1.7;1,1;gui_furnace_arrow_bg.png^[lowpart:".. (item_percent*100)..":gui_furnace_arrow_fg.png^[transformR270]".. - "label[4.75,0.76;"..minetest.formspec_escape(S("Output slots:")).."]".. - "list[current_name;dst;4.75,1.16;2,2;]".. + "label[5.75,0.70;"..minetest.formspec_escape(S("Output slots:")).."]".. + "list[current_name;dst;5.75,1.16;2,2;]".. "label[0,3.75;"..minetest.formspec_escape(S("Player inventory:")).."]".. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. @@ -319,7 +319,7 @@ function default.furnace_active(pos, percent, item_percent) "listring[current_player;main]".. "listring[current_name;src]".. "listring[current_player;main]".. - "label[0,8.4;"..default.gui_controls.."]".. + "label[0,8.5;"..default.gui_controls.."]".. default.get_hotbar_bg(0,4.25) return formspec end @@ -341,21 +341,21 @@ function default.get_furnace_active_formspec(pos, percent) end default.furnace_inactive_formspec = - "size[8,8.5]".. + "size[8,9.8]".. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. - "label[-0.1,-0.3;"..minetest.formspec_escape(S("This furnace is inactive. Read the instructions to learn how to activate it.")).."]".. - "label[2.75,0.1;"..minetest.formspec_escape(S("Source:")).."]".. - "list[current_name;src;2.75,0.5;1,1;]".. - "label[2.75,2.5;"..minetest.formspec_escape(S("Fuel:")).."]".. - "list[current_name;fuel;2.75,2.9;1,1;]".. - "label[2.75,1.3;"..minetest.formspec_escape(S("Flame:")).."]".. - "image[2.75,1.7;1,1;default_furnace_fire_bg.png]".. + "label[-0.1,-0.3;"..minetest.formspec_escape(S("This furnace is inactive. Please read the sign above.")).."]".. + "label[2.25,0.1;"..minetest.formspec_escape(S("Source:")).."]".. + "list[current_name;src;2.25,0.5;1,1;]".. + "label[2.25,2.5;"..minetest.formspec_escape(S("Fuel:")).."]".. + "list[current_name;fuel;2.25,2.9;1,1;]".. + "label[2.25,1.3;"..minetest.formspec_escape(S("Flame:")).."]".. + "image[2.25,1.7;1,1;default_furnace_fire_bg.png]".. "label[3.75,1.3;"..minetest.formspec_escape(S("Progress:")).."]".. "image[3.75,1.7;1,1;gui_furnace_arrow_bg.png^[transformR270]".. - "label[4.75,0.76;"..minetest.formspec_escape(S("Output slots:")).."]".. - "list[current_name;dst;4.75,1.16;2,2;]".. + "label[5.75,0.70;"..minetest.formspec_escape(S("Output slots:")).."]".. + "list[current_name;dst;5.75,1.16;2,2;]".. "label[0,3.75;"..minetest.formspec_escape(S("Player inventory:")).."]".. "list[current_player;main;0,4.25;8,1;]".. "list[current_player;main;0,5.5;8,3;8]".. @@ -363,7 +363,7 @@ default.furnace_inactive_formspec = "listring[current_player;main]".. "listring[current_name;src]".. "listring[current_player;main]".. - "label[0,8.4;"..default.gui_controls.."]".. + "label[0,8.5;"..default.gui_controls.."]".. default.get_hotbar_bg(0,4.25) minetest.register_node("default:furnace", {