X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=init.lua;h=60b76e3e287e1355e1c3c828483d50d27abf93c7;hb=HEAD;hp=c694f0e6102c606165ad0668208d44e7d6850367;hpb=9db4dd5fb39a0be1a865a6ca93e460535f346f6f;p=hangglider.git

diff --git a/init.lua b/init.lua
index c694f0e..60b76e3 100644
--- a/init.lua
+++ b/init.lua
@@ -35,12 +35,28 @@
 -- Reduced airbreak penalty severity
 -- gave glider limited durability.
 -- Improved gravity adjustment function.
--- Changed airbreaking process 
+-- Changed airbreaking process
 -- Removed airbreak penalty, as any 'advantage' seems minimal after new adjustments
+-- Removed airbreak until minetest devs are smart enough to implement better serverside players.
+-- Simplified liquid check.
+
+-- Modifications by gpcf
+-- 2018-12-09
+-- get shot down while flying over protected areas marked as no-fly-zones (flak, from German Flugabwehrkanone)
+--  set these areas with the /area_flak command
+
+-- Modifications by SpaghettiToastBook
+-- 2018-12-29
+-- Physics overrides use player_monoids mod if available
+
 
 
 local HUD_Overlay = true --show glider struts as overlay on HUD
 local debug = false --show debug info in top-center of hud
+local moveModelUp = false
+if tonumber(string.sub(minetest.get_version().string, 1, 1)) and tonumber(string.sub(minetest.get_version().string, 1, 1)) > 4 then
+	moveModelUp = true
+end
 hangglider = {} --Make this global, so other mods can tell if hangglider exists.
 hangglider.use = {}
 if HUD_Overlay then
@@ -48,7 +64,7 @@ hangglider.id = {}  -- hud id for displaying overlay with struts
 end
 if debug then  hangglider.debug = {} end -- hud id for debug data
 --hangglider.airbreak = {}  -- true if falling fast when equip
