diff --git a/aa12.lua b/aa12.lua index e32f77a..610c979 100644 --- a/aa12.lua +++ b/aa12.lua @@ -46,7 +46,6 @@ minetest.register_tool("rangedweapons:aa12_rrr", { suitable_ammo = {{"rangedweapons:shell",20}}, gun_skill = {"shotgun_skill",40}, gun_magazine = "rangedweapons:drum_mag", - gun_icon = "rangedweapons_aa12_icon.png", gun_unloaded = "rangedweapons:aa12_r", gun_velocity = 25, gun_accuracy = 40, diff --git a/ak47.lua b/ak47.lua index d7ba109..011b558 100644 --- a/ak47.lua +++ b/ak47.lua @@ -49,7 +49,6 @@ minetest.register_tool("rangedweapons:ak47_rrr", { suitable_ammo = {{"rangedweapons:762mm",30}}, gun_skill = {"arifle_skill",50}, gun_magazine = "rangedweapons:assaultrifle_mag", - gun_icon = "rangedweapons_ak47_icon.png", gun_unloaded = "rangedweapons:ak47_r", gun_velocity = 40, gun_accuracy = 77, diff --git a/awp.lua b/awp.lua index d35d548..d10ad69 100644 --- a/awp.lua +++ b/awp.lua @@ -72,7 +72,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:762mm",10},{"rangedweapons:308winchester",10}}, gun_skill = {"rifle_skill",20}, gun_magazine = "rangedweapons:rifle_mag", - gun_icon = "rangedweapons_awp_icon.png", gun_unloaded = "rangedweapons:awp_r", gun_cooling = "rangedweapons:awp_uld", gun_velocity = 75, diff --git a/benelli.lua b/benelli.lua index 7a6c73c..309e7e4 100644 --- a/benelli.lua +++ b/benelli.lua @@ -20,7 +20,6 @@ RW_gun_capabilities = { gun_critEffc = 2.0, suitable_ammo = {{"rangedweapons:shell",7}}, gun_skill = {"shotgun_skill",20}, - gun_icon = "rangedweapons_benelli_icon.png", gun_unloaded = "rangedweapons:benelli_rld", gun_cooling = "rangedweapons:benelli_uld", gun_velocity = 25, diff --git a/beretta.lua b/beretta.lua index a0d1f87..d998cee 100644 --- a/beretta.lua +++ b/beretta.lua @@ -32,7 +32,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:9mm",15}}, gun_skill = {"handgun_skill",43}, gun_magazine = "rangedweapons:handgun_mag_black", - gun_icon = "rangedweapons_beretta_icon.png", gun_unloaded = "rangedweapons:beretta_r", gun_cooling = "rangedweapons:beretta_rld", gun_velocity = 25, diff --git a/deagle.lua b/deagle.lua index 82ddec2..1243b9c 100644 --- a/deagle.lua +++ b/deagle.lua @@ -34,7 +34,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:357",9},{"rangedweapons:44",8},{"rangedweapons:50ae",7}}, gun_skill = {"revolver_skill",40}, gun_magazine = "rangedweapons:handgun_mag_white", - gun_icon = "rangedweapons_deagle_icon.png", gun_unloaded = "rangedweapons:deagle_r", gun_cooling = "rangedweapons:deagle_rld", gun_velocity = 50, @@ -93,7 +92,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:357",9},{"rangedweapons:44",8},{"rangedweapons:50ae",7}}, gun_skill = {"revolver_skill",38}, gun_magazine = "rangedweapons:handgun_mag_white", - gun_icon = "rangedweapons_golden_deagle_icon.png", gun_unloaded = "rangedweapons:golden_deagle_r", gun_cooling = "rangedweapons:golden_deagle_rld", gun_velocity = 50, diff --git a/depends.txt b/depends.txt deleted file mode 100644 index e1310e1..0000000 --- a/depends.txt +++ /dev/null @@ -1,10 +0,0 @@ -default -tnt -doors? -xpanes? -vessels? -moreores? -3d_armor? - - - diff --git a/g36.lua b/g36.lua index 58643b1..2f1e77c 100644 --- a/g36.lua +++ b/g36.lua @@ -49,7 +49,6 @@ minetest.register_tool("rangedweapons:g36_rrr", { suitable_ammo = {{"rangedweapons:556mm",30}}, gun_skill = {"arifle_skill",55}, gun_magazine = "rangedweapons:assaultrifle_mag", - gun_icon = "rangedweapons_g36_icon.png", gun_unloaded = "rangedweapons:g36_r", gun_velocity = 40, gun_accuracy = 80, diff --git a/glock17.lua b/glock17.lua index 02140a3..91c9983 100644 --- a/glock17.lua +++ b/glock17.lua @@ -59,7 +59,6 @@ RW_gun_capabilities = { 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, diff --git a/init.lua b/init.lua index 74bc192..6181235 100644 --- a/init.lua +++ b/init.lua @@ -22,6 +22,11 @@ minetest.register_node("rangedweapons:antigun_block", { ---- gun_funcs ---- +local function update_ammo_counter_on_gun(gunMeta) + gunMeta:set_string("count_meta", tostring(gunMeta:get_int("RW_bullets"))) +end + + make_sparks = function(pos) minetest.sound_play("rengedweapons_ricochet", {pos = pos, gain = 0.75}) for i=1,9 do @@ -104,20 +109,6 @@ end end end if player_has_ammo == 1 then -local gun_icon = "rangedweapons_emergency_gun_icon.png" - -if GunCaps.gun_icon ~= nil then -gun_icon = GunCaps.gun_icon -end - -local ammo_icon = "rangedweapons_emergency_ammo_icon.png" - -if reload_ammo:get_definition().inventory_image ~= nil then -ammo_icon = reload_ammo:get_definition().inventory_image -end - - player:hud_change(gunimg, "text", gun_icon) - player:hud_change(ammoimg, "text", ammo_icon) local gunMeta = itemstack:get_meta() local ammoCount = gunMeta:get_int("RW_bullets") @@ -140,7 +131,7 @@ end gunMeta:set_string("RW_ammo_name",reload_ammo:get_name()) -player:hud_change(gunammo, "text", gunMeta:get_int("RW_bullets")) +update_ammo_counter_on_gun(gunMeta) if GunCaps.gun_magazine ~= nil then local pos = player:get_pos() @@ -213,20 +204,6 @@ end end end if player_has_ammo == 1 then -local gun_icon = "rangedweapons_emergency_gun_icon.png" - -if GunCaps.gun_icon ~= nil then -gun_icon = GunCaps.gun_icon -end - -local ammo_icon = "rangedweapons_emergency_ammo_icon.png" - -if reload_ammo:get_definition().inventory_image ~= nil then -ammo_icon = reload_ammo:get_definition().inventory_image -end - - player:hud_change(gunimg, "text", gun_icon) - player:hud_change(ammoimg, "text", ammo_icon) local gunMeta = itemstack:get_meta() local ammoCount = gunMeta:get_int("RW_bullets") @@ -248,7 +225,7 @@ end gunMeta:set_string("RW_ammo_name",reload_ammo:get_name()) -player:hud_change(gunammo, "text", gunMeta:get_int("RW_bullets")) +update_ammo_counter_on_gun(gunMeta) if GunCaps.gun_unloaded ~= nil then itemstack:set_name(GunCaps.gun_unloaded) @@ -385,13 +362,7 @@ if math.random(1,100) > gun_ammo_save then gunMeta:set_int("RW_bullets",gunMeta:get_int("RW_bullets")-1) end -player:hud_change(gunammo, "text", gunMeta:get_int("RW_bullets")) - -local gun_icon = "rangedweapons_emergency_gun_icon.png" -if GunCaps.gun_icon ~= nil then -gun_icon = GunCaps.gun_icon -end - player:hud_change(gunimg, "text", gun_icon) +update_ammo_counter_on_gun(gunMeta) local OnCollision = function() end @@ -474,12 +445,6 @@ if gun_skillChance > 0 and gun_skill ~= "" then rangedweapons_gain_skill(player,gun_skill,gun_skillChance) end -local ammo_icon = "rangedweapons_emergency_ammo_icon.png" -if bulletStack:get_definition().inventory_image ~= nil then -ammo_icon = bulletStack:get_definition().inventory_image -end -player:hud_change(ammoimg, "text", ammo_icon) - if AmmoCaps ~= nil then OnCollision = AmmoCaps.OnCollision or function()end @@ -925,35 +890,6 @@ minetest.register_abm({ }) 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", diff --git a/jackhammer.lua b/jackhammer.lua index bcd1ced..dc8572f 100644 --- a/jackhammer.lua +++ b/jackhammer.lua @@ -46,7 +46,6 @@ minetest.register_tool("rangedweapons:jackhammer_rrr", { suitable_ammo = {{"rangedweapons:shell",10}}, gun_skill = {"shotgun_skill",35}, gun_magazine = "rangedweapons:drum_mag", - gun_icon = "rangedweapons_jackhammer_icon.png", gun_unloaded = "rangedweapons:jackhammer_r", gun_velocity = 30, gun_accuracy = 35, diff --git a/kriss_sv.lua b/kriss_sv.lua index eba47b3..98c38ca 100644 --- a/kriss_sv.lua +++ b/kriss_sv.lua @@ -47,7 +47,6 @@ minetest.register_tool("rangedweapons:kriss_sv_rrr", { suitable_ammo = {{"rangedweapons:9mm",33},{"rangedweapons:10mm",33},{"rangedweapons:45acp",13}}, gun_skill = {"mp_skill",90}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_kriss_sv_icon.png", gun_unloaded = "rangedweapons:kriss_sv_r", gun_velocity = 20, gun_accuracy = 60, diff --git a/luger.lua b/luger.lua index 24ee421..2711aa2 100644 --- a/luger.lua +++ b/luger.lua @@ -52,7 +52,6 @@ minetest.register_tool("rangedweapons:luger", { suitable_ammo = {{"rangedweapons:9mm",8}}, gun_skill = {"handgun_skill",40}, gun_magazine = "rangedweapons:handgun_mag_black", - gun_icon = "rangedweapons_luger_icon.png", gun_unloaded = "rangedweapons:luger_r", gun_cooling = "rangedweapons:luger_rld", gun_velocity = 20, diff --git a/m16.lua b/m16.lua index 08b1473..858b62f 100644 --- a/m16.lua +++ b/m16.lua @@ -49,7 +49,6 @@ minetest.register_tool("rangedweapons:m16_rrr", { suitable_ammo = {{"rangedweapons:556mm",20}}, gun_skill = {"arifle_skill",55}, gun_magazine = "rangedweapons:assaultrifle_mag", - gun_icon = "rangedweapons_m16_icon.png", gun_unloaded = "rangedweapons:m16_r", gun_velocity = 35, gun_accuracy = 75, diff --git a/m1991.lua b/m1991.lua index 58c06c6..68c537d 100644 --- a/m1991.lua +++ b/m1991.lua @@ -52,7 +52,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:45acp",8}}, gun_skill = {"handgun_skill",40}, gun_magazine = "rangedweapons:handgun_mag_black", - gun_icon = "rangedweapons_m1991_icon.png", gun_unloaded = "rangedweapons:m1991_r", gun_cooling = "rangedweapons:m1991_rld", gun_velocity = 25, diff --git a/m200.lua b/m200.lua index f910a16..8bb39ef 100644 --- a/m200.lua +++ b/m200.lua @@ -72,7 +72,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:408cheytac",7}}, gun_skill = {"rifle_skill",12}, gun_magazine = "rangedweapons:rifle_mag", - gun_icon = "rangedweapons_m200_icon.png", gun_unloaded = "rangedweapons:m200_r", gun_cooling = "rangedweapons:m200_uld", gun_velocity = 80, diff --git a/m60.lua b/m60.lua index 130761f..2fb8751 100644 --- a/m60.lua +++ b/m60.lua @@ -24,7 +24,6 @@ minetest.register_tool("rangedweapons:m60_r", { gun_critEffc = 3.0, suitable_ammo = {{"rangedweapons:762mm",100}}, gun_skill = {"heavy_skill",60}, - gun_icon = "rangedweapons_m60_icon.png", gun_unloaded = "rangedweapons:m60_r", gun_velocity = 64, gun_accuracy = 65, diff --git a/m79.lua b/m79.lua index 3b1ca07..6e6c751 100644 --- a/m79.lua +++ b/m79.lua @@ -22,7 +22,6 @@ minetest.register_tool("rangedweapons:m79", { suitable_ammo = {{"rangedweapons:40mm",1}}, gun_skill = {"",1}, gun_magazine = "rangedweapons:shell_grenadedrop", - gun_icon = "rangedweapons_m79_icon.png", gun_unloaded = "rangedweapons:m79_r", gun_cooling = "rangedweapons:m79", gun_velocity = 20, diff --git a/makarov.lua b/makarov.lua index 52495f3..40cad07 100644 --- a/makarov.lua +++ b/makarov.lua @@ -55,7 +55,6 @@ minetest.register_tool("rangedweapons:makarov", { suitable_ammo = {{"rangedweapons:9mm",8}}, gun_skill = {"handgun_skill",40}, gun_magazine = "rangedweapons:handgun_mag_black", - gun_icon = "rangedweapons_makarov_icon.png", gun_unloaded = "rangedweapons:makarov_r", gun_cooling = "rangedweapons:makarov_rld", gun_velocity = 20, diff --git a/milkor.lua b/milkor.lua index 2afc9ce..b954065 100644 --- a/milkor.lua +++ b/milkor.lua @@ -22,7 +22,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:40mm",6}}, gun_skill = {"",1}, gun_magazine = "rangedweapons:shell_grenadedrop", - gun_icon = "rangedweapons_milkor_icon.png", gun_unloaded = "rangedweapons:milkor_rld", gun_cooling = "rangedweapons:milkor", gun_velocity = 30, diff --git a/minigun.lua b/minigun.lua index 2a442a0..2598a50 100644 --- a/minigun.lua +++ b/minigun.lua @@ -25,7 +25,6 @@ minetest.register_tool("rangedweapons:minigun_r", { gun_critEffc = 3.0, suitable_ammo = {{"rangedweapons:762mm",200}}, gun_skill = {"heavy_skill",100}, - gun_icon = "rangedweapons_minigun_icon.png", gun_unloaded = "rangedweapons:minigun_r", gun_velocity = 70, gun_accuracy = 50, diff --git a/mod.conf b/mod.conf index 6a11f89..b51416d 100644 --- a/mod.conf +++ b/mod.conf @@ -2,3 +2,4 @@ name = rangedweapons description = A mod that adds guns and throwable weapons depends = default, tnt optional_depends = doors, xpanes, vessels, moreores, 3d_armor +min_minetest_version = 5.8 diff --git a/mp40.lua b/mp40.lua index 03ec887..09c821b 100644 --- a/mp40.lua +++ b/mp40.lua @@ -41,7 +41,6 @@ suitable_ammo = {{"rangedweapons:9mm",32}}, gun_skill = {"smg_skill",75}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_mp40_icon.png", gun_unloaded = "rangedweapons:mp40_r", gun_velocity = 25, gun_accuracy = 75, diff --git a/mp5.lua b/mp5.lua index e931595..2cf4992 100644 --- a/mp5.lua +++ b/mp5.lua @@ -47,7 +47,6 @@ minetest.register_tool("rangedweapons:mp5_rrr", { suitable_ammo = {{"rangedweapons:9mm",40},{"rangedweapons:10mm",40}}, gun_skill = {"smg_skill",75}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_mp5_icon.png", gun_unloaded = "rangedweapons:mp5_r", gun_velocity = 25, gun_accuracy = 74, diff --git a/python.lua b/python.lua index f4938ad..3d63c6c 100644 --- a/python.lua +++ b/python.lua @@ -25,7 +25,6 @@ RW_gun_capabilities = { gun_critEffc = 2.2, suitable_ammo = {{"rangedweapons:357",6}}, gun_skill = {"revolver_skill",40}, - gun_icon = "rangedweapons_python_icon.png", gun_unloaded = "rangedweapons:python_rld", gun_cooling = "rangedweapons:python", gun_velocity = 55, diff --git a/remington.lua b/remington.lua index d05e200..93567ab 100644 --- a/remington.lua +++ b/remington.lua @@ -20,7 +20,6 @@ RW_gun_capabilities = { gun_critEffc = 2.0, suitable_ammo = {{"rangedweapons:shell",4}}, gun_skill = {"shotgun_skill",20}, - gun_icon = "rangedweapons_remington_icon.png", gun_unloaded = "rangedweapons:remington_rld", gun_cooling = "rangedweapons:remington_uld", gun_velocity = 18, diff --git a/rpg.lua b/rpg.lua index f80e4b8..4db0719 100644 --- a/rpg.lua +++ b/rpg.lua @@ -10,7 +10,6 @@ minetest.register_tool("rangedweapons:rpg_rld", { gun_critEffc = 3.0, suitable_ammo = {{"rangedweapons:rocket",1}}, gun_skill = {"",1}, - gun_icon = "rangedweapons_rpg_icon.png", gun_unloaded = "rangedweapons:rpg_rld", gun_cooling = "rangedweapons:rpg", gun_velocity = 25, @@ -44,7 +43,6 @@ minetest.register_tool("rangedweapons:rpg", { gun_critEffc = 3.0, suitable_ammo = {{"rangedweapons:rocket",1}}, gun_skill = {"",1}, - gun_icon = "rangedweapons_rpg_icon.png", gun_unloaded = "rangedweapons:rpg_rld", gun_cooling = "rangedweapons:rpg", gun_velocity = 25, diff --git a/rpk.lua b/rpk.lua index 45b03c3..1c83899 100644 --- a/rpk.lua +++ b/rpk.lua @@ -48,7 +48,6 @@ minetest.register_tool("rangedweapons:rpk_rrr", { suitable_ammo = {{"rangedweapons:762mm",75}}, gun_skill = {"heavy_skill",55}, gun_magazine = "rangedweapons:drum_mag", - gun_icon = "rangedweapons_rpk_icon.png", gun_unloaded = "rangedweapons:rpk_r", gun_velocity = 55, gun_accuracy = 70, diff --git a/scar.lua b/scar.lua index 13d0003..c4a2fc7 100644 --- a/scar.lua +++ b/scar.lua @@ -47,7 +47,6 @@ minetest.register_tool("rangedweapons:scar_rrr", { suitable_ammo = {{"rangedweapons:762mm",20},{"rangedweapons:556mm",30}}, gun_skill = {"arifle_skill",50}, gun_magazine = "rangedweapons:assaultrifle_mag", - gun_icon = "rangedweapons_scar_icon.png", gun_unloaded = "rangedweapons:scar_r", gun_velocity = 45, gun_accuracy = 85, diff --git a/spas12.lua b/spas12.lua index 8d40802..04482c0 100644 --- a/spas12.lua +++ b/spas12.lua @@ -20,7 +20,6 @@ RW_gun_capabilities = { gun_critEffc = 2.1, suitable_ammo = {{"rangedweapons:shell",8}}, gun_skill = {"shotgun_skill",20}, - gun_icon = "rangedweapons_spas12_icon.png", gun_unloaded = "rangedweapons:spas12_rld", gun_cooling = "rangedweapons:spas12_uld", gun_velocity = 32, diff --git a/svd.lua b/svd.lua index 737705c..8808a36 100644 --- a/svd.lua +++ b/svd.lua @@ -72,7 +72,6 @@ RW_gun_capabilities = { suitable_ammo = {{"rangedweapons:762mm",10}}, gun_skill = {"rifle_skill",20}, gun_magazine = "rangedweapons:rifle_mag", - gun_icon = "rangedweapons_svd_icon.png", gun_unloaded = "rangedweapons:svd_r", gun_cooling = "rangedweapons:svd_uld", gun_velocity = 75, diff --git a/taurus.lua b/taurus.lua index fe0ca33..b5fa9ca 100644 --- a/taurus.lua +++ b/taurus.lua @@ -22,7 +22,6 @@ RW_gun_capabilities = { gun_critEffc = 3.1, suitable_ammo = {{"rangedweapons:44",6}}, gun_skill = {"revolver_skill",40}, - gun_icon = "rangedweapons_taurus_icon.png", gun_unloaded = "rangedweapons:taurus_rld", gun_cooling = "rangedweapons:taurus", gun_velocity = 55, diff --git a/tec9.lua b/tec9.lua index 5e92944..baf5653 100644 --- a/tec9.lua +++ b/tec9.lua @@ -50,7 +50,6 @@ minetest.register_craftitem("rangedweapons:tec9_rrr", { suitable_ammo = {{"rangedweapons:9mm",50}}, gun_skill = {"mp_skill",80}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_tec9_icon.png", gun_unloaded = "rangedweapons:tec9_r", gun_velocity = 20, gun_accuracy = 75, diff --git a/textures/rangedweapons_aa12_icon.png b/textures/rangedweapons_aa12_icon.png deleted file mode 100644 index ba0c48e..0000000 Binary files a/textures/rangedweapons_aa12_icon.png and /dev/null differ diff --git a/textures/rangedweapons_ak47_icon.png b/textures/rangedweapons_ak47_icon.png deleted file mode 100644 index 7f0b70c..0000000 Binary files a/textures/rangedweapons_ak47_icon.png and /dev/null differ diff --git a/textures/rangedweapons_awp_icon.png b/textures/rangedweapons_awp_icon.png deleted file mode 100644 index 80c3272..0000000 Binary files a/textures/rangedweapons_awp_icon.png and /dev/null differ diff --git a/textures/rangedweapons_benelli_icon.png b/textures/rangedweapons_benelli_icon.png deleted file mode 100644 index eb575cd..0000000 Binary files a/textures/rangedweapons_benelli_icon.png and /dev/null differ diff --git a/textures/rangedweapons_beretta_icon.png b/textures/rangedweapons_beretta_icon.png deleted file mode 100644 index b1309f4..0000000 Binary files a/textures/rangedweapons_beretta_icon.png and /dev/null differ diff --git a/textures/rangedweapons_deagle_icon.png b/textures/rangedweapons_deagle_icon.png deleted file mode 100644 index 8a07591..0000000 Binary files a/textures/rangedweapons_deagle_icon.png and /dev/null differ diff --git a/textures/rangedweapons_emergency_ammo_icon.png b/textures/rangedweapons_emergency_ammo_icon.png deleted file mode 100644 index cb6c690..0000000 Binary files a/textures/rangedweapons_emergency_ammo_icon.png and /dev/null differ diff --git a/textures/rangedweapons_emergency_gun_icon.png b/textures/rangedweapons_emergency_gun_icon.png deleted file mode 100644 index 11d4760..0000000 Binary files a/textures/rangedweapons_emergency_gun_icon.png and /dev/null differ diff --git a/textures/rangedweapons_g36_icon.png b/textures/rangedweapons_g36_icon.png deleted file mode 100644 index 46ea728..0000000 Binary files a/textures/rangedweapons_g36_icon.png and /dev/null differ diff --git a/textures/rangedweapons_glock17_icon.png b/textures/rangedweapons_glock17_icon.png deleted file mode 100644 index 1e29029..0000000 Binary files a/textures/rangedweapons_glock17_icon.png and /dev/null differ diff --git a/textures/rangedweapons_golden_deagle_icon.png b/textures/rangedweapons_golden_deagle_icon.png deleted file mode 100644 index 03a109e..0000000 Binary files a/textures/rangedweapons_golden_deagle_icon.png and /dev/null differ diff --git a/textures/rangedweapons_jackhammer_icon.png b/textures/rangedweapons_jackhammer_icon.png deleted file mode 100644 index f5cb670..0000000 Binary files a/textures/rangedweapons_jackhammer_icon.png and /dev/null differ diff --git a/textures/rangedweapons_kriss_sv_icon.png b/textures/rangedweapons_kriss_sv_icon.png deleted file mode 100644 index 5ee40c0..0000000 Binary files a/textures/rangedweapons_kriss_sv_icon.png and /dev/null differ diff --git a/textures/rangedweapons_luger_icon.png b/textures/rangedweapons_luger_icon.png deleted file mode 100644 index 2b4dccc..0000000 Binary files a/textures/rangedweapons_luger_icon.png and /dev/null differ diff --git a/textures/rangedweapons_m16_icon.png b/textures/rangedweapons_m16_icon.png deleted file mode 100644 index 6fa3218..0000000 Binary files a/textures/rangedweapons_m16_icon.png and /dev/null differ diff --git a/textures/rangedweapons_m1991_icon.png b/textures/rangedweapons_m1991_icon.png deleted file mode 100644 index 382d943..0000000 Binary files a/textures/rangedweapons_m1991_icon.png and /dev/null differ diff --git a/textures/rangedweapons_m200_icon.png b/textures/rangedweapons_m200_icon.png deleted file mode 100644 index b122838..0000000 Binary files a/textures/rangedweapons_m200_icon.png and /dev/null differ diff --git a/textures/rangedweapons_m60_icon.png b/textures/rangedweapons_m60_icon.png deleted file mode 100644 index 8acc084..0000000 Binary files a/textures/rangedweapons_m60_icon.png and /dev/null differ diff --git a/textures/rangedweapons_m79_icon.png b/textures/rangedweapons_m79_icon.png deleted file mode 100644 index 988c3f2..0000000 Binary files a/textures/rangedweapons_m79_icon.png and /dev/null differ diff --git a/textures/rangedweapons_makarov_icon.png b/textures/rangedweapons_makarov_icon.png deleted file mode 100644 index a9e5668..0000000 Binary files a/textures/rangedweapons_makarov_icon.png and /dev/null differ diff --git a/textures/rangedweapons_milkor_icon.png b/textures/rangedweapons_milkor_icon.png deleted file mode 100644 index 99677f4..0000000 Binary files a/textures/rangedweapons_milkor_icon.png and /dev/null differ diff --git a/textures/rangedweapons_minigun_icon.png b/textures/rangedweapons_minigun_icon.png deleted file mode 100644 index 3935f72..0000000 Binary files a/textures/rangedweapons_minigun_icon.png and /dev/null differ diff --git a/textures/rangedweapons_mp40_icon.png b/textures/rangedweapons_mp40_icon.png deleted file mode 100644 index c7171c6..0000000 Binary files a/textures/rangedweapons_mp40_icon.png and /dev/null differ diff --git a/textures/rangedweapons_mp5_icon.png b/textures/rangedweapons_mp5_icon.png deleted file mode 100644 index 247f868..0000000 Binary files a/textures/rangedweapons_mp5_icon.png and /dev/null differ diff --git a/textures/rangedweapons_python_icon.png b/textures/rangedweapons_python_icon.png deleted file mode 100644 index e23c7d5..0000000 Binary files a/textures/rangedweapons_python_icon.png and /dev/null differ diff --git a/textures/rangedweapons_remington_icon.png b/textures/rangedweapons_remington_icon.png deleted file mode 100644 index 587576f..0000000 Binary files a/textures/rangedweapons_remington_icon.png and /dev/null differ diff --git a/textures/rangedweapons_rpg_icon.png b/textures/rangedweapons_rpg_icon.png deleted file mode 100644 index f1df51c..0000000 Binary files a/textures/rangedweapons_rpg_icon.png and /dev/null differ diff --git a/textures/rangedweapons_rpk_icon.png b/textures/rangedweapons_rpk_icon.png deleted file mode 100644 index 9495ba2..0000000 Binary files a/textures/rangedweapons_rpk_icon.png and /dev/null differ diff --git a/textures/rangedweapons_scar_icon.png b/textures/rangedweapons_scar_icon.png deleted file mode 100644 index 47d40c4..0000000 Binary files a/textures/rangedweapons_scar_icon.png and /dev/null differ diff --git a/textures/rangedweapons_spas12_icon.png b/textures/rangedweapons_spas12_icon.png deleted file mode 100644 index 9543646..0000000 Binary files a/textures/rangedweapons_spas12_icon.png and /dev/null differ diff --git a/textures/rangedweapons_svd_icon.png b/textures/rangedweapons_svd_icon.png deleted file mode 100644 index 2785999..0000000 Binary files a/textures/rangedweapons_svd_icon.png and /dev/null differ diff --git a/textures/rangedweapons_taurus_icon.png b/textures/rangedweapons_taurus_icon.png deleted file mode 100644 index 686dbc4..0000000 Binary files a/textures/rangedweapons_taurus_icon.png and /dev/null differ diff --git a/textures/rangedweapons_tec9_icon.png b/textures/rangedweapons_tec9_icon.png deleted file mode 100644 index 012d112..0000000 Binary files a/textures/rangedweapons_tec9_icon.png and /dev/null differ diff --git a/textures/rangedweapons_thompson_icon.png b/textures/rangedweapons_thompson_icon.png deleted file mode 100644 index 61e942e..0000000 Binary files a/textures/rangedweapons_thompson_icon.png and /dev/null differ diff --git a/textures/rangedweapons_tmp_icon.png b/textures/rangedweapons_tmp_icon.png deleted file mode 100644 index 72ecc72..0000000 Binary files a/textures/rangedweapons_tmp_icon.png and /dev/null differ diff --git a/textures/rangedweapons_ump_icon.png b/textures/rangedweapons_ump_icon.png deleted file mode 100644 index abc89e2..0000000 Binary files a/textures/rangedweapons_ump_icon.png and /dev/null differ diff --git a/textures/rangedweapons_uzi_icon.png b/textures/rangedweapons_uzi_icon.png deleted file mode 100644 index 1f76cb2..0000000 Binary files a/textures/rangedweapons_uzi_icon.png and /dev/null differ diff --git a/thompson.lua b/thompson.lua index cfb88b6..3753df5 100644 --- a/thompson.lua +++ b/thompson.lua @@ -46,7 +46,6 @@ minetest.register_tool("rangedweapons:thompson_rrr", { suitable_ammo = {{"rangedweapons:10mm",30},{"rangedweapons:45acp",30}}, gun_skill = {"smg_skill",65}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_thompson_icon.png", gun_unloaded = "rangedweapons:thompson_r", gun_velocity = 30, gun_accuracy = 75, diff --git a/tmp.lua b/tmp.lua index b135b3f..cf0b6ef 100644 --- a/tmp.lua +++ b/tmp.lua @@ -46,7 +46,6 @@ minetest.register_tool("rangedweapons:tmp_rrr", { suitable_ammo = {{"rangedweapons:9mm",30}}, gun_skill = {"mp_skill",85}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_tmp_icon.png", gun_unloaded = "rangedweapons:tmp_r", gun_velocity = 20, gun_accuracy = 64, diff --git a/ump.lua b/ump.lua index b7e4cd6..c111028 100644 --- a/ump.lua +++ b/ump.lua @@ -47,7 +47,6 @@ minetest.register_tool("rangedweapons:ump_rrr", { suitable_ammo = {{"rangedweapons:9mm",25},{"rangedweapons:45acp",25}}, gun_skill = {"smg_skill",60}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_ump_icon.png", gun_unloaded = "rangedweapons:ump_r", gun_velocity = 32, gun_accuracy = 79, diff --git a/uzi.lua b/uzi.lua index 782b334..eea7b81 100644 --- a/uzi.lua +++ b/uzi.lua @@ -46,7 +46,6 @@ minetest.register_tool("rangedweapons:uzi_rrr", { suitable_ammo = {{"rangedweapons:9mm",40},{"rangedweapons:45acp",22}}, gun_skill = {"mp_skill",80}, gun_magazine = "rangedweapons:machinepistol_mag", - gun_icon = "rangedweapons_uzi_icon.png", gun_unloaded = "rangedweapons:uzi_r", gun_velocity = 25, gun_accuracy = 72,