Shell arrows and other tweakings

This commit is contained in:
echoes91 2015-03-13 12:47:16 +01:00
parent 06afd1b8d7
commit b1e6edad73
18 changed files with 140 additions and 16 deletions

View File

@ -1,10 +1,10 @@
local stiffness=0
local bow_idle=false
local bow_idle=true
local reload=0
local throwing_shoot_arrow = function(itemstack, player)
if not bow_idle then
bow_idle=true
if bow_idle then
bow_idle=false
for _,arrow in ipairs(arrows) do
if player:get_inventory():get_stack("main", player:get_wield_index()+1):get_name() == arrow[1] then
if not minetest.setting_getbool("creative_mode") then
@ -16,7 +16,7 @@ local throwing_shoot_arrow = function(itemstack, player)
obj:setvelocity({x=dir.x*stiffness, y=dir.y*stiffness, z=dir.z*stiffness})
obj:setacceleration({x=dir.x*-3, y=-10, z=dir.z*-3})
obj:setyaw(player:get_look_yaw()+math.pi)
minetest.sound_play("throwing_sound", {pos=playerpos})
minetest.sound_play("throwing_bow_sound", {pos=playerpos})
if obj:get_luaentity().player == "" then
obj:get_luaentity().player = player
end
@ -32,21 +32,22 @@ end
local function reloading ()
minetest.after(reload, function()
bow_idle=false
bow_idle=true
end)
end
minetest.register_tool("throwing:bow_wood", {
description = "Wood Bow",
inventory_image = "throwing_bow_wood.png",
wield_scale = {x=1, y=1, z=0.5},
stack_max = 1,
on_use = function(itemstack, user, pointed_thing)
stiffness = 15
stiffness = 13
reload = 1.1
if throwing_shoot_arrow(itemstack, user, pointed_thing) then
reloading()
if not minetest.setting_getbool("creative_mode") then
itemstack:add_wear(65535/100)
itemstack:add_wear(65535/80)
end
end
return itemstack
@ -74,14 +75,15 @@ minetest.register_craft({
minetest.register_tool("throwing:bow_steel", {
description = "Steel Bow",
inventory_image = "throwing_bow_steel.png",
wield_scale = {x=1, y=1, z=0.5},
stack_max = 1,
on_use = function(itemstack, user, pointed_thing)
stiffness = 20
reload = 1.5
stiffness = 16
reload = 1.6
if throwing_shoot_arrow(itemstack, user, pointed_thing) then
reloading()
if not minetest.setting_getbool("creative_mode") then
itemstack:add_wear(65535/200)
itemstack:add_wear(65535/400)
end
end
return itemstack
@ -109,14 +111,15 @@ minetest.register_craft({
minetest.register_tool("throwing:bow_composite", {
description = "Composite Bow",
inventory_image = "throwing_bow_composite.png",
wield_scale = {x=1, y=1, z=0.5},
stack_max = 1,
on_use = function(itemstack, user, pointed_thing)
stiffness = 25
stiffness = 16
reload = 1.3
if throwing_shoot_arrow(itemstack, user, pointed_thing) then
reloading()
if not minetest.setting_getbool("creative_mode") then
itemstack:add_wear(65535/250)
itemstack:add_wear(65535/150)
end
end
return itemstack
@ -144,10 +147,11 @@ minetest.register_craft({
minetest.register_tool("throwing:bow_gold", {
description = "Golden Bow",
inventory_image = "throwing_bow_gold.png",
wield_scale = {x=1, y=1, z=0.5},
stack_max = 1,
on_use = function(itemstack, user, pointed_thing)
stiffness = 20
reload = 1.5
stiffness = 16
reload = 1.6
if throwing_shoot_arrow(itemstack, user, pointed_thing) then
reloading()
if not minetest.setting_getbool("creative_mode") then

View File

@ -9,6 +9,7 @@ arrows = {
{"throwing:arrow_tnt", "throwing:arrow_tnt_entity"},
{"throwing:arrow_torch", "throwing:arrow_torch_entity"},
{"throwing:arrow_diamond", "throwing:arrow_diamond_entity"},
{"throwing:arrow_shell", "throwing:arrow_shell_entity"},
}
dofile(minetest.get_modpath("throwing").."/bows.lua")
@ -22,6 +23,8 @@ dofile(minetest.get_modpath("throwing").."/build_arrow.lua")
dofile(minetest.get_modpath("throwing").."/tnt_arrow.lua")
dofile(minetest.get_modpath("throwing").."/torch_arrow.lua")
dofile(minetest.get_modpath("throwing").."/diamond_arrow.lua")
dofile(minetest.get_modpath("throwing").."/shell_arrow.lua")
if minetest.setting_get("log_mods") then
minetest.log("action", "throwing loaded")

117
shell_arrow.lua Normal file
View File

@ -0,0 +1,117 @@
minetest.register_craftitem("throwing:arrow_shell", {
description = "Shell arrow",
inventory_image = "throwing_arrow_shell.png",
})
minetest.register_node("throwing:arrow_shell_box", {
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
-- Shaft
{-6.5/17, -1.5/17, -1.5/17, 6.5/17, 1.5/17, 1.5/17},
--Spitze
{-4.5/17, 2.5/17, 2.5/17, -3.5/17, -2.5/17, -2.5/17},
{-8.5/17, 0.5/17, 0.5/17, -6.5/17, -0.5/17, -0.5/17},
--Federn
{6.5/17, 1.5/17, 1.5/17, 7.5/17, 2.5/17, 2.5/17},
{7.5/17, -2.5/17, 2.5/17, 6.5/17, -1.5/17, 1.5/17},
{7.5/17, 2.5/17, -2.5/17, 6.5/17, 1.5/17, -1.5/17},
{6.5/17, -1.5/17, -1.5/17, 7.5/17, -2.5/17, -2.5/17},
{7.5/17, 2.5/17, 2.5/17, 8.5/17, 3.5/17, 3.5/17},
{8.5/17, -3.5/17, 3.5/17, 7.5/17, -2.5/17, 2.5/17},
{8.5/17, 3.5/17, -3.5/17, 7.5/17, 2.5/17, -2.5/17},
{7.5/17, -2.5/17, -2.5/17, 8.5/17, -3.5/17, -3.5/17},
}
},
tiles = {"throwing_arrow_shell.png", "throwing_arrow_shell.png", "throwing_arrow_shell_back.png", "throwing_arrow_shell_front.png", "throwing_arrow_shell_2.png", "throwing_arrow_shell.png"},
groups = {not_in_creative_inventory=1},
})
local THROWING_ARROW_ENTITY={
physical = false,
timer=0,
visual = "wielditem",
visual_size = {x=0.1, y=0.1},
textures = {"throwing:arrow_shell_box"},
lastpos={},
collisionbox = {0,0,0,0,0,0},
}
local radius = 1
local function add_effects(pos, radius)
minetest.add_particlespawner({
amount = 8,
time = 0.5,
minpos = vector.subtract(pos, radius / 2),
maxpos = vector.add(pos, radius / 2),
minvel = {x=-10, y=-10, z=-10},
maxvel = {x=10, y=10, z=10},
minacc = vector.new(),
maxacc = vector.new(),
minexptime = 0.5,
maxexptime = 1,
minsize = 0.5,
maxsize = 1,
texture = "tnt_smoke.png",
})
end
local function boom(pos)
minetest.sound_play("shell_explode", {pos=pos, gain=1.5, max_hear_distance=2*64})
minetest.set_node(pos, {name="tnt:boom"})
minetest.get_node_timer(pos):start(0.1)
add_effects(pos, radius)
end
-- Back to the arrow
THROWING_ARROW_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local node = minetest.get_node(pos)
if self.timer>0.2 then
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "throwing:arrow_shell_entity" and obj:get_luaentity().name ~= "__builtin:item" then
local damage = 16
obj:punch(self.object, 1.0, {
full_punch_interval=1.0,
damage_groups={fleshy=damage},
}, nil)
self.object:remove()
boom(pos)
end
end
end
end
if self.lastpos.x~=nil then
if node.name ~= "air" then
self.object:remove()
boom(self.lastpos)
end
end
self.lastpos={x=pos.x, y=pos.y, z=pos.z}
end
minetest.register_entity("throwing:arrow_shell_entity", THROWING_ARROW_ENTITY)
minetest.register_craft({
output = 'throwing:arrow_shell 8',
recipe = {
{'default:stick', 'tnt:gunpowder', 'default:bronze_ingot'},
}
})
minetest.register_craft({
output = 'throwing:arrow_shell 8',
recipe = {
{'default:bronze_ingot', 'tnt:gunpowder', 'default:stick'},
}
})

BIN
sounds/shell_explode.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 594 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 507 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 574 B

After

Width:  |  Height:  |  Size: 576 B

View File

@ -274,13 +274,13 @@ minetest.register_entity("throwing:arrow_tnt_entity", THROWING_ARROW_ENTITY)
minetest.register_craft({
output = 'throwing:arrow_tnt',
recipe = {
{'default:stick', 'default:stick', 'tnt:tnt'},
{'default:stick', 'tnt:tnt', 'default:bronze_ingot'},
}
})
minetest.register_craft({
output = 'throwing:arrow_tnt',
recipe = {
{'tnt:tnt', 'default:stick', 'default:stick'},
{'default:bronze_ingot', 'tnt:tnt', 'default:stick'},
}
})