From c5f0e8aeb93bfb01d2ae97fc494c57b051af07c1 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 3 Mar 2022 20:38:26 +0100 Subject: [PATCH] Move gravity to lzr_globals --- mods/lzr_globals/init.lua | 1 + mods/lzr_laser/blocks.lua | 6 ++---- mods/lzr_treasure/init.lua | 6 ++---- mods/lzr_treasure/mod.conf | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/mods/lzr_globals/init.lua b/mods/lzr_globals/init.lua index e5329e8..bf787f6 100644 --- a/mods/lzr_globals/init.lua +++ b/mods/lzr_globals/init.lua @@ -12,3 +12,4 @@ lzr_globals.MENU_PLAYER_SPAWN_POS = vector.add(lzr_globals.MENU_SHIP_POS, lzr_gl lzr_globals.WATER_LEVEL = 0 lzr_globals.SEABED_LEVEL = -1000 lzr_globals.SEASTONE_LEVEL = -1002 +lzr_globals.GRAVITY = tonumber(minetest.settings:get("movement_gravity")) or 9.81 diff --git a/mods/lzr_laser/blocks.lua b/mods/lzr_laser/blocks.lua index 756ee43..f1b1742 100644 --- a/mods/lzr_laser/blocks.lua +++ b/mods/lzr_laser/blocks.lua @@ -32,8 +32,6 @@ local mirror_out = { [23] = {0,0,1}, } -local movement_gravity = tonumber(minetest.settings:get("movement_gravity")) or 9.81 - lzr_laser.get_front_dir = function(param2) if not param2 then return @@ -512,8 +510,8 @@ minetest.register_node("lzr_laser:barricade_on", { maxpos = vector.add(pos, vector.new(0.5, 0.5, 0.5)), minvel = vector.new(-0.5, -0.2, -0.5), maxvel = vector.new(0.5, 0.2, 0.5), - minacc = vector.new(0, -movement_gravity, 0), - maxacc = vector.new(0, -movement_gravity, 0), + minacc = vector.new(0, -lzr_globals_GRAVITY, 0), + maxacc = vector.new(0, -lzr_globals_GRAVITY, 0), minsize = 1.5, maxsize = 1.5, node = {name="lzr_laser:barricade"}, diff --git a/mods/lzr_treasure/init.lua b/mods/lzr_treasure/init.lua index 0d6ee93..abcb06d 100644 --- a/mods/lzr_treasure/init.lua +++ b/mods/lzr_treasure/init.lua @@ -1,5 +1,3 @@ -local movement_gravity = tonumber(minetest.settings:get("movement_gravity")) or 9.81 - local S = minetest.get_translator("lzr_treasure") local N = function(s) return s end @@ -122,8 +120,8 @@ local register_chest = function(id, def) maxpos = vector.add(pos, vector.new(7/16, 7/16, 7/16)), minvel = vector.new(-0.4, 0, -0.4), maxvel = vector.new(0.4, 0.2, 0.4), - minacc = vector.new(0, -movement_gravity, 0), - maxacc = vector.new(0, -movement_gravity, 0), + minacc = vector.new(0, -lzr_globals.GRAVITY, 0), + maxacc = vector.new(0, -lzr_globals.GRAVITY, 0), minsize = 0.75, maxsize = 0.75, node = {name=treasure}, diff --git a/mods/lzr_treasure/mod.conf b/mods/lzr_treasure/mod.conf index 3900c9f..3ba9e26 100644 --- a/mods/lzr_treasure/mod.conf +++ b/mods/lzr_treasure/mod.conf @@ -1,2 +1,2 @@ name = lzr_treasure -depends = lzr_sounds, screwdriver2 +depends = lzr_globals, lzr_sounds, screwdriver2