Version MFF.

This commit is contained in:
sys4-fr 2018-09-08 16:41:47 +02:00
parent 94e812644f
commit 7694b95d08
13 changed files with 120 additions and 38 deletions

0
README.txt Normal file → Executable file
View File

1
defaults.lua Normal file → Executable file
View File

@ -2,3 +2,4 @@ DISABLE_STONE_SPEAR = false
DISABLE_STEEL_SPEAR = false DISABLE_STEEL_SPEAR = false
DISABLE_DIAMOND_SPEAR = false DISABLE_DIAMOND_SPEAR = false
DISABLE_OBSIDIAN_SPEAR = false DISABLE_OBSIDIAN_SPEAR = false
DISABLE_MITHRIL_SPEAR = false

0
depends.txt Normal file → Executable file
View File

112
functions.lua Normal file → Executable file
View File

@ -9,20 +9,25 @@ function spears_shot (itemstack, player)
obj:setvelocity({x=dir.x*sp, y=dir.y*sp, z=dir.z*sp}) obj:setvelocity({x=dir.x*sp, y=dir.y*sp, z=dir.z*sp})
obj:setacceleration({x=-dir.x*dr, y=-gravity, z=-dir.z*dr}) obj:setacceleration({x=-dir.x*dr, y=-gravity, z=-dir.z*dr})
obj:setyaw(player:get_look_yaw()+math.pi) obj:setyaw(player:get_look_yaw()+math.pi)
minetest.sound_play("spears_sound", {pos=playerpos})
obj:get_luaentity().wear = itemstack:get_wear() obj:get_luaentity().wear = itemstack:get_wear()
obj:get_luaentity().player = player:get_player_name()
obj:get_luaentity().lastpos = {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}
minetest.sound_play("spears_sound", {pos=playerpos})
return true return true
end end
function spears_set_entity(kind, eq, toughness) function spears_set_entity(kind, eq, toughness)
local SPEAR_ENTITY={ local SPEAR_ENTITY={
physical = false, physical = false,
timer=0,
visual = "wielditem", visual = "wielditem",
visual_size = {x=0.15, y=0.1}, visual_size = {x=0.15, y=0.1},
textures = {"spears:spear_" .. kind}, textures = {"spears:spear_" .. kind},
lastpos={}, lastpos={},
collisionbox = {0,0,0,0,0,0}, collisionbox = {0,0,0,0,0,0},
player = "",
wear = 0,
on_punch = function(self, puncher) on_punch = function(self, puncher)
if puncher then if puncher then
if puncher:is_player() then if puncher:is_player() then
@ -36,42 +41,111 @@ function spears_set_entity(kind, eq, toughness)
end end
end, end,
} }
SPEAR_ENTITY.on_step = function(self, dtime) SPEAR_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos() local pos = self.object:getpos()
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
if not self.wear then if not self.wear then
self.object:remove() self.object:remove()
return return
end end
if self.lastpos.x~=nil then local newpos = self.object:getpos()
if node.name ~= "air" and not (string.find(node.name, 'grass') and not string.find(node.name, 'dirt')) and not string.find(node.name, 'flowers:') and not string.find(node.name, 'farming:') then if self.lastpos.x ~= nil then
self.object:remove() for _, pos in pairs(spears_get_trajectoire(self, newpos)) do
if self.wear+65535/toughness < 65535 then local node = minetest.get_node(pos)
minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness})
if node.name ~= "air"
and not string.find(node.name, 'water_')
and not (string.find(node.name, 'grass') and not string.find(node.name, 'dirt'))
and not (string.find(node.name, 'farming:') and not string.find(node.name, 'soil'))
and not string.find(node.name, 'flowers:')
and not string.find(node.name, 'fire:') then
if self.wear+65535/toughness < 65535 then
local spear_item = minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness})
if spear_item then
spear_item:get_luaentity().item_drop_min_tstamp = minetest.get_us_time() + 3000000
end
end
self.object:remove()
return
end end
elseif self.timer>0.2 then
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1) local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
for k, obj in pairs(objs) do for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then local objpos = obj:getpos()
if obj:get_luaentity().name ~= "spears:spear_" .. kind .. "_entity" and obj:get_luaentity().name ~= "__builtin:item" then if spears_is_player(self.player, obj) or spears_is_entity(obj) then
local speed = vector.length(self.object:getvelocity()) if spears_touch(pos, objpos) then
local damage = (speed + eq)^1.12-20 local puncher = self.object
obj:punch(self.object, 1.0, { if self.player and minetest.get_player_by_name(self.player) then
puncher = minetest.get_player_by_name(self.player)
end
--local speed = vector.length(self.object:getvelocity()) --MFF crabman(28/09/2015) damage valeur equal eq
local damage = eq --((speed + eq +5)^1.2)/10 --MFF crabman(28/09/2015) damage valeur equal eq
obj:punch(puncher, 1.0, {
full_punch_interval=1.0, full_punch_interval=1.0,
damage_groups={fleshy=damage}, damage_groups={fleshy=damage},
}, nil) }, nil)
self.object:remove()
if self.wear+65535/toughness < 65535 then if self.wear+65535/toughness < 65535 then
minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness}) local spear_item = minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness})
if spear_item then
spear_item:get_luaentity().item_drop_min_tstamp = minetest.get_us_time() + 3000000
end
end end
self.object:remove()
return
end end
end end
end end
self.lastpos={x=pos.x, y=pos.y, z=pos.z}
end end
end end
self.lastpos={x=pos.x, y=pos.y, z=pos.z}
self.lastpos={x=newpos.x, y=newpos.y, z=newpos.z}
end end
return SPEAR_ENTITY return SPEAR_ENTITY
end end
function spears_is_player(name, obj)
return (obj:is_player() and obj:get_player_name() ~= name)
end
function spears_is_entity(obj)
return (obj:get_luaentity() ~= nil
and not string.find(obj:get_luaentity().name, "spears:")
and obj:get_luaentity().name ~= "__builtin:item"
and obj:get_luaentity().name ~= "gauges:hp_bar"
and obj:get_luaentity().name ~= "signs:text")
end
function spears_get_trajectoire(self, newpos)
if self.lastpos.x == nil then
return {newpos}
end
local coord = {}
local nx = (newpos["x"] - self.lastpos["x"])/3
local ny = (newpos["y"] - self.lastpos["y"])/3
local nz = (newpos["z"] - self.lastpos["z"])/3
if nx and ny and nz then
table.insert(coord, {x=self.lastpos["x"]+nx, y=self.lastpos["y"]+ny ,z=self.lastpos["z"]+nz })
table.insert(coord, {x=newpos["x"]-nx, y=newpos["y"]-ny ,z=newpos["z"]-nz })
end
table.insert(coord, newpos)
return coord
end
function spears_touch(pos, objpos)
local rx = pos.x - objpos.x
local ry = pos.y - (objpos.y+1)
local rz = pos.z - objpos.z
if (ry < 1 and ry > -1) and (rx < 0.4 and rx > -0.4) and (rz < 0.4 and rz > -0.4) then
return true
end
return false
end

