diff --git a/mods/ctf/ctf_crafting/init.lua b/mods/ctf/ctf_crafting/init.lua index 833a77d..e98cc20 100644 --- a/mods/ctf/ctf_crafting/init.lua +++ b/mods/ctf/ctf_crafting/init.lua @@ -266,3 +266,31 @@ for ore, ore_item in pairs(full_ores) do level = 1, }) end + +-- +--- Grenade Crafts +-- + +crafting.register_recipe({ + type = "inv", + output = "grenades:frag 1", + items = { "default:steel_ingot 5", "default:iron_lump" }, + always_known = true, + level = 1, +}) + +crafting.register_recipe({ + type = "inv", + output = "grenades:smoke 1", + items = { "default:steel_ingot 5", "default:coal_lump 4" }, + always_known = true, + level = 1, +}) + +-- crafting.register_recipe({ +-- type = "inv", +-- output = "grenades:flashbang 1", +-- items = { "default:steel_ingot 5", "default:torch 5" }, +-- always_known = true, +-- level = 1, +-- }) diff --git a/mods/ctf/ctf_treasure/init.lua b/mods/ctf/ctf_treasure/init.lua index 4041f2d..ffacd3a 100644 --- a/mods/ctf/ctf_treasure/init.lua +++ b/mods/ctf/ctf_treasure/init.lua @@ -16,7 +16,7 @@ function ctf_treasure.get_default_treasures() { "default:axe_stone", 0.5, 5, { 1, 10 } }, { "shooter:shotgun", 0.04, 2, 1 }, - { "shooter:grenade", 0.08, 2, 1 }, + -- { "shooter:grenade", 0.08, 2, 1 }, { "shooter:machine_gun", 0.02, 2, 1 }, { "shooter:crossbow", 0.5, 2, { 1, 5 } }, { "shooter:pistol", 0.4, 2, { 1, 5 } }, @@ -28,5 +28,9 @@ function ctf_treasure.get_default_treasures() { "sniper_rifles:rifle_magnum_loaded", 0.01, 2, 1 }, { "medkits:medkit", 0.8, 5, 2 }, + + {"grenades:frag", 0.1, 2, 1}, + {"grenades:smoke", 0.1, 2, 1}, + -- {"grenades:flashbang",0.1,2,1}, } end diff --git a/mods/pvp/grenades/api.md b/mods/pvp/grenades/api.md new file mode 100644 index 0000000..24a4c5f --- /dev/null +++ b/mods/pvp/grenades/api.md @@ -0,0 +1,24 @@ +# Grenades API + +Still WIP. Please suggest new features here: https://forum.minetest.net/viewtopic.php?f=9&t=21466 + +## API + + grenades.register_grenade("name", { -- Name of the grenade (Like 'smoke' or 'flashbang') + description = "", -- A short description of the grenade. + image = "", -- The name of the grenade's texture + on_explode = function(pos, name) + -- This function is called when the grenade 'explodes' + -- the place the grenade 'exploded' at + -- the name of the player that threw the grenade + end, + placeable = false, -- Optional, default is false + clock = 3, -- Optional, controls how long until grenade detonates. Default is 3 + particle = { -- Adds particles in the grenade's trail + image = "grenades_smoke.png", -- The particle's image + life = 1, -- How long (seconds) it takes for the particle to disappear + size = 4, -- Size of the particle + glow = 0, -- Brightens the texture in darkness + interval = 5, -- How long it takes before a particle can be added + } + }) diff --git a/mods/pvp/grenades/grenades.lua b/mods/pvp/grenades/grenades.lua new file mode 100644 index 0000000..a711ad2 --- /dev/null +++ b/mods/pvp/grenades/grenades.lua @@ -0,0 +1,199 @@ +local function remove_flora(pos, radius) + local pos1 = vector.subtract(pos, radius) + local pos2 = vector.add(pos, radius) + + for _, p in ipairs(minetest.find_nodes_in_area(pos1, pos2, "group:flora")) do + if vector.distance(pos, p) <= radius then + minetest.remove_node(p) + end + end +end + +grenades.register_grenade("grenades:frag", { + description = "Frag grenade (Kills anyone near blast)", + image = "grenades_frag.png", + on_explode = function(pos, name) + if not name or not pos then + return + end + + local player = minetest.get_player_by_name(name) + + local radius = 6 + + minetest.add_particlespawner({ + amount = 20, + time = 0.5, + minpos = vector.subtract(pos, radius), + maxpos = vector.add(pos, radius), + minvel = {x = 0, y = 5, z = 0}, + maxvel = {x = 0, y = 7, z = 0}, + minacc = {x = 0, y = 1, z = 0}, + maxacc = {x = 0, y = 1, z = 0}, + minexptime = 0.3, + maxexptime = 0.6, + minsize = 7, + maxsize = 10, + collisiondetection = true, + collision_removal = false, + vertical = false, + texture = "grenades_smoke.png", + }) + + minetest.add_particle({ + pos = pos, + velocity = {x=0, y=0, z=0}, + acceleration = {x=0, y=0, z=0}, + expirationtime = 0.3, + size = 15, + collisiondetection = false, + collision_removal = false, + object_collision = false, + vertical = false, + texture = "grenades_boom.png", + glow = 10 + }) + + minetest.sound_play("grenades_explode", { + pos = pos, + gain = 1.0, + max_hear_distance = 64, + }) + + remove_flora(pos, radius/2) + + for _, v in ipairs(minetest.get_objects_inside_radius(pos, radius)) do + local hit = minetest.raycast(pos, v:get_pos(), true, true):next() + + if hit and v:is_player() and v:get_hp() > 0 and hit.type == "object" and hit.ref:is_player() and + hit.ref:get_player_name() == v:get_player_name() then + v:punch(player, 2, {damage_groups = {grenade = 1, fleshy = 90 * 0.707106 ^ vector.distance(pos, v:get_pos())}}, nil) + end + end + end, +}) + +-- Flashbang Grenade + +-- local flash_huds = {} + +-- grenades.register_grenade("grenades:flashbang", { +-- description = "Flashbang grenade (Blinds all who look at blast)", +-- image = "grenades_flashbang.png", +-- clock = 4, +-- on_explode = function(pos) +-- for _, v in ipairs(minetest.get_objects_inside_radius(pos, 20)) do +-- local hit = minetest.raycast(pos, v:get_pos(), true, true):next() + +-- if hit and v:is_player() and v:get_hp() > 0 and not flash_huds[v:get_player_name()] and hit.type == "object" and +-- hit.ref:is_player() and hit.ref:get_player_name() == v:get_player_name() then +-- local playerdir = vector.round(v:get_look_dir()) +-- local grenadedir = vector.round(vector.direction(v:get_pos(), pos)) +-- local pname = v:get_player_name() + +-- minetest.sound_play("glasslike_break", { +-- pos = pos, +-- gain = 1.0, +-- max_hear_distance = 32, +-- }) + +-- if math.acos(playerdir.x*grenadedir.x + playerdir.y*grenadedir.y + playerdir.z*grenadedir.z) <= math.pi/4 then +-- flash_huds[pname] = {} + +-- for i = 0, 5, 1 do +-- local key = v:hud_add({ +-- hud_elem_type = "image", +-- position = {x = 0, y = 0}, +-- name = "flashbang hud "..pname, +-- scale = {x = -200, y = -200}, +-- text = "default_cloud.png^[colorize:white:255^[opacity:"..tostring(255 - (i * 20)), +-- alignment = {x = 0, y = 0}, +-- offset = {x = 0, y = 0} +-- }) + +-- flash_huds[pname][i+1] = key + +-- minetest.after(2 * i, function() +-- if minetest.get_player_by_name(pname) then +-- minetest.get_player_by_name(pname):hud_remove(key) + +-- if flash_huds[pname] then +-- table.remove(flash_huds[pname], 1) +-- end + +-- if i == 5 then +-- flash_huds[pname] = nil +-- end +-- end +-- end) +-- end +-- end + +-- end +-- end +-- end, +-- }) + +-- minetest.register_on_dieplayer(function(player) +-- local name = player:get_player_name() + +-- if flash_huds[name] then +-- for _, v in ipairs(flash_huds[name]) do +-- player:hud_remove(v) +-- end + +-- flash_huds[name] = nil +-- end +-- end) + +-- Smoke Grenade + +local SMOKE_GRENADE_TIME = 30 +grenades.register_grenade("grenades:smoke", { + description = "Smoke grenade (Generates smoke around blast site)", + image = "grenades_smoke_grenade.png", + on_explode = function(pos) + minetest.sound_play("grenades_glasslike_break", { + pos = pos, + gain = 1.0, + max_hear_distance = 32, + }) + + local hiss = minetest.sound_play("grenades_hiss", { + pos = pos, + gain = 1.0, + loop = true, + max_hear_distance = 32, + }) + + minetest.after(SMOKE_GRENADE_TIME, minetest.sound_stop, hiss) + + for i = 0, 5, 1 do + minetest.add_particlespawner({ + amount = 40, + time = SMOKE_GRENADE_TIME + 3, + minpos = vector.subtract(pos, 2), + maxpos = vector.add(pos, 2), + minvel = {x = 0, y = 2, z = 0}, + maxvel = {x = 0, y = 3, z = 0}, + minacc = {x = 1, y = 0.2, z = 1}, + maxacc = {x = 1, y = 0.2, z = 1}, + minexptime = 1, + maxexptime = 1, + minsize = 125, + maxsize = 140, + collisiondetection = false, + collision_removal = false, + vertical = false, + texture = "grenades_smoke.png", + }) + end + end, + particle = { + image = "grenades_smoke.png", + life = 1, + size = 4, + glow = 0, + interval = 5, + } +}) diff --git a/mods/pvp/grenades/init.lua b/mods/pvp/grenades/init.lua new file mode 100644 index 0000000..fa9d1cd --- /dev/null +++ b/mods/pvp/grenades/init.lua @@ -0,0 +1,149 @@ +grenades = { + grenade_deaccel = 9 +} + +local function throw_grenade(name, player) + local dir = player:get_look_dir() + local pos = player:get_pos() + local obj = minetest.add_entity({x = pos.x + dir.x, y = pos.y + 1.5 + dir.y, z = pos.z + dir.z}, name) + + local m = 20 + obj:set_velocity({x = dir.x * m, y = dir.y * m, z = dir.z * m}) + obj:set_acceleration({x = 0, y = -9.8, z = 0}) + + return(obj:get_luaentity()) +end + +function grenades.register_grenade(name, def) + if not def.clock then + def.clock = 4 + end + + local grenade_entity = { + physical = true, + sliding = 1, + collide_with_objects = true, + visual = "sprite", + visual_size = {x = 0.5, y = 0.5, z = 0.5}, + textures = {def.image}, + collisionbox = {-0.2, -0.2, -0.2, 0.2, 0.15, 0.2}, + pointable = false, + static_save = false, + particle = 0, + timer = 0, + on_step = function(self, dtime) + local obj = self.object + local vel = obj:get_velocity() + local pos = obj:get_pos() + local norm_vel -- Normalized velocity + + self.timer = self.timer + dtime + + if not self.last_vel then + self.last_vel = vel + end + + -- Check for a collision on the x/y/z axis + + if not vector.equals(self.last_vel, vel) and vector.distance(self.last_vel, vel) > 4 then + if math.abs(self.last_vel.x - vel.x) > 5 then -- Check for a large reduction in velocity + vel.x = self.last_vel.x * -0.3 -- Invert velocity and reduce it a bit + end + + if math.abs(self.last_vel.y - vel.y) > 5 then -- Check for a large reduction in velocity + vel.y = self.last_vel.y * -0.2 -- Invert velocity and reduce it a bit + end + + if math.abs(self.last_vel.z - vel.z) > 5 then -- Check for a large reduction in velocity + vel.z = self.last_vel.z * -0.3 -- Invert velocity and reduce it a bit + end + + obj:set_velocity(vel) + end + + self.last_vel = vel + + if self.sliding == 1 and vel.y == 0 then -- Check if grenade is sliding + self.sliding = 2 -- Multiplies drag by 2 + elseif self.sliding > 1 and vel.y ~= 0 then + self.sliding = 1 -- Doesn't affect drag + end + + if self.sliding > 1 then -- Is the grenade sliding? + if vector.distance(vector.new(), vel) <= 1 and not vector.equals(vel, vector.new()) then -- Grenade is barely moving, make sure it stays that way + obj:set_velocity(vector.new()) + obj:set_acceleration(vector.new(0, -9.8, 0)) + end + else + norm_vel = vector.normalize(vel) + + obj:set_acceleration({ + x = -norm_vel.x * grenades.grenade_deaccel * self.sliding, + y = -9.8, + z = -norm_vel.z * grenades.grenade_deaccel * self.sliding, + }) + end + + + -- Grenade Particles + + if def.particle and self.particle >= 4 then + self.particle = 0 + + minetest.add_particle({ + pos = obj:get_pos(), + velocity = vector.divide(vel, 2), + acceleration = vector.divide(obj:get_acceleration(), -5), + expirationtime = def.particle.life, + size = def.particle.size, + collisiondetection = false, + collision_removal = false, + vertical = false, + texture = def.particle.image, + glow = def.particle.glow + }) + elseif def.particle and self.particle < def.particle.interval then + self.particle = self.particle + 1 + end + + -- Explode when clock is up + + if self.timer > def.clock or not self.thrower_name then + if self.thrower_name then + minetest.log("[Grenades] A grenade thrown by " .. self.thrower_name .. + " explodes at " .. minetest.pos_to_string(vector.round(pos))) + def.on_explode(pos, self.thrower_name) + end + + obj:remove() + end + end + } + + minetest.register_entity(name, grenade_entity) + + local newdef = {} + + newdef.description = def.description + newdef.stack_max = 1 + newdef.range = 0 + newdef.inventory_image = def.image + newdef.on_use = function(itemstack, user, pointed_thing) + local player_name = user:get_player_name() + + if pointed_thing.type ~= "node" then + local grenade = throw_grenade(name, user) + grenade.thrower_name = player_name + + if not minetest.settings:get_bool("creative_mode") then + itemstack = "" + end + end + + return itemstack + end + + minetest.register_craftitem(name, newdef) +end + +dofile(minetest.get_modpath("grenades") .. "/grenades.lua") diff --git a/mods/pvp/grenades/license b/mods/pvp/grenades/license new file mode 100644 index 0000000..abd8a96 --- /dev/null +++ b/mods/pvp/grenades/license @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018-2019 LoneWolfHT + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/mods/pvp/grenades/mod.conf b/mods/pvp/grenades/mod.conf new file mode 100644 index 0000000..e2b506a --- /dev/null +++ b/mods/pvp/grenades/mod.conf @@ -0,0 +1 @@ +name = grenades \ No newline at end of file diff --git a/mods/pvp/grenades/readme.md b/mods/pvp/grenades/readme.md new file mode 100644 index 0000000..473f425 --- /dev/null +++ b/mods/pvp/grenades/readme.md @@ -0,0 +1,6 @@ +# grenades +Adds an API that allows for easily making grenades + +See grenades_basic for the grenades this mod used to have + +License of code: **MIT** diff --git a/mods/pvp/grenades/sounds/grenades_explode.ogg b/mods/pvp/grenades/sounds/grenades_explode.ogg new file mode 100644 index 0000000..e00a16c Binary files /dev/null and b/mods/pvp/grenades/sounds/grenades_explode.ogg differ diff --git a/mods/pvp/grenades/sounds/grenades_glasslike_break.ogg b/mods/pvp/grenades/sounds/grenades_glasslike_break.ogg new file mode 100644 index 0000000..d2138db Binary files /dev/null and b/mods/pvp/grenades/sounds/grenades_glasslike_break.ogg differ diff --git a/mods/pvp/grenades/sounds/grenades_hiss.ogg b/mods/pvp/grenades/sounds/grenades_hiss.ogg new file mode 100644 index 0000000..b9ed86c Binary files /dev/null and b/mods/pvp/grenades/sounds/grenades_hiss.ogg differ diff --git a/mods/pvp/grenades/sounds/license.txt b/mods/pvp/grenades/sounds/license.txt new file mode 100644 index 0000000..2d59177 --- /dev/null +++ b/mods/pvp/grenades/sounds/license.txt @@ -0,0 +1,133 @@ +Creative Commons Attribution 4.0 International Public License +for grenades_glasslike_break.ogg and grenades_hiss.ogg + +Copyright (c) 2019 LoneWolfHT + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + Licensor means the individual(s) or entity(ies) granting rights under this Public License. + Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + License grant. + Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + reproduce and Share the Licensed Material, in whole or in part; and + produce, reproduce, and Share Adapted Material. + Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + Term. The term of this Public License is specified in Section 6(a). + Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + Downstream recipients. + Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + Other rights. + Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + Patent and trademark rights are not licensed under this Public License. + To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + Attribution. + + If You Share the Licensed Material (including in modified form), You must: + retain the following if it is supplied by the Licensor with the Licensed Material: + identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + a copyright notice; + a notice that refers to this Public License; + a notice that refers to the disclaimer of warranties; + a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + upon express reinstatement by the Licensor. + For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +===================== +===================== +===================== + +CC0 1.0 Universal (CC0 1.0) Public Domain Dedication +for grenades_explode.ogg +TumeniNodes +steveygos93 +theneedle.tv +frankelmedico + +No Copyright + +The person who associated a work with this deed has dedicated the work to the public domain +by waiving all of his or her rights to the work worldwide under copyright law, including all +related and neighboring rights, to the extent allowed by law. + +You can copy, modify, distribute and perform the work, even for commercial purposes, all +without asking permission. See Other Information below. + +In no way are the patent or trademark rights of any person affected by CC0, nor are the +rights that other persons may have in the work or in how the work is used, such as publicity +or privacy rights. + +Unless expressly stated otherwise, the person who associated a work with this deed makes no +warranties about the work, and disclaims liability for all uses of the work, to the fullest +extent permitted by applicable law. + +When using or citing the work, you should not imply endorsement by the author or the affirmer. + +This license is acceptable for Free Cultural Works. +For more Information: +https://creativecommons.org/publicdomain/zero/1.0/ + diff --git a/mods/pvp/grenades/textures/grenades_boom.png b/mods/pvp/grenades/textures/grenades_boom.png new file mode 100644 index 0000000..bc48ee4 Binary files /dev/null and b/mods/pvp/grenades/textures/grenades_boom.png differ diff --git a/mods/pvp/grenades/textures/grenades_flashbang.png b/mods/pvp/grenades/textures/grenades_flashbang.png new file mode 100644 index 0000000..2816686 Binary files /dev/null and b/mods/pvp/grenades/textures/grenades_flashbang.png differ diff --git a/mods/pvp/grenades/textures/grenades_frag.png b/mods/pvp/grenades/textures/grenades_frag.png new file mode 100644 index 0000000..5de4795 Binary files /dev/null and b/mods/pvp/grenades/textures/grenades_frag.png differ diff --git a/mods/pvp/grenades/textures/grenades_smoke.png b/mods/pvp/grenades/textures/grenades_smoke.png new file mode 100755 index 0000000..86af3fa Binary files /dev/null and b/mods/pvp/grenades/textures/grenades_smoke.png differ diff --git a/mods/pvp/grenades/textures/grenades_smoke_grenade.png b/mods/pvp/grenades/textures/grenades_smoke_grenade.png new file mode 100644 index 0000000..3a2b0f2 Binary files /dev/null and b/mods/pvp/grenades/textures/grenades_smoke_grenade.png differ diff --git a/mods/pvp/grenades/textures/license b/mods/pvp/grenades/textures/license new file mode 100644 index 0000000..dee3c81 --- /dev/null +++ b/mods/pvp/grenades/textures/license @@ -0,0 +1,97 @@ +Creative Commons Attribution 4.0 International Public License + +Copyright (c) 2019 LoneWolfHT + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + Licensor means the individual(s) or entity(ies) granting rights under this Public License. + Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + License grant. + Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + reproduce and Share the Licensed Material, in whole or in part; and + produce, reproduce, and Share Adapted Material. + Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + Term. The term of this Public License is specified in Section 6(a). + Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + Downstream recipients. + Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + Other rights. + Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + Patent and trademark rights are not licensed under this Public License. + To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + Attribution. + + If You Share the Licensed Material (including in modified form), You must: + retain the following if it is supplied by the Licensor with the Licensed Material: + identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + a copyright notice; + a notice that refers to this Public License; + a notice that refers to the disclaimer of warranties; + a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + upon express reinstatement by the Licensor. + For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.