jungletrees growing on grass fixed and boats removed till they work again

games/minetime_game/mods/boats/README.txt

@@ -1,16 +0,0 @@
-Minetest 0.4 mod: boats
-=======================
-by PilzAdam, slightly modified for NeXt
-
-License of source code:
------------------------
-WTFPL
-
-License of media (textures and sounds):
----------------------------------------
-WTFPL
-
-Authors of media files:
------------------------
-textures: Zeg9
-model: thetoon and Zeg9, modified by PavelS(SokolovPavel)

games/minetime_game/mods/boats/init.lua

@@ -1,211 +0,0 @@
-
---
--- Helper functions
---
-
-local function is_water(pos)
-	local nn = minetest.get_node(pos).name
-	return minetest.get_item_group(nn, "water") ~= 0
-end
-
-local function get_sign(i)
-	if i == 0 then
-		return 0
-	else
-		return i / math.abs(i)
-	end
-end
-
-local function get_velocity(v, yaw, y)
-	local x = -math.sin(yaw) * v
-	local z =  math.cos(yaw) * v
-	return {x = x, y = y, z = z}
-end
-
-local function get_v(v)
-	return math.sqrt(v.x ^ 2 + v.z ^ 2)
-end
-
---
--- Boat entity
---
-
-local boat = {
-	physical = true,
-	collisionbox = {-0.6, -0.4, -0.6, 0.6, 0.3, 0.6},
-	visual = "mesh",
-	mesh = "boat.x",
-	textures = {"default_junglewood.png"},
-
-	driver = nil,
-	v = 0,
-	last_v = 0,
-	removed = false
-}
-
-function boat.on_rightclick(self, clicker)
-	if not clicker or not clicker:is_player() then
-		return
-	end
-	local name = clicker:get_player_name()
-	if self.driver and clicker == self.driver then
-		self.driver = nil
-		clicker:set_detach()
-		default.player_attached[name] = false
-		default.player_set_animation(clicker, "stand" , 30)
-	elseif not self.driver then
-		self.driver = clicker
-		clicker:set_attach(self.object, "", {x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
-		default.player_attached[name] = true
-		minetest.after(0.2, function()
-			default.player_set_animation(clicker, "sit" , 30)
-		end)
-		self.object:setyaw(clicker:get_look_yaw() - math.pi / 2)
-	end
-end
-
-function boat.on_activate(self, staticdata, dtime_s)
-	self.object:set_armor_groups({immortal = 1})
-	if staticdata then
-		self.v = tonumber(staticdata)
-	end
-	self.last_v = self.v
-end
-
-function boat.get_staticdata(self)
-	return tostring(self.v)
-end
-
-function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, direction)
-	if not puncher or not puncher:is_player() or self.removed then
-		return
-	end
-	puncher:set_detach()
-	default.player_attached[puncher:get_player_name()] = false
-
-	self.removed = true
-	-- delay remove to ensure player is detached
-	minetest.after(0.1, function()
-		self.object:remove()
-	end)
-	if not minetest.setting_getbool("creative_mode") then
-		puncher:get_inventory():add_item("main", "boats:boat")
-	end
-end
-
-function boat.on_step(self, dtime)
-	self.v = get_v(self.object:getvelocity()) * get_sign(self.v)
-	if self.driver then
-		local ctrl = self.driver:get_player_control()
-		local yaw = self.object:getyaw()
-		if ctrl.up then
-			self.v = self.v + 0.1
-		end
-		if ctrl.down then
-			self.v = self.v - 0.08
-		end
-		if ctrl.left then
-			if ctrl.down then
-				self.object:setyaw(yaw - (1 + dtime) * 0.03)
-			else
-				self.object:setyaw(yaw + (1 + dtime) * 0.03)
-			end
-		end
-		if ctrl.right then
-			if ctrl.down then
-				self.object:setyaw(yaw + (1 + dtime) * 0.03)
-			else
-				self.object:setyaw(yaw - (1 + dtime) * 0.03)
-			end
-		end
-	end
-	local velo = self.object:getvelocity()
-	if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
-		return
-	end
-	local s = get_sign(self.v)
-	self.v = self.v - 0.02 * s
-	if s ~= get_sign(self.v) then
-		self.object:setvelocity({x = 0, y = 0, z = 0})
-		self.v = 0
-		return
-	end
-	if math.abs(self.v) > 4.5 then
-		self.v = 4.5 * get_sign(self.v)
-	end
-
-	local p = self.object:getpos()
-	p.y = p.y - 0.5
-	local new_velo = {x = 0, y = 0, z = 0}
-	local new_acce = {x = 0, y = 0, z = 0}
-	if not is_water(p) then
-		local nodedef = minetest.registered_nodes[minetest.get_node(p).name]
-		if (not nodedef) or nodedef.walkable then
-			self.v = 0
-			new_acce = {x = 0, y = 1, z = 0}
-		else
-			new_acce = {x = 0, y = -9.8, z = 0} -- freefall in air -9.81
-		end
-		new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
-	else
-		p.y = p.y + 1
-		if is_water(p) then
-			new_acce = {x = 0, y = 3, z = 0}
-			local y = self.object:getvelocity().y
-			if y > 2 then
-				y = 2
-			end
-			if y < 0 then
-				self.object:setacceleration({x = 0, y = 10, z = 0})
-			end
-			new_velo = get_velocity(self.v, self.object:getyaw(), y)
-		else
-			new_acce = {x = 0, y = 0, z = 0}
-			if math.abs(self.object:getvelocity().y) <= 2 then
-				local pos = self.object:getpos()
-				pos.y = math.floor(pos.y) + 0.5
-				self.object:setpos(pos)
-				new_velo = get_velocity(self.v, self.object:getyaw(), 0)
-			else
-				new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y)
-			end
-		end
-	end
-	self.object:setvelocity(new_velo)
-	self.object:setacceleration(new_acce)
-end
-
-minetest.register_entity("boats:boat", boat)
-
-
-minetest.register_craftitem("boats:boat", {
-	description = "Boat",
-	inventory_image = "boat_inventory.png",
-	wield_image = "boat_wield.png",
-	wield_scale = {x = 2, y = 2, z = 1},
-	liquids_pointable = true,
-
-	on_place = function(itemstack, placer, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return
-		end
-		if not is_water(pointed_thing.under) then
-			return
-		end
-		pointed_thing.under.y = pointed_thing.under.y + 0.5
-		minetest.add_entity(pointed_thing.under, "boats:boat")
-		if not minetest.setting_getbool("creative_mode") then
-			itemstack:take_item()
-		end
-		return itemstack
-	end,
-})
-
-minetest.register_craft({
-	output = "boats:boat",
-	recipe = {
-		{"",           "",           ""          },
-		{"group:wood", "",           "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
-	},
-})

games/minetime_game/mods/default/functions.lua

@@ -399,6 +399,12 @@ minetest.register_abm({
 		local node_under = minetest.get_node(pos1)
 		local decay = minetest.registered_nodes[node.name].groups.treedecay
 		local nodes_around = minetest.find_node_near(pos, decay, {"group:trunk"})
+		local node = minetest.get_node(pos)
+		if node.param2 ~= 0 then
+			--print("param2 ~= 0")
+			return
+		end
+
 		if not decay or decay == 0 then
 			return
 		elseif decay ~= 1 and nodes_around then
@@ -415,15 +421,12 @@ minetest.register_abm({
 		else
 			itemstacks = minetest.get_node_drops(node.name)
 			for _, itemname in ipairs(itemstacks) do
-				if minetest.get_item_group(node.name, "treedecay_drop") ~= 0 or
-						itemname ~= node.name then
-					local p_drop = {
-						x = pos.x - 0.5 + math.random(),
-						y = pos.y - 0.5 + math.random(),
-						z = pos.z - 0.5 + math.random(),
-					}
-					minetest.add_item(p_drop, itemname)
-				end
+				local p_drop = {
+					x = pos.x - 0.5 + math.random(),
+					y = pos.y - 0.5 + math.random(),
+					z = pos.z - 0.5 + math.random(),
+				}
+				minetest.add_item(p_drop, itemname)
 			end
 			minetest.remove_node(pos)
 			nodeupdate(pos)

games/minetime_game/mods/tnt/README.txt

@@ -0,0 +1,36 @@
+=== TNT mod for Minetest ===
+by PilzAdam and ShadowNinja
+
+Introduction:
+This mod adds TNT to Minetest. TNT is a tool to help the player
+in mining.
+
+How to use the mod:
+Craft gunpowder by placing coal and gravel in the crafting area. The
+gunpowder can be used to craft TNT or as fuze for TNT. To craft TNT
+surround gunpowder with 4 wood in a + shape.
+There are different ways to blow up TNT:
+  1. Hit it with a torch.
+  2. Hit a gunpowder fuze that leads to a TNT block with a torch.
+  3. Activate it with mesecons (fastest way)
+Be aware of the damage radius of 7 blocks!
+
+License:
+WTFPL (see below)
+
+See also:
+http://minetest.net/
+
+         DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

games/minetime_game/mods/tnt/depends.txt

@@ -1 +1,3 @@
 default
+fire
+

games/minetime_game/mods/tnt/init.lua

@@ -0,0 +1,356 @@
+
+-- Default to enabled in singleplayer and disabled in multiplayer
+local singleplayer = minetest.is_singleplayer()
+local setting = minetest.setting_getbool("enable_tnt")
+if (not singleplayer and setting ~= true) or
+		(singleplayer and setting == false) then
+	return
+end
+
+-- loss probabilities array (one in X will be lost)
+local loss_prob = {}
+
+loss_prob["default:cobble"] = 3
+loss_prob["default:dirt"] = 4
+
+local radius = tonumber(minetest.setting_get("tnt_radius") or 3)
+
+-- Fill a list with data for content IDs, after all nodes are registered
+local cid_data = {}
+minetest.after(0, function()
+	for name, def in pairs(minetest.registered_nodes) do
+		cid_data[minetest.get_content_id(name)] = {
+			name = name,
+			drops = def.drops,
+			flammable = def.groups.flammable,
+		}
+	end
+end)
+
+local function rand_pos(center, pos, radius)
+	pos.x = center.x + math.random(-radius, radius)
+	pos.z = center.z + math.random(-radius, radius)
+end
+
+local function eject_drops(drops, pos, radius)
+	local drop_pos = vector.new(pos)
+	for _, item in pairs(drops) do
+		local count = item:get_count()
+		local max = item:get_stack_max()
+		if count > max then
+			item:set_count(max)
+		end
+		while count > 0 do
+			if count < max then
+				item:set_count(count)
+			end
+			rand_pos(pos, drop_pos, radius)
+			local obj = minetest.add_item(drop_pos, item)
+			if obj then
+				obj:get_luaentity().collect = true
+				obj:setacceleration({x=0, y=-10, z=0})
+				obj:setvelocity({x=math.random(-3, 3), y=10,
+						z=math.random(-3, 3)})
+			end
+			count = count - max
+		end
+	end
+end
+
+local function add_drop(drops, item)
+	item = ItemStack(item)
+	local name = item:get_name()
+	if loss_prob[name] ~= nil and math.random(1, loss_prob[name]) == 1 then
+		return
+	end
+
+	local drop = drops[name]
+	if drop == nil then
+		drops[name] = item
+	else
+		drop:set_count(drop:get_count() + item:get_count())
+	end
+end
+
+local fire_node = {name="fire:basic_flame"}
+
+local function destroy(drops, pos, cid)
+	if minetest.is_protected(pos, "") then
+		return
+	end
+	local def = cid_data[cid]
+	if def and def.flammable then
+		minetest.set_node(pos, fire_node)
+	else
+		minetest.remove_node(pos)
+		if def then
+			local node_drops = minetest.get_node_drops(def.name, "")
+			for _, item in ipairs(node_drops) do
+				add_drop(drops, item)
+			end
+		end
+	end
+end
+
+
+local function calc_velocity(pos1, pos2, old_vel, power)
+	local vel = vector.direction(pos1, pos2)
+	vel = vector.normalize(vel)
+	vel = vector.multiply(vel, power)
+
+	-- Divide by distance
+	local dist = vector.distance(pos1, pos2)
+	dist = math.max(dist, 1)
+	vel = vector.divide(vel, dist)
+
+	-- Add old velocity
+	vel = vector.add(vel, old_vel)
+	return vel
+end
+
+local function entity_physics(pos, radius)
+	-- Make the damage radius larger than the destruction radius
+	radius = radius * 2
+	local objs = minetest.get_objects_inside_radius(pos, radius)
+	for _, obj in pairs(objs) do
+		local obj_pos = obj:getpos()
+		local obj_vel = obj:getvelocity()
+		local dist = math.max(1, vector.distance(pos, obj_pos))
+
+		if obj_vel ~= nil then
+			obj:setvelocity(calc_velocity(pos, obj_pos,
+					obj_vel, radius * 10))
+		end
+
+		local damage = (4 / dist) * radius
+		obj:set_hp(obj:get_hp() - damage)
+	end
+end
+
+local function add_effects(pos, radius)
+	minetest.add_particlespawner({
+		amount = 128,
+		time = 1,
+		minpos = vector.subtract(pos, radius / 2),
+		maxpos = vector.add(pos, radius / 2),
+		minvel = {x=-20, y=-20, z=-20},
+		maxvel = {x=20,  y=20,  z=20},
+		minacc = vector.new(),
+		maxacc = vector.new(),
+		minexptime = 1,
+		maxexptime = 3,
+		minsize = 8,
+		maxsize = 16,
+		texture = "tnt_smoke.png",
+	})
+end
+
+local function burn(pos)
+	local name = minetest.get_node(pos).name
+	if name == "tnt:tnt" then
+		minetest.sound_play("tnt_ignite", {pos=pos})
+		minetest.set_node(pos, {name="tnt:tnt_burning"})
+		minetest.get_node_timer(pos):start(1)
+	elseif name == "tnt:gunpowder" then
+		minetest.sound_play("tnt_gunpowder_burning", {pos=pos, gain=2})
+		minetest.set_node(pos, {name="tnt:gunpowder_burning"})
+		minetest.get_node_timer(pos):start(1)
+	end
+end
+
+local function explode(pos, radius)
+	local pos = vector.round(pos)
+	local vm = VoxelManip()
+	local pr = PseudoRandom(os.time())
+	local p1 = vector.subtract(pos, radius)
+	local p2 = vector.add(pos, radius)
+	local minp, maxp = vm:read_from_map(p1, p2)
+	local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
+	local data = vm:get_data()
+
+	local drops = {}
+	local p = {}
+
+	local c_air = minetest.get_content_id("air")
+	local c_tnt = minetest.get_content_id("tnt:tnt")
+	local c_tnt_burning = minetest.get_content_id("tnt:tnt_burning")
+	local c_gunpowder = minetest.get_content_id("tnt:gunpowder")
+	local c_gunpowder_burning = minetest.get_content_id("tnt:gunpowder_burning")
+	local c_boom = minetest.get_content_id("tnt:boom")
+	local c_fire = minetest.get_content_id("fire:basic_flame")
+
+	for z = -radius, radius do
+	for y = -radius, radius do
+	local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z)
+	for x = -radius, radius do
+		if (x * x) + (y * y) + (z * z) <=
+				(radius * radius) + pr:next(-radius, radius) then
+			local cid = data[vi]
+			p.x = pos.x + x
+			p.y = pos.y + y
+			p.z = pos.z + z
+			if cid == c_tnt or cid == c_gunpowder then
+				burn(p)
+			elseif cid ~= c_tnt_burning and
+					cid ~= c_gunpowder_burning and
+					cid ~= c_air and
+					cid ~= c_fire and
+					cid ~= c_boom then
+				destroy(drops, p, cid)
+			end
+		end
+		vi = vi + 1
+	end
+	end
+	end
+
+	return drops
+end
+
+
+local function boom(pos)
+	minetest.sound_play("tnt_explode", {pos=pos, gain=1.5, max_hear_distance=2*64})
+	minetest.set_node(pos, {name="tnt:boom"})
+	minetest.get_node_timer(pos):start(0.5)
+
+	local drops = explode(pos, radius)
+	entity_physics(pos, radius)
+	eject_drops(drops, pos, radius)
+	add_effects(pos, radius)
+end
+
+minetest.register_node("tnt:tnt", {
+	description = "TNT",
+	tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+	groups = {dig_immediate=2, mesecon=2},
+	sounds = default.node_sound_wood_defaults(),
+	on_punch = function(pos, node, puncher)
+		if puncher:get_wielded_item():get_name() == "default:torch" then
+			minetest.sound_play("tnt_ignite", {pos=pos})
+			minetest.set_node(pos, {name="tnt:tnt_burning"})
+			minetest.get_node_timer(pos):start(4)
+		end
+	end,
+	mesecons = {effector = {action_on = boom}},
+})
+
+minetest.register_node("tnt:tnt_burning", {
+	tiles = {
+		{
+			name = "tnt_top_burning_animated.png",
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 1,
+			}
+		},
+		"tnt_bottom.png", "tnt_side.png"},
+	light_source = 5,
+	drop = "",
+	sounds = default.node_sound_wood_defaults(),
+	on_timer = boom,
+})
+
+minetest.register_node("tnt:boom", {
+	drawtype = "plantlike",
+	tiles = {"tnt_boom.png"},
+	light_source = LIGHT_MAX,
+	walkable = false,
+	drop = "",
+	groups = {dig_immediate=3},
+	on_timer = function(pos, elapsed)
+		minetest.remove_node(pos)
+	end,
+})
+
+minetest.register_node("tnt:gunpowder", {
+	description = "Gun Powder",
+	drawtype = "raillike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	tiles = {"tnt_gunpowder.png",},
+	inventory_image = "tnt_gunpowder_inventory.png",
+	wield_image = "tnt_gunpowder_inventory.png",
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	groups = {dig_immediate=2,attached_node=1},
+	sounds = default.node_sound_leaves_defaults(),
+	
+	on_punch = function(pos, node, puncher)
+		if puncher:get_wielded_item():get_name() == "default:torch" then
+			burn(pos)
+		end
+	end,
+})
+
+minetest.register_node("tnt:gunpowder_burning", {
+	drawtype = "raillike",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	light_source = 5,
+	tiles = {{
+		name = "tnt_gunpowder_burning_animated.png",
+		animation = {
+			type = "vertical_frames",
+			aspect_w = 16,
+			aspect_h = 16,
+			length = 1,
+		}
+	}},
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	drop = "",
+	groups = {dig_immediate=2,attached_node=1},
+	sounds = default.node_sound_leaves_defaults(),
+	on_timer = function(pos, elapsed)
+		for dx = -1, 1 do
+		for dz = -1, 1 do
+		for dy = -1, 1 do
+			if not (dx == 0 and dz == 0) then
+				burn({
+					x = pos.x + dx,
+					y = pos.y + dy,
+					z = pos.z + dz,
+				})
+			end
+		end
+		end
+		end
+		minetest.remove_node(pos)
+	end
+})
+
+minetest.register_abm({
+	nodenames = {"tnt:tnt", "tnt:gunpowder"},
+	neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"},
+	interval = 1,
+	chance = 1,
+	action = burn,
+})
+
+minetest.register_craft({
+	output = "tnt:gunpowder",
+	type = "shapeless",
+	recipe = {"default:coal_lump", "default:gravel"}
+})
+
+minetest.register_craft({
+	output = "tnt:tnt",
+	recipe = {
+		{"",           "group:wood",    ""},
+		{"group:wood", "tnt:gunpowder", "group:wood"},
+		{"",           "group:wood",    ""}
+	}
+})
+
+if minetest.setting_get("log_mods") then
+	minetest.debug("[TNT] Loaded!")
+end
+

src/mapgen_v6.cpp

@@ -956,8 +956,15 @@ void MapgenV6::placeTreesAndJungleGrass() {
 					continue;
 			}
 			p.Y++;
+
+
 			
 			// Make a tree
+
+
+			u32 vi = vm->m_area.index(x, y, z);
+			vm->m_data[vi] = CONTENT_AIR;
+
 			if (is_jungle) {
 				treegen::make_jungletree(*vm, p, ndef, myrand());
 			} else {