From 3e9996e6a0dde80aad95e2cc799748e2c2d7e86d Mon Sep 17 00:00:00 2001 From: Vanic Date: Thu, 25 Dec 2025 14:31:11 +0300 Subject: [PATCH] bump changes 25.12 --- mods/CORE/CraftSystem/mod.conf | 1 + mods/CORE/CraftSystem/src/CraftSystem.lua | 4 +- .../MapGenerator/src/mapGenerator.lua | 77 +++++++----------- mods/GAME/ITEMS/Wood/init.lua | 43 ++++++++++ .../Wood/textures/sheets/cases_sheet.png | Bin 0 -> 4309 bytes 5 files changed, 76 insertions(+), 49 deletions(-) create mode 100644 mods/GAME/ITEMS/Wood/textures/sheets/cases_sheet.png diff --git a/mods/CORE/CraftSystem/mod.conf b/mods/CORE/CraftSystem/mod.conf index b0db51d..5bb9aee 100644 --- a/mods/CORE/CraftSystem/mod.conf +++ b/mods/CORE/CraftSystem/mod.conf @@ -1 +1,2 @@ name = smc__core__craft_system +depends = smc__api__api_loader diff --git a/mods/CORE/CraftSystem/src/CraftSystem.lua b/mods/CORE/CraftSystem/src/CraftSystem.lua index e8552c1..2d3c449 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem.lua @@ -3,8 +3,6 @@ local HASH_SPLITTER = '&' local modInfo = Mod.getInfo('smc__core__craft_system') local require = modInfo.require -local CraftTypes = require('CraftSystem.CraftTypes') - ---@alias CraftSystem.shapelessCraftsList table> ---@alias CraftSystem.processualCraftsList table> @@ -60,7 +58,7 @@ end ---@param group CraftSystem.Craft.Group ---@return table local function getCraftGroup(type, group) - local craftList = getCraftList(CraftTypes.type) + local craftList = getCraftList(type) ---@type table? local craftGroup = craftList[group] diff --git a/mods/ENVIRONMENT/MapGenerator/src/mapGenerator.lua b/mods/ENVIRONMENT/MapGenerator/src/mapGenerator.lua index e7e8985..55f43c6 100644 --- a/mods/ENVIRONMENT/MapGenerator/src/mapGenerator.lua +++ b/mods/ENVIRONMENT/MapGenerator/src/mapGenerator.lua @@ -12,20 +12,20 @@ local MapGen = mapGenRequire('MapGen') local mapGenerator = MapGen:new({ nodes = { -- Special nodes - air = "air", + air = 'air', -- Rocks - sylite = "rocks:sylite", - tauitite = "rocks:tauitite", - iyellite = "rocks:iyellite", - falmyte = "rocks:falmyte", - hapcoryte = "rocks:hapcoryte", - burcite = "rocks:burcite", - felhor = "rocks:felhor", - malachite = "rocks:malachite", + sylite = 'rocks:sylite', + tauitite = 'rocks:tauitite', + iyellite = 'rocks:iyellite', + falmyte = 'rocks:falmyte', + hapcoryte = 'rocks:hapcoryte', + burcite = 'rocks:burcite', + felhor = 'rocks:felhor', + malachite = 'rocks:malachite', -- Liquids - water = "liquids:water_source", + water = 'liquids:water_source', }, }) @@ -37,16 +37,16 @@ local function calcHumidity(layer, value, height) return value end -mapGenerator:registerLayer("world", { - minY = -50, - maxY = 50, - minTemp = 0, +mapGenerator:registerLayer('midgard', { + minY = -256, + maxY = 256, + minTemp = -100, maxTemp = 100, minHumidity = 0, maxHumidity = 100, calcTemp = calcTemp, calcHumidity = calcHumidity, - biomesVerticalScattering = 10, + biomesVerticalScattering = 5, biomesGorizontalScattering = 5 }) @@ -102,7 +102,7 @@ local climat0 = { local v = vector.new -mapGenerator:register2DPeaks("world", +mapGenerator:register2DPeaks('midgard', { landscapeNoise = land1, tempNoise = climat2, @@ -114,7 +114,7 @@ mapGenerator:register2DPeaks("world", v(500, 0, -500), }) -mapGenerator:register2DPeaks("world", +mapGenerator:register2DPeaks('midgard', { landscapeNoise = land2, tempNoise = climat1, @@ -124,7 +124,7 @@ mapGenerator:register2DPeaks("world", v(200, 0, -400), }) -mapGenerator:register2DPeaks("world", +mapGenerator:register2DPeaks('midgard', { landscapeNoise = land2, tempNoise = climat2, @@ -134,7 +134,7 @@ mapGenerator:register2DPeaks("world", v(-300, 0, -200), }) -mapGenerator:registerCavern('world', 'cavern1', { +mapGenerator:registerCavern('midgard', 'cavern1', { minY = -48, maxY = 0, smoothDistance = 20, @@ -193,40 +193,25 @@ local function generateRock(biome, mapGenerator, data, index, x, y, z) end end +---@param biome MapGen.Biome local function generateSoil(biome, mapGenerator, data, index, x, y, z) - data[index] = biome.groundNodesId.turf + data[index] = biome.groundNodesIDs.turf end -mapGenerator:registerBiome('world', "biome1", { +mapGenerator:registerBiome('midgard', 'swamp', { tempPoint = 0, - humidityPoint = 0, - minY = -10000, - maxY = -25, + humidityPoint = 80, + minY = 100, + maxY = 0, groundNodes = { - soil = "soils:clay_soil_baren", - turf = "soils:clay_soil_baren", - rock = "rocks:sylite", - bottom = "soils:rocky_soil_baren", - }, - soilHeight = 5, - --generateRock = generateRock, - --generateSoil = generateSoil, -}) - -mapGenerator:registerBiome('world', "biome2", { - tempPoint = 100, - humidityPoint = 100, - minY = -25, - maxY = 1000, - groundNodes = { - soil = "soils:rocky_soil_baren", - turf = "soils:rocky_soil_baren", - rock = "rocks:felhor", - bottom = "soils:clay_soil_baren", + soil = 'soils:clay_soil_baren', + turf = 'soils:clay_soil_baren', + rock = 'rocks:sylite', + bottom = 'soils:rocky_soil_baren', }, soilHeight = 3, - --generateRock = generateRock, - --generateSoil = generateSoil, + generateRock = generateRock, + generateSoil = generateSoil, }) return mapGenerator \ No newline at end of file diff --git a/mods/GAME/ITEMS/Wood/init.lua b/mods/GAME/ITEMS/Wood/init.lua index 740ae2b..986afcd 100644 --- a/mods/GAME/ITEMS/Wood/init.lua +++ b/mods/GAME/ITEMS/Wood/init.lua @@ -161,4 +161,47 @@ planksFactory:registerItems({ tiles = { logTileSheet:t(10, 4) }, }, }, +}) + +-- сундучки + +---@type TileSheet +local caseTileSheet = TileSheet:new("cases_sheet.png", 16, 16) + +local function getCaseTiles(x, y) + return { + caseTileSheet:t(x, y), + caseTileSheet:t(x, y), + caseTileSheet:t(x, y+1), + } +end + +local t = getCaseTiles + +planksFactory:registerItems({ + ---@type Node.NodeDefinition + { + settings = { + name = "case_closed", + title = "Case", + --description = "", + tiles = t(0,0) + }, + }, + ---@type Node.NodeDefinition + { + settings = { + name = "case_open", + title = "Case", + --description = "", + tiles = t(1,0); + drawtype = 'nodebox'; + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.5 - 1/16*2, 0.5}, + } + } + }, + }, }) \ No newline at end of file diff --git a/mods/GAME/ITEMS/Wood/textures/sheets/cases_sheet.png b/mods/GAME/ITEMS/Wood/textures/sheets/cases_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7afb62c37021b73e96ea2ea365617ac61f0b9e GIT binary patch literal 4309 zcmbuCO-L0{6vyw#%k-Hhyd+9|xXMMJvY8XfHEj3!_1x*Q*J=Q{d3oO^hy?$7BBAkXv;_B%Je!?}s8 z&i#&A6Ca%$+vnWOuyY6RIJb4=?&D+av7mOOcWBhPhG#s{quUqeV&=w6ef`}VKW%Di zEEX?5t-J1A>CYaI9{MSoE}aM( ztmK`$i>@jKj1SEXd54452pLqLuSvwp9ODXF`dR^Nj}2QrUx89Y1@Byz-+d@mLuV== z!Wa+66aX@1#$FEX-c|{|Zvh4h3#D>X9*mNq$_3C8fe>8lwnE}ul>uiRhi7D}9@WCP zuYeq2h#(-X*0^voLIxPIeHA8awE@n~=UtA$QVXO6NIAhprMj6D_04Wu!w13nFi$F)OW(BCyY6YLQmwu`R zGK3;gh82(;qhx@bGTJvBd?h63tW?#$g2AA_;#**&mO}-C%b)(JZ35(Hm0NN3#+8=&M=!SdJqd%#=G_`w-8cK>;l0V#{^-vg9| z50Wau@KG{NDwfDzJw$G2q%2PvplIaq{-xEXJOiI%D@gR!;}jr1=t^6;45*$zgvI=Jcen|EzA*)nB2|y0?)l<*KXI0tQBe#PE4_dE&5&*^_4HFrO=LO3@ zt2sp^?0WT+0OW)_4ux%yT&o=FtaZKmJ^*V>C6qz6LKp%QPZ-HKuU9|$7GQ)Ige@Tk zW!w&;c*3h)IwOZyj=ujK+l K*MrXCD}Mp8ixqqT literal 0 HcmV?d00001