-
+--[[
 minetest.register_entity("hangglider:airstopper", { --A one-instant entity that catches the player and stops them.
 	is_visible = false,
 	physical = false,
@@ -61,32 +77,146 @@ minetest.register_entity("hangglider:airstopper", { --A one-instant entity that
 			if player:is_player() then
 				local pname = player:get_player_name()
 				canExist = true
-				if player:get_player_velocity().y < 0.5 and player:get_player_velocity().y > -0.5 then 
+				if player:get_player_velocity().y < 0.5 and player:get_player_velocity().y > -0.5 then
 					--Let go when the player actually stops, as that's the whole point.
 					if hangglider.use[pname] then
-						minetest.add_entity(player:get_pos(), "hangglider:glider"):set_attach(player, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
+						if moveModelUp then
+							minetest.add_entity(player:get_pos(), "hangglider:glider"):set_attach(player, "", {x=0,y=10,z=0}, {x=0,y=0,z=0})
+						else
+							minetest.add_entity(player:get_pos(), "hangglider:glider"):set_attach(player, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
+						end
 					end
 					canExist = false
 				end
 			end
 			if not canExist then
-				self.attach:set_detach()
+				player:set_detach()
 			end
 		end
 		if not canExist then
 			self.object:remove()
 		end
 	end
-})
+})]]
 
+if core.global_exists("areas") then
+	hangglider.flak = true
+	-- chat command definition essentially copied from areas mod.
+	minetest.register_chatcommand("area_flak",{
+		params = "<ID>",
+		description = "Toggle airspace restrictions for area <ID>",
+		func = function(name, param)
+			local id = tonumber(param)
+			if not id then
+				return false, "Invalid usage, see /help area_flak."
+			end
+
+			if not areas:isAreaOwner(id, name) then
+				return false, "Area "..id.." does not exist"
+					.." or is not owned by you."
+			end
+			local open = not areas.areas[id].flak
+			-- Save false as nil to avoid inflating the DB.
+			areas.areas[id].flak = open or nil
+			areas:save()
+			return true, ("Area's airspace %s."):format(open and "closed" or "opened")
+		end
+	})
+end
+
+if core.global_exists("minetestd") and minetestd.services.physicsctl.enabled then
+minetestd.physicsctl.register_physics_effect("hangglider",
+	function(player) -- check
+		return hangglider.use[player:get_player_name()]
+	end,
+	function(phys, player) -- blend
+		local vel_y = player:get_player_velocity().y
+		if debug then player:hud_change(hangglider.debug[pname].id, "text", vel_y..', '..player:get_physics_override().gravity..', '..tostring(hangglider.airbreak[pname])) end
+		phys.gravity = phys.gravity*((vel_y + 3)/20)
+		if vel_y < 0 and vel_y > -3 then
+			phys.speed = (math.abs(vel_y/2) + 0.75)
+		elseif vel_y <= -3 then --Cap our gliding movement speed.
+			phys.speed = 2.25
+		end
+		phys.jump = 0
+	end,
+	7 -- effect order
+)
+end
+
+hangglider.can_fly = function (pname, pos)
+	-- Checks if the player will get shot down at the position
+	if wardzones then
+		local zone = wardzones.getZone(pos)
+		if zone then
+			return (minetest.check_player_privs(pname, {protection_bypass=true}) or wardzones.checkPlayerZoneAccess(pname, zone) or not zone["data"]["no_fly"])
+		end
+	end
+	if areas and minetest.is_protected(vector.round(pos), pname) then
+		if hangglider.flak then
+			for id, area in pairs(areas:getAreasAtPos(pos)) do
+				if area.flak then
+					return false
+				end
+			end
+		end
+	end
+	return true
+end
+
+hangglider.shot_sound = function (pos)
+	minetest.sound_play("hangglider_flak_shot", {
+		pos = pos,
+		max_hear_distance = 30,
+		gain = 10.0,
+	})
+end
+
+local function set_fast(name, value)
+	local privs = minetest.get_player_privs(name)
+	privs.fast = value
+	minetest.set_player_privs(name, privs)
+end
+
+local physics_attrs = {"jump", "speed", "gravity"}
+local function apply_physics_override(player, overrides)
+	if player_monoids then
+		for _, attr in pairs(physics_attrs) do
+			if overrides[attr] then
+				player_monoids[attr]:add_change(player, overrides[attr], "hangglider:glider")
+			end
+		end
+	else
+		player:set_physics_override(overrides)
+	end
+	if minetest.settings:get_bool("hangglider_no_fast") then
+		set_fast(player:get_player_name(), nil)
+	end
+end
+
+local function remove_physics_override(player, overrides)
+	for _, attr in pairs(physics_attrs) do
+		if overrides[attr] then
+			if core.global_exists("player_monoids") then
+				player_monoids[attr]:del_change(player, "hangglider:glider")
+			else
+				player:set_physics_override({[attr] = 1})
+			end
+		end
+	end
+	set_fast(player:get_player_name(), true)
+end
+
+local step_v
 minetest.register_entity("hangglider:glider", {
 	visual = "mesh",
 	visual_size = {x = 12, y = 12},
+	collisionbox = {0,0,0,0,0,0},
 	mesh = "glider.obj",
 	immortal = true,
 	static_save = false,
 	textures = {"wool_white.png","default_wood.png"},
-	on_step = function(self, _)
+	on_step = function(self, dtime)
 		local canExist = false
 		if self.object:get_attach() then
 			local player = self.object:get_attach("parent")
@@ -96,21 +226,50 @@ minetest.register_entity("hangglider:glider", {
 				if hangglider.use[pname] then
 					local mrn_name = minetest.registered_nodes[minetest.get_node(vector.new(pos.x, pos.y-0.5, pos.z)).name]
 					if mrn_name then
-						if not (mrn_name.walkable or (mrn_name.drowning and mrn_name.drowning == 1)) then
+						if not (mrn_name.walkable or mrn_name.liquidtype ~= "none") then
 							canExist = true
-							local vel = player:get_player_velocity()
+
+							if not minetestd then
+								step_v = player:get_player_velocity().y
+								if step_v < 0 and step_v > -3 then
+									apply_physics_override(player, {speed=math.abs(step_v/2) + 0.75})
+								elseif step_v <= -3 then --Cap our gliding movement speed.
+									apply_physics_override(player, {speed=2.25})
+								else
+									remove_physics_override(player, {speed=1})
+								end
+								if debug then player:hud_change(hangglider.debug[pname].id, "text", step_v..', '..player:get_physics_override().gravity..', '..tostring(hangglider.airbreak[pname])) end
+								apply_physics_override(player, {gravity=((step_v + 3)/20)})
+							end
+							--[[local vel = player:get_player_velocity()
 							if debug then player:hud_change(hangglider.debug[pname].id, "text", vel.y..', '..grav..', '..tostring(hangglider.airbreak[pname])) end
-							
+
 							player:set_physics_override({gravity = (vel.y + 2.0)/20})
-						end
+						]]end
+					end
+				end
+				if not hangglider.can_fly(pname,pos) then
+					if not self.warned then -- warning shot
+						self.warned = 0
+						hangglider.shot_sound(pos)
+						minetest.chat_send_player(pname, "Protected area! You will be shot down in two seconds by anti-aircraft guns!")
+					end
+					self.warned = self.warned + dtime
+					if self.warned > 2 then -- shoot down
+						player:set_hp(1)
+						player:get_inventory():remove_item("main", ItemStack("hangglider:hangglider"))
+						hangglider.shot_sound(pos)
+						canExist = false
 					end
 				end
 				if not canExist then
-					player:set_physics_override({
-						gravity = 1,
+
+					if not minetestd then
+						remove_physics_override(player, {
+						gravity=1,
 						jump = 1,
-						speed = 1,
-					})
+						speed = 1,})
+					end
 					hangglider.use[pname] = false
 					if HUD_Overlay then
 					player:hud_change(hangglider.id[pname], "text", "blank.png")
@@ -119,15 +278,15 @@ minetest.register_entity("hangglider:glider", {
 				end
 			end
 		end
-		if not canExist then 
+		if not canExist then
 			self.object:set_detach()
-			self.object:remove() 
+			self.object:remove()
 		end
 	end
 })
 
 minetest.register_on_dieplayer(function(player)
-	player:set_physics_override({
+	remove_physics_override(player, {
 		gravity = 1,
 		jump = 1,
 	})
@@ -137,7 +296,7 @@ end)
 
 minetest.register_on_joinplayer(function(player)
 	local pname = player:get_player_name()
-	player:set_physics_override({
+	remove_physics_override(player, {
 		gravity = 1,
 		jump = 1,
 	})
@@ -151,7 +310,7 @@ minetest.register_on_joinplayer(function(player)
 		alignment = {x=1, y=1},
 		offset = {x=0, y=0}
 	}) end
-	if debug then 
+	if debug then
 		hangglider.debug[pname] = {id = player:hud_add({hud_elem_type = "text",
 			position = {x=0.5, y=0.1},
 			text = "-",
@@ -174,38 +333,44 @@ minetest.register_tool("hangglider:hangglider", {
 	description = "Glider",
 	inventory_image = "glider_item.png",
 	stack_max=1,
-	on_use = function(itemstack, user, pointed_thing)
-		if not user then
+	on_use = function(itemstack, player, pointed_thing)
+		if not player then
 			return
 		end
-		local pos = user:get_pos()
-		local pname = user:get_player_name()
-		if minetest.get_node(pos).name == "air" and not hangglider.use[pname] then --Equip
+		local pos = player:get_pos()
+		local pname = player:get_player_name()
+		if not hangglider.use[pname] then --Equip
 			minetest.sound_play("bedsheet", {pos=pos, max_hear_distance = 8, gain = 1.0})
-			if HUD_Overlay then user:hud_change(hangglider.id[pname], "text", "glider_struts.png") end
+			if HUD_Overlay then player:hud_change(hangglider.id[pname], "text", "glider_struts.png") end
 			local airbreak = false
-			local vel = user:get_player_velocity().y
-			if vel < -1.5 then  -- engage mid-air, falling fast, so stop but ramp velocity more quickly
+			local vel = player:get_player_velocity().y
+			--[[if vel < -1.5 then  -- engage mid-air, falling fast, so stop but ramp velocity more quickly
 				--hangglider.airbreak[pname] = true
 				airbreak = true
 				local stopper = minetest.add_entity(pos, "hangglider:airstopper")
-				stopper:get_luaentity().attach = user
-				user:set_attach( stopper, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
-			end
-			user:set_physics_override({gravity = 0,jump=0,speed=1.75})
-			if not airbreak then 
-				
-				minetest.add_entity(user:get_pos(), "hangglider:glider"):set_attach(user, "", {x=0,y=0,z=0}, {x=0,y=0,z=0}) 
+				minetest.after(0, function(stopper, player) --"Extreme Measures"
+					stopper:set_pos(player:get_pos())
+					stopper:get_luaentity().attach = player
+					player:set_attach( stopper, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
+				end, stopper, player)
+			end]]
+			if not airbreak then
+				if moveModelUp then
+					minetest.add_entity(pos, "hangglider:glider"):set_attach(player, "", {x=0,y=10,z=0}, {x=0,y=0,z=0})
+				else
+					minetest.add_entity(pos, "hangglider:glider"):set_attach(player, "", {x=0,y=0,z=0}, {x=0,y=0,z=0})
+				end
 			end
 			hangglider.use[pname] = true
+			apply_physics_override(player, {jump = 0})
 			-- if minetest 0.4.x use this:
-			
+
 			-- if minetest 5.x use this:
-			-- minetest.add_entity(user:get_pos(), "hangglider:glider"):set_attach(user, "", {x=0,y=10,z=0}, {x=0,y=0,z=0})
+			-- minetest.add_entity(player:get_pos(), "hangglider:glider"):set_attach(player, "", {x=0,y=10,z=0}, {x=0,y=0,z=0})
 			itemstack:set_wear(itemstack:get_wear() + 255)
 			return itemstack
 		elseif hangglider.use[pname] then --Unequip
-			if HUD_Overlay then user:hud_change(hangglider.id[pname], "text", "blank.png") end
+			if HUD_Overlay then player:hud_change(hangglider.id[pname], "text", "default_wood.png^[colorize:#0000:255") end
 			hangglider.use[pname] = false
 		end
 	end,