diff --git a/advtrains_train_jre231_mod/init.lua b/advtrains_train_jre231_mod/init.lua index 33a003e..f0f7eb6 100644 --- a/advtrains_train_jre231_mod/init.lua +++ b/advtrains_train_jre231_mod/init.lua @@ -1,14 +1,14 @@ -- twi_mods/advtrains_train_jre231_mod/init.lua -- Modify advtrains_train_jre231 -- Copyright (C) 2024 1F616EMO -- SPDX-License-Identifier: AGPL-3.0-or-later for _, name in ipairs({ "KuHa_E231", "MoHa_E231", "SaHa_E231", "MoHa_E230", }) do - minetest.registered_entities["advtrains:" .. name].max_speed = 30 - advtrains.wagon_prototypes["advtrains:" .. name].max_speed = 30 + minetest.registered_entities["advtrains:" .. name].max_speed = twi_fx.ADVTRAINS_MAX_TRAIN_SPEED + advtrains.wagon_prototypes["advtrains:" .. name].max_speed = twi_fx.ADVTRAINS_MAX_TRAIN_SPEED end diff --git a/advtrains_train_jre231_mod/mod.conf b/advtrains_train_jre231_mod/mod.conf index f4aba1b..1ea3508 100644 --- a/advtrains_train_jre231_mod/mod.conf +++ b/advtrains_train_jre231_mod/mod.conf @@ -1,2 +1,2 @@ name = advtrains_train_jre231_mod -depends = advtrains_train_jre231, advtrains +depends = twi_fx, advtrains_train_jre231, advtrains diff --git a/dlxtrains_diesel_locomotives_mod/init.lua b/dlxtrains_diesel_locomotives_mod/init.lua index 0a1528f..b7878f8 100644 --- a/dlxtrains_diesel_locomotives_mod/init.lua +++ b/dlxtrains_diesel_locomotives_mod/init.lua @@ -1,13 +1,13 @@ -- twi_mods/dlxtrains_diesel_locomotives_mod/init.lua -- Modify dlxtrains_diesel_locomotives -- Copyright (C) 2024 1F616EMO -- SPDX-License-Identifier: AGPL-3.0-or-later for _, name in ipairs({ "dlxtrains_diesel_locomotives:locomotive_type1", "dlxtrains_diesel_locomotives:locomotive_type2", "dlxtrains_diesel_locomotives:locomotive_type3", }) do - minetest.registered_entities[name].max_speed = 30 - advtrains.wagon_prototypes[name].max_speed = 30 + minetest.registered_entities[name].max_speed = twi_fx.ADVTRAINS_MAX_TRAIN_SPEED + advtrains.wagon_prototypes[name].max_speed = twi_fx.ADVTRAINS_MAX_TRAIN_SPEED end diff --git a/dlxtrains_diesel_locomotives_mod/mod.conf b/dlxtrains_diesel_locomotives_mod/mod.conf index 0c8474c..7fb0183 100644 --- a/dlxtrains_diesel_locomotives_mod/mod.conf +++ b/dlxtrains_diesel_locomotives_mod/mod.conf @@ -1,2 +1,2 @@ name = dlxtrains_diesel_locomotives_mod -depends = dlxtrains_diesel_locomotives +depends = twi_fx, dlxtrains_diesel_locomotives diff --git a/moretrains_mod/init.lua b/moretrains_mod/init.lua index 2ed0992..3c3076a 100644 --- a/moretrains_mod/init.lua +++ b/moretrains_mod/init.lua @@ -1,27 +1,27 @@ -- twi_mods/moretrains_mod_mod/init.lua -- Modify moretrains_mod -- Copyright (C) 2024 1F616EMO -- SPDX-License-Identifier: AGPL-3.0-or-later for _, name in ipairs({ "moretrains_nightline_couchette", "moretrains_nightline_seat_car", "moretrains_wagon_gondola", "moretrains_wagon_gondola_mese", "moretrains_wagon_gondola_cobble", "moretrains_wagon_gondola_toiletpaper", "moretrains_wagon_gondola_rails", "moretrains_wagon_tank", "moretrains_wagon_tank2", "moretrains_wagon_wood", "moretrains_wagon_wood_loaded", "moretrains_wagon_wood_acacia", "moretrains_wagon_wood_jungle", "moretrains_wagon_wood_pine", "moretrains_wagon_wood_aspen", "moretrains_wagon_box", "moretrains_railroad_car", }) do - minetest.registered_entities["advtrains:" .. name].max_speed = 30 - advtrains.wagon_prototypes["advtrains:" .. name].max_speed = 30 + minetest.registered_entities["advtrains:" .. name].max_speed = twi_fx.ADVTRAINS_MAX_TRAIN_SPEED + advtrains.wagon_prototypes["advtrains:" .. name].max_speed = twi_fx.ADVTRAINS_MAX_TRAIN_SPEED end diff --git a/moretrains_mod/mod.conf b/moretrains_mod/mod.conf index 8e1e03f..61dee1a 100644 --- a/moretrains_mod/mod.conf +++ b/moretrains_mod/mod.conf @@ -1,2 +1,2 @@ name = moretrains_mod -depends = moretrains_basic, moretrains_gondola, moretrains_industrial, moretrains_japan, moretrains_nightline, moretrains_steam, moretrains_vintage +depends = twi_fx, moretrains_basic, moretrains_gondola, moretrains_industrial, moretrains_japan, moretrains_nightline, moretrains_steam, moretrains_vintage diff --git a/twi_fx/init.lua b/twi_fx/init.lua index ac7dc23..7457d23 100644 --- a/twi_fx/init.lua +++ b/twi_fx/init.lua @@ -1,50 +1,53 @@ -- twi_mods/twi_fx/init.lua -- Common functions --[[ Copyright © 2024 1F616EMO 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. ]] twi_fx = {} function twi_fx.register_all_stairsplus(modname, name) local nodename = modname .. ":" .. name local def = table.copy(minetest.registered_nodes[nodename]) def.is_ground_content = false def.sunlight_propagates = true stairsplus:register_all(modname, name, nodename, def) end function twi_fx.override_group(name, new_groups) local groups = table.copy(minetest.registered_items[name].groups or {}) for k, v in pairs(new_groups) do groups[k] = v == 0 and nil or v end minetest.override_item(name, { groups = groups, }) end twi_fx.register_on_chat_message = minetest.global_exists("beerchat") and beerchat.register_on_chat_message or minetest.register_on_chat_message + +-- Limit that out hardware can bear +twi_fx.ADVTRAINS_MAX_TRAIN_SPEED = 30