mirror of
https://github.com/SmallJoker/boost_cart.git
synced 2024-12-23 17:30:19 +01:00
Bump to 5.0.0 and fix the copper rail
moreores only adds the copper rail when the 'carts' mod was found
This commit is contained in:
parent
e4edb96d30
commit
ae33bd7a68
@ -1,6 +1,4 @@
|
|||||||
|
|
||||||
local HAVE_MESECONS_ENABLED = minetest.global_exists("mesecon")
|
|
||||||
|
|
||||||
function boost_cart:on_rail_step(entity, pos, distance)
|
function boost_cart:on_rail_step(entity, pos, distance)
|
||||||
-- Play rail sound
|
-- Play rail sound
|
||||||
if entity.sound_counter <= 0 then
|
if entity.sound_counter <= 0 then
|
||||||
@ -13,7 +11,7 @@ function boost_cart:on_rail_step(entity, pos, distance)
|
|||||||
end
|
end
|
||||||
entity.sound_counter = entity.sound_counter - distance
|
entity.sound_counter = entity.sound_counter - distance
|
||||||
|
|
||||||
if HAVE_MESECONS_ENABLED then
|
if boost_cart.MESECONS then
|
||||||
boost_cart:signal_detector_rail(pos)
|
boost_cart:signal_detector_rail(pos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -40,7 +38,7 @@ local cart_entity = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- Model and textures
|
-- Model and textures
|
||||||
if boost_cart.mtg_compat then
|
if boost_cart.MTG_CARTS then
|
||||||
cart_entity.initial_properties.mesh = "carts_cart.b3d"
|
cart_entity.initial_properties.mesh = "carts_cart.b3d"
|
||||||
cart_entity.initial_properties.textures = {"carts_cart.png"}
|
cart_entity.initial_properties.textures = {"carts_cart.png"}
|
||||||
end
|
end
|
||||||
@ -289,7 +287,7 @@ function cart_entity:on_step(dtime)
|
|||||||
acc = speed_mod * 10
|
acc = speed_mod * 10
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if acc == nil and boost_cart.mtg_compat then
|
if acc == nil and boost_cart.MTG_CARTS then
|
||||||
-- MTG Cart API adaption
|
-- MTG Cart API adaption
|
||||||
local rail_node = minetest.get_node(vector.round(pos))
|
local rail_node = minetest.get_node(vector.round(pos))
|
||||||
local railparam = carts.railparams[rail_node.name]
|
local railparam = carts.railparams[rail_node.name]
|
||||||
@ -380,18 +378,14 @@ function cart_entity:on_step(dtime)
|
|||||||
|
|
||||||
-- Change player model rotation, depending on the Y direction
|
-- Change player model rotation, depending on the Y direction
|
||||||
if player and dir.y ~= old_y_dir then
|
if player and dir.y ~= old_y_dir then
|
||||||
local feet = {x=0, y=0, z=0}
|
local feet = {x=0, y=-4, z=0}
|
||||||
local eye = {x=0, y=-4, z=0}
|
local eye = {x=0, y=-4, z=0}
|
||||||
feet.y = boost_cart.old_player_model and 6 or -4
|
|
||||||
if dir.y ~= 0 then
|
if dir.y ~= 0 then
|
||||||
-- TODO: Find a better way to calculate this
|
-- TODO: Find a better way to calculate this
|
||||||
if boost_cart.old_player_model then
|
feet.y = feet.y + 4
|
||||||
feet.y = feet.y + 2
|
feet.z = -dir.y * 2
|
||||||
feet.z = -dir.y * 6
|
|
||||||
else
|
|
||||||
feet.y = feet.y + 4
|
|
||||||
feet.z = -dir.y * 2
|
|
||||||
end
|
|
||||||
eye.z = -dir.y * 8
|
eye.z = -dir.y * 8
|
||||||
end
|
end
|
||||||
player:set_attach(self.object, "", feet,
|
player:set_attach(self.object, "", feet,
|
||||||
@ -414,7 +408,7 @@ end
|
|||||||
minetest.register_entity(":carts:cart", cart_entity)
|
minetest.register_entity(":carts:cart", cart_entity)
|
||||||
|
|
||||||
-- Register item to place the entity
|
-- Register item to place the entity
|
||||||
if not boost_cart.mtg_compat then
|
if not boost_cart.MTG_CARTS then
|
||||||
minetest.register_craftitem(":carts:cart", {
|
minetest.register_craftitem(":carts:cart", {
|
||||||
description = "Cart (Sneak+Click to pick up)",
|
description = "Cart (Sneak+Click to pick up)",
|
||||||
inventory_image = minetest.inventorycube(
|
inventory_image = minetest.inventorycube(
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
default
|
|
||||||
mesecons?
|
|
||||||
moreores?
|
|
||||||
carts?
|
|
@ -1 +0,0 @@
|
|||||||
This mod offers improved minecarts and a few more rail types.
|
|
@ -10,19 +10,17 @@ function boost_cart:manage_attachment(player, obj)
|
|||||||
if not player then
|
if not player then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local status = obj ~= nil
|
local wants_attach = obj ~= nil
|
||||||
|
local attached = player:get_attach() ~= nil
|
||||||
|
|
||||||
local player_name = player:get_player_name()
|
local player_name = player:get_player_name()
|
||||||
if default.player_attached[player_name] == status then
|
boost_cart.player_attached[player_name] = attached or wants_attach
|
||||||
|
if attached == wants_attach then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
default.player_attached[player_name] = status
|
|
||||||
|
|
||||||
if status then
|
if wants_attach then
|
||||||
local y_pos = self.old_player_model and 6 or -4
|
player:set_attach(obj, "", {x=0, y=-4, z=0}, {x=0, y=0, z=0})
|
||||||
if player:get_properties().visual == "upright_sprite" then
|
|
||||||
y_pos = -4
|
|
||||||
end
|
|
||||||
player:set_attach(obj, "", {x=0, y=y_pos, z=0}, {x=0, y=0, z=0})
|
|
||||||
player:set_eye_offset({x=0, y=-4, z=0},{x=0, y=-4, z=0})
|
player:set_eye_offset({x=0, y=-4, z=0},{x=0, y=-4, z=0})
|
||||||
else
|
else
|
||||||
player:set_detach()
|
player:set_detach()
|
||||||
|
30
init.lua
30
init.lua
@ -1,12 +1,15 @@
|
|||||||
|
|
||||||
|
if not minetest.features.object_use_texture_alpha then
|
||||||
|
error("[boost_cart] Your Minetest version is no longer supported."
|
||||||
|
.. " (Version < 5.0.0)")
|
||||||
|
end
|
||||||
|
|
||||||
boost_cart = {}
|
boost_cart = {}
|
||||||
boost_cart.modpath = minetest.get_modpath("boost_cart")
|
boost_cart.modpath = minetest.get_modpath("boost_cart")
|
||||||
|
boost_cart.MESECONS = minetest.global_exists("mesecon")
|
||||||
|
boost_cart.MTG_CARTS = minetest.global_exists("carts") and carts.pathfinder
|
||||||
if not minetest.settings then
|
boost_cart.PLAYER_API = minetest.global_exists("player_api")
|
||||||
error("[boost_cart] Your Minetest version is no longer supported."
|
boost_cart.player_attached = {}
|
||||||
.. " (Version <= 0.4.15)")
|
|
||||||
end
|
|
||||||
|
|
||||||
local function getNum(setting)
|
local function getNum(setting)
|
||||||
return tonumber(minetest.settings:get(setting))
|
return tonumber(minetest.settings:get(setting))
|
||||||
@ -20,27 +23,22 @@ boost_cart.punch_speed_max = getNum("boost_cart.punch_speed_max") or 7
|
|||||||
boost_cart.path_distance_max = 3
|
boost_cart.path_distance_max = 3
|
||||||
|
|
||||||
|
|
||||||
-- Support for non-default games
|
if boost_cart.PLAYER_API then
|
||||||
if not default.player_attached then
|
-- This is a table reference!
|
||||||
default.player_attached = {}
|
boost_cart.player_attached = player_api.player_attached
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.after(0, function()
|
|
||||||
boost_cart.old_player_model = not minetest.global_exists("player_api")
|
|
||||||
end)
|
|
||||||
|
|
||||||
dofile(boost_cart.modpath.."/functions.lua")
|
dofile(boost_cart.modpath.."/functions.lua")
|
||||||
dofile(boost_cart.modpath.."/rails.lua")
|
dofile(boost_cart.modpath.."/rails.lua")
|
||||||
|
|
||||||
if minetest.global_exists("mesecon") then
|
if boost_cart.MESECONS then
|
||||||
dofile(boost_cart.modpath.."/detector.lua")
|
dofile(boost_cart.modpath.."/detector.lua")
|
||||||
--else
|
--else
|
||||||
-- minetest.register_alias("carts:powerrail", "boost_cart:detectorrail")
|
-- minetest.register_alias("carts:powerrail", "boost_cart:detectorrail")
|
||||||
-- minetest.register_alias("carts:powerrail", "boost_cart:detectorrail_on")
|
-- minetest.register_alias("carts:powerrail", "boost_cart:detectorrail_on")
|
||||||
end
|
end
|
||||||
|
|
||||||
boost_cart.mtg_compat = minetest.global_exists("carts") and carts.pathfinder
|
if boost_cart.MTG_CARTS then
|
||||||
if boost_cart.mtg_compat then
|
|
||||||
minetest.log("action", "[boost_cart] Overwriting definitions of similar carts mod")
|
minetest.log("action", "[boost_cart] Overwriting definitions of similar carts mod")
|
||||||
end
|
end
|
||||||
dofile(boost_cart.modpath.."/cart_entity.lua")
|
dofile(boost_cart.modpath.."/cart_entity.lua")
|
||||||
|
8
mod.conf
8
mod.conf
@ -1 +1,7 @@
|
|||||||
name = boost_cart
|
name = boost_cart
|
||||||
|
description = """
|
||||||
|
Boost Cart
|
||||||
|
The mod that add a cart and new kinds of rails to your world.
|
||||||
|
"""
|
||||||
|
depends = default
|
||||||
|
optional_depends = mesecons, moreores, carts, player_api
|
||||||
|
13
rails.lua
13
rails.lua
@ -16,18 +16,21 @@ boost_cart:register_rail(":"..regular_rail_itemname, {
|
|||||||
})
|
})
|
||||||
|
|
||||||
-- Moreores' copper rail
|
-- Moreores' copper rail
|
||||||
|
local copperrail_registered = false
|
||||||
if minetest.get_modpath("moreores") then
|
if minetest.get_modpath("moreores") then
|
||||||
minetest.register_alias("carts:copperrail", "moreores:copper_rail")
|
minetest.register_alias("carts:copperrail", "moreores:copper_rail")
|
||||||
|
|
||||||
if minetest.raillike_group then
|
local raildef = minetest.registered_nodes["moreores:copper_rail"]
|
||||||
|
if raildef and minetest.raillike_group then
|
||||||
-- Ensure that this rail uses the same connect_to_raillike
|
-- Ensure that this rail uses the same connect_to_raillike
|
||||||
local new_groups = minetest.registered_nodes["moreores:copper_rail"].groups
|
raildef.groups.connect_to_raillike = minetest.raillike_group("rail")
|
||||||
new_groups.connect_to_raillike = minetest.raillike_group("rail")
|
|
||||||
minetest.override_item("moreores:copper_rail", {
|
minetest.override_item("moreores:copper_rail", {
|
||||||
groups = new_groups
|
groups = raildef.groups
|
||||||
})
|
})
|
||||||
|
copperrail_registered = true
|
||||||
end
|
end
|
||||||
else
|
end
|
||||||
|
if not copperrail_registered then
|
||||||
boost_cart:register_rail(":carts:copperrail", {
|
boost_cart:register_rail(":carts:copperrail", {
|
||||||
description = "Copper rail",
|
description = "Copper rail",
|
||||||
tiles = {
|
tiles = {
|
||||||
|
Loading…
Reference in New Issue
Block a user