Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use voxel manip for barrier placing commands #1265

Merged
merged 7 commits into from
Jun 29, 2024
Merged

Use voxel manip for barrier placing commands #1265

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec2c22f
Use Voxel Manip
a-blob Jan 29, 2024
87b758d
Maybe this makes the code cleaner?
a-blob Jan 29, 2024
4539d74
Merge branch 'master' into barrier-commands
a-blob Apr 20, 2024
ec7ef6e
Merge branch 'master' into barrier-commands
a-blob May 13, 2024
38ffb39
Merge branch 'master' into barrier-commands
a-blob Jun 4, 2024
dea5561
Merge branch 'master' into barrier-commands
a-blob Jun 17, 2024
6ad0ab3
Merge branch 'master' into barrier-commands
LoneWolfHT Jun 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 35 additions & 34 deletions mods/ctf/ctf_map/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,56 +194,57 @@ minetest.register_chatcommand("ctf_barrier", {
"use /ctf_barrier remove_buildtime to remove unwanted parts"))
end

local vm = minetest.get_voxel_manip()
local emin, emax = vm:read_from_map(pos1, pos2)
local a = VoxelArea:new{
MinEdge = emin,
MaxEdge = emax
}
local data = vm:get_data()

for x = pos1.x, pos2.x do
for y = pos1.y, pos2.y do
for z = pos1.z, pos2.z do
local vi = a:index(x, y, z)
if params == "place_buildtime" then
local current_pos = {x = x, y = y, z = z}
local current_node = minetest.get_node_or_nil(current_pos)
if current_node then
if current_node.name == "air" then
minetest.set_node(current_pos, {name = "ctf_map:ind_glass_red"})
elseif current_node.name == "default:stone" then
minetest.set_node(current_pos, {name = "ctf_map:ind_stone_red"})
elseif current_node.name == "default:water_source" then
minetest.set_node(current_pos, {name = "ctf_map:ind_water"})
elseif current_node.name == "default:lava_source" then
minetest.set_node(current_pos, {name = "ctf_map:ind_lava"})
end
if data[vi] == minetest.get_content_id("air") then
data[vi] = minetest.get_content_id("ctf_map:ind_glass_red")
elseif data[vi] == minetest.get_content_id("default:stone") then
data[vi] = minetest.get_content_id("ctf_map:ind_stone_red")
elseif data[vi] == minetest.get_content_id("default:water_source") then
data[vi] = minetest.get_content_id("ctf_map:ind_water")
elseif data[vi] == minetest.get_content_id("default:lava_source") then
data[vi] = minetest.get_content_id("ctf_map:ind_lava")
end
elseif params == "remove_buildtime" then
local current_pos = {x = x, y = y, z = z}
local current_node = minetest.get_node_or_nil(current_pos)
if current_node then
if current_node.name == "ctf_map:ind_glass_red" then
minetest.set_node(current_pos, {name = "air"})
elseif current_node.name == "ctf_map:ind_stone_red" then
minetest.set_node(current_pos, {name = "default:stone"})
elseif current_node.name == "ctf_map:ind_water" then
minetest.set_node(current_pos, {name = "default:water_source"})
elseif current_node.name == "ctf_map:ind_lava" then
minetest.set_node(current_pos, {name = "default:lava_source"})
end
if data[vi] == minetest.get_content_id("ctf_map:ind_glass_red") then
data[vi] = minetest.get_content_id("air")
elseif data[vi] == minetest.get_content_id("ctf_map:ind_stone_red") then
data[vi] = minetest.get_content_id("default:stone")
elseif data[vi] == minetest.get_content_id("ctf_map:ind_water") then
data[vi] = minetest.get_content_id("default:water_source")
elseif data[vi] == minetest.get_content_id("ctf_map:ind_lava") then
data[vi] = minetest.get_content_id("default:lava_source")
end
elseif params == "place_outer" then
local current_pos = {x = x, y = y, z = z}
if x == pos1.x or x == pos2.x or y == pos1.y
or z == pos1.z or z == pos2.z then
local current_node = minetest.get_node_or_nil(current_pos)
if current_node then
if current_node.name == "air" or
current_node.name == "ctf_map:ignore" or
current_node.name == "ignore" then
minetest.set_node(current_pos, {name = "ctf_map:ind_glass"})
else
minetest.set_node(current_pos, {name = "ctf_map:stone"})
end
if data[vi] == minetest.get_content_id("air") or
data[vi] == minetest.get_content_id("ignore") or
data[vi] == minetest.get_content_id("ctf_map:ignore") then
data[vi] = minetest.get_content_id("ctf_map:ind_glass")
else
data[vi] = minetest.get_content_id("ctf_map:stone")
end
end
end
end
end
end

vm:set_data(data)
vm:write_to_map(true)

local message =
(params == "place_buildtime" and "Build-time barrier placed") or
(params == "remove_buildtime" and "Build-time barrier removed") or
Expand Down