Skip to content

Commit

Permalink
Add new warp sound (#29)
Browse files Browse the repository at this point in the history
Co-authored-by: ChaosWormz <ChaosWormz@users.noreply.github.com>
  • Loading branch information
Panquesito7 and ChaosWormz committed Jan 21, 2020
1 parent c4fc42f commit b418b67
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 8 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ Report bugs or suggest ideas by [creating an issue](https://github.com/ChaosWorm
If you know how to fix an issue, or want something to be added, consider opening a [pull request](https://github.com/ChaosWormz/teleport-request/compare).

## License
[LGPLv2.1+](https://github.com/ChaosWormz/teleport-request/blob/master/LICENSE.md) for everything.
Copyright (C) 2014-2020 ChaosWormz and contributors.

Teleport Request code is licensed under LGPLv2.1+, see [`LICENSE.md`](LICENSE.md).
[`tpr_warp.ogg`](sounds/tpr_warp.ogg) is licensed under [CC BY-SA 4.0 International](https://creativecommons.org/licenses/by-sa/4.0/).

## Contributors
List of contributors (in no particular order):
Expand Down
12 changes: 6 additions & 6 deletions functions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@ function tp.tpr_teleport_player()
target_coords = source:get_pos()
local target_sound = target:get_pos()
target:set_pos(tp.find_free_position_near(target_coords))
minetest.sound_play("whoosh", {pos = target_coords, gain = 0.5, max_hear_distance = 10})
minetest.sound_play("whoosh", {pos = target_sound, gain = 0.5, max_hear_distance = 10})
minetest.sound_play("tpr_warp", {pos = target_coords, gain = 0.5, max_hear_distance = 10})
minetest.sound_play("tpr_warp", {pos = target_sound, gain = 0.5, max_hear_distance = 10})
--tp.parti2(target_coords)
end

-- TPC & TPJ
function tp.tpc_teleport_player(player)
local pname = minetest.get_player_by_name(player)
minetest.sound_play("whoosh", {pos = pname:get_pos(), gain = 0.5, max_hear_distance = 10})
minetest.sound_play("tpr_warp", {pos = pname:get_pos(), gain = 0.5, max_hear_distance = 10})
pname:set_pos(tp.find_free_position_near(target_coords))
minetest.sound_play("whoosh", {pos = target_coords, gain = 0.5, max_hear_distance = 10})
minetest.sound_play("tpr_warp", {pos = target_coords, gain = 0.5, max_hear_distance = 10})
--tp.parti2(target_coords)
end

-- TPP
function tp.tpp_teleport_player(player, pos)
local pname = minetest.get_player_by_name(player)
minetest.sound_play("whoosh", {pos = pname:get_pos(), gain = 0.5, max_hear_distance = 10})
minetest.sound_play("tpr_warp", {pos = pname:get_pos(), gain = 0.5, max_hear_distance = 10})
pname:set_pos(tp.find_free_position_near(pos))
minetest.sound_play("whoosh", {pos = pos, gain = 0.5, max_hear_distance = 10})
minetest.sound_play("tpr_warp", {pos = pos, gain = 0.5, max_hear_distance = 10})
--tp.parti2(target_coords)
end

Expand Down
2 changes: 1 addition & 1 deletion init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Originally made by Traxie21 and released with the WTFPL license.
Forum link: https://forum.minetest.net/viewtopic.php?id=4457
Updates by Zeno, Panquesito7 and ChaosWormz.
License: LGPLv2.1+ for everything.
License: LGPLv2.1+ for code, CC BY-SA 4.0 for sounds.
--]]

-- Load support for intllib.
Expand Down
20 changes: 20 additions & 0 deletions sounds/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
Copyright (C) 2020 David Leal (halfpacho@gmail.com) & ChaosWormz

You are free to:
Share — copy and redistribute the material in any medium or format
Adapt — remix, transform, and build upon the material for any purpose, even commercially.

Under the following terms:

Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.

ShareAlike — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.

Notices:

You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.

For more details:
https://creativecommons.org/licenses/by-sa/4.0/
Binary file added sounds/tpr_warp.ogg
Binary file not shown.
Binary file removed sounds/whoosh.ogg
Binary file not shown.

0 comments on commit b418b67

Please sign in to comment.