Merge branch 'tnt' of github.com:farooqkz/capturetheflag into tnt

Author: farooqkz

docs/ctf-api.md

@@ -39,7 +39,10 @@ ctf_settings.register("my_setting", {
 
 ---
 # mods/ctf/
-TODO
+TODO, below is a collection of quick notes for later
+
+## ctf_teams
+* https://modern.ircdocs.horse/formatting.html#colors-16-98
 
 ---
 # mods/mtg/

mods/apis/ctf_gui/dev.lua

@@ -1,4 +1,4 @@
-local unset_function = "[f]\nreturn "
+local unset_function = "return "
 
 function ctf_gui.show_formspec_dev(player, formname, formspec, formcontext)
 	local filepath = minetest.get_worldpath().."/ctf_gui/"
@@ -20,8 +20,8 @@ function ctf_gui.show_formspec_dev(player, formname, formspec, formcontext)
 	local function interval()
 		if type(formspec) == "function" then
 			ctf_gui.show_formspec(player, formname, formspec(formcontext))
-		elseif formspec:sub(1, 3) == "[f]" then
-			local result, form = pcall((loadstring(formspec:sub(4)) or function() return function() end end)(), formcontext)
+		elseif formspec:match("^%s*return") then
+			local result, form = pcall((loadstring(formspec) or function() return function() end end)(), formcontext)
 
 			ctf_gui.show_formspec(player, formname,
 				result and form or "size[10,10]hypertext[0,0;10,10;err;"..minetest.formspec_escape(form or "").."]"

mods/apis/ctf_gui/init.lua

@@ -460,10 +460,16 @@ function ctf_gui.old_show_formspec(player, formname, formdef)
 		formdef._info = formdef
 		context[player] = formdef
 
-		minetest.log("action", "Showing formspec "..dump(formname).." to "..dump(player))
-		minetest.show_formspec(player, formname, formspec)
+		if minetest.get_player_by_name(player) then
+			minetest.log("action", "Showing formspec "..dump(formname).." to "..dump(player))
+			minetest.show_formspec(player, formname, formspec)
+		end
 	end,
 	formdef, ctf_gui.ELEM_SIZE, ctf_gui.SCROLLBAR_WIDTH)
 end
 
+minetest.register_on_leaveplayer(function(player)
+	context[player:get_player_name()] = nil
+end)
+
 dofile(minetest.get_modpath("ctf_gui").."/dev.lua")

mods/apis/ctf_settings/init.lua

@@ -40,7 +40,7 @@ function ctf_settings.get(player, setting)
 	local value = player:get_meta():get_string("ctf_settings:"..setting)
 	local info = ctf_settings.settings[setting]
 
-	return value == "" and info.default or value
+	return value == "" and (info and info.default) or value
 end
 
 -- This Function MIT by Rubenwardy

mods/ctf/ctf_combat/ctf_ranged/init.lua

@@ -77,8 +77,8 @@ local function process_ray(ray, user, look_dir, def)
 				end
 			end
 		elseif hitpoint.type == "object" then
-			hitpoint.ref:punch(user, 1, {
-				full_punch_interval = 1,
+			hitpoint.ref:punch(user, def.fire_interval or 0.1, {
+				full_punch_interval = def.fire_interval or 0.1,
 				damage_groups = {ranged = 1, [def.type] = 1, fleshy = def.damage}
 			}, look_dir)
 		end

mods/ctf/ctf_core/init.lua

@@ -2,7 +2,7 @@ ctf_core = {
 	settings = {
 		-- server_mode = minetest.settings:get("ctf_server_mode") or "play",
 		server_mode = minetest.settings:get_bool("creative_mode", false) and "mapedit" or "play",
-		low_ram_mode = minetest.settings:get("ctf_low_ram_mode") or false,
+		low_ram_mode = minetest.settings:get("ctf_low_ram_mode") == "true" or false,
 	}
 }
 

mods/ctf/ctf_map/ctf_traps.lua

@@ -68,29 +68,31 @@ minetest.register_node("ctf_map:spike", {
 })
 
 for _, team in ipairs(ctf_teams.teamlist) do
-	local spikecolor = ctf_teams.team[team].color
-
-	minetest.register_node("ctf_map:spike_"..team, {
-		description = HumanReadable(team).." Team Spike",
-		drawtype = "plantlike",
-		tiles = {"ctf_map_spike.png^[colorize:"..spikecolor..":150"},
-		inventory_image = "ctf_map_spike.png^[colorize:"..spikecolor..":150",
-		use_texture_alpha = "clip",
-		paramtype = "light",
-		paramtype2 = "meshoptions",
-		sunlight_propagates = true,
-		walkable = false,
-		damage_per_second = 7,
-		groups = {cracky=1, level=2},
-		drop = "ctf_map:spike",
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
-		},
-		on_place = function(itemstack, placer, pointed_thing)
-			return minetest.item_place(itemstack, placer, pointed_thing, 34)
-		end
-	})
+	if not ctf_teams.team[team].not_playing then
+		local spikecolor = ctf_teams.team[team].color
+
+		minetest.register_node("ctf_map:spike_"..team, {
+			description = HumanReadable(team).." Team Spike",
+			drawtype = "plantlike",
+			tiles = {"ctf_map_spike.png^[colorize:"..spikecolor..":150"},
+			inventory_image = "ctf_map_spike.png^[colorize:"..spikecolor..":150",
+			use_texture_alpha = "clip",
+			paramtype = "light",
+			paramtype2 = "meshoptions",
+			sunlight_propagates = true,
+			walkable = false,
+			damage_per_second = 7,
+			groups = {cracky=1, level=2},
+			drop = "ctf_map:spike",
+			selection_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+			},
+			on_place = function(itemstack, placer, pointed_thing)
+				return minetest.item_place(itemstack, placer, pointed_thing, 34)
+			end
+		})
+	end
 end
 
 minetest.register_on_player_hpchange(function(player, hp_change, reason)
@@ -129,7 +131,7 @@ local function damage_cobble_dig(pos, node, digger)
 	local placerobj = minetest.get_player_by_name(placer_name)
 
 	if placerobj then
-		digger:punch(placerobj, 10, {
+		digger:punch(placerobj, 1, {
 			damage_groups = {
 				fleshy = 7,
 				damage_cobble = 1,

mods/ctf/ctf_map/map_functions.lua

@@ -11,12 +11,14 @@ function ctf_map.place_map(mapmeta, callback)
 	local dirname = mapmeta.dirname
 	local schempath = ctf_map.maps_dir .. dirname .. "/map.mts"
 
+	local barrier_data = mapmeta.barriers and mapmeta.barriers()
+
 	ctf_map.emerge_with_callbacks(nil, mapmeta.pos1, mapmeta.pos2, function(ctx)
 		local rotation = (mapmeta.rotation and mapmeta.rotation ~= "z") and "90" or "0"
 		local res = minetest.place_schematic(mapmeta.pos1, schempath, rotation, {["ctf_map:chest"] = "air"})
 
 		minetest.log("action", string.format(
-			"Placed map %s in %.2fs", dirname, (minetest.get_us_time() - ctx.start_time) / 1000000
+			"Placed map %s in %.2fs", dirname, (minetest.get_us_time() - ctx.start_time) / 1e6
 		))
 
 		for name, def in pairs(mapmeta.teams) do
@@ -46,6 +48,10 @@ function ctf_map.place_map(mapmeta, callback)
 
 		ctf_map.current_map = mapmeta
 
+		if barrier_data then
+			ctf_map.current_map.barrier_data = barrier_data
+		end
+
 		callback()
 	end)
 end
@@ -61,7 +67,7 @@ local ID_WATER = minetest.get_content_id("default:water_source")
 ---@param mapmeta table Map meta table
 ---@param callback function
 function ctf_map.remove_barrier(mapmeta, callback)
-	if not mapmeta.barriers then
+	if not mapmeta.barrier_data then
 		minetest.log("action", "Clearing barriers using mapmeta.barrier_area")
 
 		local pos1, pos2 = mapmeta.barrier_area.pos1, mapmeta.barrier_area.pos2
@@ -94,14 +100,26 @@ function ctf_map.remove_barrier(mapmeta, callback)
 			vm2:update_liquids()
 		end)
 	else
+		minetest.log("action", "Clearing barriers using barriers.data")
+
 		local i = 0
-		for _, barrier_area in pairs(mapmeta.barriers) do
+		for _, barrier_area in pairs(mapmeta.barrier_data) do
 			minetest.after(i, function()
 				local vm = VoxelManip()
 				vm:read_from_map(barrier_area.pos1, barrier_area.pos2)
 
 				local data = vm:get_data()
-				assert(#data == barrier_area.max)
+
+				if #data ~= barrier_area.max then
+					-- minetest.log(dump(mapmeta.barrier_data)) -- Used for debugging issues
+					minetest.log("error", "Potential issue with barriers.data. Aborting... | " ..
+							"Debug: "..dump(#data)..", "..dump(barrier_area.max))
+
+					mapmeta.barrier_data = nil
+					ctf_map.remove_barrier(mapmeta, callback)
+					return
+				end
+
 				for idx in pairs(data) do
 					data[idx] = barrier_area.reps[idx] or ID_IGNORE
 				end
@@ -110,13 +128,15 @@ function ctf_map.remove_barrier(mapmeta, callback)
 				vm:write_to_map(false)
 			end)
 
-			i = i + 0.04
+			i = i + 0.05
 		end
 
-		minetest.after(i - 0.04, function()
+		minetest.after(i - 0.05, function()
 			local vm = VoxelManip(mapmeta.pos1, mapmeta.pos2)
 			vm:update_liquids()
 
+			mapmeta.barrier_data = nil -- Contains a large amount of data, free it up now that it's not needed
+
 			callback()
 		end)
 
@@ -193,8 +213,10 @@ local function prepare_nodes(pos1, pos2, data, team_chest_items, blacklisted_nod
 	end
 
 	for _, team in ipairs(ctf_teams.teamlist) do
-		local node = "ctf_teams:chest_" .. team
-		nodes[minetest.get_content_id(node)] = minetest.registered_nodes[node]
+		if not ctf_teams.team[team].not_playing then
+			local node = "ctf_teams:chest_" .. team
+			nodes[minetest.get_content_id(node)] = minetest.registered_nodes[node]
+		end
 	end
 
 	for i, v in ipairs(data) do

mods/ctf/ctf_map/map_meta.lua

@@ -26,6 +26,43 @@ local function calc_flag_center(map)
 	return flag_center
 end
 
+local function connect_barriers_file(map_name, offset, barriers_filepath)
+	return function()
+		local f, err = io.open(barriers_filepath, "rb")
+
+		if (ctf_core.settings.server_mode ~= "mapedit" and assert(f, err)) or f then
+			local barriers = f:read("*all")
+
+			f:close()
+
+			assert(barriers and barriers ~= "")
+
+			barriers = minetest.deserialize(minetest.decompress(barriers, "deflate"))
+
+			if barriers then
+				for _, barrier_area in pairs(barriers) do
+					barrier_area.pos1 = vector.add(barrier_area.pos1, offset)
+					barrier_area.pos2 = vector.add(barrier_area.pos2, offset)
+
+					for i = 1, barrier_area.max do
+						if not barrier_area.reps[i] then
+							barrier_area.reps[i] = minetest.CONTENT_IGNORE
+						else
+							barrier_area.reps[i] = minetest.get_content_id(barrier_area.reps[i])
+						end
+					end
+				end
+
+				return barriers
+			else
+				minetest.log("error", "Map "..map_name.." has a corrupted barriers file. Re-save map to fix")
+			end
+		else
+			minetest.log("error", "Map "..map_name.." is missing its barriers file. Re-save map to fix")
+		end
+	end
+end
+
 function ctf_map.load_map_meta(idx, dirname)
 	local meta = Settings(ctf_map.maps_dir .. dirname .. "/map.conf")
 
@@ -134,7 +171,7 @@ function ctf_map.load_map_meta(idx, dirname)
 		offset.y = -size.y/2
 
 		map = {
-			map_version    = CURRENT_MAP_VERSION,
+			map_version    = tonumber(meta:get("map_version") or "0"),
 			pos1           = offset,
 			pos2           = vector.add(offset, size),
 			offset         = offset,
@@ -160,39 +197,8 @@ function ctf_map.load_map_meta(idx, dirname)
 			game_modes     = minetest.deserialize(meta:get("game_modes")),
 			enable_shadows = tonumber(meta:get("enable_shadows") or "0.26"),
 		}
-		if tonumber(meta:get("map_version")) > 2 and not ctf_core.settings.low_ram_mode then
-			local f, err = io.open(ctf_map.maps_dir .. dirname .. "/barriers.data", "rb")
-
-			if (ctf_core.settings.server_mode ~= "mapedit" and assert(f, err)) or f then
-				local barriers = f:read("*all")
-
-				f:close()
-
-				assert(barriers and barriers ~= "")
-
-				barriers = minetest.deserialize(minetest.decompress(barriers, "deflate"))
-
-				if barriers then
-					for _, barrier_area in pairs(barriers) do
-						barrier_area.pos1 = vector.add(barrier_area.pos1, offset)
-						barrier_area.pos2 = vector.add(barrier_area.pos2, offset)
-
-						for i = 1, barrier_area.max do
-							if not barrier_area.reps[i] then
-								barrier_area.reps[i] = minetest.CONTENT_IGNORE
-							else
-								barrier_area.reps[i] = minetest.get_content_id(barrier_area.reps[i])
-							end
-						end
-					end
-
-					map.barriers = barriers
-				else
-					minetest.log("error", "Map "..dirname.." has a corrupted barriers file. Re-save map to fix")
-				end
-			else
-				minetest.log("error", "Map "..dirname.." is missing its barriers file. Re-save map to fix")
-			end
+		if tonumber(meta:get("map_version")) >= 3 and not ctf_core.settings.low_ram_mode then
+			map.barriers = connect_barriers_file(dirname, offset, ctf_map.maps_dir .. dirname .. "/barriers.data")
 		end
 
 		for id, def in pairs(map.chests) do

mods/ctf/ctf_modebase/build_timer.lua

@@ -29,7 +29,8 @@ local function timer_func(time_left)
 		end
 
 		local pteam = ctf_teams.get(player)
-		if pteam and not ctf_core.pos_inside(player:get_pos(), ctf_teams.get_team_territory(pteam)) then
+		local tpos1, tpos2 = ctf_teams.get_team_territory(pteam)
+		if pteam and tpos1 and not ctf_core.pos_inside(player:get_pos(), tpos1, tpos2) then
 			hud_events.new(player, {
 				quick = true,
 				text = "You can't cross the barrier until build time is over!",
@@ -47,6 +48,13 @@ local function timer_func(time_left)
 	timer = minetest.after(1, timer_func, time_left - 1)
 end
 
+function ctf_modebase.build_timer.start(build_time)
+	local time = build_time or ctf_modebase:get_current_mode().build_timer or DEFAULT_BUILD_TIME
+
+	if time > 0 then
+		timer = timer_func(time)
+	end
+end
 
 function ctf_modebase.build_timer.finish()
 	if timer == nil then return end
@@ -76,10 +84,6 @@ function ctf_modebase.build_timer.finish()
 	end
 end
 
-ctf_api.register_on_new_match(function()
-	timer = minetest.after(1, timer_func, ctf_modebase:get_current_mode().build_timer or DEFAULT_BUILD_TIME)
-end)
-
 ctf_api.register_on_match_end(function()
 	if timer == nil then return end
 	timer:cancel()
@@ -119,4 +123,3 @@ minetest.register_chatcommand("ctf_start", {
 		return true, "Build time ended"
 	end,
 })
-