diff --git a/crafts.lua b/crafts.lua index a7c2b0a..3260399 100644 --- a/crafts.lua +++ b/crafts.lua @@ -32,7 +32,7 @@ elseif minetest.get_modpath("luxury_decor") then recipe = {"luxury_decor:wolfram_wire_reel", "luxury_decor:plastic_sheet", "dye:red"} }) else - error("From 'turret' mod: No one required dependency is avaialble!") + error("No one required dependency is avaialble! Please, enable \'basic_materials\' or \'luxury_decor\' to use this mod!") end minetest.register_craft({ diff --git a/functions.lua b/functions.lua index 3e95a10..e5dc3a8 100644 --- a/functions.lua +++ b/functions.lua @@ -146,8 +146,10 @@ turret.direct_ray_to_entity = function(pos) local new_ray_dir if ang < math.rad(ANGLE_SPEED_DIRECT) then - new_ray_dir = vector.rotate_around_axis(cur_ray_dir, pivot_vec, ang) + new_ray_dir = vector.normalize(rel_tpos) minetest.debug("ang: " .. ang) + minetest.debug("tpos_dir: " .. minetest.pos_to_string(vector.normalize(rel_tpos))) + minetest.debug("new_ray_dir: " .. minetest.pos_to_string(new_ray_dir)) minetest.debug("ANGLE: " .. vector.angle(rel_tpos, new_ray_dir)) else @@ -191,9 +193,9 @@ turret.shoot = function(pos) local vel = vector.multiply(ray_dir, 10) local offset_horiz = {-0.2, 0.2} - local offset_vert = {-0.1, 0, 0.1} + local offset_vert = {-0.1, 0, 0.4} - local rand_offset = {x=offset_horiz[math.random(1, 2)], y=offset_vert[math.random(1, 2)]+0.175, z=0.1} + local rand_offset = {x=offset_horiz[math.random(1, 2)], y=offset_vert[math.random(1, 2)]+0.175, z=0} local yaw = vector.angle({x=0, y=0, z=1}, turret.get_turret_unitdir(pos)) local res_pos = vector.add(pos, vector.rotate(rand_offset, {x=0, y=yaw, z=0})) diff --git a/models/fiery_dart.b3d b/models/fiery_dart.b3d index 1515410..3c8b00e 100644 Binary files a/models/fiery_dart.b3d and b/models/fiery_dart.b3d differ diff --git a/models/fiery_dart.blend b/models/fiery_dart.blend index 23e3c2b..8763a35 100644 Binary files a/models/fiery_dart.blend and b/models/fiery_dart.blend differ diff --git a/models/fiery_dart.blend1 b/models/fiery_dart.blend1 index 0c2f1d8..31bc24c 100644 Binary files a/models/fiery_dart.blend1 and b/models/fiery_dart.blend1 differ diff --git a/register.lua b/register.lua index e091e14..2d52c47 100644 --- a/register.lua +++ b/register.lua @@ -12,7 +12,7 @@ minetest.register_entity("turret:ray", { minetest.register_entity("turret:fiery_dart", { visual = "mesh", - visual_size = {x=25, y=25, z=25}, + visual_size = {x=5, y=5, z=20}, physical = true, pointable = false, mesh = "fiery_dart.b3d", @@ -40,7 +40,7 @@ minetest.register_node("turret:turret_off", { description = "Turret", drawtype = "mesh", mesh = "turret2.b3d", - tiles = {"turret.png"}, + tiles = {"turret_turret.png"}, paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, @@ -81,7 +81,7 @@ minetest.register_node("turret:turret_on", { description = "Turret", drawtype = "mesh", mesh = "turret_unfold2.b3d", - tiles = {"turret.png"}, + tiles = {"turret_turret.png"}, paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, @@ -126,5 +126,5 @@ minetest.register_craftitem("turret:turret_eye", { minetest.register_craftitem("turret:red_led", { description = "Red LED", - inventory_image = "red_led.png" + inventory_image = "turret_red_led.png" }) diff --git a/textures/red_led.png b/textures/turret_red_led.png similarity index 100% rename from textures/red_led.png rename to textures/turret_red_led.png diff --git a/textures/turret.png b/textures/turret_turret.png similarity index 100% rename from textures/turret.png rename to textures/turret_turret.png diff --git a/textures/turret_64x64.png b/textures/turret_turret_64x64.png similarity index 100% rename from textures/turret_64x64.png rename to textures/turret_turret_64x64.png