From 151c9d79a4ed660962471ea2aacd42f5c0b7baf6 Mon Sep 17 00:00:00 2001 From: Juraj Vajda Date: Fri, 5 May 2023 21:22:37 -0400 Subject: [PATCH] Add cursed lands stone and update crystal forest stone --- LICENSE.txt | 1 + crafting.lua | 12 ++ mapgen_cursed_lands.lua | 129 ++++++++++++++++++++++ mapgen_cursed_lands_dunes.lua | 90 +++++++++++++++ mapgen_cursed_lands_ocean.lua | 112 +++++++++++++++++++ mapgen_cursed_lands_swamp.lua | 90 +++++++++++++++ nodes.lua | 49 +++++++- textures/everness_crystal_stone.png | Bin 272 -> 1656 bytes textures/everness_cursed_stone_carved.png | Bin 0 -> 661 bytes 9 files changed, 479 insertions(+), 4 deletions(-) create mode 100644 textures/everness_cursed_stone_carved.png diff --git a/LICENSE.txt b/LICENSE.txt index 40a2012..7e83748 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -875,6 +875,7 @@ GNU Lesser General Public License v2.1 or later - everness_crystal_stone_brick.png - everness_crystal_stone.png - everness_crystal_cobble.png +- everness_cursed_stone_carved.png **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated diff --git a/crafting.lua b/crafting.lua index b21e617..930914a 100644 --- a/crafting.lua +++ b/crafting.lua @@ -753,6 +753,18 @@ minetest.register_craft({ recipe = 'everness:forsaken_desert_cobble_red', }) +minetest.register_craft({ + type = 'cooking', + output = 'everness:cursed_stone_carved', + recipe = 'everness:cursed_stone', +}) + +minetest.register_craft({ + type = 'cooking', + output = 'everness:crystal_stone', + recipe = 'everness:crystal_cobble', +}) + -- -- Saplings -- diff --git a/mapgen_cursed_lands.lua b/mapgen_cursed_lands.lua index cc39c36..4d5a0fa 100644 --- a/mapgen_cursed_lands.lua +++ b/mapgen_cursed_lands.lua @@ -33,6 +33,7 @@ minetest.register_biome({ depth_filler = 1, node_riverbed = 'everness:cursed_dirt', depth_riverbed = 2, + node_stone = 'everness:cursed_stone_carved', node_dungeon = 'everness:cursed_brick', node_dungeon_alt = 'everness:cursed_brick_with_growth', node_dungeon_stair = 'stairs:stair_cursed_brick', @@ -42,6 +43,134 @@ minetest.register_biome({ humidity_point = 85, }) +-- +-- Register ores +-- + +-- Stratum ores. +-- These obviously first. + +minetest.register_ore({ + ore_type = 'stratum', + ore = 'everness:cursed_stone', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 1, + y_max = (y_max - y_max) + 46, + y_min = (y_max - y_max) + 4, + noise_params = { + offset = 28, + scale = 16, + spread = { x = 128, y = 128, z = 128 }, + seed = 90122, + octaves = 1, + }, + stratum_thickness = 4, + biomes = { 'everness_cursed_lands' }, +}) + +minetest.register_ore({ + ore_type = 'stratum', + ore = 'everness:cursed_stone', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 1, + y_max = (y_max - y_max) + 42, + y_min = (y_max - y_max) + 6, + noise_params = { + offset = 24, + scale = 16, + spread = { x = 128, y = 128, z = 128 }, + seed = 90122, + octaves = 1, + }, + stratum_thickness = 2, + biomes = { 'everness_cursed_lands' }, +}) + +-- Blob ore. +-- These before scatter ores to avoid other ores in blobs. + +-- Sand + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_sand', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 2316, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands' } +}) + +-- Dirt + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_dirt', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 766, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands' } +}) + +-- Mud + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_mud', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 17676, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands' } +}) + +-- Scatter ores + +-- Coal + +minetest.register_ore({ + ore_type = 'scatter', + ore = 'everness:cursed_stone_carved_with_coal', + wherein = 'everness:cursed_stone_carved', + clust_scarcity = 8 * 8 * 8, + clust_num_ores = 9, + clust_size = 3, + y_max = y_max, + y_min = y_min, + biomes = { 'everness_cursed_lands' } +}) + -- -- Register decorations -- diff --git a/mapgen_cursed_lands_dunes.lua b/mapgen_cursed_lands_dunes.lua index a207820..f1dd5b2 100644 --- a/mapgen_cursed_lands_dunes.lua +++ b/mapgen_cursed_lands_dunes.lua @@ -33,6 +33,7 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:cursed_sand', depth_riverbed = 2, + node_stone = 'everness:cursed_stone_carved', node_dungeon = 'everness:cursed_sandstone_brick', node_dungeon_alt = 'everness:cursed_sandstone_block', node_dungeon_stair = 'stairs:stair_cursed_sandstone_brick', @@ -43,6 +44,95 @@ minetest.register_biome({ humidity_point = 85, }) +-- +-- Register ores +-- + +-- Blob ore. +-- These before scatter ores to avoid other ores in blobs. + +-- Sand + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_sand', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 2316, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_dunes' } +}) + +-- Dirt + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_dirt', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 766, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_dunes' } +}) + +-- Mud + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_mud', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 17676, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_dunes' } +}) + +-- Scatter ores + +-- Coal + +minetest.register_ore({ + ore_type = 'scatter', + ore = 'everness:cursed_stone_carved_with_coal', + wherein = 'everness:cursed_stone_carved', + clust_scarcity = 8 * 8 * 8, + clust_num_ores = 9, + clust_size = 3, + y_max = y_max, + y_min = y_min, + biomes = { 'everness_cursed_lands_dunes' } +}) + -- -- Register decorations -- diff --git a/mapgen_cursed_lands_ocean.lua b/mapgen_cursed_lands_ocean.lua index 2a85f6a..fc9f03a 100644 --- a/mapgen_cursed_lands_ocean.lua +++ b/mapgen_cursed_lands_ocean.lua @@ -33,6 +33,7 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:cursed_stone', depth_riverbed = 2, + node_stone = 'everness:cursed_stone_carved', node_cave_liquid = 'default:water_source', node_dungeon = 'everness:cursed_lands_deep_ocean_sandstone_block', node_dungeon_alt = 'everness:cursed_lands_deep_ocean_sandstone_brick', @@ -43,6 +44,117 @@ minetest.register_biome({ humidity_point = 85, }) +-- +-- Register ores +-- + +-- Blob ore. +-- These before scatter ores to avoid other ores in blobs. + +-- Clay + +minetest.register_ore({ + ore_type = 'blob', + ore = 'default:clay', + wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = -316, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_ocean' } +}) + +-- Sand + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_sand', + wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 2316, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_ocean' } +}) + +-- Dirt + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_dirt', + wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 766, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_ocean' } +}) + +-- Mud + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_mud', + wherein = { 'everness:cursed_stone', 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 17676, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_ocean' } +}) + +-- Scatter ores + +-- Coal + +minetest.register_ore({ + ore_type = 'scatter', + ore = 'everness:cursed_stone_carved_with_coal', + wherein = 'everness:cursed_stone_carved', + clust_scarcity = 8 * 8 * 8, + clust_num_ores = 9, + clust_size = 3, + y_max = y_max, + y_min = y_min, + biomes = { 'everness_cursed_lands_ocean' } +}) + -- -- Register decorations -- diff --git a/mapgen_cursed_lands_swamp.lua b/mapgen_cursed_lands_swamp.lua index d720ce1..bb2dff5 100644 --- a/mapgen_cursed_lands_swamp.lua +++ b/mapgen_cursed_lands_swamp.lua @@ -33,6 +33,7 @@ minetest.register_biome({ depth_filler = 3, node_riverbed = 'everness:cursed_stone', depth_riverbed = 2, + node_stone = 'everness:cursed_stone_carved', node_dungeon = 'everness:cursed_sandstone_brick', node_dungeon_alt = 'everness:cursed_sandstone_block', node_dungeon_stair = 'stairs:stair_cursed_sandstone_brick', @@ -42,6 +43,95 @@ minetest.register_biome({ humidity_point = 85, }) +-- +-- Register ores +-- + +-- Blob ore. +-- These before scatter ores to avoid other ores in blobs. + +-- Sand + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_sand', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 2316, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_swamp' } +}) + +-- Dirt + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_dirt', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 766, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_swamp' } +}) + +-- Mud + +minetest.register_ore({ + ore_type = 'blob', + ore = 'everness:cursed_mud', + wherein = { 'everness:cursed_stone_carved' }, + clust_scarcity = 16 * 16 * 16, + clust_size = 5, + y_max = y_max, + y_min = y_min, + noise_threshold = 0.0, + noise_params = { + offset = 0.5, + scale = 0.2, + spread = { x = 5, y = 5, z = 5 }, + seed = 17676, + octaves = 1, + persist = 0.0 + }, + biomes = { 'everness_cursed_lands_swamp' } +}) + +-- Scatter ores + +-- Coal + +minetest.register_ore({ + ore_type = 'scatter', + ore = 'everness:cursed_stone_carved_with_coal', + wherein = 'everness:cursed_stone_carved', + clust_scarcity = 8 * 8 * 8, + clust_num_ores = 9, + clust_size = 3, + y_max = y_max, + y_min = y_min, + biomes = { 'everness_cursed_lands_swamp' } +}) + -- -- Register decorations -- diff --git a/nodes.lua b/nodes.lua index 483e88c..0d4d737 100644 --- a/nodes.lua +++ b/nodes.lua @@ -34,7 +34,15 @@ minetest.register_node('everness:coral_desert_stone_with_coal', { minetest.register_node('everness:crystal_stone_with_coal', { description = S('Coal Ore'), - tiles = { 'everness_crystal_stone.png^everness_mineral_coal.png' }, + tiles = { 'everness_crystal_stone.png^[sheet:2x2:1,1^everness_mineral_coal.png' }, + groups = { cracky = 3 }, + drop = 'default:coal_lump', + sounds = Everness.node_sound_stone_defaults(), +}) + +minetest.register_node('everness:cursed_stone_carved_with_coal', { + description = S('Coal Ore'), + tiles = { 'everness_cursed_stone_carved.png^[sheet:2x2:1,1^everness_mineral_coal.png' }, groups = { cracky = 3 }, drop = 'default:coal_lump', sounds = Everness.node_sound_stone_defaults(), @@ -284,7 +292,13 @@ Everness:register_node('everness:coral_desert_stone', { Everness:register_node('everness:crystal_stone', { description = S('Crystal Stone'), - tiles = { 'everness_crystal_stone.png' }, + tiles = { + { + name = 'everness_crystal_stone.png', + align_style = 'world', + scale = 2 + } + }, drop = 'everness:crystal_cobble', groups = { -- MTG @@ -935,7 +949,35 @@ Everness:register_node('everness:magmacobble', { Everness:register_node('everness:cursed_stone', { description = S('Cursed Stone'), - tiles = { 'everness_cursed_stone.png' }, + tiles = { + { name = 'everness_cursed_stone.png' } + }, + groups = { + -- MTG + cracky = 3, + -- MCL + pickaxey = 1, + building_block = 1, + material_stone = 1, + -- ALL + stone = 1, + }, + _mcl_blast_resistance = 6, + _mcl_hardness = 1.5, + _mcl_silk_touch_drop = true, + sounds = Everness.node_sound_stone_defaults() +}) + +Everness:register_node('everness:cursed_stone_carved', { + description = S('Cursed Stone Carved'), + tiles = { + { + name = 'everness_cursed_stone_carved.png', + align_style = 'world', + scale = 2 + } + }, + drop = 'everness:cursed_stone', groups = { -- MTG cracky = 3, @@ -1246,7 +1288,6 @@ Everness:register_node('everness:forsaken_tundra_rocks', { _mcl_blast_resistance = 6, _mcl_hardness = 1.5, _mcl_silk_touch_drop = true, - drop = 'everness:coral_desert_cobble', legacy_mineral = true, sounds = Everness.node_sound_stone_defaults(), }) diff --git a/textures/everness_crystal_stone.png b/textures/everness_crystal_stone.png index 068fc9d95c2eedbf388c2a4d86264fb7f46eaf50..a57d060c6fc0c1fcd7289f6aed2f39c5e3881860 100644 GIT binary patch literal 1656 zcmV-;28a2HP)vh-7l-{8e_Sqes7zsIW{1;IncK_Ee3xNh`62hq>WGG5Bp4g$AL)60Tqk{Q99#=YDt z^+Kav>74dXd)1z2Jku?A3h{hXZMAcaCEeyb-x700O2Avx><#npy^%DyRwiC%G3>EnCp_zxx--sAI)?nQ9N6QKjRy zG(`?P78gsXrk1cbpDJDpJbC1Me$qXG=dbtaZzRvgxup{1;)qxB7y(QS6n0~ z4RwoX9EV?@nQt!4u7%v8pf`lo^D`?mV@4hcF}c<9tWwF>D7W2RteS zB$q7U5$5EgS+ae+aSiLRh?HU=D5-l<{OMWoTjT7?%0z&x6J%kU$d zU}J^UV@@WLAuMYq%U$Oa9D?3!>^=&;X7Z-{&ZYAfF{$RNhtAUz_caDK@;(@^OP-~1 z`Xv02dKG*rT~^32`|GEdb}ZLaT{Ywl#e6aLqb{jJ3ZENMsg-Pl1PGo|A=QLV@~pm- zd~y`HH^3{gV9dJg`6}=&B_VRSTWN9VC^Amd+Gn=yYOk8B)r-xe_7OD$PstrM_Wg4O zEl=p+d24`ISY0*N;-NSXT=|dJ=n4dvyp8DY@{-3b<=lRkqkq^s1j01@5XXcY26f^Zi!wvCa3!~;TvhTOT^WW|7<3N79#wY~x<_IU+?Ny^JiSQp z^dfkLJAA}sVKotCCw%99tXMUe+m<~hX@B_6uJEjWu6}nj`3~MX8iOa>6xGehW2%nr z1;07uf>(GTGoa*zLu8m)=9=GZ-YdLkp~7;hQ`zx4Jp_a|NemlvVg*kEmPb6;>oz+@ zBgh*WT z-0H3E^?9iW=0(?=Sl?x-2L#799;Ux*^#JF(-dj>XfayzumwK@JsZH`9^Z+GbPmY!B z?=*wki5KPd?tmWHbOosgz`S_r@3$;06?yH$NciDNazuI=wJQyNQCv7GGhl;fNFpPVwOA5_|{ zz+IsqhW{^0p2j7*AuvO^AAiP%)Bo0s^2cAQP4suE2jt_d{R^#-8L1!Wu+$Ii)AGLI zn9vXEu%Bdp_U$L4zY}F%(DwJK5nU~Coy6!rGxI3*BW+9zJ%Fd)w0f}cKQnwJm~1R` z6dW{<`elD#AMp?Lcedn6v*LrqYkVKj4+d?O%9cEiBHi#G^q}AI1NZ5-qQ9emvcFRm zM2s#b`#Yvc{g8U#oybU@4LI9Z^Z@n1-a@8~X(W(1NIjsm?xx;p`#Ya1WLV2{VpU^R z>PNqMd>$Os1JU345APa|GpPr@rS?F7r@d%-l6T8_Px72r5_YtHaYYZPB)(^eBh`tP zYW0AC4D@$Akb1z&y^USTv%;z8X=psE<+&>4?OOH6r?ubt2*3ob9?*fc{T+K*QR=~f zegvn>T0I~b@YI4rE0=n}huDA~i2hEh`E0opek}E1KtE8uv(0OQCra?=!B;r6sNcMz z2Xs>oz3lH;%_K`dt^W8V{t92&bwEEjgMH<&U2+vxU$`D!v)mE-!GXA<2Lv>~(bo2N zYPro8c^?SPZ!4!j%daS4Eg^V zSo)X)7>s>3Gk8@w2^nP^ab{R3aM9Q((!7L0L1Kzqw7XFhL!hVD3WJ(DOaq3CtkE+Jl@FUROi5DCj1M#RWcV8z z>?yD@bP0l+XkKxRF!o diff --git a/textures/everness_cursed_stone_carved.png b/textures/everness_cursed_stone_carved.png new file mode 100644 index 0000000000000000000000000000000000000000..58364bf3e7f07b19d6ab710926b616053fb4cd82 GIT binary patch literal 661 zcmV;G0&4wcF=)I3}=U}h>QnYBtI03^%>k-u_9 zEfrLmueGW&DipC68#MN=@;nZ2w(N7xuF-}c-zx7_cEQG7VXEq$${Lo9foKe10?oaA zN1$hVWHic~YVn-(v|16ZHqcKlAnCDwt;1|z6fnK_HEdOrt48GvA2!6kk1G8>VFDf# z`B=Y8gwLAlfSagTq(T$S97xvTDpkMVZ#iwqcQQy{Wamta;evT%4W!4~M?&1--- z9-!SlEmzVKyaZP!$(;3{p(bpLS~VcQjq*jw811ww4_Nlu=aS~Pw^;{} zF`#rPnoLQkv!zyV6Kf;;`_AOXfT*I}gL`c@=?xnSY=>RBct_tp5L%xPmjCv_-hK$f zgrQF(34xd^f!*`}eh5>2nCY2SfWkB@e(U#h=dZ$7P^RIUXHimKu<5=B^;GNpRIn;* z(H7c~&S3zl&Y5YVb_({|!LFI8USL%8R+wu(