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 e3f5a4a..f3d1100 100644 Binary files a/mods/GAME/ITEMS/plants/textures/test_plant.png and b/mods/GAME/ITEMS/plants/textures/test_plant.png differ 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 21b732e..0d0b0f9 100644 Binary files a/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png and b/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png differ