From c315f00a310bf7edd19e1d7d29d2b84ff56dffbf Mon Sep 17 00:00:00 2001 From: Andrey2470T Date: Sat, 18 Jul 2020 16:58:01 +0300 Subject: [PATCH] 1.1.4: Decreased alpha of oil source, added solid oil, small optimization fixes in ores generation --- materials.lua | 141 +++++++++++++++++++++++++---------------- textures/solid_oil.png | Bin 0 -> 1773 bytes 2 files changed, 86 insertions(+), 55 deletions(-) create mode 100644 textures/solid_oil.png diff --git a/materials.lua b/materials.lua index 5cba116..8538141 100644 --- a/materials.lua +++ b/materials.lua @@ -13,26 +13,35 @@ for _, material in ipairs({"", "jungle_", "pine_"}) do stack_max = 99 }) - minetest.register_craftitem("luxury_decor:" .. material .. "wooden_board", { - description = string.upper(string.sub(material, 1, 1)) .. string.sub(material, 2, -2) .. " Wooden Board", - inventory_image = material .. "wooden_board.png" - }) - minetest.register_craft({ - type = "shapeless", - output = "luxury_decor:" .. material .. "wooden_plank 2", - recipe = {"luxury_decor:" .. material .. "wooden_board", "luxury_decor:saw"}, - replacements = { - {"", "luxury_decor:saw"} - } - }) - minetest.register_craft({ - type = "shapeless", - output = "default:stick 2", - recipe = {"luxury_decor:" .. material .. "wooden_plank", "luxury_decor:saw"}, - replacements = {{"", "luxury_decor:saw"}} - }) end +minetest.register_craft({ + type = "shapeless", + output = "luxury_decor:wooden_plank 2", + recipe = {"luxury_decor:wooden_board", "luxury_decor:saw"}, + replacements = { + {"", "luxury_decor:saw"} + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "luxury_decor:jungle_wooden_plank 2", + recipe = {"luxury_decor:jungle_wooden_board", "luxury_decor:saw"}, + replacements = { + {"", "luxury_decor:saw"} + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "luxury_decor:pine_wooden_plank 2", + recipe = {"luxury_decor:pine_wooden_board", "luxury_decor:saw"}, + replacements = { + {"", "luxury_decor:saw"} + } +}) + minetest.register_craftitem("luxury_decor:bucket_oil", { description = "Bucket Oil", inventory_image = "bucket_oil.png", @@ -43,7 +52,7 @@ minetest.register_node("luxury_decor:oil_source", { description = "Oil Source", drawtype = "liquid", tiles = {"oil_source.png"}, - alpha = 160, + alpha = 250, paramtype = "light", walkable = false, pointable = false, @@ -55,11 +64,10 @@ minetest.register_node("luxury_decor:oil_source", { liquidtype = "source", liquid_alternative_flowing = "luxury_decor:oil_flowing", liquid_alternative_source = "luxury_decor:oil_source", - liquid_viscosity = 5, + liquid_viscosity = 7, liquid_range = 5, - damage_per_second = 1, post_effect_color = {a = 103, r = 30, g = 60, b = 90}, - groups = {water = 3, liquid = 3, cools_lava = 1, not_in_creative_inventory=1}, + groups = {water = 3, liquid = 3, not_in_creative_inventory=1}, on_rightclick = function (pos, node, player, itemstack, pointed_thing) if itemstack:get_name() == "bucket:bucket_empty" then minetest.remove_node(pos) @@ -71,11 +79,20 @@ minetest.register_node("luxury_decor:oil_source", { end }) +minetest.register_node("luxury_decor:solid_oil", { + description = "Solid Oil (use furnace to melt)", + tiles = {"solid_oil.png"}, + paramtype = "light", + paramtype2 = "facedir", + groups = {cracky = 2}, + sounds = default.node_sound_stone_defaults() +}) + minetest.register_node("luxury_decor:oil_flowing", { description = "Flowing Oil", drawtype = "flowingliquid", tiles = {"oil_source.png"}, - special_tiles = { + special_tiles = { { name = "oil_source_animated.png", backface_culling = false, @@ -83,7 +100,7 @@ minetest.register_node("luxury_decor:oil_flowing", { type = "vertical_frames", aspect_w = 16, aspect_h = 16, - length = 5, + length = 10, }, }, { @@ -93,11 +110,11 @@ minetest.register_node("luxury_decor:oil_flowing", { type = "vertical_frames", aspect_w = 16, aspect_h = 16, - length = 5, + length = 10, }, - }, + } }, - alpha = 160, + alpha = 250, paramtype = "light", paramtype2 = "flowingliquid", walkable = false, @@ -108,12 +125,12 @@ minetest.register_node("luxury_decor:oil_flowing", { drop = "", drowning = 1, liquidtype = "flowing", + liquid_range = 4, liquid_alternative_flowing = "luxury_decor:oil_flowing", liquid_alternative_source = "luxury_decor:oil_source", - liquid_viscosity = 5, + liquid_viscosity = 7, post_effect_color = {a = 103, r = 30, g = 60, b = 90}, - groups = {water = 3, liquid = 3, not_in_creative_inventory = 1, - cools_lava = 1, not_in_creative_inventory=1}, + groups = {water = 3, liquid = 3, not_in_creative_inventory = 1}, on_rightclick = function (pos, node, player, itemstack, pointed_thing) if itemstack:get_name() == "bucket:bucket_empty" then minetest.remove_node(pos) @@ -199,6 +216,24 @@ minetest.register_craftitem("luxury_decor:copper_and_zinc", { stack_max = 99 }) +minetest.register_craftitem("luxury_decor:wooden_board", { + description = "Wooden Board", + inventory_image = "wooden_board.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:jungle_wooden_board", { + description = "Jungle Board", + inventory_image = "jungle_board.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:pine_wooden_board", { + description = "Pine Board", + inventory_image = "pine_board.png", + stack_max = 99 +}) + minetest.register_craftitem("luxury_decor:plastic_sheet", { description = "Plastic Sheet", inventory_image = "plastic_sheet.png", @@ -279,7 +314,7 @@ minetest.register_ore({ ore_type = "scatter", ore = "luxury_decor:zinc_ore", wherein = "default:stone", - clust_scarcity = 100, + clust_scarcity = 400, clust_num_ores = 5, clust_size = 3, height_min = -31000, @@ -290,7 +325,7 @@ minetest.register_ore({ ore_type = "scatter", ore = "luxury_decor:wolfram_ore", wherein = "default:stone", - clust_scarcity = 200, + clust_scarcity = 800, clust_num_ores = 4, clust_size = 2, height_min = -31000, @@ -299,15 +334,28 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "luxury_decor:oil_source", + ore = "luxury_decor:solid_oil", wherein = "default:stone", - clust_scarcity = 400, + clust_scarcity = 700, clust_num_ores = 3, - clust_size = 1, + clust_size = 3, height_min = -31000, height_max = -25 }) +minetest.register_craft({ + type = "shapeless", + output = "luxury_decor:bucket_oil", + recipe = {"bucket:bucket_empty", "luxury_decor:oil_source"} +}) + +minetest.register_craft({ + type = "cooking", + output = "luxury_decor:oil_source", + recipe = "luxury_decor:solid_oil", + cooktime = 4 +}) + minetest.register_craft({ type = "cooking", output = "luxury_decor:paraffin_cake 2", @@ -421,38 +469,21 @@ minetest.register_craftitem("luxury_decor:saw", { minetest.register_craft({ type = "shapeless", output = "luxury_decor:wooden_board 3", - recipe = {"stairs:slab_wood", "luxury_decor:saw"}, - replacements = {{"", "luxury_decor:saw"}} + recipe = {"stairs:slab_wood", "luxury_decor:saw"} }) minetest.register_craft({ type = "shapeless", output = "luxury_decor:jungle_wooden_board 3", - recipe = {"stairs:slab_junglewood", "luxury_decor:saw"}, - replacements = {{"", "luxury_decor:saw"}} + recipe = {"stairs:slab_junglewood", "luxury_decor:saw"} }) minetest.register_craft({ type = "shapeless", output = "luxury_decor:pine_wooden_board 3", - recipe = {"stairs:slab_pine_wood", "luxury_decor:saw"}, - replacements = {{"", "luxury_decor:saw"}} + recipe = {"stairs:slab_pine_wood", "luxury_decor:saw"} }) -minetest.register_on_craft(function (itemstack, player, old_craft_grid, craft_inv) - minetest.debug(dump(old_craft_grid)) - for i = 1, #old_craft_grid do - local ud = old_craft_grid[i] - local name = ud:get_name() - if name == "luxury_decor:saw" then - minetest.sound_play("wood_sawing", { - to_player = player:get_player_name() - }) - return - end - end -end) - minetest.register_craft({ type = "shapeless", output = "luxury_decor:saw", diff --git a/textures/solid_oil.png b/textures/solid_oil.png new file mode 100644 index 0000000000000000000000000000000000000000..20640a14a3aa16a1f7664db1428b3b612addb32e GIT binary patch literal 1773 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+ND-ovg0TW{nsjb2}mFw%fSY!dIz)oK49V-`^Irn zW6H=8La!r1sQ&l2(H}fwypYonee&Mmamgjg_=skE@|fAUG0z|7@p0hOz93*(P`mw% ze)22$0(qJIb?V9B>yx5X=fZMa$WxKTY2aaT8nV0@Fl8#rQ<0Tv*=@gckt#n7*Dyi?&Wz%#1O%G9lPf{&gGv>H?X}34y z4Vb})99uuW{ouQiUqgTlF2M6Nb6d@x%|mW>R9-*yNm#QS4sh>Zvkd6h!l?{=oqT&j z&+l~b>Ab-D8t#GVlSjerhUMTADvVQpdzc-!Hd8m$!a_3t`BY! zY_i2h6vm2DvEWK;G=1S=Hw}9$M_4WlQDG=!Y`GouiO{>zTJI%hnmxlCz|z|gZgk}O z3^5?WZ6;Mmf*<2pkP}!72z8`6BEW2xO~s=8Q(JZbZ6T+iTXSL<8}8p>+bsjAnYQIlqGy(4s(_rdq$HU}GA(BMM|F{F^AjV@~RF~k^C%t?~PX{-tD zm|{vPXV}cpoIPd8XK)r-?BW(({1TS9q$RH?pVh6p`ZcU^O=~VvY(XCvUqXo`m0Y=^ zl&Y&r)z?sCO*J>vTC>eHZN7yTTWWbnZKC>Xe1RHI)MOyl<-(2{xFKwmM!i5u#|(&x zV;~+n0w`$dn3>4VNk^_@W|E*QRN$m`YzmvqUL09hS+wzv-4AkK;YQxQ#Z5j%jyiPz z6S;vKRei$k1!|>V+v`AV>%yK>W6^yL*^!w04Z1ibb~xTeLHgCWbn?tN(=-M6Az0=D z)rZzWa=)XG)J*~Np5n~*ryaXWJu|}Dzw(gqkxqM-v&+jlmU9;D<_P`7ptm0Bo9O8E zR)3M8%S;NL7<#+oLXga@H+-ez5Fvdc$+!N7LZ?Er{?i!sTu0{Pe4f2HR1@9T>?J*9 zlfK$nPSv?5Le7ZqVsXT`U)YoxcQPd)cCUsAdgxH!ko2VD2) zC~Q#B6Rw480vR{DZDv zB9}t04KQ-dqXG@G>j(dX-`!e;iE%F}oB%ps9Oq*g2<-xmn&W&QJ5J*S2tET>ddpv_ z1Jj?R*IHWa24l zRq6&fI0QzDl)dKj?ymOU{yo#|?+5+Ua(LT1d?Ek<00v@9M??Ss00000`9r&Z00009 za7bBm001r{001r{0eGc9b^rhX2XskIMF->u5)BXpOh)x90000PbVXQnLvL+uWo~o; zLvm$dbY)~9cWHEJAV*0}P*;Ht7XSbNuSrBfR5;6(Q$Y^HFbo3J5A^?Ut=VBp$2>RE zd}?AF15SCKr>hFKK@zsHVttc@q%o)Ky1o*b1OQ1OiL9%t4=~C5(3$kR4h{fEN1clD z+<}g+dlhsKCSXa>N@P(s_U3M+7WIkt)YL