8
init.lua Normal file → Executable file
View File

@ -15,3 +15,11 @@ dofile(minetest.get_modpath("spears").."/tools.lua")
if minetest.setting_get("log_mods") then if minetest.setting_get("log_mods") then
minetest.log("action", "spears loaded") minetest.log("action", "spears loaded")
end end
--alias
minetest.register_alias("throwing:spear_stone", "spears:spear_stone")
minetest.register_alias("throwing:spear_steel", "spears:spear_steel")
minetest.register_alias("throwing:spear_diamond", "spears:spear_diamond")
minetest.register_alias("throwing:spear_obsidian", "spears:spear_obsidian")
minetest.register_alias("throwing:spear_mithril", "spears:spear_mithril")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 KiB

BIN
sounds/spears_sound.ogg Normal file → Executable file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 192 B

37
tools.lua Normal file → Executable file
View File

@ -11,13 +11,6 @@ function spears_register_spear(kind, desc, eq, toughness, material)
end end
return itemstack return itemstack
end, end,
on_place = function(itemstack, user, pointed_thing)
minetest.add_item(pointed_thing.above, itemstack)
if not minetest.setting_getbool("creative_mode") then
itemstack:take_item()
end
return itemstack
end,
tool_capabilities = { tool_capabilities = {
full_punch_interval = 1.5, full_punch_interval = 1.5,
max_drop_level=1, max_drop_level=1,
@ -27,18 +20,19 @@ function spears_register_spear(kind, desc, eq, toughness, material)
damage_groups = {fleshy=eq}, damage_groups = {fleshy=eq},
} }
}) })
SPEAR_ENTITY=spears_set_entity(kind, eq, toughness)
local SPEAR_ENTITY=spears_set_entity(kind, eq, toughness)
minetest.register_entity("spears:spear_" .. kind .. "_entity", SPEAR_ENTITY) minetest.register_entity("spears:spear_" .. kind .. "_entity", SPEAR_ENTITY)
minetest.register_craft({ minetest.register_craft({
output = 'spears:spear_' .. kind, output = 'spears:spear_' .. kind,
recipe = { recipe = {
{'group:wood', 'group:wood', material}, {'group:wood', 'group:wood', material},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = 'spears:spear_' .. kind, output = 'spears:spear_' .. kind,
recipe = { recipe = {
@ -48,17 +42,22 @@ function spears_register_spear(kind, desc, eq, toughness, material)
end end
if not DISABLE_STONE_SPEAR then if not DISABLE_STONE_SPEAR then
spears_register_spear('stone', 'Stone', 4, 20, 'group:stone') spears_register_spear('stone', 'Stone (Hunter)', 3, 25, 'group:stone') --MFF crabman(28/09/2015) damage and wear
end end
if not DISABLE_STEEL_SPEAR then if not DISABLE_STEEL_SPEAR then
spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot') spears_register_spear('steel', 'Steel (Hunter)', 4, 30, 'default:steel_ingot') --MFF crabman(28/09/2015) damage and wear
end
if not DISABLE_OBSIDIAN_SPEAR then
spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian')
end end
if not DISABLE_DIAMOND_SPEAR then if not DISABLE_DIAMOND_SPEAR then
spears_register_spear('diamond', 'Diamond', 8, 40, 'default:diamond') spears_register_spear('diamond', 'Diamond (Hunter)', 7, 50, 'default:diamond') --MFF crabman(28/09/2015) damage and wear
end end
if not DISABLE_OBSIDIAN_SPEAR then
spears_register_spear('obsidian', 'Obsidian (Hunter)', 5, 40, 'default:obsidian') --MFF crabman(28/09/2015) damage and wear
end
if not DISABLE_MITHRIL_SPEAR then
spears_register_spear('mithril', 'Mithril (Hunter)', 8, 200, 'default:mithril_ingot') --MFF crabman(28/09/2015) damage and wear
end