[trampoline] Update to Git commit 5e15530:

https://github.com/AntumDeluge/mtmod-trampoline/tree/5e15530
master
AntumDeluge 2017-05-26 17:47:20 -07:00
parent 3196963637
commit 5432dfa8d1
4 changed files with 6 additions and 8 deletions

View File

@ -42,7 +42,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
* [farming_plus][] ([WTFPL][lic.farming_plus]) -- version: [7e0d976 Git][ver.farming_plus] *2014-07-31* ([patched][patch.farming_plus]) * [farming_plus][] ([WTFPL][lic.farming_plus]) -- version: [7e0d976 Git][ver.farming_plus] *2014-07-31* ([patched][patch.farming_plus])
* furniture/ * furniture/
* [jukebox][] ([WTFPL / CC0][lic.jukebox]) -- version: [e6a507f Git][ver.jukebox] *2016-05-23* * [jukebox][] ([WTFPL / CC0][lic.jukebox]) -- version: [e6a507f Git][ver.jukebox] *2016-05-23*
* [trampoline][] ([GPL][lic.gpl3.0]) -- version: [ab3b2ce Git][ver.trampoline] *2017-05-24* * [trampoline][] ([GPL][lic.gpl3.0]) -- version: [5e15530 Git][ver.trampoline] *2017-05-26*
* [trash_can][] ([MIT][lic.trash_can]) -- version: [5fd3df7 Git][ver.trash_can] *2016-01-14* ([patched][patch.trash_can]) * [trash_can][] ([MIT][lic.trash_can]) -- version: [5fd3df7 Git][ver.trash_can] *2016-01-14* ([patched][patch.trash_can])
* inventory/ * inventory/
* [bags][] ([BSD 3-Clause][lic.bags]) -- version: [f17d829 Git][ver.bags] *2015-10-11* ([patched][patch.bags]) * [bags][] ([BSD 3-Clause][lic.bags]) -- version: [f17d829 Git][ver.bags] *2015-10-11* ([patched][patch.bags])
@ -519,7 +519,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[ver.tnt]: https://github.com/PilzAdam/TNT/tree/d6a0b7d [ver.tnt]: https://github.com/PilzAdam/TNT/tree/d6a0b7d
[ver.tools_obsidian]: https://github.com/Dragonop/tools_obsidian/tree/f77fd79 [ver.tools_obsidian]: https://github.com/Dragonop/tools_obsidian/tree/f77fd79
[ver.torches]: https://github.com/BlockMen/torches/tree/e19c772 [ver.torches]: https://github.com/BlockMen/torches/tree/e19c772
[ver.trampoline]: https://github.com/AntumDeluge/mtmod-trampoline/tree/ab3b2ce [ver.trampoline]: https://github.com/AntumDeluge/mtmod-trampoline/tree/5e15530
[ver.trash_can]: https://github.com/minetest-mods/trash_can/tree/5fd3df7 [ver.trash_can]: https://github.com/minetest-mods/trash_can/tree/5fd3df7
[ver.unifieddyes]: https://github.com/minetest-mods/unifieddyes/tree/70b1f9f [ver.unifieddyes]: https://github.com/minetest-mods/unifieddyes/tree/70b1f9f
[ver.vector_extras]: https://github.com/HybridDog/vector_extras/tree/472deb6 [ver.vector_extras]: https://github.com/HybridDog/vector_extras/tree/472deb6

View File

@ -1,9 +1,6 @@
-- Functions for trampoline mod -- Functions for trampoline mod
local default_bounce = 20
-- Log messages specific to trampoline mod -- Log messages specific to trampoline mod
trampoline.log = function(message) trampoline.log = function(message)
minetest.log('action', '[' .. trampoline.modname .. '] ' .. message) minetest.log('action', '[' .. trampoline.modname .. '] ' .. message)
@ -12,7 +9,7 @@ end
-- Define function to add a colored trampoline -- Define function to add a colored trampoline
trampoline.addColoredTrampNode = function(color, bounce) trampoline.addColoredTrampNode = function(color, bounce)
local bounce = default_bounce * bounce local bounce = trampoline.bounce * bounce
minetest.register_node('trampoline:' .. color, { minetest.register_node('trampoline:' .. color, {
description = color:gsub('^%l', string.upper) .. ' Trampoline', description = color:gsub('^%l', string.upper) .. ' Trampoline',

View File

@ -2,6 +2,7 @@
trampoline = {} trampoline = {}
trampoline.modname = minetest.get_current_modname() trampoline.modname = minetest.get_current_modname()
trampoline.modpath = minetest.get_modpath(trampoline.modname) trampoline.modpath = minetest.get_modpath(trampoline.modname)
trampoline.bounce = 20
minetest.log("action", "[MOD] Loading '" .. trampoline.modname .. "' ...") minetest.log("action", "[MOD] Loading '" .. trampoline.modname .. "' ...")

View File

@ -13,7 +13,7 @@ minetest.register_node("trampoline:regular", {
"bottom.png", "bottom.png",
"sides.png^sides_overlay.png" "sides.png^sides_overlay.png"
}, },
groups = {dig_immediate=2, bouncy=20+20, fall_damage_add_percent=-70}, groups = {dig_immediate=2, bouncy=trampoline.bounce*2, fall_damage_add_percent=-70},
}) })
@ -29,5 +29,5 @@ minetest.register_node("trampoline:brown", {
"bottom.png", "bottom.png",
"sides.png^sides_overlay_brown.png" "sides.png^sides_overlay_brown.png"
}, },
groups = {dig_immediate=2, bouncy=20+20, fall_damage_add_percent=-70}, groups = {dig_immediate=2, bouncy=trampoline.bounce*2, fall_damage_add_percent=-70},
}) })