From b50d642bcf90af6e43aee2a4992e777d337df1fe Mon Sep 17 00:00:00 2001 From: Vanic Date: Tue, 24 Feb 2026 21:48:42 +0300 Subject: [PATCH] Trees update --- mods/CORE/adminCommands/init.lua | 12 ++- .../GAME/ITEMS/plants/textures/test_plant.png | Bin 1221 -> 1221 bytes mods/GAME/ITEMS/soils/init.lua | 7 +- mods/GAME/ITEMS/wood/init.lua | 69 +++++++++++++++++- .../ITEMS/wood/textures/sheets/wood_sheet.png | Bin 124456 -> 124456 bytes 5 files changed, 78 insertions(+), 10 deletions(-) diff --git a/mods/CORE/adminCommands/init.lua b/mods/CORE/adminCommands/init.lua index b4cc021..375d0b5 100644 --- a/mods/CORE/adminCommands/init.lua +++ b/mods/CORE/adminCommands/init.lua @@ -74,4 +74,14 @@ core.register_on_player_receive_fields(function(player, formname, fields) end end end -end) \ No newline at end of file +end) + +core.register_on_joinplayer(function(player, last_login) + player:set_sky({ + sky_color = { + day_sky = '#F1DAC0', + day_horizon = '#F1B795', + }, + type = "regular", + }) +end) diff --git a/mods/GAME/ITEMS/plants/textures/test_plant.png b/mods/GAME/ITEMS/plants/textures/test_plant.png index e3f5a4a9b1b90be0f524a73fee6f8a350fd845a6..f3d1100298af24674e159ad7f4338b17bc503a07 100644 GIT binary patch literal 1221 zcmcIjJ4gdT5S=~zCPa-*#DH4aC?bORL6Jx_xgx;?8?6#7EG!JDjg2BUR$^x%SZSju zTFGHyDh+}~z`{~Rh>8dX6#NkPoy@U!g{E;~Z|A+4_hxoORz{*BkE`BAL>@gHjLWkI zyP`~f8}o&vJj6^qG$^hztqT&AOa>wWqJvfUXR=h{ripMoLNwn@w75+4E~&*F(Of&x zLxQMxoyeEkFk*c&QJD&l%@9?kvBlBa)RQF3XZ6TX`Ge;3cGe}1`?q8Zza9*Xc6&ul z$@7P-_{Wu;9xnW4uc-ya2-JF8{F@j#XP&vDCfHmv#M9%8tsyuY0T3PUw%r-n+1XiR znQ)=Afbnpw$214#4Y9^TcDlcN<eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a z5n0T@z;_UY8Fx&~ehU<2FY)wsWq-*d$FC>NG=0@BpcT@dE{-7;xlB5jI0%Vi*RP+v|b-j;tAE7&dW` zAz%YQib0A%0^-u3B*VY}vER2;6HUMTbNF!ENXo4{HAYlv_ zpgSFxp)hq|17HDyY!OTWvKYuPWO0x_CiKup*6{uFUoaP>3C0EqAiIhY#DN7CvLa-I fKx~j2WO*2Wdtlo9Devt=Kx#Z){an^LB{Ts5AC!}8 diff --git a/mods/GAME/ITEMS/soils/init.lua b/mods/GAME/ITEMS/soils/init.lua index ffa2f6f..e02a771 100644 --- a/mods/GAME/ITEMS/soils/init.lua +++ b/mods/GAME/ITEMS/soils/init.lua @@ -12,6 +12,7 @@ local defaultSoilDef = { tiles = {}, groups = { dig_immediate = 2, + soil = 1, soil_fertiliry = 100, -- Soil fertility for agriculture } }, @@ -245,14 +246,10 @@ soilFactory:registerItems({ ---@type TileSheet local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16) -Node:new({ +defaultSoil:new({ settings = { name = 'turf_swamp', tiles = {tsT:t(0,0), ts:t(6, 0), ts:t(6,0)..'^'..tsT:t(0,1)}, - groups = { - dig_immediate = 2, - soil_fertiliry = 100, -- Soil fertility for agriculture - }, _rarity = 'unique' } }) \ No newline at end of file diff --git a/mods/GAME/ITEMS/wood/init.lua b/mods/GAME/ITEMS/wood/init.lua index 2945425..9020e36 100644 --- a/mods/GAME/ITEMS/wood/init.lua +++ b/mods/GAME/ITEMS/wood/init.lua @@ -11,9 +11,9 @@ local defaultLogDef = { tiles = {}, groups = { dig_immediate = 2, + wood = 1 }, - paramtype2 = 'facedir', - }, + } } ---@type Node.NodeDefinition @@ -68,16 +68,77 @@ local function registerWood(name, x) defaultLog:new({ settings = { name = name..'_log', - tiles = getLogTiles(x, 1) + tiles = getLogTiles(x, 1), + paramtype2 = 'facedir', }, + callbacks = { + on_place = core.rotate_node + } }) defaultLog:new({ settings = { name = name..'_trunk', + tiles = {logTileSheet:t(x, 2)}, + inventory_overlay = 'wood_trunk_overlay.png', + drop = 'wood:'..name..'_log', + paramtype2 = 'facedir', + }, + callbacks = { + on_place = core.rotate_node + } + }) + + defaultLog:new({ + settings = { + name = name..'_trunk_vertical', tiles = getLogTiles(x, 1), inventory_overlay = 'wood_trunk_overlay.png', - drop = 'wood:'..name..'_log' + drop = 'wood:'..name..'_log', + paramtype2 = 'facedir', + }, + callbacks = { + on_place = core.rotate_node + } + }) + + defaultLog:new({ + settings = { + drawtype = 'nodebox', + name = name..'_trunk_branch', + tiles = {logTileSheet:t(x, 2)}, + inventory_overlay = 'wood_trunk_overlay.png', + drop = 'wood:'..name..'_log', + paramtype = 'light', + node_box = { + type = 'connected', + fixed = {-.25,-.25,-.25, .25,.25,.25}, + connect_top = {-.25,-.25,-.25, .25,.5,.25}, + connect_bottom = {-.25,-.5,-.25, .25,.25,.25}, + connect_front = {-.25,-.25,-.5, .25,.25,.25}, + connect_left = {-.5,-.25,-.25, .25,.25,.25}, + connect_back = {-.25,-.25,-.25, .25,.25,.5}, + connect_right = {-.25,-.25,-.25, .5,.25,.25}, + }, + connects_to = {'group:wood', 'group:soil'} + }, + }) + + defaultLog:new({ + settings = { + drawtype = 'nodebox', + name = name..'_trunk_branch_vertical', + tiles = getLogTiles(x, 1), + inventory_overlay = 'wood_trunk_overlay.png', + drop = 'wood:'..name..'_log', + paramtype = 'light', + node_box = { + type = 'connected', + fixed = {-.25,-.25,-.25, .25,.25,.25}, + connect_top = {-.25,-.25,-.25, .25,.5,.25}, + connect_bottom = {-.25,-.5,-.25, .25,.25,.25}, + }, + connects_to = {'group:wood', 'group:soil'} }, }) diff --git a/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png b/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png index 21b732ebfa7d34714615e483f164825456d0ea36..0d0b0f950b992b71e8071f5e06ee4071392cc0a8 100644 GIT binary patch delta 6915 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 Wop+~XY}=0|6?2!&*)zLp%l`n?9|pSs delta 5735 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