diff --git a/blocks/antigun_block.lua b/blocks/antigun_block.lua index 55b5746..a9f0c7e 100644 --- a/blocks/antigun_block.lua +++ b/blocks/antigun_block.lua @@ -1,6 +1,9 @@ +local modpath = minetest.get_modpath(minetest.get_current_modname()) +local colors = dofile(modpath.."/colors.lua") + minetest.register_node("rangedweapons:antigun_block", { - description = "" ..core.colorize("#35cdff","Anti-gun block\n")..core.colorize("#FFFFFF", "Prevents people from using guns, in 10 node radius to each side from this block"), - tiles = {"textures/blocks/antigun_block.png"}, + description = core.colorize(colors["title_color"], "Anti-gun block\n") .. core.colorize(colors.white, "Prevents people from using guns, in 10 node radius to each side from this block"), + tiles = {"rangedweapons_antigun_block.png"}, groups = {choppy = 3, oddly_breakable_by_hand = 3}, sounds = default.node_sound_wood_defaults(), }) diff --git a/colors.lua b/colors.lua index b8495af..f077938 100644 --- a/colors.lua +++ b/colors.lua @@ -1,6 +1,8 @@ -local color = {} - -color.white = "#FFFFFF" +local color = { + white = "#ffffff", + turquoise = "#35cdff" +} +color.title_color = color["turquoise"] return color diff --git a/cooldown_stuff.lua b/cooldown_stuff.lua index 2d6dcd6..a7befcc 100644 --- a/cooldown_stuff.lua +++ b/cooldown_stuff.lua @@ -1,12 +1,7 @@ minetest.register_globalstep(function(dtime, player) for _, player in pairs(minetest.get_connected_players()) do - - - - - local w_item = player:get_wielded_item() - +local w_item = player:get_wielded_item() local controls = player:get_player_control() if w_item:get_definition().weapon_zoom ~= nil then @@ -33,7 +28,7 @@ player:hud_change(scope_hud, "text", "rangedweapons_empty_icon.png") if player:get_properties().zoom_fov ~= new_zoom_fov then player:set_properties({zoom_fov = new_zoom_fov}) end - else + else new_zoom_fov = 0 if player:get_properties().zoom_fov ~= new_zoom_fov then player:set_properties({zoom_fov = new_zoom_fov}) @@ -53,9 +48,9 @@ end local itemstack = player:get_wielded_item() if controls.LMB then -if player:get_wielded_item():get_definition().RW_gun_capabilities then +if player:get_wielded_item():get_definition().rw_gun_data then if -player:get_wielded_item():get_definition().RW_gun_capabilities.automatic_gun and player:get_wielded_item():get_definition().RW_gun_capabilities.automatic_gun > 0 then +player:get_wielded_item():get_definition().rw_gun_data.automatic_gun and player:get_wielded_item():get_definition().rw_gun_data.automatic_gun > 0 then rangedweapons_shoot_gun(itemstack, player) player:set_wielded_item(itemstack) @@ -83,7 +78,7 @@ minetest.sound_play(itemstack:get_definition().loaded_sound, {player}) end itemstack:set_name(player:get_wielded_item():get_definition().loaded_gun) player:set_wielded_item(itemstack) -end +end if player:get_wielded_item():get_definition().rw_next_reload ~= nil then local itemstack = player:get_wielded_item() diff --git a/init.lua b/init.lua index 96be539..1184f8f 100644 --- a/init.lua +++ b/init.lua @@ -906,51 +906,53 @@ minetest.register_abm( } ) -minetest.register_on_joinplayer( - function(player) - player:hud_add({ - hud_elem_type = "text", - name = "gunammo", - text = "", - number = 0xFFFFFF, - scale = {x = 100, y = 20}, - position = {x = 0.7, y = 0.1}, - offset = {x = 30, y = 100}, - alignment = {x = 0, y = -1} - }) - player:hud_add({ - hud_elem_type = "image", - text = "rangedweapons_empty_icon.png", - scale = {x = 2, y = 2}, - position = {x = 0.7, y = 0.065}, - offset = {x = 30, y = 100}, - alignment = {x = 0, y = -1} - }) - player:hud_add({ - hud_elem_type = "image", - text = "rangedweapons_empty_icon.png", - scale = {x = 1.5, y = 1.5}, - position = {x = 0.725, y = 0.1}, - offset = {x = 30, y = 100}, - alignment = {x = 0, y = -1} - }) - player:hud_add({ - hud_elem_type = "image", - text = "rangedweapons_empty_icon.png", - scale = {x = 2, y = 2}, - position = {x = 0.5, y = 0.5}, - offset = {x = 0, y = 0}, - alignment = {x = 0, y = 0} - }) - player:hud_add({ - hud_elem_type = "image", - position = {x = 0.5, y = 0.5}, - scale = {x = -100, y = -100}, - text = "rangedweapons_empty_icon.png" - } - ) - end -) +minetest.register_on_joinplayer(function(player) + gunammo = + player:hud_add({ + hud_elem_type = "text", + name = "gunammo", + text = "", + number = 0xFFFFFF, + scale = {x = 100, y = 20}, + position = {x = 0.7, y = 0.1}, + offset = {x = 30, y = 100}, + alignment = {x = 0, y = -1} + }) + gunimg = + player:hud_add({ + hud_elem_type = "image", + text = "rangedweapons_empty_icon.png", + scale = {x = 2, y = 2}, + position = {x = 0.7, y = 0.065}, + offset = {x = 30, y = 100}, + alignment = {x = 0, y = -1} + }) + ammoimg = + player:hud_add({ + hud_elem_type = "image", + text = "rangedweapons_empty_icon.png", + scale = {x = 1.5, y = 1.5}, + position = {x = 0.725, y = 0.1}, + offset = {x = 30, y = 100}, + alignment = {x = 0, y = -1} + }) + hit = + player:hud_add({ + hud_elem_type = "image", + text = "rangedweapons_empty_icon.png", + scale = {x = 2, y = 2}, + position = {x = 0.5, y = 0.5}, + offset = {x = 0, y = 0}, + alignment = {x = 0, y = 0} + }) +scope_hud = + player:hud_add({ + hud_elem_type = "image", + position = { x=0.5, y=0.5 }, + scale = { x=-100, y=-100 }, + text = "rangedweapons_empty_icon.png", + }) +end) local timer = 0 minetest.register_globalstep( diff --git a/textures/weapons/handgun/glock17/rangedweapons_glock17.png b/textures/rangedweapons_glock17.png similarity index 100% rename from textures/weapons/handgun/glock17/rangedweapons_glock17.png rename to textures/rangedweapons_glock17.png diff --git a/weapons/handgun/glock17.lua b/weapons/handgun/glock17.lua index 44ac2ec..c3422f7 100644 --- a/weapons/handgun/glock17.lua +++ b/weapons/handgun/glock17.lua @@ -49,7 +49,7 @@ minetest.register_tool("rangedweapons:glock17_r", { load_sound = "rangedweapons_handgun_mag_in", range = 0, groups = {not_in_creative_inventory = 1}, - inventory_image = "rangedweapons_glock17.png", + inventory_image = glock_data["texture"]["default"], }) minetest.register_tool("rangedweapons:glock17_rr", { @@ -60,7 +60,7 @@ minetest.register_tool("rangedweapons:glock17_rr", { load_sound = "rangedweapons_reload_a", range = 0, groups = {not_in_creative_inventory = 1}, - inventory_image = "rangedweapons_glock17.png", + inventory_image = glock_data["texture"]["default"], }) minetest.register_tool("rangedweapons:glock17_rrr", { @@ -71,7 +71,7 @@ minetest.register_tool("rangedweapons:glock17_rrr", { load_sound = "rangedweapons_reload_b", range = 0, groups = {not_in_creative_inventory = 1}, - inventory_image = "rangedweapons_glock17_rld.png", + inventory_image = glock_data["texture"]["reload"], }) @@ -82,27 +82,7 @@ minetest.register_tool("rangedweapons:glock17", { wield_scale = {x=1.2,y=1.2,z=1.2}, range = 0, inventory_image = glock_data["texture"]["default"], - rw_gun_data = { - gun_damage = {fleshy=5,knockback=4}, - gun_crit = 15, - gun_critEffc = 2.2, - suitable_ammo = {{"rangedweapons:9mm",17},{"rangedweapons:10mm",17},{"rangedweapons:45acp",17}}, - gun_skill = {"handgun_skill",45}, - gun_magazine = "rangedweapons:handgun_mag_black", - gun_icon = "rangedweapons_glock17_icon.png", - gun_unloaded = "rangedweapons:glock17_r", - gun_cooling = "rangedweapons:glock17_rld", - gun_velocity = 30, - gun_accuracy = 96, - gun_cooldown = 0.35, - gun_reload = 0.9/4, - gun_projectiles = 1, - has_shell = 1, - gun_durability = 1400, - gun_smokeSize = 5, - gun_unload_sound = "rangedweapons_handgun_mag_out", - gun_sound = "rangedweapons_glock", - }, + rw_gun_data = glock_data, on_secondary_use = function(itemstack, user, pointed_thing) rangedweapons_reload_gun(itemstack, user) return itemstack diff --git a/weapons/handgun/glock19.lua b/weapons/handgun/glock19.lua deleted file mode 100644 index 0998870..0000000 --- a/weapons/handgun/glock19.lua +++ /dev/null @@ -1,83 +0,0 @@ -minetest.register_tool("rangedweapons:glock19_rld", { - stack_max= 1, - wield_scale = {x=1.1,y=1.1,z=1.05}, - description = "", - loaded_gun = "rangedweapons:glock19", - range = 0, - groups = {not_in_creative_inventory = 1}, - inventory_image = "rangedweapons_glock17_rld.png", -}) - - -minetest.register_tool("rangedweapons:glock19_r", { - stack_max= 1, - wield_scale = {x=1.2,y=1.2,z=1.2}, - description = "", - rw_next_reload = "rangedweapons:glock19_rr", - load_sound = "rangedweapons_handgun_mag_in", - range = 0, - groups = {not_in_creative_inventory = 1}, - inventory_image = "rangedweapons_glock17.png", -}) - -minetest.register_tool("rangedweapons:glock19_rr", { - stack_max= 1, - wield_scale = {x=1.2,y=1.2,z=1.2}, - description = "", - rw_next_reload = "rangedweapons:glock19_rrr", - load_sound = "rangedweapons_reload_a", - range = 0, - groups = {not_in_creative_inventory = 1}, - inventory_image = "rangedweapons_glock17.png", -}) - -minetest.register_tool("rangedweapons:glock19_rrr", { - stack_max= 1, - wield_scale = {x=1.2,y=1.2,z=1.2}, - description = "", - rw_next_reload = "rangedweapons:glock19", - load_sound = "rangedweapons_reload_b", - range = 0, - groups = {not_in_creative_inventory = 1}, - inventory_image = "rangedweapons_glock17_rld.png", -}) - - - - -minetest.register_tool("rangedweapons:glock19", { - description = "" ..core.colorize("#35cdff","Glock 19\n") ..core.colorize("#FFFFFF", "Gun damage: 5\n") ..core.colorize("#FFFFFF", "Accuracy: 96%\n") ..core.colorize("#FFFFFF", "Gun knockback: 4\n") ..core.colorize("#FFFFFF", "Gun Critical chance: 15%\n") ..core.colorize("#FFFFFF", "Gun Critical efficiency: 2.2x\n") ..core.colorize("#FFFFFF", "Reload delay: 0.9\n")..core.colorize("#FFFFFF", "Clip size: 17/17/17\n") ..core.colorize("#FFFFFF", "Ammunition: 9x19mm Parabellum/10mm Auto/.45acp\n") ..core.colorize("#FFFFFF", "Rate of fire: 0.35\n") ..core.colorize("#FFFFFF", "Gun type: Handgun\n") ..core.colorize("#FFFFFF", "Bullet velocity: 30"), - wield_scale = {x=1.2,y=1.2,z=1.2}, - range = 0, - inventory_image = "rangedweapons_glock17.png", -RW_gun_capabilities = { - gun_damage = {fleshy=5,knockback=4}, - gun_crit = 15, - gun_critEffc = 2.2, - suitable_ammo = {{"rangedweapons:9mm",17},{"rangedweapons:10mm",17},{"rangedweapons:45acp",17}}, - gun_skill = {"handgun_skill",45}, - gun_magazine = "rangedweapons:handgun_mag_black", - gun_icon = "rangedweapons_glock17_icon.png", - gun_unloaded = "rangedweapons:glock19_r", - gun_cooling = "rangedweapons:glock19_rld", - gun_velocity = 30, - gun_accuracy = 96, - gun_cooldown = 0.35, - gun_reload = 0.9/4, - gun_projectiles = 1, - has_shell = 1, - gun_durability = 1400, - gun_smokeSize = 5, - gun_unload_sound = "rangedweapons_handgun_mag_out", - gun_sound = "rangedweapons_glock", - }, - on_secondary_use = function(itemstack, user, pointed_thing) -rangedweapons_reload_gun(itemstack, user) -return itemstack -end, - on_use = function(itemstack, user, pointed_thing) -rangedweapons_shoot_gun(itemstack, user) -return itemstack - end, -}) -