From 200c2d04dc23108d7bfe1e0726586fc3c3916bdf Mon Sep 17 00:00:00 2001 From: runs Date: Sun, 20 Mar 2022 10:28:03 +0100 Subject: [PATCH] hunger --- mods/.luacheckrc | 12 +++- mods/bedz/api.lua | 13 ++-- mods/eat/init.lua | 34 +++++++++ mods/eat/textures/eat_particles.png | Bin 0 -> 269 bytes mods/farmz/api.lua | 9 +-- mods/furnace/textures/furn_smoke.kra | Bin 21637 -> 0 bytes mods/helper/textures/sun.png | Bin 5560 -> 5845 bytes mods/nodez/textures/nodez_water.png~ | Bin 7040 -> 0 bytes mods/playerz/api.lua | 39 +++++++++-- mods/playerz/hunger.lua | 25 +++++-- mods/playerz/init.lua | 14 ++-- .../player_eyebrowns_default.png-autosave.kra | Bin 4224 -> 0 bytes mods/signs/textures/signs_wood.png | Bin 1911 -> 565 bytes mods/stairs/api.lua | 65 ++++++++++++++++++ mods/stairs/init.lua | 63 ++--------------- mods/stairs/locale/stairs.es.tr | 11 +++ mods/stairs/mod.conf | 2 +- mods/stairs/stairs.lua | 43 ++++++++++++ mods/treez/api.lua | 8 ++- .../textures/treez_apple_tree_trunk_top.png | Bin 575 -> 574 bytes .../textures/treez_cherry_tree_trunk_top.png | Bin 577 -> 573 bytes mods/treez/trees.lua | 8 ++- 22 files changed, 251 insertions(+), 95 deletions(-) create mode 100644 mods/eat/init.lua create mode 100644 mods/eat/textures/eat_particles.png delete mode 100644 mods/furnace/textures/furn_smoke.kra delete mode 100644 mods/nodez/textures/nodez_water.png~ delete mode 100644 mods/playerz/textures/player_eyebrowns_default.png-autosave.kra create mode 100644 mods/stairs/api.lua create mode 100644 mods/stairs/locale/stairs.es.tr create mode 100644 mods/stairs/stairs.lua diff --git a/mods/.luacheckrc b/mods/.luacheckrc index 1fc35ca..baf7ec6 100644 --- a/mods/.luacheckrc +++ b/mods/.luacheckrc @@ -3,18 +3,24 @@ allow_defined_top = false max_line_length = false globals = { + "eat", + "bedz", + "farmz", + "flowers", "furn", + "helper", "minetest", "nodez", "playerz", + "playerphysics", "samz", "sfinv", "sound", "stairs", "svrz", "treez", - "wield3d" - + "wield3d", + "mapgen", } read_globals = { @@ -22,7 +28,7 @@ read_globals = { table = {fields = {"copy", "getn"}}, -- Builtin - "vector", "ItemStack", + "vector", "ItemStack", "math", "dump", "DIR_DELIM", "VoxelArea", "Settings", -- MTG diff --git a/mods/bedz/api.lua b/mods/bedz/api.lua index b59a848..8d9762c 100644 --- a/mods/bedz/api.lua +++ b/mods/bedz/api.lua @@ -93,9 +93,9 @@ local function unmark_bed(pos) end end -local function rest_player(player, rest) +local function rest_player(player, rest_hours) local hp = player:get_hp() - hp = hp + (rest * 0.5) + hp = hp + (rest_hours * 0.5) player:set_hp(hp) end @@ -112,11 +112,12 @@ local function stop_sleep(player) --playerz.player_attached[player_name] = false end -local function awake(player, rest) +local function awake(player, rest_hours) if playerz.get_status(player) == "sleep" then - stop_sleep(player, rest) - if rest then - rest_player(player, rest) + stop_sleep(player) + if rest_hours then + rest_player(player, rest_hours) + playerz.change_hunger(player, -(rest_hours*(playerz.max_hunger/playerz.starving_hours))) --decrease hunger end return true else diff --git a/mods/eat/init.lua b/mods/eat/init.lua new file mode 100644 index 0000000..e4348a3 --- /dev/null +++ b/mods/eat/init.lua @@ -0,0 +1,34 @@ +eat = {} + +local function eat_particlespawner(user, item_name, itemstack) + local pos = user:getpos() + pos.y = pos.y + 1.43 + local texture = minetest.registered_items[item_name].inventory_image + local dir = user:get_look_dir() + + minetest.add_particlespawner({ + amount = 8, + time = 0.1, + minpos = pos, + maxpos = pos, + minvel = {x = dir.x - 1, y = dir.y, z = dir.z - 1}, + maxvel = {x = dir.x + 1, y = dir.y, z = dir.z + 1}, + minacc = {x = 0, y = -5, z = 0}, + maxacc = {x = 0, y = -9, z = 0}, + minexptime = 0.3, + maxexptime = 0.5, + minsize = 1.5, + maxsize = 3, + texture = "eat_particles.png^"..texture.."^eat_particles.png^[makealpha:255,126,126", + }) +end + +function eat.item_eat(itemstack, user, item_name, hp, hunger) + if user and user:is_player() then + playerz.change_hp(user, hp or 1, "eat") + eat_particlespawner(user, item_name, itemstack) + playerz.change_hunger(user, hunger or 1) + end + itemstack:take_item() + return itemstack +end diff --git a/mods/eat/textures/eat_particles.png b/mods/eat/textures/eat_particles.png new file mode 100644 index 0000000000000000000000000000000000000000..bb35bbf8872c1e9562a31b007c130d85510cde01 GIT binary patch literal 269 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 Sz-ib30000` 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 70 then pitch = 70 end + if pitch < -50 then pitch = -50 end + if anim_base == "swin" or on_water then pitch = pitch + 70 end local head_rotation = {x= pitch, y= 0, z= 0} --the head movement {pitch, yaw, roll} - local head_offset = 6.3 - local head_position = {x=0, y=head_offset, z=0} + local head_offset + if minetest.get_modpath("3d_armor")~=nil then + head_offset = 6.75 + else + head_offset = 6.3 + end + local head_position = {x=0, y= head_offset, z=0} player:set_bone_position("Head", head_position, head_rotation) --set the head movement end @@ -302,7 +327,7 @@ minetest.register_globalstep(function(dtime) if on_water and player_pos.y < 0 then if timer > 1 then player_pos.y = player_pos.y + 1 - minetest.addadd_particlespawner({ + minetest.add_particlespawner({ amount = 6, time = 1, minpos = player_pos, diff --git a/mods/playerz/hunger.lua b/mods/playerz/hunger.lua index e8655ba..ebca216 100644 --- a/mods/playerz/hunger.lua +++ b/mods/playerz/hunger.lua @@ -1,7 +1,12 @@ local player_hunger = {} ---Time to decrease Hunger -local hunger_tick = 1500 +--Const: Max Hunger Points +playerz.max_hunger = 20 +--Game Hours to hunger to 0 +playerz.starving_hours = 48 +--24 game hours = 20 real min +--1 game hour = 50 real seconds +local hunger_tick = (playerz.starving_hours * 50)/playerz.max_hunger --Time to produce health damage when starving local hunger_tick_damage = 4 @@ -36,15 +41,27 @@ function playerz.get_hunger(player) return hunger end +function playerz.change_hunger(player, value) + local hunger = playerz.get_hunger(player) + hunger = hunger + value + if hunger < 0 then + hunger = 0 + elseif hunger > playerz.max_hunger then + hunger = playerz.max_hunger + end + playerz.set_hunger(player, hunger) + return hunger +end + function playerz.reset_hunger(player) local name = player:get_player_name() - local hunger = 20 + local hunger = playerz.max_hunger player_hunger[name].points = hunger playerz.hb_change(player, hunger) end function playerz.init_hunger(player) - local hunger = playerz.save_hunger(player, 20) + local hunger = playerz.save_hunger(player, playerz.max_hunger) local name = player:get_player_name() player_hunger[name] = { points = hunger, diff --git a/mods/playerz/init.lua b/mods/playerz/init.lua index aad44bc..9217094 100644 --- a/mods/playerz/init.lua +++ b/mods/playerz/init.lua @@ -1,10 +1,13 @@ -- player/init.lua -dofile(minetest.get_modpath("playerz") .. "/api.lua") -dofile(minetest.get_modpath("playerz") .. "/base_texture.lua") -dofile(minetest.get_modpath("playerz") .. "/cloths.lua") -dofile(minetest.get_modpath("playerz") .. "/freeze.lua") -dofile(minetest.get_modpath("playerz") .. "/hunger.lua") +local modname = minetest.get_current_modname() +local modpath = minetest.get_modpath(modname) + +dofile(modpath .. "/api.lua") +dofile(modpath .. "/base_texture.lua") +dofile(modpath .. "/cloths.lua") +dofile(modpath .. "/freeze.lua") +dofile(modpath .. "/hunger.lua") -- Default player appearance playerz.register_model("character.b3d", { @@ -26,7 +29,6 @@ playerz.register_model("character.b3d", { collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, stepheight = 0.6, eye_height = 1.47, - }) -- Update appearance when the player joins diff --git a/mods/playerz/textures/player_eyebrowns_default.png-autosave.kra b/mods/playerz/textures/player_eyebrowns_default.png-autosave.kra deleted file mode 100644 index e9ba3d70fc3056594594b7cf3193a7f8ea995ee7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4224 zcmeHKc{G$?A0I=Jh7^)amW;|0V~{l>`&h=llx1XMEMs3P(G*&ck|MH|C?yrq&m?=Y zga+C7We5#pH^0pLOr6dd&Z+nG-}}e=z0ZB_x#!&P=iYNa-|eE1%q%=0HlU5&l(o#7 zW6s?N0)e=J&IWXEtT!g`oG*rn8#F^h`}%re&!7XbJ~)}sqn`fQKr{-;%EqXJ+JyGc zov-F-FbE{V0s`%%qoJ`lSD!P|q269m7LB-GIM+Lpq^)DvQ|-0cz2@M8lJ$Y@Z}jzE_}0i znW@-mGf(K~B=pD6rVOQeW%y_e4&K(R=&JVk)a6lfkX00V_z~R2>pSMe_6wx1@v#Tu z>)@m2H;8kn)Yr9$cn&Us327nW3&aHEb(3^3nis0n7z9kslG!e@r5~a;*4hEg``$~vHSOWx>DR)E8lzLk`kdh-!d3aWn!A=%+Fa=q8NC}A^MrIjYeOxLKviY>_(_Us z=EUN>g{f+#wl615=a#dZ3l2E-AqGz_7hIqJGMUjOJ3~C$!uj}fTm#u&Ya~PRTc}pj zhGBwwglJI1IME(`z@|BP^{`pT9!CrZsckZ@>+`}kM)@W5> znbXH6F_EY8Ja0NpD(QQ@mB`vvG`c{$)^4ky)f@HMYP$TYTbyiWALnhpkx7n$NZ?k2>k1kWpG_j}KKQA1Ech^1vn)E3M3WOAaLqs?9I1sQV0R@O;wn z6bwT>zRyz#kGliUy!6|=l5(w3hQxNueHAs<+f7?KS4tX% z!CV95l57hHH3G8z*oVK0us=+brHV&htrj_y9AGUDMOys>Rr<(u?69;ke|KqhqgR1e zOI5@m&)G+y;W)2YUM577Z;Ht3_n_?Tlq1E8!J&<&rqX$-p9I7{=&Fn#8E}8}vYM}; zG0aTLvD4FY>ea%#wo%PI;)scI1B)Ca-~>;tZk|-hQueLLyL&1ZGLe~&F%Q9G`br&k zmxuV375J?Q!`t;VM33F1#;a1n!P-OhO8oJf36}%Sv+qn{5XOhtIFCwSKVzow)}L>Q z7@+&4Rj{N12Mw0gdn-!_zUN)7%+LVIfmjp06?E+HF_fP0k<* zfcugApblX&3Z70UWiC3{kzXm5dgN0Aibu1C3mbKv=v*=~wwcR;{iAp%fXiN>)1!>9 zKPDK936b{2xlKdn0!ZTtBQDO)LraUkJAjb|!C$1@b!lwz9Xv?5)^2FGT~kFx2umb? zuE&A_v(?i1Ql)6irgIl+{W?ThZ-2R3+f!&h5LzpLE{U+bmSWp;UP8Weez|jsqE0K| zq6DUB5$mR%o)!1x+gc@2$X}bv%Sn7K=V+>m)>a|JvfhmRFJ6wX1FU*xTLx#e3UVw> z5%Ul3jtY6~KfgpN8A2+Thon1L@9(8i$rD4Zg(W@{|8jElzk{i%D&l(D%BCI5rF)*r zO%1FJzTqxE{V&as*3kR9QzBq|y}v-uE~)OGp2MI@nQL$V+%v_-Z+Zr#@WBt^y~?Vc zBcJAbR$FV4%lZCFqjkUdY9!6lj;}KU%>J#hzCKG;|I(>RJ z!-ll+KCF-$@SWHrQ^LOy831Qngu|gwsdfQBat_vXN&VG0ex$jrqXm;@p~d~f#~5#a zGcSDUqdG1CCk{ZT=M)PpP8jFo?c$G-@j{=&_y_zP5KInC4>zoJ%qjrO;v5(fSECIsB;9|eeSpdUOjvay*b=%BX9 z4qz3Kq(Ndp{~b@#u9&mvAg@4QY$(Qyi3LQZ0gHcNGa_upw&}h&djloX&YrK5{BChqiabnQ`sQWN%F2w| zyelzH;=r5LoM4V-sQmCcbTOy)+k>N7&awAyW(2+uzk*x}>kx2x&VsAe`P^#L-Nx0ZZ0P z%q!2oHQZ*YNm@P-(OUFbwX;ds_m4sH9}zoJMtuNDp9EE{B!?-k>^$( z&x1@is`MS5>?Tz5cf(#?6VvC)%8W)xyxjfB;c%^1N;9|m2D($`Hd4ffKNh<4iPn{w z^-9{%idTMBdv+3!0jOW*=7KDHWC;Fjzu)`#1G(qGk?DBJve|-TmsSr?Efw!Q4qh+8 z$4nRJ%rGUXR!#wmjLCK1^K$8{ge7Kes)7Fv6<7MI?O@m0cS>(CnCT#H(hm zIr+gJ^LvkN977F#4B&$C*M$<`GpDr6Lq9?a*6rr2%;ceRM_i5uh+0LTZtDE%yzfKt zO_MQQoc;3iIgdie=jJ04u(>b_kMxL~lE!5Av4bw)9oe_;SB+c|0_vfbLK`(&6jWkO zK;{LpDoyVE9m>%@19ULNsd$Qd>WHPkuin|vP-QKasPI!8izEu`(OKD03(lS}!t|L# z-mEg=lzGnA-k#bumPKi9p?P=#t|y6SuMYGz@hLPEM}OgcY-1<}A+WQTRjgFa#U@LN zDDILYWDK{K(0X>QSGx1YPC9E}%_33bE_RBjSY0O~Rf~uE2(l;4yeal6E==d^+tlzX zgOHC3gU8Ic5BXCN2Xi}|##1L%y|vSAd{Cx2Z5+pyjmyfk$HHPvJZP)a+A6nAvbm?| z!&v#ADIHRXlI!xkLyyg}BHe-*?PRkBG1}Jt&CZX;;d}yryd(l-{_pz#3$D)u7G(bY zJCGjf=>o&k|G!>^DCA}>#(JAxiO~g!Ab^$$@Mn1aZB=9}?&#$>U4AM~0*Pa5alTcX zu>|?GEgb=dF9LEJLpiurkufLIE0kXX!y9e?eIDG3!kGQ&f%2EY@QbX!N7wYV}zF diff --git a/mods/signs/textures/signs_wood.png b/mods/signs/textures/signs_wood.png index 718ec47d698d5b2b6feda5914dbe38b3fc8a2fa9..04114193e307a27338c9282b402fe8fae3937e72 100644 GIT binary patch literal 565 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 diff --git a/mods/stairs/api.lua b/mods/stairs/api.lua new file mode 100644 index 0000000..050ff39 --- /dev/null +++ b/mods/stairs/api.lua @@ -0,0 +1,65 @@ +-- Node will be called stairs:stair_ +function stairs.register_stair(subname, recipeitem, groups, images, description) + local stairs_name = "stairs:stair_" .. subname + minetest.register_node("stairs:stair_" .. subname, { + description = description, + drawtype = "nodebox", + tiles = images, + paramtype = "light", + paramtype2 = "facedir", + is_ground_content = true, + groups = groups, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + {-0.5, 0, 0, 0.5, 0.5, 0.5}, + }, + }, + }) + minetest.register_craft({ + output = stairs_name, + type = "shaped", + recipe = { + {recipeitem, "", + recipeitem}, {recipeitem, "", ""}, + {"", "", ""}, + } + }) +end + +-- Node will be called stairs:slab_ +function stairs.register_slab(subname, recipeitem, groups, images, description) + local slab_name = "stairs:slab_" .. subname + minetest.register_node("stairs:slab_" .. subname, { + description = description, + drawtype = "nodebox", + tiles = images, + paramtype = "light", + is_ground_content = true, + groups = groups, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + }, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, + }, + }) + minetest.register_craft({ + output = slab_name, + type = "shaped", + recipe = { + {"", "", + recipeitem}, {recipeitem, "", ""}, + {"", "", ""}, + } + }) +end + +-- Nodes will be called stairs:{stair,slab}_ +function stairs.register_stair_and_slab(subname, def) + stairs.register_stair(subname, def.recipeitem, def.groups, def.images, def.desc_stair) + stairs.register_slab(subname, def.recipeitem, def.groups, def.images, def.desc_slab) +end diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index 0f54cde..c9549c6 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -1,61 +1,8 @@ stairs = {} --- Node will be called stairs:stair_ -function stairs.register_stair(subname, recipeitem, groups, images, description) - minetest.register_node(":stairs:stair_" .. subname, { - description = description, - drawtype = "nodebox", - tiles = images, - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = true, - groups = groups, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - {-0.5, 0, 0, 0.5, 0.5, 0.5}, - }, - }, - }) -end +local modname = minetest.get_current_modname() +local modpath = minetest.get_modpath(modname) +local S = minetest.get_translator(modname) --- Node will be called stairs:slab_ -function stairs.register_slab(subname, recipeitem, groups, images, description) - minetest.register_node(":stairs:slab_" .. subname, { - description = description, - drawtype = "nodebox", - tiles = images, - paramtype = "light", - is_ground_content = true, - groups = groups, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - }, - }) -end - --- Nodes will be called stairs:{stair,slab}_ -function stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab) - stairs.register_stair(subname, recipeitem, groups, images, desc_stair) - stairs.register_slab(subname, recipeitem, groups, images, desc_slab) -end - -stairs.register_stair_and_slab("stone", "nodez:stone", - {cracky=3}, - {"nodez_stone.png"}, - "Stone Stair", - "Stone Slab" -) - -stairs.register_stair_and_slab("cobble", "nodez:cobble", - {cracky=3}, - {"nodez_cobble.png"}, - "Cobblestone Stair", - "Cobblestone Slab" -) +assert(loadfile(modpath .. "/api.lua"))() +assert(loadfile(modpath .. "/stairs.lua"))(S) diff --git a/mods/stairs/locale/stairs.es.tr b/mods/stairs/locale/stairs.es.tr new file mode 100644 index 0000000..7f835d9 --- /dev/null +++ b/mods/stairs/locale/stairs.es.tr @@ -0,0 +1,11 @@ +# textdomain: stairs +Apple Wood Stair=Escalera de manzano +Apple Wood Slab=Losa de manzano +Cherry Wood Stair=Escalera de cerezo +Cherry Wood Slab=Losa de cerezo +Cobblestone Stair=Escalera de empedrado +Cobblestone Slab=Losa de empedrado +Sandstone Stair=Escalera de arenisca +Sandstone Slab=Losa de arenisca +Stone Stair=Escalera de piedra +Stone Slab=Losa de piedra diff --git a/mods/stairs/mod.conf b/mods/stairs/mod.conf index c147cb5..98253b3 100644 --- a/mods/stairs/mod.conf +++ b/mods/stairs/mod.conf @@ -1,3 +1,3 @@ name = stairs description = Adds stairs and slabs -depends = nodez +depends = nodez, treez diff --git a/mods/stairs/stairs.lua b/mods/stairs/stairs.lua new file mode 100644 index 0000000..cde0795 --- /dev/null +++ b/mods/stairs/stairs.lua @@ -0,0 +1,43 @@ +local S = ... + +stairs.register_stair_and_slab("stone", { + recipeitem = "nodez:stone", + groups = {cracky=3}, + images = {"nodez_stone.png"}, + desc_stair = S("Stone Stair"), + desc_slab = S("Stone Slab") +}) + +stairs.register_stair_and_slab("cobble", { + recipeitem = "nodez:cobble", + groups = {cracky=3}, + images = {"nodez_cobble.png"}, + desc_stair = S("Cobblestone Stair"), + desc_slab = S("Cobblestone Slab") +}) + +stairs.register_stair_and_slab("sandstone", { + recipeitem = "nodez:sandstone", + groups = {crumbly=3}, + images = {"nodez_sandstone.png"}, + desc_stair = S("Sandstone Stair"), + desc_slab = S("Sandstone Slab") +}) + +--Treez--> + +stairs.register_stair_and_slab("apple_tree", { + recipeitem = "treez:apple_tree_wood", + groups = {choppy = 2}, + images = {"treez_apple_tree_wood.png"}, + desc_stair = S("Apple Wood Stair"), + desc_slab = S("Apple Wood Slab") +}) + +stairs.register_stair_and_slab("cherry_tree", { + recipeitem = "treez:cherry_tree_wood", + groups = {choppy = 2}, + images = {"treez_cherry_tree_wood.png"}, + desc_stair = S("Cherry Wood Stair"), + desc_slab = S("Cherry Wood Slab") +}) diff --git a/mods/treez/api.lua b/mods/treez/api.lua index 251381f..6682b61 100644 --- a/mods/treez/api.lua +++ b/mods/treez/api.lua @@ -7,7 +7,8 @@ local tree_grow_time = 5 --3600 by default function treez.register_tree(name, def) --Fruit if def.fruit then - minetest.register_node("treez:"..def.fruit.name, { + local fruit_name = "treez:"..def.fruit.name + minetest.register_node(fruit_name, { description = S(def.fruit.description), drawtype = "plantlike", tiles = {"treez_"..def.fruit.name..".png"}, @@ -24,7 +25,10 @@ function treez.register_tree(name, def) leafdecay = 3, leafdecay_drop = 1}, sounds = sound.leaves(), - on_use = minetest.item_eat(2), + on_use = function(itemstack, user, pointed_thing) + eat.item_eat(itemstack, user, fruit_name, def.fruit.hp, def.fruit.hunger) + return itemstack + end, after_place_node = function(pos, placer, itemstack) minetest.set_node(pos, {name = "treez:"..def.fruit.name, param2 = 1}) diff --git a/mods/treez/textures/treez_apple_tree_trunk_top.png b/mods/treez/textures/treez_apple_tree_trunk_top.png index c1eeaa140c0adc29d12f6a572d68a843e90b0d72..985f088ac6efeaa90a6bb60dd706bf33afea9b22 100644 GIT binary patch delta 394 zcmV;50d@Yr1il22B!6ycLqkw$V`BgSD3NuMJ4*vW6otPeim!-;79tia#9$FY6vR?v zVG|_82u5v^%}dyg%Wi@MTfxRcun=v075)Ql1zQC{Py`Vxe}Jz>!g|LQBBHa*-j6eL zE;DDqA2W2*X&3^tRJIdSQEe_YuQfdpppzE*2&Z+&nuy0^{C_*%Z}6#lJ*ay9zwgh{ zmd!aj_?m@Bb;~Xbj|<0E%9i2{;V!+H&I<1fM{GHu@P*Pd9zQBBc>Jo^P9`S7uX<{Q zADsEYdeJt82ZTeWQPIE8qizz+m1bw8_Q>qTA;A<;G%{3J!l2Bc)RJWOw{PgnH_ftm zbopCUvBgoKD1Y9Fs1@m&lbRPjC!ax8<^DTQCqFXmbq_|N@xgUp`k`qHYMZY6ap1bO zLkQf%S*h+{mYl}kMBl7yp*`qWgOl^Rmf42Wb?Cmc(suew3dr>5^YDBO?J4NIg4P8u otM7G=ZXvlUPjm@8yAYQB9gCmp6=(ox>TG@h000SaNRy%gozEn`Bme*a delta 394 zcmV;50d@Yq1iu83B!6#dLqkw$V`BgSD3NuMJxfAi6vuyRVU*!egG7UaMT3GAL}S_D zA|Ymw)uPw8z?aLtS3+8YmIk3AYUyq08`K)K76d^NL^SmQdRszn=c=HDp38I3kNJv4yEpy-=lo~?-=);r00009aFd_`o+Wj}$^ZZW diff --git a/mods/treez/textures/treez_cherry_tree_trunk_top.png b/mods/treez/textures/treez_cherry_tree_trunk_top.png index e6db1bf81a4f010adb9dfb2f60be0c5caa840950..8cf0f896898321b38d34202831a8826c09c53000 100644 GIT binary patch delta 534 zcmV+x0_pw11ib{1B!6ycLqkw$V`BgSD3NuMJ4*vW6otPeim!-;79tia#9$FY6vR?v zVG|_82u5v^%}dyg%Wi@MTfxRcun=v075)Ql1zQC{Py`Vxe}Jz>!g|LQBBHa*-j6eL zE;DDqA2W2*X&3^tRJIdSQEe_YuQfdpppzE*2&Z+&nuy0^{C_*%Z}6#lJ*ay9zwgh{ zmd!aj_?m@Bb;~Xbj|<0E%9i2{;V!+H&I<1fM{GHu@P*Pd9zQBBc>Jo^P9`S7uX<{Q zADsEYdeJt82ZTeWQPIE8qizz+m1bw8_Q>qTA;A<;G%{3J!l2Bc)RJWOw{PgnH_ftm zbopCUvBgoKD1Y9Fs1@m&lbRPjC!ax8<^DTQCqFXmbq_|N@xgUp`k`qHYMZY6ap1bO zLkQf%S*h+{mYl}kMBl7yp*`qWgOl^Rmf42Wb?Cmc(suew3dr>5^YDBO?J4NIg4P8u ztM7G=ZXvlUPjm@8yAYQB9gCmp6=(ox>TG@h000SaNRy%g5`T3`L_t(I%VSK8^Z3s| z0bqeK-o5`rl13px7K8yH&Bf}%BpJ|q^DWpA7Hksu0J=pi=$Z++1YHdaK85&f#%lmJ zm*8?86Cvjk3KJ$$0*qt>h%tl(mnMn=kyz(r7=X=Yk`fXrHlr8-O4EdF#+#Xt1xN(| Y$_OsHuj9#X01E&B07*qoM6N<$f_I|y8~^|S delta 552 zcmV+@0@wY$1i=K5B!6#dLqkw$V`BgSD3NuMJ4*vW6otR6kBCMsv=FgKk%&bEQ4mXw zg-sBN3Px>`bvF@`xa=lKuoY}90v4i;ufl(ztzfGl2#O$L$G8s=u%1 zXj?HH9egdqqq=1mgvW(r>jg{kws5zeNv;SV3P)@?pzxK_QyxDnPJ8^W*q)0|f~I-~ z(|sB*D(=tE}<}CA|=2`Hh>sISa4~gC=iKtK869!0000