From b7217dd1f77db09f35c65f3fc3b46147c93d07ee Mon Sep 17 00:00:00 2001 From: Richard Qian Date: Sat, 4 Mar 2017 15:50:09 -0600 Subject: [PATCH] Resync with upstream again --- aliases.lua | 2 + crafting.lua | 24 +++++++ nodes.lua | 59 ++++++++++++++---- textures/default_brick.png | Bin 716 -> 0 bytes textures/default_fence_overlay.png | Bin 285 -> 0 bytes textures/invisible.png | Bin 68 -> 0 bytes ....png => moreblocks_checker_stone_tile.png} | Bin textures/moreblocks_fence_jungle_wood.png | Bin 204 -> 0 bytes textures/moreblocks_fence_wood.png | Bin 480 -> 0 bytes textures/moreblocks_glass.png | Bin 210 -> 0 bytes textures/moreblocks_trap_box.png | Bin 0 -> 135 bytes textures/moreblocks_trap_box_glass.png | Bin 0 -> 160 bytes textures/moreblocks_trap_glass.png | Bin 170 -> 0 bytes textures/moreblocks_trap_glow_glass.png | Bin 170 -> 0 bytes textures/moreblocks_trap_stone.png | Bin 333 -> 0 bytes textures/moreblocks_trap_super_glow_glass.png | Bin 170 -> 0 bytes 16 files changed, 73 insertions(+), 12 deletions(-) delete mode 100644 textures/default_brick.png delete mode 100644 textures/default_fence_overlay.png delete mode 100644 textures/invisible.png rename textures/{moreblocks_split_stone_tile_alt.png => moreblocks_checker_stone_tile.png} (100%) delete mode 100644 textures/moreblocks_fence_jungle_wood.png delete mode 100644 textures/moreblocks_fence_wood.png delete mode 100644 textures/moreblocks_glass.png create mode 100644 textures/moreblocks_trap_box.png create mode 100644 textures/moreblocks_trap_box_glass.png delete mode 100644 textures/moreblocks_trap_glass.png delete mode 100644 textures/moreblocks_trap_glow_glass.png delete mode 100644 textures/moreblocks_trap_stone.png delete mode 100644 textures/moreblocks_trap_super_glow_glass.png diff --git a/aliases.lua b/aliases.lua index de425f9..a57c409 100644 --- a/aliases.lua +++ b/aliases.lua @@ -61,6 +61,8 @@ minetest.register_alias("moreblocks:wood_tile_down","moreblocks:wood_tile_up") minetest.register_alias("moreblocks:wood_tile_left","moreblocks:wood_up") minetest.register_alias("moreblocks:wood_tile_right","moreblocks:wood_up") minetest.register_alias("moreblocks:empty_bookshelf","moreblocks:empty_shelf") +minetest.register_alias("moreblocks:split_stone_tile_alt","moreblocks:checker_stone_tile") +minetest.register_alias("moreblocks:tar","default:gravel") -- ABM for horizontal trees (fix facedir): local horizontal_tree_convert_facedir = {7, 12, 9, 18} diff --git a/crafting.lua b/crafting.lua index f76532f..e71aad2 100644 --- a/crafting.lua +++ b/crafting.lua @@ -401,12 +401,36 @@ minetest.register_craft({ recipe = {"default:mese_crystal_fragment", "default:stone"}, }) +minetest.register_craft({ + output = "moreblocks:trap_desert_stone", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:desert_stone"}, +}) + minetest.register_craft({ output = "moreblocks:trap_glass", type = "shapeless", recipe = {"default:mese_crystal_fragment", "default:glass"}, }) +minetest.register_craft({ + output = "moreblocks:trap_obsidian_glass", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:obsidian_glass"}, +}) + +minetest.register_craft({ + output = "moreblocks:trap_obsidian", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:obsidian"}, +}) + +minetest.register_craft({ + output = "moreblocks:trap_sandstone", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:sandstone"}, +}) + minetest.register_craft({ output = "moreblocks:cactus_brick", type = "shapeless", diff --git a/nodes.lua b/nodes.lua index e7b7c7b..2778e54 100644 --- a/nodes.lua +++ b/nodes.lua @@ -25,7 +25,7 @@ end local nodes = { ["wood_tile"] = { description = S("Wooden Tile"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, + groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, is_ground_content = false, paramtype2 = "facedir", place_param2 = 0, @@ -107,8 +107,8 @@ local nodes = { is_ground_content = false, sounds = sound_stone, }, - ["split_stone_tile_alt"] = { - description = S("Checkered Stone Tile"), + ["checker_stone_tile"] = { + description = S("Checker Stone Tile"), groups = {stone = 1, cracky = 3}, is_ground_content = false, sounds = sound_stone, @@ -236,6 +236,16 @@ local nodes = { }, ["trap_stone"] = { description = S("Trap Stone"), + tiles = {"default_stone.png^moreblocks_trap_box.png"}, + walkable = false, + groups = {cracky = 3}, + is_ground_content = false, + sounds = sound_stone, + no_stairs = true, + }, + ["trap_desert_stone"] = { + description = S("Trap Desert Stone"), + tiles = {"default_desert_stone.png^moreblocks_trap_box.png"}, walkable = false, groups = {cracky = 3}, is_ground_content = false, @@ -246,7 +256,7 @@ local nodes = { description = S("Trap Glass"), drawtype = "glasslike_framed_optional", --tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"}, - tiles = {"moreblocks_trap_glass.png"}, + tiles = {"default_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -255,6 +265,37 @@ local nodes = { sounds = sound_glass, no_stairs = true, }, + ["trap_obsidian_glass"] = { + description = S("Trap Obsidian Glass"), + drawtype = "glasslike_framed_optional", + --tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"}, + tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png"}, + paramtype = "light", + sunlight_propagates = true, + is_ground_content = false, + walkable = false, + groups = {cracky = 3, oddly_breakable_by_hand = 3}, + sounds = sound_glass, + no_stairs = true, + }, + ["trap_obsidian"] = { + description = S("Trap Obsidian"), + tiles = {"default_obsidian.png^moreblocks_trap_box.png"}, + walkable = false, + groups = {cracky = 1, level = 2}, + is_ground_content = false, + sounds = sound_stone, + no_stairs = true, + }, + ["trap_sandstone"] = { + description = S("Trap Sandstone"), + tiles = {"default_sandstone.png^moreblocks_trap_box.png"}, + walkable = false, + groups = {crumbly = 1, cracky = 3}, + is_ground_content = false, + sounds = sound_stone, + no_stairs = true, + }, ["all_faces_tree"] = { description = S("All-faces Tree"), tiles = {"default_tree_top.png"}, @@ -306,7 +347,7 @@ local nodes = { description = S("Trap Glow Glass"), drawtype = "glasslike_framed_optional", --tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"}, - tiles = {"moreblocks_trap_glass.png"}, + tiles = {"moreblocks_glow_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -332,7 +373,7 @@ local nodes = { description = S("Trap Super Glow Glass"), drawtype = "glasslike_framed_optional", --tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, - tiles = {"moreblocks_trap_super_glow_glass.png"}, + tiles = {"moreblocks_super_glow_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -384,15 +425,9 @@ for name, def in pairs(nodes) do end end - -- Items minetest.register_craftitem("moreblocks:sweeper", { description = S("Sweeper"), inventory_image = "moreblocks_sweeper.png", }) - -minetest.register_craftitem("moreblocks:nothing", { - inventory_image = "invisible.png", - on_use = function() end, -}) diff --git a/textures/default_brick.png b/textures/default_brick.png deleted file mode 100644 index 9c76033fb40e2f22adfa87203e9fb58c506a1eb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 716 zcmV;-0yF)IP)yf`YIX+SzKAB0@kx zAw?hrK@dSgimbb{*|~G?o$r}*&U;?L=V3p5_}(%}{%p!?cfKjU{6Y(!8nqfn2Q)Y0 zX;FOi)%Rz2KA+8Wz4cKO_bE&%?U7h6U$YsL04Qk3NDri@L70 z(TuV1KWi-!0f6_O{q*q-0^r0Z=Q1z@U=jK^Z{BK-?+L+`=6#EYb5peLeBHc%{2k{+ z96&@^>?9M5sglih%Cf8{&_Xm_2pk%Z6u3-8ViWl+FL$^g51_$t(XxOP5ivS<+V;%w z;A7=@H~2(~b-89wo<4Toot@>EF1=oDtHdVOS^#L<&U*&{S(Yspi#*RSU%h;Be!+hJ z^aDiv>vZ$Zt-Ex5KM?gc%ARRrd%OCNR~J`4yS=@4S06}=j2XrUjD3$gTBNC6j{yQ5 zqEf_}W|a(U^y4`0FEq7O1}_}Qzw?y@MgV<3oR;-E6*NZ18CFr$d>_<&K7Y~In?3}j z=N{Q_kAIO$mPMKEW>U(o>xJOP7;Eh~j(L85^{p!aP!{E4Z!ru5`|*?Of&oozjF1>m zO#IVs-oANTef#y`qc*a@34EMM`Lb=_y?@O8MBdQ>Xq3^r2m=Eo5Jlgz6dtM^!DWu(Q^{j=(PSnwzCcU|n?k~pY>*2V*^1(^yZ?U>8wTTza=cj{ zK*sTe*%u*v+wJzj`Fw4`EzSW5vx=0+Wa&+7aUKAhv>XB`YFsX#%e6wmO?sQU+F&;PE5~ENsQUFxDDF|C`C80hLECan1T#TnRr!@sb jW^;q=oA}JhzyHQReZYDGgC>Ma00000NkvXXu0mjfvk!5c diff --git a/textures/invisible.png b/textures/invisible.png deleted file mode 100644 index 4b5b3029265a4ef9b9c654442d56c7f198ffdeb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-5DwYogajamnSs&YgKIsI O#o+1c=d#Wzp$Pyq!wQA~ diff --git a/textures/moreblocks_split_stone_tile_alt.png b/textures/moreblocks_checker_stone_tile.png similarity index 100% rename from textures/moreblocks_split_stone_tile_alt.png rename to textures/moreblocks_checker_stone_tile.png diff --git a/textures/moreblocks_fence_jungle_wood.png b/textures/moreblocks_fence_jungle_wood.png deleted file mode 100644 index b59db10418a9323e0b1e1fefb8a2b80bbdd84be5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=5TR4DNbzUIy~{p8A#k zCbLqU)?AcI07@{G1o;IsFqBO`YXRh?c)B=-a73r}7;-fj2(WAq_#Hg?-VY|;Z)`sK z3fHBl{Q1ur=fG09s`X~<1?GDTiWM$dIv#adVzD58hGkXzxv1=8l@8~%1G+EW<}(Sp w_H#mk<%&gG@)x9{XSmGWq;LO6^Lc~3IZLrfd-6;+d!T&`p00i_>zopr0LOeoH~;_u diff --git a/textures/moreblocks_fence_wood.png b/textures/moreblocks_fence_wood.png deleted file mode 100644 index e3510c52a1085b10c272c40fc440b9c5eb939e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfw*a3IS0K&Ez@VofYNW_(%*$XR z&1fRWZmq;)qrz>cqvWK->8vj3tRv#4&Fii&=4B$|t0&}ZBIau%{T z?5L6Kq@C=dk?O3P>SC1YuAk~fW4W-<;;!mh01z;nbNQ z)L9tWRg&19wmU3*{u(^5zWjUFq#)Pr!dkNL-=qbR+S6IsuKF}J zBr|0(te9arb>5qASquutO`@7FW<6wNk(sP-)38}Y_yMEF`TFmS-Sb73UOTOM73f3; MPgg&ebxsLQ02F(h`2YX_ diff --git a/textures/moreblocks_glass.png b/textures/moreblocks_glass.png deleted file mode 100644 index 912b029e210f06af2f56750b69d869dfa9ff5ec5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Q-Dv1E0A8c4nJ z@ErkR#;MwT(m+8?PZ!4!i{9ipHaCCRGpjZTF{}BT{X6e6@huMz&tkS7DT6Eq7K5N! aa~UU!an}BsXuScbiNVv=&t;ucLK6UBav?JS literal 0 HcmV?d00001 diff --git a/textures/moreblocks_trap_box_glass.png b/textures/moreblocks_trap_box_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..fbb25cae59242b847b02eba05146ce9a06cd8000 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+8cPZ!4!i{9ipHaCCRGmA}_T|G^3x(t_sm!RBUpC?(%y0|5PK%QvapcIL?wSqTN!6|(*3BSLz3%NZ^)iY#CV)#>T(DokMXV4oly|ATSqG*(&DTcK<~ Pvlu*G{an^LB{Ts5DBL?T diff --git a/textures/moreblocks_trap_glow_glass.png b/textures/moreblocks_trap_glow_glass.png deleted file mode 100644 index 1096dd7e79c29495ef5d81bcd1010b506ddd9a56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=5oz8^1i8`0`xx%L~~r zFIB$0T>bKL?U`lI7XjrMOM?7@862M7NCR>lJY5_^IAmE528ucah_D>EY5QZJ)E*9{ zPK8};XP!Kfl~7<^A=`gGBBY16oZ%9q$O48?ou2Nl!URSS_6frAKNy!zW0f_%70L!Q Oi^0>?&t;ucLK6ToEI9-K diff --git a/textures/moreblocks_trap_stone.png b/textures/moreblocks_trap_stone.png deleted file mode 100644 index 764aa8187075e60f4957237c6c08b85fba999927..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmV-T0kZyyP)_ fNN#{}f{OkJb(UCcEcdL-00000NkvXXu0mjf%(sV? diff --git a/textures/moreblocks_trap_super_glow_glass.png b/textures/moreblocks_trap_super_glow_glass.png deleted file mode 100644 index fef974bcdb32e4ef9c5fa647c5d9d1684821a2bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=5oz8~^`b@&AAI|Nou; z|Ih#bf6@Q{OZNxP{R@<1ED7=pW^j0RBMr!L@N{tu;gDrL7%1uxAi{FsrtOb?QhPX* zIu&-Yoq6&^RziVwg>3)%h>#xMa)wKcA`2Kob$YtH3KJMT*e3|b|6p7?jaAn4Rwx_L OECx?kKbLh*2~7YVtUC|@