Merge 9769ae9493 into 235fc35751

README.txt

@@ -1,17 +1,15 @@
+Modifié par Xiug
+Modifié pour le serveur Steinheim 
++ rapide 
++ loin 
++ fort 
++ couleur
+Mod apartenant à Diego Martínez
 
-Soccer Mod
-----------
-
-Play soccer on Minetest!
-
-This currently only provides the ball; the actual logic for implementing a match
-will be implemented in the future. For now, you can use Mesecons Wooden Pressure
-Plates along with some logic to at least handle scoring. Goals are also provided
-but have no functionality.
-
-The ball is not craftable ATM. Use /giveme soccer:ball_item, and place it with
-right-click. You can take it again by punching it.
-
-You can push the ball by standing near it, and kick it by holding the "sneak"
-key (by default "Shift"). The ball will get pushed/kicked in the direction the
-player is facing (you can center-on the ball by looking up).
+Edited by Xiug
+Modified to Steinheim server
++ Quick 
++ far
++ Strong
++ color
+Mod created by Diego Martínez

init.lua

@@ -1,4 +1,5 @@
 
+
 local BALL_PUSH_CHECK_INTERVAL = 0.1
 
 minetest.register_entity("soccer:ball", {
@@ -18,9 +19,9 @@ minetest.register_entity("soccer:ball", {
 			local p = self.object:getpos();
 			p.y = p.y - 0.5
 			if minetest.registered_nodes[minetest.env:get_node(p).name].walkable then
-				vel.x = vel.x * 0.80
-				if vel.y < 0 then vel.y = vel.y * -0.50 end
-				vel.z = vel.z * 0.80
+				vel.x = vel.x * 0.85
+				if vel.y < 0 then vel.y = vel.y * -0.65 end
+				vel.z = vel.z * 0.90
 			end
 			if  (math.abs(vel.x) < 0.1)
 			 and (math.abs(vel.z) < 0.1) then
@@ -81,7 +82,7 @@ minetest.register_craftitem("soccer:ball_item", {
 		local pos = pointed_thing.above
 		--pos = { x=pos.x+0.5, y=pos.y, z=pos.z+0.5 }
 		local ent = minetest.env:add_entity(pos, "soccer:ball")
-		ent:setvelocity({x=0, y=-4, z=0})
+		ent:setvelocity({x=0, y=-15, z=0})
 		itemstack:take_item()
 		return itemstack
 	end,
@@ -157,3 +158,514 @@ minetest.register_craft({
 })
 
 minetest.register_alias("ball", "soccer:ball_item")
+
+
+-- Green 
+
+local GREEN_BALL_PUSH_CHECK_INTERVAL = 0.2
+
+minetest.register_entity("soccer:green_ball", {
+	physical = true,
+	visual = "mesh",
+	mesh = "soccer_ball.x",
+	hp_max = 1000,
+	groups = { immortal = true },
+	textures = { "green_soccer_ball.png" },
+	collisionbox = { -0.2, -0.2, -0.2, 0.2, 0.2, 0.2 },
+	on_step = function(self, dtime)
+		self.timer = self.timer + dtime
+		if self.timer >= GREEN_BALL_PUSH_CHECK_INTERVAL then
+			self.object:setacceleration({x=0, y=-math.random(0,150), z=0})
+			self.timer = 0
+			local vel = self.object:getvelocity()
+			local p = self.object:getpos();
+			p.y = p.y - 0.5
+			if minetest.registered_nodes[minetest.env:get_node(p).name].walkable then
+				vel.x = vel.x * math.random(0,2)
+				if vel.y < 0 then vel.y = vel.y * -0.1 end
+				vel.z = vel.z * math.random(0,2)
+			end
+			if  (math.abs(vel.x) < 0.9)
+			 and (math.abs(vel.z) < 0.9) then
+				vel.x = 0
+				vel.z = 0
+			end
+			self.object:setvelocity(vel)
+			local pos = self.object:getpos()
+			local objs = minetest.env:get_objects_inside_radius(pos, 1)
+			local player_count = 0
+			local final_dir = { x=0, y=0, z=0 }
+			for _,obj in ipairs(objs) do
+				if obj:is_player() then
+					local objdir = obj:get_look_dir()
+					local mul = 1
+					if (obj:get_player_control().sneak) then
+						mul = 3
+					end
+					final_dir.x = final_dir.x + (objdir.x * mul)
+					final_dir.y = final_dir.y + (objdir.y * mul)
+					final_dir.z = final_dir.z + (objdir.z * mul)
+					player_count = player_count + 1
+				end
+			end
+			if final_dir.x ~= 0 or final_dir.y ~= 0 or final_dir.z ~= 0 then
+				final_dir.x = (final_dir.x * 5) / player_count
+				final_dir.y = (final_dir.y * 5) / player_count
+				final_dir.z = (final_dir.z * 5) / player_count
+				self.object:setvelocity(final_dir)
+			end
+		end
+	end,
+	on_punch = function(self, puncher)
+		if puncher and puncher:is_player() then
+			local inv = puncher:get_inventory()
+			inv:add_item("main", ItemStack("soccer:green_ball_item"))
+			self.object:remove()
+		end
+	end,
+	is_moving = function(self)
+		local v = self.object:getvelocity()
+		if  (math.abs(v.x) <= 0.5)
+		 and (math.abs(v.z) <= 0.5) then
+			v.x = 0
+			v.z = 0
+			self.object:setvelocity(v)
+			return false
+		end
+		return true
+	end,
+	timer = 0,
+})
+
+minetest.register_craftitem("soccer:green_ball_item", {
+	description = "WTF Green Soccer Ball",
+	inventory_image = "green_soccer_ball_inv.png",
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		--pos = { x=pos.x+0.5, y=pos.y, z=pos.z+0.5 }
+		local ent = minetest.env:add_entity(pos, "soccer:green_ball")
+		ent:setvelocity({x=0, y=-math.random(0,50), z=0})
+		itemstack:take_item()
+		return itemstack
+	end,
+})
+
+minetest.register_craft({
+	output = "soccer:green_ball_item",
+	recipe = {
+		{ "", "wool:green", "" },
+		{ "wool:green", "default:coal_lump", "wool:green" },
+		{ "", "wool:green", "" },
+	},
+})
+
+minetest.register_alias("ball", "soccer:green_ball_item")
+
+
+-- Red 
+
+local RED_BALL_PUSH_CHECK_INTERVAL = 0.1
+
+minetest.register_entity("soccer:red_ball", {
+	physical = true,
+	visual = "mesh",
+	mesh = "soccer_ball.x",
+	hp_max = 1000,
+	groups = { immortal = true },
+	textures = { "red_soccer_ball.png" },
+	collisionbox = { -0.2, -0.2, -0.2, 0.2, 0.2, 0.2 },
+	on_step = function(self, dtime)
+		self.timer = self.timer + dtime
+		if self.timer >= RED_BALL_PUSH_CHECK_INTERVAL then
+			self.object:setacceleration({x=0, y=-200, z=0})
+			self.timer = 0
+			local vel = self.object:getvelocity()
+			local p = self.object:getpos();
+			p.y = p.y - 0.55
+			if minetest.registered_nodes[minetest.env:get_node(p).name].walkable then
+				vel.x = vel.x * 2
+				if vel.y < 0 then vel.y = vel.y * -0.50 end
+				vel.z = vel.z * 2
+			end
+			if  (math.abs(vel.x) < 0.8)
+			 and (math.abs(vel.z) < 0.8) then
+				vel.x = 0
+				vel.z = 0
+			end
+			self.object:setvelocity(vel)
+			local pos = self.object:getpos()
+			local objs = minetest.env:get_objects_inside_radius(pos, 1)
+			local player_count = 0
+			local final_dir = { x=0, y=0, z=0 }
+			for _,obj in ipairs(objs) do
+				if obj:is_player() then
+					local objdir = obj:get_look_dir()
+					local mul = 1
+					if (obj:get_player_control().sneak) then
+						mul = 3
+					end
+					final_dir.x = final_dir.x + (objdir.x * mul)
+					final_dir.y = final_dir.y + (objdir.y * mul)
+					final_dir.z = final_dir.z + (objdir.z * mul)
+					player_count = player_count + 1
+				end
+			end
+			if final_dir.x ~= 0 or final_dir.y ~= 0 or final_dir.z ~= 0 then
+				final_dir.x = (final_dir.x * 5) / player_count
+				final_dir.y = (final_dir.y * 5) / player_count
+				final_dir.z = (final_dir.z * 5) / player_count
+				self.object:setvelocity(final_dir)
+			end
+		end
+	end,
+	on_punch = function(self, puncher)
+		if puncher and puncher:is_player() then
+			local inv = puncher:get_inventory()
+			inv:add_item("main", ItemStack("soccer:red_ball_item"))
+			self.object:remove()
+		end
+	end,
+	is_moving = function(self)
+		local v = self.object:getvelocity()
+		if  (math.abs(v.x) <= 0.35)
+		 and (math.abs(v.z) <= 0.35) then
+			v.x = 0
+			v.z = 0
+			self.object:setvelocity(v)
+			return false
+		end
+		return true
+	end,
+	timer = 0,
+})
+
+minetest.register_craftitem("soccer:red_ball_item", {
+	description = "Powerade Red Soccer Ball",
+	inventory_image = "red_soccer_ball_inv.png",
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		--pos = { x=pos.x+0.5, y=pos.y, z=pos.z+0.5 }
+		local ent = minetest.env:add_entity(pos, "soccer:red_ball")
+		ent:setvelocity({x=0, y=-math.random(0,50), z=0})
+		itemstack:take_item()
+		return itemstack
+	end,
+})
+
+minetest.register_craft({
+	output = "soccer:red_ball_item",
+	recipe = {
+		{ "", "wool:red", "" },
+		{ "wool:red", "default:coal_lump", "wool:red" },
+		{ "", "wool:red", "" },
+	},
+})
+
+minetest.register_alias("ball", "soccer:red_ball_item")
+
+-- Blue
+
+local BLUE_BALL_PUSH_CHECK_INTERVAL = 0.3
+
+minetest.register_entity("soccer:blue_ball", {
+	physical = true,
+	visual = "mesh",
+	mesh = "soccer_ball.x",
+	hp_max = 1000,
+	groups = { immortal = true },
+	textures = { "blue_soccer_ball.png" },
+	collisionbox = { -0.2, -0.2, -0.2, 0.2, 0.2, 0.2 },
+	on_step = function(self, dtime)
+		self.timer = self.timer + dtime
+		if self.timer >= BLUE_BALL_PUSH_CHECK_INTERVAL then
+			self.object:setacceleration({x=0.2, y=-90, z=0.1})
+			self.timer = 0
+			local vel = self.object:getvelocity()
+			local p = self.object:getpos();
+			p.y = p.y - 0.55
+			if minetest.registered_nodes[minetest.env:get_node(p).name].walkable then
+				vel.x = vel.x * 0.90
+				if vel.y < 0 then vel.y = vel.y * -0.60 end
+				vel.z = vel.z * 0.90
+			end
+			if  (math.abs(vel.x) < 0.8)
+			 and (math.abs(vel.z) < 0.8) then
+				vel.x = 0
+				vel.z = 0
+			end
+			self.object:setvelocity(vel)
+			local pos = self.object:getpos()
+			local objs = minetest.env:get_objects_inside_radius(pos, 1)
+			local player_count = 0
+			local final_dir = { x=0, y=0, z=0 }
+			for _,obj in ipairs(objs) do
+				if obj:is_player() then
+					local objdir = obj:get_look_dir()
+					local mul = 1
+					if (obj:get_player_control().sneak) then
+						mul = 3
+					end
+					final_dir.x = final_dir.x + (objdir.x * mul)
+					final_dir.y = final_dir.y + (objdir.y * mul)
+					final_dir.z = final_dir.z + (objdir.z * mul)
+					player_count = player_count + 1
+				end
+			end
+			if final_dir.x ~= 0 or final_dir.y ~= 0 or final_dir.z ~= 0 then
+				final_dir.x = (final_dir.x * 5) / player_count
+				final_dir.y = (final_dir.y * 5) / player_count
+				final_dir.z = (final_dir.z * 5) / player_count
+				self.object:setvelocity(final_dir)
+			end
+		end
+	end,
+	on_punch = function(self, puncher)
+		if puncher and puncher:is_player() then
+			local inv = puncher:get_inventory()
+			inv:add_item("main", ItemStack("soccer:blue_ball_item"))
+			self.object:remove()
+		end
+	end,
+	is_moving = function(self)
+		local v = self.object:getvelocity()
+		if  (math.abs(v.x) <= 0.35)
+		 and (math.abs(v.z) <= 0.35) then
+			v.x = 0
+			v.z = 0
+			self.object:setvelocity(v)
+			return false
+		end
+		return true
+	end,
+	timer = 0,
+})
+
+minetest.register_craftitem("soccer:blue_ball_item", {
+	description = "Ice Blue Soccer Ball",
+	inventory_image = "blue_soccer_ball_inv.png",
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		--pos = { x=pos.x+0.5, y=pos.y, z=pos.z+0.5 }
+		local ent = minetest.env:add_entity(pos, "soccer:blue_ball")
+		ent:setvelocity({x=0.1, y=-5, z=0.2})
+		itemstack:take_item()
+		return itemstack
+	end,
+})
+
+minetest.register_craft({
+	output = "soccer:blue_ball_item",
+	recipe = {
+		{ "", "wool:blue", "" },
+		{ "wool:blue", "default:coal_lump", "wool:blue" },
+		{ "", "wool:blue", "" },
+	},
+})
+
+minetest.register_alias("ball", "soccer:blue_ball_item")
+
+-- Yellow
+
+local YELLOW_BALL_PUSH_CHECK_INTERVAL = 0.5
+
+minetest.register_entity("soccer:yellow_ball", {
+	physical = true,
+	visual = "mesh",
+	mesh = "soccer_ball.x",
+	hp_max = 1000,
+	groups = { immortal = true },
+	textures = { "yellow_soccer_ball.png" },
+	collisionbox = { -0.2, -0.2, -0.2, 0.2, 0.2, 0.2 },
+	on_step = function(self, dtime)
+		self.timer = self.timer + dtime
+		if self.timer >= YELLOW_BALL_PUSH_CHECK_INTERVAL then
+			self.object:setacceleration({x=0.2, y=-90, z=0.1})
+			self.timer = 0
+			local vel = self.object:getvelocity()
+			local p = self.object:getpos();
+			p.y = p.y - 0.55
+			if minetest.registered_nodes[minetest.env:get_node(p).name].walkable then
+				vel.x = vel.x * 2.5
+				if vel.y < 2 then vel.y = vel.y * -0.55 end
+				vel.z = vel.z * 2.5
+			end
+			if  (math.abs(vel.x) < 0.8)
+			 and (math.abs(vel.z) < 0.8) then
+				vel.x = 0
+				vel.z = 0
+			end
+			self.object:setvelocity(vel)
+			local pos = self.object:getpos()
+			local objs = minetest.env:get_objects_inside_radius(pos, 1)
+			local player_count = 0
+			local final_dir = { x=0, y=0, z=0 }
+			for _,obj in ipairs(objs) do
+				if obj:is_player() then
+					local objdir = obj:get_look_dir()
+					local mul = 1
+					if (obj:get_player_control().sneak) then
+						mul = 3
+					end
+					final_dir.x = final_dir.x + (objdir.x * mul)
+					final_dir.y = final_dir.y + (objdir.y * mul)
+					final_dir.z = final_dir.z + (objdir.z * mul)
+					player_count = player_count + 1
+				end
+			end
+			if final_dir.x ~= 0 or final_dir.y ~= 0 or final_dir.z ~= 0 then
+				final_dir.x = (final_dir.x * 5) / player_count
+				final_dir.y = (final_dir.y * 5) / player_count
+				final_dir.z = (final_dir.z * 5) / player_count
+				self.object:setvelocity(final_dir)
+			end
+		end
+	end,
+	on_punch = function(self, puncher)
+		if puncher and puncher:is_player() then
+			local inv = puncher:get_inventory()
+			inv:add_item("main", ItemStack("soccer:yellow_ball_item"))
+			self.object:remove()
+		end
+	end,
+	is_moving = function(self)
+		local v = self.object:getvelocity()
+		if  (math.abs(v.x) <= 0.35)
+		 and (math.abs(v.z) <= 0.35) then
+			v.x = 0
+			v.z = 0
+			self.object:setvelocity(v)
+			return false
+		end
+		return true
+	end,
+	timer = 0,
+})
+
+minetest.register_craftitem("soccer:yellow_ball_item", {
+	description = "Sun Yellow Soccer Ball",
+	inventory_image = "yellow_soccer_ball_inv.png",
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		--pos = { x=pos.x+0.5, y=pos.y, z=pos.z+0.5 }
+		local ent = minetest.env:add_entity(pos, "soccer:yellow_ball")
+		ent:setvelocity({x=0.1, y=-5, z=0.2})
+		itemstack:take_item()
+		return itemstack
+	end,
+})
+
+minetest.register_craft({
+	output = "soccer:yellow_ball_item",
+	recipe = {
+		{ "", "wool:yellow", "" },
+		{ "wool:yellow", "default:coal_lump", "wool:yellow" },
+		{ "", "wool:yellow", "" },
+	},
+})
+
+minetest.register_alias("ball", "soccer:yellow_ball_item")
+
+
+-- Purple 
+
+local PURPLE_BALL_PUSH_CHECK_INTERVAL = 0.1
+
+minetest.register_entity("soccer:purple_ball", {
+	physical = true,
+	visual = "mesh",
+	mesh = "soccer_ball.x",
+	hp_max = 1000,
+	groups = { immortal = true },
+	textures = { "purple_soccer_ball.png" },
+	collisionbox = { -0.2, -0.2, -0.2, 0.2, 0.2, 0.2 },
+	on_step = function(self, dtime)
+		self.timer = self.timer + dtime
+		if self.timer >= PURPLE_BALL_PUSH_CHECK_INTERVAL then
+			self.object:setacceleration({x=0, y=-20, z=0})
+			self.timer = 0
+			local vel = self.object:getvelocity()
+			local p = self.object:getpos();
+			p.y = p.y - 1
+			if minetest.registered_nodes[minetest.env:get_node(p).name].walkable then
+				vel.x = vel.x * 0.90
+				if vel.y < 0 then vel.y = vel.y * -0.60 end
+				vel.z = vel.z * 0.95
+			end
+			if  (math.abs(vel.x) < 0.2)
+			 and (math.abs(vel.z) < 0.2) then
+				vel.x = 0
+				vel.z = 0
+			end
+			self.object:setvelocity(vel)
+			local pos = self.object:getpos()
+			local objs = minetest.env:get_objects_inside_radius(pos, 1)
+			local player_count = 0
+			local final_dir = { x=0, y=0, z=0 }
+			for _,obj in ipairs(objs) do
+				if obj:is_player() then
+					local objdir = obj:get_look_dir()
+					local mul = 1
+					if (obj:get_player_control().sneak) then
+						mul = 3
+					end
+					final_dir.x = final_dir.x + (objdir.x * mul)
+					final_dir.y = final_dir.y + (objdir.y * mul)
+					final_dir.z = final_dir.z + (objdir.z * mul)
+					player_count = player_count + 1
+				end
+			end
+			if final_dir.x ~= 0 or final_dir.y ~= 0 or final_dir.z ~= 0 then
+				final_dir.x = (final_dir.x * 5) / player_count
+				final_dir.y = (final_dir.y * 5) / player_count
+				final_dir.z = (final_dir.z * 5) / player_count
+				self.object:setvelocity(final_dir)
+			end
+		end
+	end,
+	on_punch = function(self, puncher)
+		if puncher and puncher:is_player() then
+			local inv = puncher:get_inventory()
+			inv:add_item("main", ItemStack("soccer:purple_ball_item"))
+			self.object:remove()
+		end
+	end,
+	is_moving = function(self)
+		local v = self.object:getvelocity()
+		if  (math.abs(v.x) <= 0.3)
+		 and (math.abs(v.z) <= 0.3) then
+			v.x = 0
+			v.z = 0
+			self.object:setvelocity(v)
+			return false
+		end
+		return true
+	end,
+	timer = 0,
+})
+
+minetest.register_craftitem("soccer:purple_ball_item", {
+	description = "Girl Purple Soccer Ball",
+	inventory_image = "purple_soccer_ball_inv.png",
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		--pos = { x=pos.x+0.5, y=pos.y, z=pos.z+0.5 }
+		local ent = minetest.env:add_entity(pos, "soccer:purple_ball")
+		ent:setvelocity({x=0, y=-45, z=0})
+		itemstack:take_item()
+		return itemstack
+	end,
+})
+
+
+minetest.register_craft({
+	output = "soccer:purple_ball_item",
+	recipe = {
+		{ "", "wool:magenta", "" },
+		{ "wool:violet", "default:coal_lump", "wool:violet" },
+		{ "", "wool:magenta", "" },
+	},
+})
+
+minetest.register_alias("ball", "soccer:purple_ball_item")
+
+