mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2025-04-02 18:50:34 +02:00
add pole perfect deco and textures
add pole perfect deco cp textures pole_deco to pole_perfect_deco (simple fix, new textures must will be created) fix missing variable BooTSWear in bobber_shark.lua reindent code
This commit is contained in:
parent
2240d7fa0c
commit
74e7f5ca44
@ -12,6 +12,8 @@ else
|
|||||||
S = function ( s ) return s end
|
S = function ( s ) return s end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local PoLeWeaR = (65535/(30-(math.random(15, 29))))
|
||||||
|
local BooTSWear = (2000*(math.random(20, 29)))
|
||||||
-- Here's what you can catch if you use a fish as bait
|
-- Here's what you can catch if you use a fish as bait
|
||||||
local CaTCH_BiG = {
|
local CaTCH_BiG = {
|
||||||
-- MoD iTeM WeaR MeSSaGe ("You caught "..) GeTBaiTBack NRMiN CHaNCe (../120)
|
-- MoD iTeM WeaR MeSSaGe ("You caught "..) GeTBaiTBack NRMiN CHaNCe (../120)
|
||||||
|
@ -187,7 +187,7 @@ minetest.register_tool("fishing:pole_perfect", {
|
|||||||
local direction = minetest.dir_to_facedir(placer:get_look_dir())
|
local direction = minetest.dir_to_facedir(placer:get_look_dir())
|
||||||
--local meta1 = minetest.get_meta(pt.under)
|
--local meta1 = minetest.get_meta(pt.under)
|
||||||
local meta = minetest.get_meta(pt.above)
|
local meta = minetest.get_meta(pt.above)
|
||||||
minetest.set_node(pt.above, {name="fishing:pole_deco", param2=direction})
|
minetest.set_node(pt.above, {name="fishing:pole_perfect_deco", param2=direction})
|
||||||
--meta1:set_int("wear", wear)
|
--meta1:set_int("wear", wear)
|
||||||
meta:set_int("wear", wear)
|
meta:set_int("wear", wear)
|
||||||
if not minetest.setting_getbool("creative_mode") then
|
if not minetest.setting_getbool("creative_mode") then
|
||||||
@ -199,7 +199,8 @@ minetest.register_tool("fishing:pole_perfect", {
|
|||||||
})
|
})
|
||||||
|
|
||||||
if SIMPLE_DECO_FISHING_POLE == true then
|
if SIMPLE_DECO_FISHING_POLE == true then
|
||||||
minetest.register_node("fishing:pole_deco", {
|
--Canne à pêche deco
|
||||||
|
minetest.register_node("fishing:pole_deco", {
|
||||||
description = S("Fishing Pole"),
|
description = S("Fishing Pole"),
|
||||||
inventory_image = "fishing_pole.png",
|
inventory_image = "fishing_pole.png",
|
||||||
wield_image = "fishing_pole.png^[transformFXR270",
|
wield_image = "fishing_pole.png^[transformFXR270",
|
||||||
@ -238,10 +239,54 @@ minetest.register_node("fishing:pole_deco", {
|
|||||||
end
|
end
|
||||||
minetest.remove_node(pos)
|
minetest.remove_node(pos)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
--Canne à pêche parfaite deco
|
||||||
|
minetest.register_node("fishing:pole_perfect_deco", {
|
||||||
|
description = S("Perfect Fishing Pole"),
|
||||||
|
inventory_image = "fishing_pole_perfect.png",
|
||||||
|
wield_image = "fishing_pole_perfect.png^[transformFXR270",
|
||||||
|
drawtype = "nodebox",
|
||||||
|
paramtype = "light",
|
||||||
|
paramtype2 = "facedir",
|
||||||
|
tiles = {
|
||||||
|
"fishing_pole_perfect_simple.png",
|
||||||
|
"fishing_pole_perfect_simple.png",
|
||||||
|
"fishing_pole_perfect_simple.png",
|
||||||
|
"fishing_pole_perfect_simple.png^[transformFX",
|
||||||
|
},
|
||||||
|
groups = {
|
||||||
|
snappy=3,
|
||||||
|
flammable=2,
|
||||||
|
not_in_creative_inventory=1
|
||||||
|
},
|
||||||
|
node_box = {
|
||||||
|
type = "fixed",
|
||||||
|
fixed = {
|
||||||
|
{ 0 , -1/2 , 0 , 0 , 1/2 , 1 },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
selection_box = {
|
||||||
|
type = "fixed",
|
||||||
|
fixed = {
|
||||||
|
{-1/16 , -1/2 , 0 , 1/16 , 1/2 , 1 },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
sounds = default.node_sound_wood_defaults(),
|
||||||
|
on_dig = function(pos, node, digger)
|
||||||
|
if digger:is_player() and digger:get_inventory() then
|
||||||
|
local meta = minetest.get_meta(pos)
|
||||||
|
local wear_out = meta:get_int("wear")
|
||||||
|
digger:get_inventory():add_item("main", {name="fishing:pole_perfect", count=1, wear=wear_out, metadata=""})
|
||||||
|
end
|
||||||
|
minetest.remove_node(pos)
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
else
|
else
|
||||||
minetest.register_node("fishing:pole_deco", {
|
--Canne à pêche deco
|
||||||
|
minetest.register_node("fishing:pole_deco", {
|
||||||
description = S("Fishing Pole"),
|
description = S("Fishing Pole"),
|
||||||
inventory_image = "fishing_pole.png",
|
inventory_image = "fishing_pole.png",
|
||||||
wield_image = "fishing_pole.png^[transformFXR270",
|
wield_image = "fishing_pole.png^[transformFXR270",
|
||||||
@ -258,7 +303,7 @@ minetest.register_node("fishing:pole_deco", {
|
|||||||
},
|
},
|
||||||
node_box = {
|
node_box = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
-- { left , bottom , front , right , top , back }
|
-- { left , bottom , front , right , top , back }
|
||||||
fixed = {
|
fixed = {
|
||||||
{-1/32 , -1/16 , 14/16 , 1/32 , 6/16 , 15/16},
|
{-1/32 , -1/16 , 14/16 , 1/32 , 6/16 , 15/16},
|
||||||
{-1/32 , -3/16 , 13/16 , 1/32 , -1/16 , 14/16},
|
{-1/32 , -3/16 , 13/16 , 1/32 , -1/16 , 14/16},
|
||||||
@ -302,8 +347,71 @@ minetest.register_node("fishing:pole_deco", {
|
|||||||
end
|
end
|
||||||
minetest.remove_node(pos)
|
minetest.remove_node(pos)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
--Canne à pêche parfaite deco
|
||||||
|
minetest.register_node("fishing:pole_perfect_deco", {
|
||||||
|
description = S("Fishing Pole"),
|
||||||
|
inventory_image = "fishing_pole_perfect.png",
|
||||||
|
wield_image = "fishing_pole_perfect.png^[transformFXR270",
|
||||||
|
drawtype = "nodebox",
|
||||||
|
paramtype = "light",
|
||||||
|
paramtype2 = "facedir",
|
||||||
|
tiles = {
|
||||||
|
"fishing_pole_perfect_top.png",
|
||||||
|
"fishing_pole_perfect_bottom.png",
|
||||||
|
"fishing_pole_perfect_deco.png", -- right
|
||||||
|
"fishing_pole_perfect_deco.png^[transformFX", -- left
|
||||||
|
"fishing_pole_perfect_back.png",
|
||||||
|
"fishing_pole_perfect_front.png"
|
||||||
|
},
|
||||||
|
node_box = {
|
||||||
|
type = "fixed",
|
||||||
|
-- { left , bottom , front , right , top , back }
|
||||||
|
fixed = {
|
||||||
|
{-1/32 , -1/16 , 14/16 , 1/32 , 6/16 , 15/16},
|
||||||
|
{-1/32 , -3/16 , 13/16 , 1/32 , -1/16 , 14/16},
|
||||||
|
{-1/32 , -4/16 , 12/16 , 1/32 , -3/16 , 13/16},
|
||||||
|
{-1/32 , -5/16 , 11/16 , 1/32 , -4/16 , 12/16},
|
||||||
|
{-1/32 , -6/16 , 9/16 , 1/32 , -5/16 , 11/16},
|
||||||
|
{-1/32 , -5/16 , 9/16 , 1/32 , -4/16 , 10/16},
|
||||||
|
-- stick
|
||||||
|
{-1/32 , 6/16 , 12/16 , 1/32 , 7/16 , 15/16}, -- top
|
||||||
|
{-1/32 , 5/16 , 11/16 , 1/32 , 7/16 , 12/16},
|
||||||
|
{-1/32 , 5/16 , 10/16 , 1/32 , 6/16 , 11/16},
|
||||||
|
{-1/32 , 4/16 , 9/16 , 1/32 , 6/16 , 10/16},
|
||||||
|
{-1/32 , 3/16 , 8/16 , 1/32 , 5/16 , 9/16},
|
||||||
|
{-1/32 , 2/16 , 7/16 , 1/32 , 4/16 , 8/16},
|
||||||
|
{-1/32 , 1/16 , 6/16 , 1/32 , 3/16 , 7/16},
|
||||||
|
{-1/32 , 0 , 5/16 , 1/32 , 2/16 , 6/16},
|
||||||
|
{-1/32 , -2/16 , 4/16 , 1/32 , 1/16 , 5/16},
|
||||||
|
{-1/32 , -3/16 , 3/16 , 1/32 , 0 , 4/16},
|
||||||
|
{-1/32 , -5/16 , 2/16 , 1/32 , -1/16 , 3/16},
|
||||||
|
{-1/32 , -7/16 , 1/16 , 1/32 , -3/16 , 2/16},
|
||||||
|
{-1/32 , -1/2 , 0 , 1/32 , -5/16 , 1/16}, -- bottom
|
||||||
|
}
|
||||||
|
},
|
||||||
|
selection_box = {
|
||||||
|
type = "fixed",
|
||||||
|
fixed = {
|
||||||
|
{-1/16 , -1/2 , 0 , 1/16 , 1/2 , 1 },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
groups = {
|
||||||
|
snappy=3,
|
||||||
|
flammable=2,
|
||||||
|
not_in_creative_inventory=1
|
||||||
|
},
|
||||||
|
sounds = default.node_sound_wood_defaults(),
|
||||||
|
on_dig = function(pos, node, digger)
|
||||||
|
if digger:is_player() and digger:get_inventory() then
|
||||||
|
local meta = minetest.get_meta(pos)
|
||||||
|
local wear_out = meta:get_int("wear")
|
||||||
|
digger:get_inventory():add_item("main", {name="fishing:pole_perfect", count=1, wear=wear_out, metadata=""})
|
||||||
|
end
|
||||||
|
minetest.remove_node(pos)
|
||||||
|
end,
|
||||||
|
})
|
||||||
end
|
end
|
||||||
-----------------------------------------------------------------------------------------------
|
-----------------------------------------------------------------------------------------------
|
||||||
-- GETTING WORMS
|
-- GETTING WORMS
|
||||||
@ -311,7 +419,7 @@ end
|
|||||||
-- get worms from digging in dirt:
|
-- get worms from digging in dirt:
|
||||||
if NEW_WORM_SOURCE == false then
|
if NEW_WORM_SOURCE == false then
|
||||||
|
|
||||||
minetest.register_node(":default:dirt", {
|
minetest.register_node(":default:dirt", {
|
||||||
description = S("Dirt"),
|
description = S("Dirt"),
|
||||||
tiles = {"default_dirt.png"},
|
tiles = {"default_dirt.png"},
|
||||||
is_ground_content = true,
|
is_ground_content = true,
|
||||||
@ -332,13 +440,13 @@ minetest.register_node(":default:dirt", {
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
else
|
else
|
||||||
-- get worms from digging with hoes:
|
-- get worms from digging with hoes:
|
||||||
|
|
||||||
-- turns nodes with group soil=1 into soil
|
-- turns nodes with group soil=1 into soil
|
||||||
local function hoe_on_use(itemstack, user, pointed_thing, uses)
|
local function hoe_on_use(itemstack, user, pointed_thing, uses)
|
||||||
local pt = pointed_thing
|
local pt = pointed_thing
|
||||||
-- check if pointing at a node
|
-- check if pointing at a node
|
||||||
if not pt then
|
if not pt then
|
||||||
@ -389,37 +497,37 @@ local function hoe_on_use(itemstack, user, pointed_thing, uses)
|
|||||||
end
|
end
|
||||||
itemstack:add_wear(65535/(uses-1))
|
itemstack:add_wear(65535/(uses-1))
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
-- didn't change the hoes, just here because hoe_on_use is local
|
-- didn't change the hoes, just here because hoe_on_use is local
|
||||||
minetest.register_tool(":farming:hoe_wood", {
|
minetest.register_tool(":farming:hoe_wood", {
|
||||||
description = S("Wooden Hoe"),
|
description = S("Wooden Hoe"),
|
||||||
inventory_image = "farming_tool_woodhoe.png",
|
inventory_image = "farming_tool_woodhoe.png",
|
||||||
on_use = function(itemstack, user, pointed_thing)
|
on_use = function(itemstack, user, pointed_thing)
|
||||||
return hoe_on_use(itemstack, user, pointed_thing, 30)
|
return hoe_on_use(itemstack, user, pointed_thing, 30)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
minetest.register_tool(":farming:hoe_stone", {
|
minetest.register_tool(":farming:hoe_stone", {
|
||||||
description = S("Stone Hoe"),
|
description = S("Stone Hoe"),
|
||||||
inventory_image = "farming_tool_stonehoe.png",
|
inventory_image = "farming_tool_stonehoe.png",
|
||||||
on_use = function(itemstack, user, pointed_thing)
|
on_use = function(itemstack, user, pointed_thing)
|
||||||
return hoe_on_use(itemstack, user, pointed_thing, 90)
|
return hoe_on_use(itemstack, user, pointed_thing, 90)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
minetest.register_tool(":farming:hoe_steel", {
|
minetest.register_tool(":farming:hoe_steel", {
|
||||||
description = S("Steel Hoe"),
|
description = S("Steel Hoe"),
|
||||||
inventory_image = "farming_tool_steelhoe.png",
|
inventory_image = "farming_tool_steelhoe.png",
|
||||||
on_use = function(itemstack, user, pointed_thing)
|
on_use = function(itemstack, user, pointed_thing)
|
||||||
return hoe_on_use(itemstack, user, pointed_thing, 200)
|
return hoe_on_use(itemstack, user, pointed_thing, 200)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
minetest.register_tool(":farming:hoe_bronze", {
|
minetest.register_tool(":farming:hoe_bronze", {
|
||||||
description = S("Bronze Hoe"),
|
description = S("Bronze Hoe"),
|
||||||
inventory_image = "farming_tool_bronzehoe.png",
|
inventory_image = "farming_tool_bronzehoe.png",
|
||||||
on_use = function(itemstack, user, pointed_thing)
|
on_use = function(itemstack, user, pointed_thing)
|
||||||
return hoe_on_use(itemstack, user, pointed_thing, 220)
|
return hoe_on_use(itemstack, user, pointed_thing, 220)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
end
|
end
|
||||||
-----------------------------------------------------------------------------------------------
|
-----------------------------------------------------------------------------------------------
|
||||||
|
BIN
mods/fishing/textures/fishing_pole_perfect_back.png
Normal file
BIN
mods/fishing/textures/fishing_pole_perfect_back.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 235 B |
BIN
mods/fishing/textures/fishing_pole_perfect_bottom.png
Normal file
BIN
mods/fishing/textures/fishing_pole_perfect_bottom.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 215 B |
BIN
mods/fishing/textures/fishing_pole_perfect_front.png
Normal file
BIN
mods/fishing/textures/fishing_pole_perfect_front.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 214 B |
BIN
mods/fishing/textures/fishing_pole_perfect_simple.png
Normal file
BIN
mods/fishing/textures/fishing_pole_perfect_simple.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 303 B |
BIN
mods/fishing/textures/fishing_pole_perfect_top.png
Normal file
BIN
mods/fishing/textures/fishing_pole_perfect_top.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 197 B |
Loading…
x
Reference in New Issue
Block a user