diff --git a/canapa.lua b/canapa.lua index 223e247..3fc7ef7 100644 --- a/canapa.lua +++ b/canapa.lua @@ -26,16 +26,43 @@ minetest.register_node("cannabis:canapa", { } }, after_dig_node = function(pos, node, metadata, digger) - default.dig_up(pos, node, digger) + cannabis.dig_up(pos, node, digger) + --default.dig_up(pos, node, digger) end, }) ---function +--function___________________________________________ + + + +-- Dig upwards function for dig_up 2 elements +-- + +function cannabis.dig_up(pos, node, digger) + if digger == nil then return end + local np = {x = pos.x, y = pos.y + 1, z = pos.z} + local nn = minetest.get_node(np) + if nn.name == node.name or nn.name == "cannabis:flowering" then + minetest.node_dig(np, nn, digger) + end +end + + + + +--____________________________________________________ + + + + + + function minetest.grow_canapa(pos, node) pos.y = pos.y - 1 local name = minetest.get_node(pos).name if name ~= "default:dirt_with_grass" - and name ~= "default:dirt" + and name ~= "default:dirt" + and name ~= "farming:soil_wet" and name ~= "default:dirt_with_rainforest_litter" and name ~= "default:dry_dirt" and name ~= "default:dirt_with_snow" diff --git a/canapa_ice.lua b/canapa_ice.lua index 479f652..f88842c 100644 --- a/canapa_ice.lua +++ b/canapa_ice.lua @@ -26,19 +26,66 @@ sounds ={"cannabis_canapa_s"}, } }, after_dig_node = function(pos, node, metadata, digger) - default.dig_up(pos, node, digger) + cannabis.dig_up_ice(pos, node, digger) end, }) --____________________________________ - +if minetest.get_modpath("farming") then +function minetest.grow_canapa_ice(pos, node) + pos.y = pos.y - 1 + local name = minetest.get_node(pos).name + if name ~= "farming:soil_wet" + then + return + end + if not minetest.find_node_near(pos, 5, {"default:water"}) then + return + end + + pos.y = pos.y + 1 + local height = 0 + while node.name == "cannabis:canapa_ice" and height < 6 do + height = height + 1 + pos.y = pos.y + 1 + node = minetest.get_node(pos) + end + if height==6 then + minetest.set_node(pos, {name = "cannabis:flowering_ice"}) + else + if height == 6 or node.name ~= "air" then + return + end + minetest.set_node(pos, {name = "cannabis:canapa_ice"}) + return true +end +end +end --___________________________________ --function +-- Dig upwards function for dig_up 2 elements +-- + +function cannabis.dig_up_ice(pos, node, digger) + if digger == nil then return end + local np = {x = pos.x, y = pos.y + 1, z = pos.z} + local nn = minetest.get_node(np) + if nn.name == node.name or nn.name == "cannabis:flowering_ice" then + minetest.node_dig(np, nn, digger) + end +end + + +--____________________________________ + + function minetest.grow_canapa_ice(pos, node) pos.y = pos.y - 1 local name = minetest.get_node(pos).name if name ~= "default:sand" + --and name ~= "farming:soil_wet" + --and name ~= "farming:soil" and name ~= "default:silver_sand" and name ~= "default:dirt_with_snow" and name ~= "default:permafrost_with_moss" @@ -49,6 +96,17 @@ function minetest.grow_canapa_ice(pos, node) if not minetest.find_node_near(pos, 5, {"default:snow"}) then return end + --[[if minetest.get_modpath("farming") then + local name=minetest.get_node(pos).name + if name ~= "farming:soil_wet" then + return + end + end + if minetest.get_modpath("farming") then + if not minetest.find_node_near(pos, 5, {"default:water"}) then + return + end + end]] pos.y = pos.y + 1 local height = 0 while node.name == "cannabis:canapa_ice" and height < 6 do diff --git a/canapa_red.lua b/canapa_red.lua index 7d42827..7d0e30f 100644 --- a/canapa_red.lua +++ b/canapa_red.lua @@ -26,19 +26,33 @@ sounds ={"cannabis_canapa_s"}, } }, after_dig_node = function(pos, node, metadata, digger) - default.dig_up(pos, node, digger) + cannabis.dig_up_red(pos, node, digger) end, }) --____________________________________ ---___________________________________ ---function +--function___________________________________________ + +-- Dig upwards function for dig_up 2 elements +-- + +function cannabis.dig_up_red(pos, node, digger) + if digger == nil then return end + local np = {x = pos.x, y = pos.y + 1, z = pos.z} + local nn = minetest.get_node(np) + if nn.name == node.name or nn.name == "cannabis:flowering_red" then + minetest.node_dig(np, nn, digger) + end +end +--______________________________________________________ + function minetest.grow_canapa_red(pos, node) pos.y = pos.y - 1 local name = minetest.get_node(pos).name if name ~= "default:sand" + and name ~= "farming:soil_wet" and name ~= "default:desert_sand" and name ~= "default:sandstone" and name ~= "default:silver_sand" diff --git a/cannabis/init.lua b/cannabis/init.lua index 73ebfba..8fda3ae 100644 --- a/cannabis/init.lua +++ b/cannabis/init.lua @@ -23,12 +23,21 @@ dofile(path.."/tools.lua") dofile(path.."/canapa.lua") dofile(path.."/node_ingot.lua") dofile(path.."/craftitem.lua") -dofile(path.."/armor.lua") +--dofile(path.."/armor.lua") dofile(path.."/joint.lua") dofile(path.."/canapa_red.lua") dofile(path.."/craftred.lua") dofile(path.."/rope.lua") dofile(path.."/wool.lua") -dofile(path.."/bag.lua") +dofile(path.."/eye_effect.lua") dofile(path.."/canapa_ice.lua") dofile(path.."/craftice.lua") +--dofile(path.."/ethereal.lua") + + +if minetest.get_modpath("3d_armor") then +dofile(path.."/armor.lua") +end +if minetest.get_modpath("unified_inventory") then +dofile(path.."/bag.lua") +end diff --git a/cannabis/release.txt b/cannabis/release.txt index 2da5229..6e3064f 100644 --- a/cannabis/release.txt +++ b/cannabis/release.txt @@ -1 +1 @@ -9.5.2020 \ No newline at end of file +22.12.2021 \ No newline at end of file diff --git a/craftice.lua b/craftice.lua index 88c9dcd..ef088fb 100644 --- a/craftice.lua +++ b/craftice.lua @@ -4,6 +4,10 @@ local S = cannabis.S minetest.register_craftitem("cannabis:canapa_ice_seed", { description = S("Hemp Seed"), inventory_image = "cannabis_canapa_ice_seed.png", + groups = {seed = 2, food_artichoke = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "cannabis:canapa_ice") + end, on_use = minetest.item_eat(10), }) @@ -75,7 +79,7 @@ minetest.register_craft({ } }) minetest.register_craft({ - output = "cannabis:climbing_i ", + output = "cannabis:climbing_i", recipe = { {"cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves"}, {"cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves","cannabis:canapa_ice_leaves"}, @@ -134,7 +138,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "cannabis:cannabis_foglie_ice_block ", + output = "cannabis:cannabis_foglie_ice_block", recipe = { {"cannabis:climbing_i","cannabis:climbing_i","cannabis:climbing_i"}, {"cannabis:climbing_i","cannabis:climbing_i","cannabis:climbing_i"}, diff --git a/craftitem.lua b/craftitem.lua index af063da..81ed656 100644 --- a/craftitem.lua +++ b/craftitem.lua @@ -38,6 +38,10 @@ minetest.register_craftitem("cannabis:canapa_bread", { minetest.register_craftitem("cannabis:canapa_seed", { description = S("Hemp Seed"), inventory_image = "cannabis_canapa_seed.png", + groups = {seed = 2, food_artichoke = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "cannabis:canapa") + end, on_use = minetest.item_eat(10), }) @@ -72,7 +76,7 @@ minetest.register_craftitem("cannabis:canapa_glue", { }) --crafting - +--____________________________________________________________________________oil_______________________________________ minetest.register_craft({ output = "cannabis:canapa_oil 4 ", recipe = { @@ -81,7 +85,7 @@ minetest.register_craft({ {"cannabis:canapa_flower","cannabis:canapa_raisin","cannabis:canapa_flower"}, } }) - +--________________________________________________________________________fuel________________________________________________ minetest.register_craft({ output = "cannabis:canapa_fuel 4 ", recipe ={ @@ -90,7 +94,17 @@ minetest.register_craft({ {"cannabis:canapa","cannabis:canapa",""}, } }) - +minetest.register_craft({ + type = "fuel", + recipe = "cannabis:canapa", + burntime = 15, +}) +minetest.register_craft({ + type = "fuel", + recipe = "cannabis:canapa_fuel", + burntime = 70, +}) +--_______________________________________________________________________plastic__________________________________________________ minetest.register_craft({ output = "cannabis:canapa_plastic 8 ", recipe ={ @@ -98,9 +112,8 @@ minetest.register_craft({ {"cannabis:canapa","cannabis:canapa","cannabis:canapa"}, } }) - - - minetest.register_craft({ +--________________________________________________________________________glue_____________________________________________________ +minetest.register_craft({ output = "cannabis:canapa_glue 10 ", recipe = { {"cannabis:canapa_plastic","cannabis:canapa_raisin","cannabis:canapa_plastic"}, @@ -108,15 +121,32 @@ minetest.register_craft({ {"cannabis:canapa_plastic","cannabis:canapa_raisin","cannabis:canapa_plastic"}, } }) - minetest.register_craft({ - output = "cannabis:climbing ", +--________________________________________________________________________climbing___________________________________________________ +minetest.register_craft({ + output = "cannabis:climbing", recipe = { {"cannabis:canapa_leaves","cannabis:canapa_leaves","cannabis:canapa_leaves"}, {"cannabis:canapa_leaves","cannabis:canapa_leaves","cannabis:canapa_leaves"}, {"cannabis:canapa_leaves","cannabis:canapa_leaves","cannabis:canapa_leaves"}, } +}) + +--_____________________________________________________________________________CRAFT BLOCK______________________________________________ + + +--________________________________________________________________________foglie_____________________________________________________ + +minetest.register_craft({ + output = "cannabis:cannabis_foglie_block 5 ", + recipe = { + {"cannabis:climbing","cannabis:climbing","cannabis:climbing"}, + {"cannabis:climbing","cannabis:climbing","cannabis:climbing"}, + {"cannabis:climbing","cannabis:climbing","cannabis:climbing"}, + } }) - minetest.register_craft({ + +--_______________________________________________________________________hp_block_canapa_______________________________________________ +minetest.register_craft({ output = "cannabis:hp_block_canapa 4 ", recipe = { {"cannabis:canapa_fiber","cannabis:canapa_glue","cannabis:canapa_fiber"}, @@ -125,8 +155,11 @@ minetest.register_craft({ } }) - - minetest.register_craft({ + + +--____________________________________________________________________________________________________________ +--________________________________________________________________________resina (fumo)_______________________ +minetest.register_craft({ output = "cannabis:canapa_raisin 3 ", recipe = { {"","",""}, @@ -134,9 +167,7 @@ minetest.register_craft({ {"cannabis:canapa_flower","cannabis:canapa_flower",""}, } }) - - - +--________________________________________________________________________tessuto______________________________ minetest.register_craft({ output = "cannabis:canapa_cloth 3 ", recipe = { @@ -144,10 +175,7 @@ minetest.register_craft({ {"cannabis:canapa_fiber", "cannabis:canapa_fiber", "cannabis:canapa_fiber"}, } }) - - - - +--________________________________________________________________________fiber_________________________________ minetest.register_craft({ output = "cannabis:canapa_fiber 10 ", recipe = { @@ -156,7 +184,7 @@ minetest.register_craft({ {"cannabis:canapa","",""}, } }) - +--_________________________________________________________________________paper_________________________________ minetest.register_craft({ output = "cannabis:canapa_paper 6 ", recipe = { @@ -164,41 +192,26 @@ minetest.register_craft({ }, } }) - minetest.register_craft({ - type = "fuel", - recipe = "cannabis:canapa", - burntime = 15, + output = "default:paper 10 ", + recipe = { + {"cannabis:canapa_paper"}, + } }) - -minetest.register_craft({ - type = "fuel", - recipe = "cannabis:canapa_fuel", - burntime = 70, -}) - - - +--_________________________________________________________________________flour__________________________________ minetest.register_craft({ type = "shapeless", output = "cannabis:canapa_flour 4", recipe = {"cannabis:canapa_seed", "cannabis:canapa_seed", "cannabis:canapa_seed", "cannabis:canapa_seed"} }) - +--_________________________________________________________________________bread___________________________________ minetest.register_craft({ type = "cooking", cooktime = 10, output = "cannabis:canapa_bread", recipe = "cannabis:canapa_flour" }) - minetest.register_craft({ - output = "cannabis:cannabis_foglie_block 5 ", - recipe = { - {"cannabis:climbing","cannabis:climbing","cannabis:climbing"}, - {"cannabis:climbing","cannabis:climbing","cannabis:climbing"}, - {"cannabis:climbing","cannabis:climbing","cannabis:climbing"}, - } -}) + minetest.register_craft({ type = "shapeless", @@ -212,7 +225,7 @@ minetest.register_craft({ recipe = {"cannabis:fibra_ingot", "cannabis:foglie_ingot", "cannabis:tessuto_ingot"} }) --- register bag crafts +--____________________________________________________________________________ register bag crafts_____________________________________ if minetest.get_modpath("unified_inventory") ~= nil then minetest.register_craft({ output = "cannabis:bag_bob_small", diff --git a/craftred.lua b/craftred.lua index de1dc45..fd8ea70 100644 --- a/craftred.lua +++ b/craftred.lua @@ -4,6 +4,10 @@ local S = cannabis.S minetest.register_craftitem("cannabis:canapa_red_seed", { description = S("Hemp Seed"), inventory_image = "cannabis_canapa_red_seed.png", + groups = {seed = 2, food_artichoke = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "cannabis:canapa_red") + end, on_use = minetest.item_eat(10), }) @@ -126,7 +130,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "cannabis:cannabis_foglie_red_block ", + output = "cannabis:cannabis_foglie_red_block", recipe = { {"cannabis:climbing_r","cannabis:climbing_r","cannabis:climbing_r"}, {"cannabis:climbing_r","cannabis:climbing_r","cannabis:climbing_r"}, diff --git a/depends.txt b/depends.txt index ff70141..220e7ed 100644 --- a/depends.txt +++ b/depends.txt @@ -1,5 +1,7 @@ default +tnt fire +farming 3d_armor? maptools? diff --git a/eye_effect.lua b/eye_effect.lua new file mode 100644 index 0000000..797c22e --- /dev/null +++ b/eye_effect.lua @@ -0,0 +1,284 @@ +--[[ + Minetest HUD eye effect + Author: Droog71 + Version: 1 + License: GNU Affero General Public License version 3 (AGPLv3) +]]-- +--_______________________________________________________________________fumo_________________________________________________ + +local hud_f_eyes = {} +local eyes_f_active = {} +local effect_f_timers = {} + +--initialization +minetest.register_on_joinplayer(function(player) + local name = player:get_player_name() + hud_f_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 1, y = 1}, + text = "", + }) + eyes_f_active[name] = 0 + effect_f_timers[name] = 0 +end) + +--removes player from list on exit +minetest.register_on_leaveplayer(function(player) + local name = player:get_player_name() + hud_f_eyes[name] = nil + eyes_f_active[name] = nil + effect_f_timers[name] = nil +end) + +--for timed effects +minetest.register_globalstep(function(dtime) + for name, active in pairs(eyes_f_active) do + if active then + effect_f_timers[name] = effect_f_timers[name] + 1 + if effect_f_timers[name] >= 480 then + toggle_f_eyes(name, 0) + end + end + end +end) + +--toggles effects on or off +function toggle_f_eyes(name, active) + local player = minetest.get_player_by_name(name) + if player then + if active == 1 then + player:hud_remove(hud_f_eyes[name]) + hud_f_eyes[name] = player:hud_add({ + hud_elem_type = "image", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = -100, y = -100}, + text = "cannabis_effect_eye_f.png", + + }) + eyes_f_active[name] = true + effect_f_timers[name] = 0 + elseif active == 0 then + player:hud_remove(hud_f_eyes[name]) + hud_f_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 3, y = 3}, + text = "", + }) + eyes_f_active[name] = false + effect_f_timers[name] = 0 + end + end +end + +--_______________________________________________________________________rossa___________________________________ +local hud_r_eyes = {} +local eyes_r_active = {} +local effect_r_timers = {} + +--initialization +minetest.register_on_joinplayer(function(player) + local name = player:get_player_name() + hud_r_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 1, y = 1}, + text = "", + }) + eyes_r_active[name] = 0 + effect_r_timers[name] = 0 +end) + +--removes player from list on exit +minetest.register_on_leaveplayer(function(player) + local name = player:get_player_name() + hud_r_eyes[name] = nil + eyes_r_active[name] = nil + effect_r_timers[name] = nil +end) + +--for timed effects +minetest.register_globalstep(function(dtime) + for name, active in pairs(eyes_r_active) do + if active then + effect_r_timers[name] = effect_r_timers[name] + 1 + if effect_r_timers[name] >= 480 then + toggle_r_eyes(name, 0) + end + end + end +end) + +--toggles effects on or off +function toggle_r_eyes(name, active) + local player = minetest.get_player_by_name(name) + if player then + if active == 1 then + player:hud_remove(hud_r_eyes[name]) + hud_r_eyes[name] = player:hud_add({ + hud_elem_type = "image", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = -100, y = -100}, + text = "cannabis_effect_eye_r.png", + + }) + eyes_r_active[name] = true + effect_r_timers[name] = 0 + elseif active == 0 then + player:hud_remove(hud_r_eyes[name]) + hud_r_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 3, y = 3}, + text = "", + }) + eyes_r_active[name] = false + effect_r_timers[name] = 0 + end + end +end +--_______________________________________________________________________ice____________________________________ +local hud_i_eyes = {} +local eyes_i_active = {} +local effect_i_timers = {} + +--initialization +minetest.register_on_joinplayer(function(player) + local name = player:get_player_name() + hud_i_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 1, y = 1}, + text = "", + }) + eyes_i_active[name] = 0 + effect_i_timers[name] = 0 +end) + +--removes player from list on exit +minetest.register_on_leaveplayer(function(player) + local name = player:get_player_name() + hud_i_eyes[name] = nil + eyes_i_active[name] = nil + effect_i_timers[name] = nil +end) + +--for timed effects +minetest.register_globalstep(function(dtime) + for name, active in pairs(eyes_i_active) do + if active then + effect_i_timers[name] = effect_i_timers[name] + 1 + if effect_i_timers[name] >= 480 then + toggle_i_eyes(name, 0) + end + end + end +end) + +--toggles effects on or off +function toggle_i_eyes(name, active) + local player = minetest.get_player_by_name(name) + if player then + if active == 1 then + player:hud_remove(hud_i_eyes[name]) + hud_i_eyes[name] = player:hud_add({ + hud_elem_type = "image", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = -100, y = -100}, + text = "cannabis_effect_eye_i.png", + + }) + eyes_i_active[name] = true + effect_i_timers[name] = 0 + elseif active == 0 then + player:hud_remove(hud_i_eyes[name]) + hud_i_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 3, y = 3}, + text = "", + }) + eyes_i_active[name] = false + effect_i_timers[name] = 0 + end + end +end +--________________________________________________________________________verde_________________________________ +local hud_v_eyes = {} +local eyes_v_active = {} +local effect_v_timers = {} + +--initialization +minetest.register_on_joinplayer(function(player) + local name = player:get_player_name() + hud_v_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 1, y = 1}, + text = "", + }) + eyes_v_active[name] = 0 + effect_v_timers[name] = 0 +end) + +--removes player from list on exit +minetest.register_on_leaveplayer(function(player) + local name = player:get_player_name() + hud_v_eyes[name] = nil + eyes_v_active[name] = nil + effect_v_timers[name] = nil +end) + +--for timed effects +minetest.register_globalstep(function(dtime) + for name, active in pairs(eyes_v_active) do + if active then + effect_v_timers[name] = effect_v_timers[name] + 1 + if effect_v_timers[name] >= 480 then + toggle_v_eyes(name, 0) + end + end + end +end) + +--toggles effects on or off +function toggle_v_eyes(name, active) + local player = minetest.get_player_by_name(name) + if player then + if active == 1 then + player:hud_remove(hud_v_eyes[name]) + hud_v_eyes[name] = player:hud_add({ + hud_elem_type = "image", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = -100, y = -100}, + text = "cannabis_effect_eye_v.png", + + }) + eyes_v_active[name] = true + effect_v_timers[name] = 0 + elseif active == 0 then + player:hud_remove(hud_v_eyes[name]) + hud_v_eyes[name] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + scale = {x = 3, y = 3}, + text = "", + }) + eyes_v_active[name] = false + effect_v_timers[name] = 0 + end + end +end diff --git a/init.lua b/init.lua index 681c872..8fda3ae 100644 --- a/init.lua +++ b/init.lua @@ -29,7 +29,7 @@ dofile(path.."/canapa_red.lua") dofile(path.."/craftred.lua") dofile(path.."/rope.lua") dofile(path.."/wool.lua") ---dofile(path.."/bag.lua") +dofile(path.."/eye_effect.lua") dofile(path.."/canapa_ice.lua") dofile(path.."/craftice.lua") --dofile(path.."/ethereal.lua") diff --git a/joint.lua b/joint.lua index a3b36ee..db2115d 100644 --- a/joint.lua +++ b/joint.lua @@ -1,140 +1,443 @@ -- get Boilerplate for Translations local S = cannabis.S - minetest.register_craftitem("cannabis:joint_fumo_acceso", { + --[[minetest.register_craftitem("cannabis:joint_fumo_acceso", { description = S("Joint of hash lit"), inventory_image = "joint_joint_fac.png", stack_max = 1 , - on_use = function(itemstack, user, pointed_thing) - itemstack:add_wear(1000) - return itemstack - end - - }) - minetest.register_craftitem("cannabis:joint_erba_acceso", { - description = S("Joint of weed lit"), - inventory_image = "joint_joint_cac.png", - stack_max = 1 , - -- post_effect_color = smokeCOLOR, - on_use = function(itemstack, user, pointed_thing) - - itemstack:add_wear(1000) - return itemstack + on_use = function(pos,player,pointed_thing) +local p = player:get_pos() + + minetest.add_particlespawner({ + amount = 600, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke.png", + -- playername = player + toggle_eyes(player:get_player_name(), 1) - - end - }) - minetest.register_craftitem("cannabis:joint_erba_spento", { - description = S("Joint of weed unlit"), - inventory_image = "joint_joint_csp.png", - - }) + }) + minetest.sound_play("canapa_joint", { + to_player = "", + gain = 1.0, + }) + after_use=minetest.item_eat(2) + after_use =function(itemstack, user, pointed_thing) + itemstack:take_item() + return + end + + end + }) ]] +--______________________________________________________________________________________________________________________________________________ +--| | +--| CRAFT ITEM JOINT | +--|_____________________________________________________________________________________________________________________________________________| + + +--_______________________________________________________________________fumo spento___________________________________________________________________ minetest.register_craftitem("cannabis:joint_fumo_spento", { description = S("Joint of hash unlit"), inventory_image = "joint_joint_fsp.png", }) +--_______________________________________________________________________erba verde spento_____________________________________________________________ + minetest.register_craftitem("cannabis:joint_erba_spento", { + description = S("Joint of weed unlit"), + inventory_image = "joint_joint_csp.png", + + }) +--_______________________________________________________________________erba rossa spento_____________________________________________________________ + minetest.register_craftitem("cannabis:joint_erba_rossa_spento", { + description = S("Joint of red_weed unlit"), + inventory_image = "joint_joint_cspr.png", + + }) +--_______________________________________________________________________erba ice spento_______________________________________________________________ + minetest.register_craftitem("cannabis:joint_erba_ice_spento", { + description = S("Joint of ice_weed unlit"), + inventory_image = "joint_joint_cspi.png", + + }) + +--_______________________________________________________________________FUMO ACCESO___________________________________________________________________ + + +--[[ ___________________________________________________________________________________________________________________________________________________________ + | | + | | + | local item = ItemStack("my_mod:my_item") --aggiunge un item dopo l uso codice da mettere alla fine come il codice del sound | + | player:get_inventory():add_item("main", item) | + | | + | | + |___________________________________________________________________________________________________________________________________________________________|]] + + + minetest.register_craftitem("cannabis:joint_fumo_acceso", { + description = "Joint of hash lit", + inventory_image = "joint_joint_fac.png", + stack_max = 1, + on_use = function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + minetest.add_particlespawner({ + amount = 600, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_f.png" + }) + minetest.sound_play("canapa_joint", { to_player = "", gain = 1.0 }) + toggle_f_eyes(player:get_player_name(), 1) + local new_stack = ItemStack("cannabis:joint_fumo_acceso_m") + return new_stack + end + end +}) + +--_______________________________________________________________________FUMO ACCESO CONSUMATO_______________________________________________________ + + minetest.register_craftitem("cannabis:joint_fumo_acceso_m", { + description = "Joint of hash lit", + inventory_image = "joint_joint_fac_m.png", + stack_max = 1, + on_use = function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + minetest.add_particlespawner({ + amount = 500, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_f.png" + }) + minetest.sound_play("canapa_joint_f", { to_player = "", gain = 1.0 }) + toggle_f_eyes(player:get_player_name(), 1) + return itemstack + end + end +}) + +--______________________________________________________________________ E. VERDE ACCESA_________________________________________________ + + + minetest.register_craftitem("cannabis:joint_erba_acceso", { + description = S("Joint of weed lit"), + inventory_image = "joint_joint_cac.png", + stack_max = 1 , + -- post_effect_color = smokeCOLOR, + on_use =function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + + minetest.add_particlespawner({ + amount = 600, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_v.png", + }) + minetest.sound_play("canapa_joint_v", { to_player = "", gain = 1.0 }) + toggle_v_eyes(player:get_player_name(), 1) + local new_stack = ItemStack("cannabis:joint_erba_acceso_m") -- sostituisce un item con un altro item + return new_stack + end + end + }) +--_______________________________________________________________________E. VERDE CONSUMATA_______________________________________ + + minetest.register_craftitem("cannabis:joint_erba_acceso_m", { + description = "Joint of weed lit", + inventory_image = "joint_joint_cac_m.png", + stack_max = 1, + on_use = function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + minetest.add_particlespawner({ + amount = 500, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_v.png" + }) + minetest.sound_play("canapa_joint_v", { to_player = "", gain = 1.0 }) + toggle_v_eyes(player:get_player_name(), 1) + return itemstack + end + end +}) + +--_______________________________________________________________________E. ROSSA______________________________________ + + minetest.register_craftitem("cannabis:joint_erba_rossa_acceso", { + description = S("Joint of weed lit"), + inventory_image = "joint_joint_cacr.png", + stack_max = 1 , + on_use =function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + + minetest.add_particlespawner({ + amount = 600, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_r.png", + }) + minetest.sound_play("canapa_joint_r", { to_player = "", gain = 1.0 }) + toggle_r_eyes(player:get_player_name(), 1) + local new_stack = ItemStack("cannabis:joint_erba_rossa_acceso_m") -- sostituisce un item con un altro item + return new_stack + end + end + }) +--_______________________________________________________________________E.ROSSA ACCESA CONSUMATA_______________________ + + minetest.register_craftitem("cannabis:joint_erba_rossa_acceso_m", { + description = "Joint of weed lit", + inventory_image = "joint_joint_cacr_m.png", + stack_max = 1, + on_use = function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + minetest.add_particlespawner({ + amount = 500, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_r.png" + }) + minetest.sound_play("canapa_joint_r", { to_player = "", gain = 1.0 }) + toggle_r_eyes(player:get_player_name(), 1) + return itemstack + end + end +}) +--_______________________________________________________________________E. ICE____________________________________________ + + minetest.register_craftitem("cannabis:joint_erba_ice_acceso", { + description = S("Joint of ice_weed lit"), + inventory_image = "joint_joint_caci.png", + stack_max = 1 , + -- post_effect_color = smokeCOLOR, + on_use =function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + + minetest.add_particlespawner({ + amount = 600, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_i.png", + }) + minetest.sound_play("canapa_joint_i", { to_player = "", gain = 1.0 }) + toggle_i_eyes(player:get_player_name(), 1) + local new_stack = ItemStack("cannabis:joint_erba_ice_acceso_m") -- sostituisce un item con un altro item + return new_stack + end + end + }) +--_______________________________________________________________________E. ICE ACCESA CONSUMATA_______________________________ + + minetest.register_craftitem("cannabis:joint_erba_ice_acceso_m", { + description = "Joint of ice_weed lit", + inventory_image = "joint_joint_caci_m.png", + stack_max = 1, + on_use = function(itemstack,player,pointed_thing) + if itemstack:take_item() ~= nil then + local p = player:get_pos() + minetest.add_particlespawner({ + amount = 500, + time = 3, + minpos = {x=p.x-2,y=p.y+1,z=p.z-1}, + maxpos = {x=p.x+2,y=p.y+15,z=p.z+2}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "j_smoke_i.png" + }) + minetest.sound_play("canapa_joint_i", { to_player = "", gain = 1.0 }) + toggle_i_eyes(player:get_player_name(), 1) + return itemstack + end + end +}) + +--______________________________________________________________________________________________________________________________________________ +--| | +--| CRAFTITEM STAFF | +--|_____________________________________________________________________________________________________________________________________________| + +--_______________________________________________________________________INFIORESCENZA VERDE TRITURATA____________________________________________ minetest.register_craftitem("cannabis:joint_cima", { description = S("Flowering chopped"), inventory_image = "joint_cima_s.png", }) +--_______________________________________________________________________INFIORESCENZA ROSSA TRITURATA____________________________________________ + minetest.register_craftitem("cannabis:joint_cimar", { + description = S("Red flowering chopped"), + inventory_image = "joint_cima_sr.png", + + }) +--_______________________________________________________________________INFIORESCENZA ICE TRITURATA____________________________________________ + minetest.register_craftitem("cannabis:joint_cimai", { + description = S("Ice flowering chopped"), + inventory_image = "joint_cima_si.png", + + }) +--_______________________________________________________________________FUMO SQUAGLIATO______________________________________________________ minetest.register_craftitem("cannabis:joint_fumo", { description = S("Hash melted"), inventory_image = "joint_fumo_s.png", }) +--_______________________________________________________________________CARTINE______________________________________________________________ minetest.register_craftitem("cannabis:joint_cartina", { description = S("Rolling paper"), inventory_image = "joint_cartina.png", }) +--_______________________________________________________________________CARTINA DA ARROTOLARE CON CIMA VERDE E FOGLIE__________________________ minetest.register_craftitem("cannabis:joint_cartina_cima", { - description = S("Rolling paper with hemp leaves and flowering chopped "), + description = S("Rolling paper with hemp leaves and flowering chopped "), inventory_image = "joint_cartina_cima.png", - + }) +--_______________________________________________________________________CARTINA DA ARROTOLARE CON CIMA ROSSA E FOGLIE__________________________ + minetest.register_craftitem("cannabis:joint_cartina_cimar", { + description = S("Rolling paper with hemp leaves and red flowering chopped "), + inventory_image = "joint_cartina_cimar.png", + + }) +--_______________________________________________________________________CARTINA DA ARROTOLARE CON CIMA ICE E FOGLIE__________________________ + minetest.register_craftitem("cannabis:joint_cartina_cimai", { + description = S("Rolling paper with hemp leaves and ice flowering chopped "), + inventory_image = "joint_cartina_cimai.png", + + }) +--_______________________________________________________________________CARTINA DA ARROTOLARE CON FUMO E FOGLIE_________________________________ minetest.register_craftitem("cannabis:joint_cartina_fumo", { - description = S("Rolling paper with hemp leaves melted hash"), + description = S("Rolling paper with hemp leaves and melted hash"), inventory_image = "joint_cartina_fumo.png", }) +--_______________________________________________________________________SCATOLA DI FILTRI________________________________________________________ minetest.register_craftitem("cannabis:joint_filter_box", { description = S("Filters pack"), inventory_image = "joint_filter_p.png", }) +--_______________________________________________________________________FILTRI ARROTOLATI________________________________________________________ minetest.register_craftitem("cannabis:joint_filter", { description = S("Filter"), inventory_image = "joint_filter.png", }) +--_______________________________________________________________________ACCENDINO_________________________________________________________________ + minetest.register_craftitem("cannabis:joint_lighter", { + description = S("Lighter"), + inventory_image = "joint_accendino.png", + + }) - --______________________________________________________________________________ - --craft - --______________________________________________________________________________ - minetest.register_craft({ - output = "cannabis:joint_fumo 3 ", - recipe = { - {"","",""}, - {"","cannabis:canapa_raisin",""}, - {"","cannabis:joint_accendino",""}, - } -}) - minetest.register_craft({ - output = "cannabis:joint_cima 3 ", - recipe = { - {"","cannabis:canapa_leaves",""}, - {"","cannabis:canapa_flower",""}, - {"","cannabis:canapa_leaves",""}, - } -}) - minetest.register_craft({ - output = "cannabis:joint_accendino 5 ", - recipe = { - {"default:steel_ingot","fire:flint_and_steel","cannabis:canapa_plastic"}, - {"cannabis:canapa_plastic","cannabis:canapa_fuel","cannabis:canapa_plastic"}, - {"cannabis:canapa_plastic","cannabis:canapa_plastic","cannabis:canapa_plastic"}, - } -}) - minetest.register_craft({ - output = "cannabis:joint_cartina 10 ", - recipe = { - {"","",""}, - {"","",""}, - {"cannabis:canapa_paper","cannabis:canapa_paper","cannabis:canapa_paper"}, - } -}) - minetest.register_craft({ - output = "cannabis:joint_cartina_cima ", - recipe = { - {"","",""}, - {"","cannabis:joint_cima",""}, - {"","cannabis:joint_cartina",""}, - } -}) - minetest.register_craft({ - output = "cannabis:joint_cartina_fumo ", - recipe = { - {"","",""}, - {"","cannabis:joint_fumo","cannabis:canapa_leaves"}, - {"","cannabis:joint_cartina",""}, - } -}) - minetest.register_craft({ - output = "cannabis:joint_filter_box ", - recipe = { - {"","",""}, - {"cannabis:canapa_paper","cannabis:canapa_paper",""}, - {"cannabis:canapa_paper","cannabis:canapa_paper",""}, - } -}) - minetest.register_craft({ - type = "shapeless", - output = "cannabis:joint_filter 10 ", - recipe = {"cannabis:joint_filter_box", "", "", ""} -}) - minetest.register_craft({ + +--______________________________________________________________________________________________________________________________________________ +--| | +--| CRAFT JOINT | +--|_____________________________________________________________________________________________________________________________________________| + +--_______________________________________________________________________FUMO SPENTO_________________ + minetest.register_craft({ output = "cannabis:joint_fumo_spento ", recipe = { {"","",""}, @@ -142,6 +445,18 @@ local S = cannabis.S {"cannabis:joint_filter","cannabis:joint_cartina_fumo",""}, } }) +--_______________________________________________________________________FUMO ACCESO_________________ + minetest.register_craft({ + output = "cannabis:joint_fumo_acceso ", + + recipe = { + --{"","",""}, + {"cannabis:joint_fumo_spento"}, + + {"cannabis:joint_lighter"}, + } +}) +--_______________________________________________________________________ERBA VERDE SPENTO___________ minetest.register_craft({ output = "cannabis:joint_erba_spento ", recipe = { @@ -150,28 +465,199 @@ local S = cannabis.S {"cannabis:joint_filter","cannabis:joint_cartina_cima",""}, } }) - minetest.register_craft({ - output = "cannabis:joint_fumo_acceso ", - recipe = { - {"","",""}, - {"","",""}, - {"cannabis:joint_fumo_spento","cannabis:joint_accendino",""}, - } -}) +--_______________________________________________________________________ERBA VERDE ACCESO___________ minetest.register_craft({ output = "cannabis:joint_erba_acceso ", recipe = { - {"","",""}, - {"","",""}, - {"cannabis:joint_erba_spento","cannabis:joint_accendino",""}, + --{"","",""}, + {"cannabis:joint_erba_spento"}, + {"cannabis:joint_lighter"}, } }) +--_______________________________________________________________________ERBA ROSSA SPENTO___________ minetest.register_craft({ - output = "cannabis:joint_accendino 5 ", + output = "cannabis:joint_erba_rossa_spento ", + recipe = { + {"","",""}, + {"","",""}, + {"cannabis:joint_filter","cannabis:joint_cartina_cimar",""}, + } +}) +--_______________________________________________________________________ERBA ROSSA ACCESO___________ +minetest.register_craft({ + output = "cannabis:joint_erba_rossa_acceso ", + recipe = { + --{"","",""}, + {"cannabis:joint_erba_rossa_spento"}, + {"cannabis:joint_lighter"}, + } +}) +--_______________________________________________________________________ERBA ICE SPENTO___________ + minetest.register_craft({ + output = "cannabis:joint_erba_ice_spento ", + recipe = { + {"","",""}, + {"","",""}, + {"cannabis:joint_filter","cannabis:joint_cartina_cimai",""}, + } +}) +--_______________________________________________________________________ERBA ICE ACCESO___________ +minetest.register_craft({ + output = "cannabis:joint_erba_ice_acceso ", + recipe = { + --{"","",""}, + {"cannabis:joint_erba_ice_spento"}, + {"cannabis:joint_lighter"}, + } +}) +--______________________________________________________________________________________________________________________________________________ +--| | +--| CRAFT JOINT STAFF | +--|_____________________________________________________________________________________________________________________________________________| + +--_________________________________________________________________________________________ + +--_______________________________________________________________________SQUAGLIARE FUMO______ + + minetest.register_craft({ + output = "cannabis:joint_fumo 3 ", + recipe = { + {"","",""}, + {"","cannabis:canapa_raisin",""}, + {"","cannabis:joint_lighter",""}, + } +}) +--_______________________________________________________________________MESCOLA CIMA_______________________ + + + local Color_list = { + { "canapa_red_flower", "canapa_red_leaves"}, + { "canapa_flower", "canapa_leaves"}, + { "canapa_ice_flower", "canapa_ice_leaves"}, + +} + +for i in ipairs(Color_list) do + local flowers = Color_list[i][1] + local leaves = Color_list[i][2] + + +--_______________________________________________________________________MESCOLA CIMA VERDE CON FOGLIE_______________________ + + + minetest.register_craft({ + output = "cannabis:joint_cima 3 ", + recipe = { + {"","cannabis:"..leaves.."",""}, + {"","cannabis:canapa_flower",""}, + {"","cannabis:"..leaves.."",""}, + } +}) +--_______________________________________________________________________MESCOLA CIMA ROSSA CON FOGLIE_______________________ + + minetest.register_craft({ + output = "cannabis:joint_cimar 3 ", + recipe = { + {"","cannabis:"..leaves.."",""}, + {"","cannabis:canapa_red_flower",""}, + {"","cannabis:"..leaves.."",""}, + } +}) +--_______________________________________________________________________MESCOLA CIMA ICE CON FOGLIE_______________________ + minetest.register_craft({ + output = "cannabis:joint_cimai 3 ", + recipe = { + {"","cannabis:"..leaves.."",""}, + {"","cannabis:canapa_ice_flower",""}, + {"","cannabis:"..leaves.."",""}, + } +}) +--____________________________________________________________________________________________________ + + + + --______________________________________________________________________________ + --craft + + --____________________________________________________________________accendino__________ + + minetest.register_craft({ + output = "cannabis:joint_lighter 5 ", + recipe = { +{"default:steel_ingot","fire:flint_and_steel","cannabis:canapa_plastic"}, +{"cannabis:canapa_plastic","cannabis:canapa_fuel","cannabis:canapa_plastic"}, +{"cannabis:canapa_plastic","cannabis:canapa_plastic","cannabis:canapa_plastic"}, + } +}) +--_______________________________________________________________________cartina__________________ + minetest.register_craft({ + output = "cannabis:joint_cartina 10 ", + recipe = { + {"","",""}, + {"","",""}, + {"cannabis:canapa_paper","cannabis:canapa_paper","cannabis:canapa_paper"}, + } +}) +--_______________________________________________________________________mettere la mescola d erba verde nella cartina___________________________________ + minetest.register_craft({ + output = "cannabis:joint_cartina_cima ", + recipe = { + {"","",""}, + {"","cannabis:joint_cima","cannabis:"..leaves..""}, + {"","cannabis:joint_cartina",""}, + } +}) +--_______________________________________________________________________mettere la mescola d erba rossa nella cartina___________________________________ + minetest.register_craft({ + output = "cannabis:joint_cartina_cimar ", + recipe = { + {"","",""}, + {"","cannabis:joint_cimar","cannabis:"..leaves..""}, + {"","cannabis:joint_cartina",""}, + } +}) +--_______________________________________________________________________mettere la mescola d erba ice nella cartina___________________________________ + minetest.register_craft({ + output = "cannabis:joint_cartina_cimai ", + recipe = { + {"","",""}, + {"","cannabis:joint_cimai","cannabis:"..leaves..""}, + {"","cannabis:joint_cartina",""}, + } +}) +--________________________________________________________________________mettere la mescola fumo foglie nella cartina fare table per usare tutte le foglie + + minetest.register_craft({ + output = "cannabis:joint_cartina_fumo ", + recipe = { + {"","",""}, + {"","cannabis:joint_fumo","cannabis:"..leaves..""}, + {"","cannabis:joint_cartina",""}, + } +}) +--________________________________________________________________________box filtri___________________________________________________________________________ + minetest.register_craft({ + output = "cannabis:joint_filter_box ", + recipe = { + {"","",""}, + {"cannabis:canapa_paper","cannabis:canapa_paper",""}, + {"cannabis:canapa_paper","cannabis:canapa_paper",""}, + } +}) +--__________________________________________________________________________arrotolare filtri__________________________________________________________________ + minetest.register_craft({ + type = "shapeless", + output = "cannabis:joint_filter 10 ", + recipe = {"cannabis:joint_filter_box"} +}) +--_______________________________________________________________________accendino con torch________________________________________________________________ + + minetest.register_craft({ + output = "cannabis:joint_lighter 3 ", recipe = { {"default:steel_ingot","default:torch","cannabis:canapa_plastic"}, - {"cannabis:canapa_plastic","cannabis:canapa_fuel","cannabis:canapa_plastic"}, - {"cannabis:canapa_plastic","cannabis:canapa_plastic","cannabis:canapa_plastic"}, + {"cannabis:canapa_plastic","cannabis:canapa_fuel","cannabis:canapa_plastic"}, + {"cannabis:canapa_plastic","cannabis:canapa_plastic","cannabis:canapa_plastic"}, } }) ----------------------------------------- @@ -186,9 +672,10 @@ minetest.register_craft({ --for color, smokecolor in pairs(smokeCOLOR) do -- water --end +--________________________________________________________________________accendino con acciarino vedere flint e still acciarino per dare stesse funzioni ad accendino if minetest.get_modpath("fire") then minetest.register_craft({ - output = "cannabis:joint_accendino 5 ", + output = "cannabis:joint_lighter 10 ", recipe = { {"default:steel_ingot","fire:flint_and_steel","cannabis:canapa_plastic"}, {"cannabis:canapa_plastic","cannabis:canapa_fuel","cannabis:canapa_plastic"}, @@ -196,3 +683,4 @@ if minetest.get_modpath("fire") then } }) end +end diff --git a/locale/cannabis.de.tr b/locale/cannabis.de.tr index ab321d7..2d156bd 100644 --- a/locale/cannabis.de.tr +++ b/locale/cannabis.de.tr @@ -74,14 +74,21 @@ Filter=Filter Filters pack=Filterpaket Flowering chopped=blühend gehäckselt Hash melted=Haschisch geschmolzen +Ice flowering chopped= Joint of hash lit=Haschisch Joint angezündet Joint of hash unlit=Haschisch Joint nicht angezündet +Joint of ice_weed lit= +Joint of ice_weed unlit= +Joint of red_weed unlit= Joint of weed lit=Joint aus Gras angezündet Joint of weed unlit=Joint aus Gras nicht angezündet Lighter=Feuerzeug +Red flowering chopped= Rolling paper=Zigarettenpapier Rolling paper with hemp leaves and flowering chopped =Zigarettenpapier mit Hanfblättern und gehäckselten Blüten -Rolling paper with hemp leaves melted hash=Zigarettenpapier mit Hanfblättern und geschmolzenem Haschisch +Rolling paper with hemp leaves and ice flowering chopped = +Rolling paper with hemp leaves and melted hash= +Rolling paper with hemp leaves and red flowering chopped = ### node_ingot.lua ### @@ -94,6 +101,7 @@ Fiber Ingot=Faserbarren High Performance Block=Hochwertiger Block High Performance Block Hemp=Hochwertiger Hanfblock High Performance Ingot=Hochwertiger Barren +Ice Leaves Block= Leaves Block=Blätterblock Leaves Ingot=Blätterbarren Mixed HR Ingot=Gemischter HR Barren @@ -126,4 +134,5 @@ Hemp Steel Sword=Hanf Eisen Schwert ##### not used anymore ##### +Rolling paper with hemp leaves melted hash=Zigarettenpapier mit Hanfblättern und geschmolzenem Haschisch Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert diff --git a/locale/cannabis.de.tr.old b/locale/cannabis.de.tr.old index a98aa7a..d7824af 100644 --- a/locale/cannabis.de.tr.old +++ b/locale/cannabis.de.tr.old @@ -9,6 +9,12 @@ Hemp Shield= Hanfschild Leggings= Hose +### bag.lua ### + +Large Bob Bag= BOB Tasche Breit +Medium Bob Bag= BOB Tasche Mittel +Small Bob Bag= BOB Tasche Klein + ### canapa.lua ### Hemp=Hanf @@ -17,7 +23,15 @@ Hemp (flowering)=Hanf (blühend) Hemp (seedling)=Hanf (Sämling) Hemp (sproutling)=Hanf (sprießend) -### canapa_rossa.lua ### +### canapa_ice.lua ### + +Hemp (Ice flowering)=Gletscherhanf +Hemp ice= Gletscherhanf (blühend) +Hemp ice (climbing plant)=Gletscherhanf (kletternde Pflanze) +Hemp ice (sproutling)=Gletscherhanf (sprießend) +Hemp ice(seedling)=Gletscherhanf (Sämling) + +### canapa_red.lua ### Hemp (Red flowering)=Hanf (Rot blühend) Hemp red=Roter Hanf @@ -25,10 +39,22 @@ Hemp red (climbing plant)=Roter Hanf (kletternde Pflanze) Hemp red (sproutling)=Roter Hanf (Sämling) Hemp red(seedling)=Roter Hanf (Sprießend) +### craftice.lua ### + +Hemp ice Flower= Gletscherhanfblume + +### craftice.lua ### +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves=Hanfblätter +Hemp Seed=Hanfsamen + ### craftitem.lua ### BioFuel=BioKraftstoff Bread=Brot +Cloth= Fiber=Faser Flour=Mehl Hemp Flower=Hanfblume @@ -38,18 +64,24 @@ Hemp Resin=Hanfharz Paper=Papier Plastic=Plastik -### craftitem.lua ### -### craftred.lua ### - -Hemp Leaves=Hanfblätter -Hemp Seed=Hanfsamen - ### craftred.lua ### Hemp red Flower=Roter Hanf Blüte ### joint.lua ### +Ice flowering chopped= +Joint of ice_weed lit= +Joint of ice_weed unlit= +Joint of red_weed unlit= +Red flowering chopped= +Rolling paper with hemp leaves and ice flowering chopped = +Rolling paper with hemp leaves and melted hash= +Rolling paper with hemp leaves and red flowering chopped = + +### joint.lua ### +### o_joint.lua ### + Filter=Filter Filters pack=Filterpaket Flowering chopped=blühend gehäckselt @@ -58,10 +90,9 @@ Joint of hash lit=Haschisch Joint angezündet Joint of hash unlit=Haschisch Joint nicht angezündet Joint of weed lit=Joint aus Gras angezündet Joint of weed unlit=Joint aus Gras nicht angezündet -Lighter=Feuerzeug Rolling paper=Zigarettenpapier Rolling paper with hemp leaves and flowering chopped =Zigarettenpapier mit Hanfblättern und gehäckselten Blüten -Rolling paper with hemp leaves melted hash=Zigarettenpapier mit Hanfblättern und geschmolzenem Haschisch +lighter= ### node_ingot.lua ### @@ -74,14 +105,18 @@ Fiber Ingot=Faserbarren High Performance Block=Hochwertiger Block High Performance Block Hemp=Hochwertiger Hanfblock High Performance Ingot=Hochwertiger Barren +Ice Leaves Block= Leaves Block=Blätterblock Leaves Ingot=Blätterbarren Mixed HR Ingot=Gemischter HR Barren Red Leaves Block=Roter Blätterblock +### o_joint.lua ### + +Rolling paper with hemp leaves melted hash=Zigarettenpapier mit Hanfblättern und geschmolzenem Haschisch + ### tools.lua ### -Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert Hemp Adminh Pickaxe=Hanf Admin hochwertige Spitzhacke Hemp Bronze Axe= Hanf Bronze Axt Hemp Bronze Pickaxe=Hanf Bronze Spitzhacke @@ -103,3 +138,9 @@ Hemp Steel Axe=Hanf Eisen Axt Hemp Steel Pickaxe=Hanf Eisen Spitzhacke Hemp Steel Shovel=Hanf Eisen Schaufel Hemp Steel Sword=Hanf Eisen Schwert + + +##### not used anymore ##### + +Lighter=Feuerzeug +Hemp Admin High Performance Sword=Hanf Admin hochwertiges Schwert diff --git a/locale/cannabis.it.tr b/locale/cannabis.it.tr index 2a8dedf..68f4c25 100644 --- a/locale/cannabis.it.tr +++ b/locale/cannabis.it.tr @@ -74,14 +74,21 @@ Filter=Filtro Filters pack=Pacchetto di filtri Flowering chopped=Infiorescenza triturata Hash melted=Fumo sciolto +Ice flowering chopped=Infiorescenza canapa_ice tritata Joint of hash lit=Sigaretta con fumo accesa Joint of hash unlit=Sigaretta con fumo spenta +Joint of ice_weed lit= Sigaretta di canapa_ice accesa +Joint of ice_weed unlit=Sigaretta di canapa spenta +Joint of red_weed unlit=Sigaretta di canapa_rossa spenta Joint of weed lit=Sigaretta di erba acceso Joint of weed unlit=Sigaretta di erba spenta Lighter=Accendino +Red flowering chopped= Infiorescenza canapa_rossa tritata Rolling paper=Cartine Rolling paper with hemp leaves and flowering chopped =Cartina con foglie e cime di canapa -Rolling paper with hemp leaves melted hash=Cartina con foglie e resina sciolta di canapa +Rolling paper with hemp leaves and ice flowering chopped =Cartina con infiorescenza di canapa_ice e foglie di canapa +Rolling paper with hemp leaves and melted hash=Cartina con resina e foglie di canapa +Rolling paper with hemp leaves and red flowering chopped = Cartina con infiorescenza di canapa_rossa e foglie di canapa ### node_ingot.lua ### @@ -94,6 +101,7 @@ Fiber Ingot=Lingotto di fibra High Performance Block=Blocco ad alte prestazioni High Performance Block Hemp=Blocco alla fibra di canapa ad alte prestazioni High Performance Ingot=Lingotto alte prestazioni +Ice Leaves Block=Blocco di foglie canapa_ice Leaves Block=Blocco di foglie Leaves Ingot=Lingotto di foglie Mixed HR Ingot=Lingotto mescola HR diff --git a/locale/cannabis.it.tr.bak b/locale/cannabis.it.tr.bak new file mode 100644 index 0000000..2da0c97 --- /dev/null +++ b/locale/cannabis.it.tr.bak @@ -0,0 +1,145 @@ +# textdomain: cannabis + + +### armor.lua ### + + Boots=Stivali + Chestplate=Corazza + Helmet=Elmo + Hemp Shield= Scudo di canapa + Leggings=Gambali + +### bag.lua ### + +Large Bob Bag= Borsa BOB larga +Medium Bob Bag= Borsa BOB media +Small Bob Bag= Borsa BOB piccola + +### canapa.lua ### + +Hemp=Canapa +Hemp (climbing plant)=Canapa (rampicante) +Hemp (flowering)=Canapa (infiorescena) +Hemp (seedling)=Canapa (piantina) +Hemp (sproutling)=Canapa (germoglio) + +### canapa_ice.lua ### + +Hemp (Ice flowering)= Inffiorescenza di canapa Glaciale +Hemp ice= Canapa Glaciale +Hemp ice (climbing plant)=Canapa Glaciale(rampicante) +Hemp ice (sproutling)=Canapa Glaciale (piantina) +Hemp ice(seedling)=Canapa Glaciale (germoglio) + +### canapa_red.lua ### + +Hemp (Red flowering)=Canapa rossa (infiorescena) +Hemp red=Canapa rossa +Hemp red (climbing plant)=Canapa rossa (rampicante) +Hemp red (sproutling)=Canapa rossa (piantina) +Hemp red(seedling)=Canapa rossa (germoglio) + +### craftice.lua ### + +Hemp ice Flower= Fiore di canapa glaciale + +### craftice.lua ### +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves= Foglie di canapa +Hemp Seed= Semi di canapa + +### craftitem.lua ### + +BioFuel=BioCarburante +Bread=Pane +Cloth= Stoffa +Fiber=Fibra +Flour=Farina +Hemp Flower=Fiore di Canapa +Hemp Glue=Colla di Canapa +Hemp Oil=Olio di Canapa +Hemp Resin=Resina di Canapa +Paper=Carta +Plastic=Plastica + +### craftred.lua ### + +Hemp red Flower=Fiore di canapa rossa + +### joint.lua ### + +Ice flowering chopped= +Joint of ice_weed lit= +Joint of ice_weed unlit= +Joint of red_weed unlit= +Red flowering chopped= +Rolling paper with hemp leaves and ice flowering chopped = +Rolling paper with hemp leaves and melted hash= +Rolling paper with hemp leaves and red flowering chopped = + +### joint.lua ### +### o_joint.lua ### + +Filter=Filtro +Filters pack=Pacchetto di filtri +Flowering chopped=Infiorescenza triturata +Hash melted=Fumo sciolto +Joint of hash lit=Sigaretta con fumo accesa +Joint of hash unlit=Sigaretta con fumo spenta +Joint of weed lit=Sigaretta di erba acceso +Joint of weed unlit=Sigaretta di erba spenta +Rolling paper=Cartine +Rolling paper with hemp leaves and flowering chopped =Cartina con foglie e cime di canapa +lighter= + +### node_ingot.lua ### + +Adminh Block=Blocco Adminh (indistruttibile) +Adminh Ingot=Lingotto Adminh +Fabric Block=Blocco di Tessuto +Fabric Ingot=Lingotto tessuto +Fiber Block=Blocco di fibra +Fiber Ingot=Lingotto di fibra +High Performance Block=Blocco ad alte prestazioni +High Performance Block Hemp=Blocco alla fibra di canapa ad alte prestazioni +High Performance Ingot=Lingotto alte prestazioni +Ice Leaves Block= +Leaves Block=Blocco di foglie +Leaves Ingot=Lingotto di foglie +Mixed HR Ingot=Lingotto mescola HR +Red Leaves Block=Blocco di foglie rosse + +### o_joint.lua ### + +Rolling paper with hemp leaves melted hash=Cartina con foglie e resina sciolta di canapa + +### tools.lua ### + +Hemp Adminh Pickaxe=Piccone Adminh di canapa +Hemp Bronze Axe=Ascia di canapa e bronzo +Hemp Bronze Pickaxe=Piccone di canapa e bronzo +Hemp Bronze Shovel=Pala di canapa e bronzo +Hemp Bronze Sword=Spada di canapa e bronzo +Hemp Diamond Axe=Ascia di canapa e diamante +Hemp Diamond Pickaxe=Picconedi canapa e diamante +Hemp Diamond Shovel=Pala di canapa e diamante +Hemp Diamond Sword=Spada di canapa e diamante +Hemp High Performance Axe=Ascia di canapa ad alte prestazioni +Hemp High Performance Sword=Spada di canapa ad alte prestazioni +Hemp High Pickaxe=Piccone di canapa ad alte prestazioni +Hemp High Shovel=Pala di canapa ad alte prestazioni +Hemp Mese Axe=Ascia di canapa e mese +Hemp Mese Pickaxe=Piccone di canapa e mese +Hemp Mese Shovel=Pala di canapa e mese +Hemp Mese Sword=Spada di canapa e mese +Hemp Steel Axe=Ascia di canapa ed acciaio +Hemp Steel Pickaxe=Piccone di canapa ed acciaio +Hemp Steel Shovel=Pala di canapa ed acciaio +Hemp Steel Sword=Spada di canapa ed acciaio + + +##### not used anymore ##### + +Lighter=Accendino diff --git a/locale/cannabis.it.tr.old b/locale/cannabis.it.tr.old index a79e6c0..66304a8 100644 --- a/locale/cannabis.it.tr.old +++ b/locale/cannabis.it.tr.old @@ -9,6 +9,12 @@ Hemp Shield= Scudo di canapa Leggings=Gambali +### bag.lua ### + +Large Bob Bag= Borsa BOB larga +Medium Bob Bag= Borsa BOB media +Small Bob Bag= Borsa BOB piccola + ### canapa.lua ### Hemp=Canapa @@ -17,7 +23,15 @@ Hemp (flowering)=Canapa (infiorescena) Hemp (seedling)=Canapa (piantina) Hemp (sproutling)=Canapa (germoglio) -### canapa_rossa.lua ### +### canapa_ice.lua ### + +Hemp (Ice flowering)= Inffiorescenza di canapa Glaciale +Hemp ice= Canapa Glaciale +Hemp ice (climbing plant)=Canapa Glaciale(rampicante) +Hemp ice (sproutling)=Canapa Glaciale (piantina) +Hemp ice(seedling)=Canapa Glaciale (germoglio) + +### canapa_red.lua ### Hemp (Red flowering)=Canapa rossa (infiorescena) Hemp red=Canapa rossa @@ -25,10 +39,22 @@ Hemp red (climbing plant)=Canapa rossa (rampicante) Hemp red (sproutling)=Canapa rossa (piantina) Hemp red(seedling)=Canapa rossa (germoglio) +### craftice.lua ### + +Hemp ice Flower= Fiore di canapa glaciale + +### craftice.lua ### +### craftitem.lua ### +### craftred.lua ### + +Hemp Leaves= Foglie di canapa +Hemp Seed= Semi di canapa + ### craftitem.lua ### BioFuel=BioCarburante Bread=Pane +Cloth= Stoffa Fiber=Fibra Flour=Farina Hemp Flower=Fiore di Canapa @@ -38,18 +64,20 @@ Hemp Resin=Resina di Canapa Paper=Carta Plastic=Plastica -### craftitem.lua ### -### craftred.lua ### - -Hemp Leaves= Foglie di canapa -Hemp Seed= Semi di canapa - ### craftred.lua ### Hemp red Flower=Fiore di canapa rossa ### joint.lua ### +Ice flowering chopped=Infiorescenza canapa_ice tritata +Joint of ice_weed lit= Sigaretta di canapa_ice accesa +Joint of ice_weed unlit=Sigaretta di canapa spenta +Joint of red_weed unlit=Sigaretta di canapa_rossa spenta +Red flowering chopped= Infiorescenza canapa_rossa tritata +Rolling paper with hemp leaves and ice flowering chopped =Cartina con infiorescenza di canapa_ice e foglie di canapa +Rolling paper with hemp leaves and melted hash=Cartina con resina e foglie di canapa +Rolling paper with hemp leaves and red flowering chopped = Cartina con infiorescenza di canapa_rossa e foglie di canapa Filter=Filtro Filters pack=Pacchetto di filtri Flowering chopped=Infiorescenza triturata @@ -58,10 +86,9 @@ Joint of hash lit=Sigaretta con fumo accesa Joint of hash unlit=Sigaretta con fumo spenta Joint of weed lit=Sigaretta di erba acceso Joint of weed unlit=Sigaretta di erba spenta -Lighter=Accendino Rolling paper=Cartine Rolling paper with hemp leaves and flowering chopped =Cartina con foglie e cime di canapa -Rolling paper with hemp leaves melted hash=Cartina con foglie e resina sciolta di canapa +Lighter=Accendino ### node_ingot.lua ### @@ -74,14 +101,18 @@ Fiber Ingot=Lingotto di fibra High Performance Block=Blocco ad alte prestazioni High Performance Block Hemp=Blocco alla fibra di canapa ad alte prestazioni High Performance Ingot=Lingotto alte prestazioni +Ice Leaves Block=Blocco di foglie canapa_ice Leaves Block=Blocco di foglie Leaves Ingot=Lingotto di foglie Mixed HR Ingot=Lingotto mescola HR Red Leaves Block=Blocco di foglie rosse + + + + ### tools.lua ### -Hemp Admin High Performance Sword= Hemp Adminh Pickaxe=Piccone Adminh di canapa Hemp Bronze Axe=Ascia di canapa e bronzo Hemp Bronze Pickaxe=Piccone di canapa e bronzo @@ -103,3 +134,6 @@ Hemp Steel Axe=Ascia di canapa ed acciaio Hemp Steel Pickaxe=Piccone di canapa ed acciaio Hemp Steel Shovel=Pala di canapa ed acciaio Hemp Steel Sword=Spada di canapa ed acciaio + + + diff --git a/locale/template.txt b/locale/template.txt index 0e48b9f..72eef50 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -74,14 +74,21 @@ Filter= Filters pack= Flowering chopped= Hash melted= +Ice flowering chopped= Joint of hash lit= Joint of hash unlit= +Joint of ice_weed lit= +Joint of ice_weed unlit= +Joint of red_weed unlit= Joint of weed lit= Joint of weed unlit= Lighter= +Red flowering chopped= Rolling paper= Rolling paper with hemp leaves and flowering chopped = -Rolling paper with hemp leaves melted hash= +Rolling paper with hemp leaves and ice flowering chopped = +Rolling paper with hemp leaves and melted hash= +Rolling paper with hemp leaves and red flowering chopped = ### node_ingot.lua ### @@ -94,6 +101,7 @@ Fiber Ingot= High Performance Block= High Performance Block Hemp= High Performance Ingot= +Ice Leaves Block= Leaves Block= Leaves Ingot= Mixed HR Ingot= diff --git a/mod.conf b/mod.conf index f232e95..8be7a6c 100644 --- a/mod.conf +++ b/mod.conf @@ -1,3 +1,7 @@ name = cannabis depends = default optional_default = 3d_armor,fire,ropes,unified_inventory,wool +release = 10065 +author = ulla +title = Hemp mod +description = Hemp with all possible utility see readme.md | La canapa e tutti i suoi usi guardare il readme.md diff --git a/node_ingot.lua b/node_ingot.lua index c6aba44..30db57d 100644 --- a/node_ingot.lua +++ b/node_ingot.lua @@ -98,6 +98,13 @@ minetest.register_node("cannabis:cannabis_foglie_red_block", { groups = {cracky=1, level=2}, sounds = {"cannabis_canapa_s3"} }) +minetest.register_node("cannabis:cannabis_foglie_ice_block", { + description = S("Ice Leaves Block"), + tiles = { "cannabis_foglie_ice_block.png" }, + is_ground_content = false, + groups = {cracky=1, level=2}, + sounds = {"cannabis_canapa_s3"} +}) minetest.register_node("cannabis:cannabis_tessuto_block", { description = S("Fabric Block"), tiles = { "cannabis_tessuto_block.png" }, diff --git a/sounds/canapa_joint.ogg b/sounds/canapa_joint.ogg new file mode 100644 index 0000000..990b30e Binary files /dev/null and b/sounds/canapa_joint.ogg differ diff --git a/sounds/canapa_joint_f.ogg b/sounds/canapa_joint_f.ogg new file mode 100644 index 0000000..98c5c3f Binary files /dev/null and b/sounds/canapa_joint_f.ogg differ diff --git a/sounds/canapa_joint_i.ogg b/sounds/canapa_joint_i.ogg new file mode 100644 index 0000000..1ebaba8 Binary files /dev/null and b/sounds/canapa_joint_i.ogg differ diff --git a/sounds/canapa_joint_r.ogg b/sounds/canapa_joint_r.ogg new file mode 100644 index 0000000..d1306b7 Binary files /dev/null and b/sounds/canapa_joint_r.ogg differ diff --git a/sounds/canapa_joint_v.ogg b/sounds/canapa_joint_v.ogg new file mode 100644 index 0000000..f2b655a Binary files /dev/null and b/sounds/canapa_joint_v.ogg differ diff --git a/textures/cannabis_effect_eye_f.png b/textures/cannabis_effect_eye_f.png new file mode 100644 index 0000000..2a0227e Binary files /dev/null and b/textures/cannabis_effect_eye_f.png differ diff --git a/textures/cannabis_effect_eye_i.png b/textures/cannabis_effect_eye_i.png new file mode 100644 index 0000000..1fac723 Binary files /dev/null and b/textures/cannabis_effect_eye_i.png differ diff --git a/textures/cannabis_effect_eye_r.png b/textures/cannabis_effect_eye_r.png new file mode 100644 index 0000000..84ca4ed Binary files /dev/null and b/textures/cannabis_effect_eye_r.png differ diff --git a/textures/cannabis_effect_eye_v.png b/textures/cannabis_effect_eye_v.png new file mode 100644 index 0000000..a7edff8 Binary files /dev/null and b/textures/cannabis_effect_eye_v.png differ diff --git a/textures/j_smoke.png b/textures/j_smoke.png new file mode 100644 index 0000000..63d4727 Binary files /dev/null and b/textures/j_smoke.png differ diff --git a/textures/j_smoke_f.png b/textures/j_smoke_f.png new file mode 100644 index 0000000..456809b Binary files /dev/null and b/textures/j_smoke_f.png differ diff --git a/textures/j_smoke_i.png b/textures/j_smoke_i.png new file mode 100644 index 0000000..00c8b21 Binary files /dev/null and b/textures/j_smoke_i.png differ diff --git a/textures/j_smoke_r.png b/textures/j_smoke_r.png new file mode 100644 index 0000000..63d4727 Binary files /dev/null and b/textures/j_smoke_r.png differ diff --git a/textures/j_smoke_v.png b/textures/j_smoke_v.png new file mode 100644 index 0000000..176fbac Binary files /dev/null and b/textures/j_smoke_v.png differ diff --git a/textures/joint_cartina_cimai.png b/textures/joint_cartina_cimai.png new file mode 100644 index 0000000..4244c33 Binary files /dev/null and b/textures/joint_cartina_cimai.png differ diff --git a/textures/joint_cartina_cimar.png b/textures/joint_cartina_cimar.png new file mode 100644 index 0000000..eaf241b Binary files /dev/null and b/textures/joint_cartina_cimar.png differ diff --git a/textures/joint_cima_si.png b/textures/joint_cima_si.png new file mode 100644 index 0000000..aba2c15 Binary files /dev/null and b/textures/joint_cima_si.png differ diff --git a/textures/joint_cima_sr.png b/textures/joint_cima_sr.png new file mode 100644 index 0000000..e03e8f0 Binary files /dev/null and b/textures/joint_cima_sr.png differ diff --git a/textures/joint_joint_cac.png b/textures/joint_joint_cac.png index 84bf076..f64fe77 100644 Binary files a/textures/joint_joint_cac.png and b/textures/joint_joint_cac.png differ diff --git a/textures/joint_joint_cac_m.png b/textures/joint_joint_cac_m.png new file mode 100644 index 0000000..bd491c3 Binary files /dev/null and b/textures/joint_joint_cac_m.png differ diff --git a/textures/joint_joint_caci.png b/textures/joint_joint_caci.png new file mode 100644 index 0000000..237ea1c Binary files /dev/null and b/textures/joint_joint_caci.png differ diff --git a/textures/joint_joint_caci_m.png b/textures/joint_joint_caci_m.png new file mode 100644 index 0000000..01884fb Binary files /dev/null and b/textures/joint_joint_caci_m.png differ diff --git a/textures/joint_joint_cacr.png b/textures/joint_joint_cacr.png new file mode 100644 index 0000000..46967af Binary files /dev/null and b/textures/joint_joint_cacr.png differ diff --git a/textures/joint_joint_cacr_m.png b/textures/joint_joint_cacr_m.png new file mode 100644 index 0000000..d6a53b3 Binary files /dev/null and b/textures/joint_joint_cacr_m.png differ diff --git a/textures/joint_joint_csp.png b/textures/joint_joint_csp.png index de08adc..b5eb479 100644 Binary files a/textures/joint_joint_csp.png and b/textures/joint_joint_csp.png differ diff --git a/textures/joint_joint_cspi.png b/textures/joint_joint_cspi.png new file mode 100644 index 0000000..e623b6e Binary files /dev/null and b/textures/joint_joint_cspi.png differ diff --git a/textures/joint_joint_cspr.png b/textures/joint_joint_cspr.png new file mode 100644 index 0000000..9878303 Binary files /dev/null and b/textures/joint_joint_cspr.png differ diff --git a/textures/joint_joint_fac.png b/textures/joint_joint_fac.png index c946c55..558c3a8 100644 Binary files a/textures/joint_joint_fac.png and b/textures/joint_joint_fac.png differ diff --git a/textures/joint_joint_fac_m.png b/textures/joint_joint_fac_m.png new file mode 100644 index 0000000..7c81390 Binary files /dev/null and b/textures/joint_joint_fac_m.png differ diff --git a/textures/joint_joint_fsp.png b/textures/joint_joint_fsp.png index fdcc181..506df02 100644 Binary files a/textures/joint_joint_fsp.png and b/textures/joint_joint_fsp.png differ