diff --git a/mods/Decorations/signs_lib/textures/hdf_51.png b/mods/Decorations/signs_lib/textures/hdf_51.png index e69de29..acb395e 100644 Binary files a/mods/Decorations/signs_lib/textures/hdf_51.png and b/mods/Decorations/signs_lib/textures/hdf_51.png differ diff --git a/mods/Nodes/color/init.lua b/mods/Nodes/color/init.lua index d709de1..efdb084 100644 --- a/mods/Nodes/color/init.lua +++ b/mods/Nodes/color/init.lua @@ -25,27 +25,13 @@ for i in ipairs(source_list) do local red = source_list[i][4] local green = source_list[i][5] local blue = source_list[i][6] - - if wieldskin == "white" then - - wieldskin2 = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)" - - elseif wieldskin == "black" then - - wieldskin2 = "color_handblack.png^(color_handwhite2.png^[colorize:#"..colour..":70)" - - else - - wieldskin2 = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)" - - end minetest.register_node("color:" .. name, { description = desc .. " color", inventory_image = "blocks.png^[colorize:#"..colour..":70", tiles = {"color_white.png^[colorize:#"..colour..":70"}, - wield_image = wieldskin2, + wield_image = "color_handwhite.png^(color_handwhite2.png^[colorize:#"..colour..":70)", wield_scale = {x=1,y=1,z=0.5}, is_ground_content = true, groups = {snappy = 2, choppy = 2, wool = 2}, diff --git a/mods/Nodes/color/textures/color_handblack.png b/mods/Nodes/color/textures/color_handblack.png deleted file mode 100644 index 03b350f..0000000 Binary files a/mods/Nodes/color/textures/color_handblack.png and /dev/null differ diff --git a/mods/Nodes/color/textures/screenshot.png b/mods/Nodes/color/textures/screenshot.png deleted file mode 100644 index 270ce99..0000000 Binary files a/mods/Nodes/color/textures/screenshot.png and /dev/null differ diff --git a/mods/Nodes/doors/textures/doors_item_wood.png b/mods/Nodes/doors/textures/doors_item_wood.png index e69de29..100fe15 100644 Binary files a/mods/Nodes/doors/textures/doors_item_wood.png and b/mods/Nodes/doors/textures/doors_item_wood.png differ diff --git a/mods/Player/character_creator/init.lua b/mods/Player/character_creator/init.lua index 8325192..a8ae282 100644 --- a/mods/Player/character_creator/init.lua +++ b/mods/Player/character_creator/init.lua @@ -53,33 +53,33 @@ local formspec = "size[8,7.5]" -- Skin -.. "image_button[3.5,1;1,1;gui_hotbar_selected.png^".. skins_array.skin[indexes.skin]..";skin;]" -.. "image_button[1.5,1;1,1;gui_hotbar_selected.png^gauche.png;skin_back;]" -.. "image_button[5.5,1;1,1;gui_hotbar_selected.png^droite.png;skin_next;]" +-- .. "image_button[3.5,1;1,1;gui_hotbar_selected.png^".. skins_array.skin[indexes.skin]..";skin;]" +-- .. "image_button[1.5,1;1,1;gui_hotbar_selected.png^gauche.png;skin_back;]" +-- .. "image_button[5.5,1;1,1;gui_hotbar_selected.png^droite.png;skin_next;]" -- Eyes -.. "image_button[3.5,2;1,1;gui_hotbar_selected.png^".. skins_array.face[indexes.face]..";face;]" -.. "image_button[1.5,2;1,1;gui_hotbar_selected.png^gauche.png;face_back;]" -.. "image_button[5.5,2;1,1;gui_hotbar_selected.png^droite.png;face_next;]" +.. "image_button[3.5,1.5;1,1;gui_hotbar_selected.png^".. skins_array.face[indexes.face]..";face;]" +.. "image_button[1.5,1.5;1,1;gui_hotbar_selected.png^gauche.png;face_back;]" +.. "image_button[5.5,1.5;1,1;gui_hotbar_selected.png^droite.png;face_next;]" -- T-Shirt -.. "image_button[3.5,3;1,1;gui_hotbar_selected.png^".. skins_array.tshirt[indexes.tshirt]..";tshirt;]" -.. "image_button[1.5,3;1,1;gui_hotbar_selected.png^gauche.png;tshirt_back;]" -.. "image_button[5.5,3;1,1;gui_hotbar_selected.png^droite.png;tshirt_next;]" +.. "image_button[3.5,2.5;1,1;gui_hotbar_selected.png^".. skins_array.tshirt[indexes.tshirt]..";tshirt;]" +.. "image_button[1.5,2.5;1,1;gui_hotbar_selected.png^gauche.png;tshirt_back;]" +.. "image_button[5.5,2.5;1,1;gui_hotbar_selected.png^droite.png;tshirt_next;]" -- Pants -.. "image_button[3.5,4;1,1;gui_hotbar_selected.png^".. skins_array.pants[indexes.pants]..";pants;]" -.. "image_button[1.5,4;1,1;gui_hotbar_selected.png^gauche.png;pants_back;]" -.. "image_button[5.5,4;1,1;gui_hotbar_selected.png^droite.png;pants_next;]" +.. "image_button[3.5,3.5;1,1;gui_hotbar_selected.png^".. skins_array.pants[indexes.pants]..";pants;]" +.. "image_button[1.5,3.5;1,1;gui_hotbar_selected.png^gauche.png;pants_back;]" +.. "image_button[5.5,3.5;1,1;gui_hotbar_selected.png^droite.png;pants_next;]" -- Shoes -.. "image_button[3.5,5;1,1;gui_hotbar_selected.png^".. skins_array.shoes[indexes.shoes]..";shoes;]" -.. "image_button[1.5,5;1,1;gui_hotbar_selected.png^gauche.png;shoes_back;]" -.. "image_button[5.5,5;1,1;gui_hotbar_selected.png^droite.png;shoes_next;]" +.. "image_button[3.5,4.5;1,1;gui_hotbar_selected.png^".. skins_array.shoes[indexes.shoes]..";shoes;]" +.. "image_button[1.5,4.5;1,1;gui_hotbar_selected.png^gauche.png;shoes_back;]" +.. "image_button[5.5,4.5;1,1;gui_hotbar_selected.png^droite.png;shoes_next;]" -- Done @@ -173,22 +173,6 @@ local function change_skin(player) }) local name = player:get_player_name() - - wieldskin3 = player:get_attribute("character_creator:skin") - - if wieldskin3 == "skinwhite.png" then - - wieldskin = "white" - - elseif wieldskin3 == "skinblack.png" then - - wieldskin = "black" - - else - - wieldskin = "white" - - end if minetest.get_modpath("multiskin") then multiskin.layers[name].skin = texture diff --git a/mods/Player/character_creator/skins.lua b/mods/Player/character_creator/skins.lua index 421dd82..c49857f 100644 --- a/mods/Player/character_creator/skins.lua +++ b/mods/Player/character_creator/skins.lua @@ -3,7 +3,6 @@ return { skin = { ["skinwhite.png"] = "cc_skin_white.png", - ["skinblack.png"] = "cc_skin_black.png", }, diff --git a/mods/Player/character_creator/textures/skinblack.png b/mods/Player/character_creator/textures/skinblack.png deleted file mode 100644 index 2495a13..0000000 Binary files a/mods/Player/character_creator/textures/skinblack.png and /dev/null differ diff --git a/mods/World/default/mapgen.lua b/mods/World/default/mapgen.lua index a95e861..9d2bf32 100644 --- a/mods/World/default/mapgen.lua +++ b/mods/World/default/mapgen.lua @@ -2,7 +2,7 @@ -- Aliases for map generators -- -minetest.register_alias("mapgen_stone","comboblock:slab_black_onc_slab_black") +minetest.register_alias("mapgen_stone","color:black") minetest.register_alias("mapgen_dirt","comboblock:slab_orange_onc_slab_orange") diff --git a/mods/World/default/textures/default_dry_grass.png b/mods/World/default/textures/default_dry_grass.png index e69de29..ca7e4ae 100644 Binary files a/mods/World/default/textures/default_dry_grass.png and b/mods/World/default/textures/default_dry_grass.png differ