From dcf9f5c5c5ad7bea262fc2104ac191985ebac8e4 Mon Sep 17 00:00:00 2001 From: Zughy <4279489-marco_a@users.noreply.gitlab.com> Date: Fri, 14 Aug 2020 13:21:16 +0200 Subject: [PATCH] Modello granata --- _weapons/grenade.lua | 15 +- _weapons/throwables.lua | 9 +- models/quake_grenade.obj | 263 ++++++++++++++++++++++++++++++++ textures/quake_grenade.png | Bin 0 -> 367 bytes textures/quake_grenade_icon.png | Bin 0 -> 184 bytes 5 files changed, 274 insertions(+), 13 deletions(-) create mode 100644 models/quake_grenade.obj create mode 100644 textures/quake_grenade.png create mode 100644 textures/quake_grenade_icon.png diff --git a/_weapons/grenade.lua b/_weapons/grenade.lua index 4932f30..0d0b5bd 100644 --- a/_weapons/grenade.lua +++ b/_weapons/grenade.lua @@ -1,10 +1,9 @@ quake.register_grenade("quake:grenade", { description = "grenade", - --mesh = "quake_railgun.obj", - --tiles = {"quake_railgun.png"}, + mesh = "quake_grenade.obj", + tiles = {"quake_grenade.png"}, wield_scale = {x=1.5, y=1.5, z=1.5}, - inventory_image = "quake_railgun.png", - wield_image = "quake_railgun.png", + inventory_image = "quake_grenade_icon.png", entity = { throw_speed = 17, @@ -13,10 +12,10 @@ quake.register_grenade("quake:grenade", { collide_with_objects = true, visual = "mesh", --wield_item = "quake:grenade", - visual_size = {x=1, y=1, z=1}, - mesh = "quake_rocket.obj", + visual_size = {x=5, y=5, z=5}, + mesh = "quake_grenade.obj", explosion_texture = "quake_rocket_particle.png", - textures = {"quake_bullet_rocket.png"}, + textures = {"quake_grenade.png"}, collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3}, explosion_range = 4, duration = 1.5, @@ -25,7 +24,7 @@ quake.register_grenade("quake:grenade", { particle = { image = "quake_bullet_rocket.png", life = 1, - size = 4, + size = 1, glow = 0, interval = 5, }, diff --git a/_weapons/throwables.lua b/_weapons/throwables.lua index 933c516..4faf346 100644 --- a/_weapons/throwables.lua +++ b/_weapons/throwables.lua @@ -3,14 +3,13 @@ function quake.register_grenade(name, def) if not def.entity.throw_speed then return end - minetest.register_tool(name, { + minetest.register_node(name, { description = def.description, - --drawtype = "mesh", - --mesh = def.mesh, - --tiles = def.tiles, + drawtype = "mesh", + mesh = def.mesh, + tiles = def.tiles, wield_scale = def.wield_scale, inventory_image = def.inventory_image, - wield_image = def.wield_image, on_drop = function() end, on_place = function(itemstack, user, pointed_thing) grenade_throw(itemstack, user, pointed_thing) diff --git a/models/quake_grenade.obj b/models/quake_grenade.obj new file mode 100644 index 0000000..e17df8d --- /dev/null +++ b/models/quake_grenade.obj @@ -0,0 +1,263 @@ +# Blender v2.81 (sub 16) OBJ File: '' +# www.blender.org +mtllib quake_grenade.mtl +o cube +v -0.270601 0.156305 0.031250 +v -0.216475 0.125055 0.031250 +v -0.270601 0.156305 -0.031250 +v -0.216475 0.125055 -0.031250 +v -0.270633 0.156250 -0.031250 +v -0.216506 0.125000 -0.031250 +v -0.270633 0.156250 0.031250 +v -0.216506 0.125000 0.031250 +vt 0.718750 0.062500 +vt 0.718750 0.031250 +vt 0.750000 0.062500 +vt 0.750000 0.031250 +vt 0.250000 0.781250 +vt 0.250000 0.750000 +vt 0.281250 0.781250 +vt 0.281250 0.750000 +vn 0.5000 0.8660 0.0000 +vn -0.5000 -0.8660 0.0000 +usemtl m_0 +s 1 +f 1/1/1 2/2/1 3/3/1 +f 2/2/1 4/4/1 3/3/1 +f 5/5/2 6/6/2 7/7/2 +f 6/6/2 8/8/2 7/7/2 +o cube.000 +v -0.227998 0.167719 0.031250 +v -0.227945 0.167688 0.031250 +v -0.227998 0.167719 -0.156250 +v -0.227945 0.167688 -0.156250 +v -0.259248 0.113593 -0.156250 +v -0.259195 0.113562 -0.156250 +v -0.259248 0.113593 0.031250 +v -0.259195 0.113562 0.031250 +vt 0.000000 1.000000 +vt 0.000000 1.000000 +vt 0.187500 1.000000 +vt 0.187500 1.000000 +vt 0.000000 1.000000 +vt 0.000000 1.000000 +vt 0.187500 1.000000 +vt 0.187500 1.000000 +vt 0.281250 0.687500 +vt 0.281250 0.593750 +vt 0.312500 0.687500 +vt 0.312500 0.593750 +vt 0.187500 0.812500 +vt 0.187500 0.781250 +vt 0.218750 0.812500 +vt 0.218750 0.781250 +vt 0.000000 1.000000 +vt 0.000000 1.000000 +vt 0.062500 1.000000 +vt 0.062500 1.000000 +vt 0.000000 1.000000 +vt 0.000000 1.000000 +vt 0.062500 1.000000 +vt 0.062500 1.000000 +vn 0.5000 0.8660 0.0000 +vn -0.5000 -0.8660 0.0000 +vn -0.5003 -0.8659 0.0000 +vn -0.8660 0.5000 0.0000 +vn 0.8660 -0.5000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +usemtl m_0 +s 1 +f 9/9/3 10/10/3 11/11/3 +f 10/10/3 12/12/3 11/11/3 +f 13/13/4 14/14/4 15/15/5 +f 14/14/4 16/16/5 15/15/5 +f 13/17/6 15/18/6 11/19/6 +f 15/18/6 9/20/6 11/19/6 +f 16/21/7 14/22/7 10/23/7 +f 14/22/7 12/24/7 10/23/7 +f 15/25/8 16/26/8 9/27/8 +f 16/26/8 10/28/8 9/27/8 +f 11/29/9 12/30/9 13/31/9 +f 12/30/9 14/32/9 13/31/9 +o cube.001 +v -0.259195 0.113562 -0.156187 +v 0.119691 -0.105188 -0.156188 +v -0.227945 0.167688 -0.156187 +v 0.150941 -0.051062 -0.156188 +v -0.227945 0.167688 -0.156250 +v 0.150941 -0.051062 -0.156250 +v -0.259195 0.113562 -0.156250 +v 0.119691 -0.105188 -0.156250 +vt 0.250000 0.812500 +vt 0.250000 0.593750 +vt 0.281250 0.812500 +vt 0.281250 0.593750 +vt 0.250000 0.812500 +vt 0.250000 0.593750 +vt 0.281250 0.812500 +vt 0.281250 0.593750 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +usemtl m_0 +s 1 +f 17/33/10 18/34/10 19/35/10 +f 18/34/10 20/36/10 19/35/10 +f 21/37/11 22/38/11 23/39/11 +f 22/38/11 24/40/11 23/39/11 +o cube.002 +v -0.154006 0.233253 0.125000 +v -0.045753 0.170753 0.125000 +v -0.154006 0.233253 -0.125000 +v -0.045753 0.170753 -0.125000 +v -0.279006 0.016747 -0.125000 +v -0.170753 -0.045753 -0.125000 +v -0.279006 0.016747 0.125000 +v -0.170753 -0.045753 0.125000 +vt 0.000000 0.875000 +vt 0.000000 0.812500 +vt 0.125000 0.875000 +vt 0.125000 0.812500 +vt 0.000000 0.875000 +vt 0.000000 0.812500 +vt 0.125000 0.875000 +vt 0.125000 0.812500 +vt 0.000000 1.000000 +vt 0.125000 1.000000 +vt 0.250000 1.000000 +vt 0.250000 0.875000 +vt 0.375000 1.000000 +vt 0.375000 0.875000 +vt 0.250000 0.875000 +vt 0.250000 0.812500 +vt 0.250000 0.875000 +vt 0.250000 0.812500 +vn 0.5000 0.8660 0.0000 +vn -0.5000 -0.8660 -0.0000 +vn -0.8660 0.5000 0.0000 +vn 0.8660 -0.5000 -0.0000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +usemtl m_0 +s 1 +f 25/41/12 26/42/12 27/43/12 +f 26/42/12 28/44/12 27/43/12 +f 29/45/13 30/46/13 31/47/13 +f 30/46/13 32/48/13 31/47/13 +f 29/45/14 31/49/14 27/43/14 +f 31/49/14 25/50/14 27/43/14 +f 32/51/15 30/52/15 26/53/15 +f 30/52/15 28/54/15 26/53/15 +f 31/47/16 32/48/16 25/55/16 +f 32/48/16 26/56/16 25/55/16 +f 27/43/17 28/44/17 29/57/17 +f 28/44/17 30/58/17 29/57/17 +o cube.003 +v 0.387260 -0.079247 0.125000 +v 0.495513 -0.141747 0.125000 +v 0.387260 -0.079247 -0.125000 +v 0.495513 -0.141747 -0.125000 +v 0.262260 -0.295753 -0.125000 +v 0.370513 -0.358253 -0.125000 +v 0.262260 -0.295753 0.125000 +v 0.370513 -0.358253 0.125000 +vt 0.000000 0.875000 +vt 0.000000 0.812500 +vt 0.125000 0.875000 +vt 0.125000 0.812500 +vt 0.000000 0.875000 +vt 0.000000 0.812500 +vt 0.125000 0.875000 +vt 0.125000 0.812500 +vt 0.000000 1.000000 +vt 0.125000 1.000000 +vt 0.250000 1.000000 +vt 0.250000 0.875000 +vt 0.375000 1.000000 +vt 0.375000 0.875000 +vt 0.250000 0.875000 +vt 0.250000 0.812500 +vt 0.250000 0.875000 +vt 0.250000 0.812500 +vn 0.5000 0.8660 0.0000 +vn -0.5000 -0.8660 0.0000 +vn -0.8660 0.5000 0.0000 +vn 0.8660 -0.5000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +usemtl m_0 +s 1 +f 33/59/18 34/60/18 35/61/18 +f 34/60/18 36/62/18 35/61/18 +f 37/63/19 38/64/19 39/65/19 +f 38/64/19 40/66/19 39/65/19 +f 37/63/20 39/67/20 35/61/20 +f 39/67/20 33/68/20 35/61/20 +f 40/69/21 38/70/21 34/71/21 +f 38/70/21 36/72/21 34/71/21 +f 39/65/22 40/66/22 33/73/22 +f 40/66/22 34/74/22 33/73/22 +f 35/61/23 36/62/23 37/75/23 +f 36/62/23 38/76/23 37/75/23 +o cube.004 +v -0.061378 0.143690 0.093750 +v 0.371635 -0.106310 0.093750 +v -0.061378 0.143690 -0.093750 +v 0.371635 -0.106310 -0.093750 +v -0.155128 -0.018690 -0.093750 +v 0.277885 -0.268690 -0.093750 +v -0.155128 -0.018690 0.093750 +v 0.277885 -0.268690 0.093750 +vt 0.000000 0.812500 +vt 0.000000 0.562500 +vt 0.093750 0.812500 +vt 0.093750 0.562500 +vt 0.000000 0.812500 +vt 0.000000 0.562500 +vt 0.093750 0.812500 +vt 0.093750 0.562500 +vt 0.187500 0.812500 +vt 0.000000 1.000000 +vt 0.187500 1.000000 +vt 0.187500 1.000000 +vt 0.000000 1.000000 +vt 0.187500 0.812500 +vt 0.000000 0.812500 +vt 0.187500 0.812500 +vt 0.187500 0.562500 +vt 0.187500 0.812500 +vt 0.187500 0.562500 +vn 0.5000 0.8660 -0.0000 +vn -0.5000 -0.8660 0.0000 +vn -0.8660 0.5000 0.0000 +vn 0.8660 -0.5000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn -0.0000 0.0000 -1.0000 +usemtl m_0 +s 1 +f 41/77/24 42/78/24 43/79/24 +f 42/78/24 44/80/24 43/79/24 +f 45/81/25 46/82/25 47/83/25 +f 46/82/25 48/84/25 47/83/25 +f 45/81/26 47/85/26 43/86/26 +f 47/85/26 41/87/26 43/86/26 +f 48/88/27 46/89/27 42/90/27 +f 46/89/27 44/91/27 42/90/27 +f 47/83/28 48/84/28 41/92/28 +f 48/84/28 42/93/28 41/92/28 +f 43/79/29 44/80/29 45/94/29 +f 44/80/29 46/95/29 45/94/29 +o cube.005 +v -0.317558 0.075089 0.000024 +v -0.255418 0.039213 0.173251 +v -0.223808 0.237469 0.000024 +v -0.161668 0.201592 0.173251 +vt 0.281250 0.500000 +vt 0.281250 0.593750 +vt 0.187500 0.500000 +vt 0.187500 0.593750 +vn -0.8001 0.4619 0.3827 +usemtl m_0 +s 1 +f 49/96/30 50/97/30 51/98/30 +f 50/97/30 52/99/30 51/98/30 diff --git a/textures/quake_grenade.png b/textures/quake_grenade.png new file mode 100644 index 0000000000000000000000000000000000000000..085ae082453b54eb4c7d9c2f48d09dadf21995f6 GIT binary patch literal 367 zcmV-#0g(QQP)5a4L_R*hc~~$kE-W}hIWbE|Ej(T}LpeuyRzPGtSyrh# zJ2`tqjz^3+c&O$`E`o5B&0v#psxAE}*L(hw%EUT({ z9)_kViXpD&2*l~`}#Mm@hg%5}r49oH3Y9Igr N002ovPDHLkV1i5Km$3i< literal 0 HcmV?d00001 diff --git a/textures/quake_grenade_icon.png b/textures/quake_grenade_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4090201038618e5da0fa11af30b5869f2aa55190 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^`0({Ar-fh6BHOFUcC6rp2$|j z;PLopvh{%(I?fKW#C+ZVm28T#tl8pGj#c&IupAOOy_# ibGXiI%Q^dmfnk5zWrgd}xyOJ`VeoYIb6Mw<&;$UeZAB6Q literal 0 HcmV?d00001