From d71e3182301164ee9d08d1e62d268a341b190ff4 Mon Sep 17 00:00:00 2001 From: Vitaliy Olkhin Date: Sat, 21 Sep 2024 13:29:48 +0500 Subject: [PATCH] fix --- dimensions.lua | 149 +++++++++++------------------------------------ sky.lua | 4 +- space_drives.lua | 2 +- 3 files changed, 37 insertions(+), 118 deletions(-) diff --git a/dimensions.lua b/dimensions.lua index a06c598..e60196e 100644 --- a/dimensions.lua +++ b/dimensions.lua @@ -75,16 +75,7 @@ multidimensions.clear_dimensions() -- clear all dimensions multidimensions.register_dimension("luna_moon",{ - ground_ores = {--[[ - ["default:tree"] = 1000, -- (chance) ... spawns on ground, used by trees, grass, flowers... - ["default:stone"] = {chance=1000}, -- same as above - ["default:dirt_with_snow"] = { -- names will be remade to content_id - chance=5000, -- chance - min_heat=10, -- min heat - max_heat=40, -- max heat - chunk=3, -- chunk size - }, - ]]}, + ground_ores = {}, stone_ores = { ["space_travel:space_stone_iron_ore"]=400, ["space_travel:space_stone_copper_ore"]=500, @@ -107,9 +98,9 @@ multidimensions.register_dimension("luna_moon",{ self = {}, -- can contain everything, var like dirt="default:dirt" will be remade to dirt=content_id - dim_y = space_travel.yarth_orbit, -- dimension start (don't change if you don't know what you're doing) - dim_height = space_travel.luna + 499, -- dimension height - + dim_y = space_travel.yarth_orbit, -- начало измерения (не меняйте, если не знаете, что делаете) + dim_height = 1499, -- Высота измерения + --deep_y = 240, dirt_start = 501, -- when dirt begins to appear (default is 501) dirt_depth = 3, -- dirt depth @@ -127,39 +118,19 @@ multidimensions.register_dimension("luna_moon",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, scale = 1, spread = {x=100,y=18,z=100}, - seeddiff = 24, + seeddiff = 0, octaves = 5, persist = 0.7, lacunarity = 1, flags = "absvalue", }, - - --[[ - craft = { -- teleport craft recipe - {"default:obsidianbrick", "default:steel_ingot", "default:obsidianbrick"}, - {"default:wood","default:mese","default:wood",}, - {"default:obsidianbrick", "default:steel_ingot", "default:obsidianbrick"}, - }, - ]] - ---[[ - on_generate=function(self,data,id,area,x,y,z) - if y <= self.dirt_start+5 then - data[id] = self.air - else - return - end - return data -- to return changes - end, - ]] - - -- data: active generating area (VoxelArea) + -- data: active generating area (VoxelArea) -- index: data index -- self: {dim_start, dim_end, dim_height, ground_limit, heat, humidity, dirt, stone, grass, air, water, sand, bedrock ... and your inputs ----area: (VoxelArea:new({MinEd...}) @@ -224,7 +195,7 @@ multidimensions.register_dimension("mars_planet",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:mars_sand", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:mars_stone", -- at dimension edges map = { offset = 0, @@ -324,7 +295,7 @@ multidimensions.register_dimension("mercury_planet",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, @@ -397,8 +368,8 @@ multidimensions.register_dimension("venus_planet",{ dirt_ores = {}, grass_ores = { ["space_travel:venus_gravel"] = 100, - ["space_travel:venus_vapor_spout_spawner"] = space_travel.yarth + 30000, --15000, - ["space_travel:venus_volcano_spawner"] = space_travel.yarth + 30000, --15000, + ["space_travel:venus_vapor_spout_spawner"] = 30000, --15000, + ["space_travel:venus_volcano_spawner"] = 30000, --15000, }, air_ores = {}, water_ores = {}, @@ -428,7 +399,7 @@ multidimensions.register_dimension("venus_planet",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:venus_gravel", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:venus_stone", -- at dimension edges map = { offset = 0, @@ -531,7 +502,7 @@ multidimensions.register_dimension("ganymede_moon",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, @@ -631,7 +602,7 @@ multidimensions.register_dimension("callisto_moon",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, @@ -709,7 +680,7 @@ multidimensions.register_dimension("io_moon",{ grass_ores = { ["space_travel:io_gravel"] = 100, ["space_travel:space_lava_source"] = 256, - ["space_travel:io_volcano_spawner"] = space_travel.yarth + 15000, + ["space_travel:io_volcano_spawner"] = 15000, ["space_travel:irradiated_io_sulfur_dust"] = 200, }, air_ores = {}, @@ -738,7 +709,7 @@ multidimensions.register_dimension("io_moon",{ air = "vacuum:vacuum", water = "space_travel:space_lava_source", sand = "space_travel:io_gravel", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:io_stone", -- at dimension edges map = { offset = 0, @@ -799,7 +770,7 @@ multidimensions.register_dimension("europa_moon",{ }, grass_ores = { ["space_travel:space_gravel"] = 100, - ["space_travel:europa_water_geyser_spawner"] = space_travel.yarth + 15000, + ["space_travel:europa_water_geyser_spawner"] = 15000, ["space_travel:irradiated_space_dust"] = 200, }, air_ores = {}, @@ -828,7 +799,7 @@ multidimensions.register_dimension("europa_moon",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:tholins", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "default:ice", -- at dimension edges map = { offset = 0, @@ -905,7 +876,7 @@ multidimensions.register_dimension("titan_moon",{ ["space_travel:titan_icestone_ilmenite_ore"]=600, }, grass_ores = { - ["space_travel:titan_cryovolcano_spawner"] = space_travel.yarth + 15000, + ["space_travel:titan_cryovolcano_spawner"] = 15000, }, air_ores = {}, water_ores = {}, @@ -933,7 +904,7 @@ multidimensions.register_dimension("titan_moon",{ air = "vacuum:vacuum", water = "space_travel:liquid_hydrocarbon_source", sand = "space_travel:titan_hydrocarbon_sand", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:titan_icestone", -- at dimension edges map = { offset = 0, @@ -1033,12 +1004,12 @@ multidimensions.register_dimension("oberon_moon",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, scale = 1, - spread = {x=100,y=18,z=100}, + spread = {x=100,y=20,z=100}, seeddiff = 24, octaves = 5, persist = 0.7, @@ -1106,7 +1077,7 @@ multidimensions.register_dimension("triton_moon",{ dirt_ores = {}, grass_ores = { ["space_travel:space_gravel"] = 100, - ["space_travel:space_cryovolcano_spawner"] = space_travel.yarth + 15000, + ["space_travel:space_cryovolcano_spawner"] = 15000, }, air_ores = {}, water_ores = {}, @@ -1134,7 +1105,7 @@ multidimensions.register_dimension("triton_moon",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, @@ -1207,7 +1178,7 @@ multidimensions.register_dimension("pluto_dwarf_planet",{ dirt_ores = {}, grass_ores = { ["space_travel:space_gravel"] = 100, - ["space_travel:space_cryovolcano_spawner"] = space_travel.yarth + 15000, + ["space_travel:space_cryovolcano_spawner"] = 15000, }, air_ores = {}, water_ores = {}, @@ -1235,7 +1206,7 @@ multidimensions.register_dimension("pluto_dwarf_planet",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, @@ -1335,7 +1306,7 @@ multidimensions.register_dimension("charon_moon",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map = { offset = 0, @@ -1436,7 +1407,7 @@ multidimensions.register_dimension("sedna_dwarf_planet",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:sedna_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:sedna_stone", -- at dimension edges map = { offset = 0, @@ -1528,7 +1499,7 @@ multidimensions.register_dimension("asteriod_belt",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:space_dust", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:space_stone", -- at dimension edges map={ spread={x=30,y=30,z=30}, octaves=3, @@ -1603,7 +1574,7 @@ multidimensions.register_dimension("minerva_exoplanet",{ air = "air", water = "space_travel:minerva_water_source", sand = "default:silver_sand", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:minerva_stone", -- at dimension edges map = { offset = 0, @@ -1700,7 +1671,7 @@ multidimensions.register_dimension("bacchus_exoplanet",{ air = "air", water = "space_travel:bacchus_water_source", sand = "space_travel:bacchus_sand", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:bacchus_stone", -- at dimension edges map = { offset = 0, @@ -1795,7 +1766,7 @@ multidimensions.register_dimension("ourea_exomoon",{ air = "air", water = "default:water_source", sand = "default:sand", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "default:stone", -- at dimension edges map = { offset = 0, @@ -1894,7 +1865,7 @@ multidimensions.register_dimension("osiris_exoplanet",{ air = "air", water = "default:water_source", sand = "default:sand", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "default:desert_stone", -- at dimension edges map = { offset = 0, @@ -1990,7 +1961,7 @@ multidimensions.register_dimension("minthe_exoplanet",{ air = "vacuum:vacuum", water = "vacuum:vacuum", sand = "space_travel:minthe_sand", - bedrock = "multidimensions:bedrock", -- at dimension edges + bedrock = "space_travel:minthe_stone", -- at dimension edges map = { offset = 0, @@ -2295,58 +2266,6 @@ multidimensions.register_dimension("minthe_exoplanet",{ --LBMs and ABMs ---Bedrock -minetest.register_lbm({ - name = "space_travel:bedrock_lbm", - run_at_every_load = true, - nodenames = {"vacuum:vacuum", "air"}, - action = function(pos, node) - if pos.y >= space_travel.luna and pos.y < space_travel.yarth_orbit + 68 then --Luna (the Moon) bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.mars and pos.y < space_travel.mars + 68 then --Mars bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.mercury and pos.y < space_travel.mercury + 68 then --Mercury bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.venus and pos.y < space_travel.venus + 68 then --Venus bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.ganymede and pos.y < space_travel.ganymede + 68 then --Ganymede bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.callisto and pos.y < space_travel.callisto + 68 then --Callisto bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.io and pos.y < space_travel.io + 68 then --Io bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.europa and pos.y < space_travel.europa + 68 then --Europa bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.titan and pos.y < space_travel.titan + 68 then --Titan bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.oberon and pos.y < space_travel.oberon + 68 then --Oberon bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.triton and pos.y < space_travel.triton + 68 then --Triton bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.pluto and pos.y < space_travel.pluto + 68 then --Pluto bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.charon and pos.y < space_travel.charon + 68 then --Charon bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.sedna and pos.y < space_travel.sedna + 68 then --Sedna bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.asteriod_belt and pos.y < space_travel.asteriod_belt + 5 then --Asteriod belt bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.asteriod_belt + 6 and pos.y < space_travel.asteriod_belt + 10 then --Asteriod belt killing - minetest.set_node(pos, {name = "multidimensions:killing"}) - elseif pos.y >= space_travel.minerva and pos.y < space_travel.minerva + 68 then --Minerva bedrock ["space_travel:space_lava_source"] = 100, - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.bacchus and pos.y < space_travel.bacchus + 68 then --Bacchus bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.ourea and pos.y < space_travel.ourea + 68 then --Ourea bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.osiris and pos.y < space_travel.osiris + 68 then --Osiris bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - elseif pos.y >= space_travel.minthe and pos.y < space_travel.minthe + 68 then --Minthe bedrock - minetest.set_node(pos, {name = "multidimensions:bedrock"}) - end - end, -}) - --Venus Vapor Spouts minetest.register_lbm({ name = "space_travel:venus_vapor_spout_lbm", diff --git a/sky.lua b/sky.lua index cba252b..0ea2537 100644 --- a/sky.lua +++ b/sky.lua @@ -264,7 +264,7 @@ local ourea_sky = { } local caelus_space = { - "space_travel_caelus_space_sky_pos_y.png^[transform3", -- +y (top) + "space_travel_caelus_space_sky_neg_y.png^[transform3", -- +y (top) "space_travel_caelus_space_sky_neg_y.png^[transform1", -- -y (bottom) "space_travel_caelus_space_sky_pos_z.png", -- +z (back) "space_travel_caelus_space_sky_neg_z.png", -- -z (front @@ -380,7 +380,7 @@ minetest.register_globalstep(function(dtime) player:set_sky({r = 0, g = 0, b = 0}, "skybox", mercury_space) player:set_clouds({density = 0}) player:set_physics_override(1, 0.6, 0.2) -- speed, jump, gravity - elseif minetest.get_player_by_name(name) and pos.y >= pos.y < space_travel.mercury and pos.y < space_travel.venus and day_time then --Venus sky at day + elseif minetest.get_player_by_name(name) and pos.y >= space_travel.mercury and pos.y < space_travel.venus and day_time then --Venus sky at day player:set_sky({r=208, g=177, b=11}, "plain", {}) player:set_clouds({ density = 0.6, diff --git a/space_drives.lua b/space_drives.lua index bdd5fa2..105849e 100644 --- a/space_drives.lua +++ b/space_drives.lua @@ -1,5 +1,5 @@ function space_travel.move(object,pos,destination) - --object:set_pos(pos) + --minetest.chat_send_all(surface_effect.dump(destination)) local location = -1 if pos.y >= space_travel.yarth and pos.y < space_travel.yarth_orbit then --earth location = space_travel.yarth_orbit * 0