diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/jumping/init.lua b/init.lua old mode 100644 new mode 100755 similarity index 61% rename from jumping/init.lua rename to init.lua index 7937c63..cf2a7fe --- a/jumping/init.lua +++ b/init.lua @@ -24,9 +24,14 @@ local trampoline_punch = function(pos, node) minetest.add_node(pos, {name = string.sub(node.name, 1, #node.name - 1)..id}) end -for i = 1, 6 do - minetest.register_node("jumping:trampoline"..i, { - description = "Trampoline", +local u = 6 + +local bounces = {90, 100, 110, 120, 130, 140} + +for i = 1, u do + local bnc_pct = bounces[i] + minetest.register_node("jumping:trampoline_" .. i, { + description = "Trampoline (bounce : " .. bnc_pct .. "%)", drawtype = "nodebox", node_box = trampolinebox, selection_box = trampolinebox, @@ -35,9 +40,10 @@ for i = 1, 6 do tiles = { "jumping_trampoline_top.png", "jumping_trampoline_bottom.png", - "jumping_trampoline_sides.png^jumping_trampoline_sides_overlay"..i..".png" + "jumping_trampoline_sides.png^jumping_trampoline_sides_overlay_" .. i .. ".png", }, - groups = {dig_immediate=2, bouncy=20+i*20, fall_damage_add_percent=-70}, + drop = "jumping:trampoline_1", + groups = {dig_immediate = 2, bouncy = bnc_pct, fall_damage_add_percent = -95}, }) end @@ -50,25 +56,29 @@ minetest.register_node("jumping:cushion", { tiles = { "jumping_cushion_tb.png", "jumping_cushion_tb.png", - "jumping_cushion_sides.png" + "jumping_cushion_sides.png", }, - groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100}, + groups = {dig_immediate = 2, disable_jump = 1, fall_damage_add_percent = -100}, }) minetest.register_craft({ - output = "jumping:trampoline1", + output = "jumping:trampoline_1", recipe = { - {"default:wood", "default:wood", "default:wood"}, + {"group:ingot", "group:ingot", "group:ingot"}, {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"} + {"default:stick", "default:stick", "default:stick"}, } }) minetest.register_craft({ output = "jumping:cushion", recipe = { + {"default:junglegrass", "default:junglegrass", "default:junglegrass"}, {"default:leaves", "default:leaves", "default:leaves"}, - {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"} + {"default:stick", "default:stick", "default:stick"}, } }) + +if minetest.setting_getbool("log_mods") then + minetest.log("action", "Carbone: [jumping] loaded.") +end diff --git a/jumping/textures/jumping_cushion_sides.png b/jumping/textures/jumping_cushion_sides.png deleted file mode 100644 index 8c6de57..0000000 Binary files a/jumping/textures/jumping_cushion_sides.png and /dev/null differ diff --git a/jumping/textures/jumping_cushion_tb.png b/jumping/textures/jumping_cushion_tb.png deleted file mode 100644 index 09b50e8..0000000 Binary files a/jumping/textures/jumping_cushion_tb.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_bottom.png b/jumping/textures/jumping_trampoline_bottom.png deleted file mode 100644 index cd9da65..0000000 Binary files a/jumping/textures/jumping_trampoline_bottom.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_sides.png b/jumping/textures/jumping_trampoline_sides.png deleted file mode 100644 index a5f3689..0000000 Binary files a/jumping/textures/jumping_trampoline_sides.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_sides_overlay1.png b/jumping/textures/jumping_trampoline_sides_overlay1.png deleted file mode 100644 index aebcf05..0000000 Binary files a/jumping/textures/jumping_trampoline_sides_overlay1.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_sides_overlay2.png b/jumping/textures/jumping_trampoline_sides_overlay2.png deleted file mode 100644 index 74f43fa..0000000 Binary files a/jumping/textures/jumping_trampoline_sides_overlay2.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_sides_overlay3.png b/jumping/textures/jumping_trampoline_sides_overlay3.png deleted file mode 100644 index d619fcc..0000000 Binary files a/jumping/textures/jumping_trampoline_sides_overlay3.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_sides_overlay4.png b/jumping/textures/jumping_trampoline_sides_overlay4.png deleted file mode 100644 index f1679e6..0000000 Binary files a/jumping/textures/jumping_trampoline_sides_overlay4.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_sides_overlay5.png b/jumping/textures/jumping_trampoline_sides_overlay5.png deleted file mode 100644 index 2af894d..0000000 Binary files a/jumping/textures/jumping_trampoline_sides_overlay5.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_sides_overlay6.png b/jumping/textures/jumping_trampoline_sides_overlay6.png deleted file mode 100644 index 3c2fa6e..0000000 Binary files a/jumping/textures/jumping_trampoline_sides_overlay6.png and /dev/null differ diff --git a/jumping/textures/jumping_trampoline_top.png b/jumping/textures/jumping_trampoline_top.png deleted file mode 100644 index a927fdb..0000000 Binary files a/jumping/textures/jumping_trampoline_top.png and /dev/null differ diff --git a/modpack.txt b/modpack.txt deleted file mode 100644 index e69de29..0000000 diff --git a/textures/jumping_cushion_sides.png b/textures/jumping_cushion_sides.png new file mode 100755 index 0000000..9d65797 Binary files /dev/null and b/textures/jumping_cushion_sides.png differ diff --git a/textures/jumping_cushion_tb.png b/textures/jumping_cushion_tb.png new file mode 100755 index 0000000..1cc91c8 Binary files /dev/null and b/textures/jumping_cushion_tb.png differ diff --git a/textures/jumping_trampoline_bottom.png b/textures/jumping_trampoline_bottom.png new file mode 100755 index 0000000..7ade61e Binary files /dev/null and b/textures/jumping_trampoline_bottom.png differ diff --git a/textures/jumping_trampoline_sides.png b/textures/jumping_trampoline_sides.png new file mode 100755 index 0000000..ff3f6e4 Binary files /dev/null and b/textures/jumping_trampoline_sides.png differ diff --git a/textures/jumping_trampoline_sides_overlay_1.png b/textures/jumping_trampoline_sides_overlay_1.png new file mode 100755 index 0000000..1119f46 Binary files /dev/null and b/textures/jumping_trampoline_sides_overlay_1.png differ diff --git a/textures/jumping_trampoline_sides_overlay_2.png b/textures/jumping_trampoline_sides_overlay_2.png new file mode 100755 index 0000000..3853953 Binary files /dev/null and b/textures/jumping_trampoline_sides_overlay_2.png differ diff --git a/textures/jumping_trampoline_sides_overlay_3.png b/textures/jumping_trampoline_sides_overlay_3.png new file mode 100755 index 0000000..7c3ae24 Binary files /dev/null and b/textures/jumping_trampoline_sides_overlay_3.png differ diff --git a/textures/jumping_trampoline_sides_overlay_4.png b/textures/jumping_trampoline_sides_overlay_4.png new file mode 100755 index 0000000..f1ba54d Binary files /dev/null and b/textures/jumping_trampoline_sides_overlay_4.png differ diff --git a/textures/jumping_trampoline_sides_overlay_5.png b/textures/jumping_trampoline_sides_overlay_5.png new file mode 100755 index 0000000..fde0ad0 Binary files /dev/null and b/textures/jumping_trampoline_sides_overlay_5.png differ diff --git a/textures/jumping_trampoline_sides_overlay_6.png b/textures/jumping_trampoline_sides_overlay_6.png new file mode 100755 index 0000000..b1a93fe Binary files /dev/null and b/textures/jumping_trampoline_sides_overlay_6.png differ diff --git a/textures/jumping_trampoline_top.png b/textures/jumping_trampoline_top.png new file mode 100755 index 0000000..c5df874 Binary files /dev/null and b/textures/jumping_trampoline_top.png differ