From 3865d138874f688a8cc6210f5450a8ac18c30177 Mon Sep 17 00:00:00 2001 From: Piezo_ Date: Thu, 29 Nov 2018 21:46:05 -0800 Subject: Minetest_systemd dependency is now optional --- README.md | 38 +++++++++++++++++++++ depends.txt | 3 +- init.lua | 80 +++++++++++++++++++++++++++++++++----------- textures/blank.png | Bin 4194 -> 0 bytes textures/glider_struts.png~ | Bin 32906 -> 0 bytes 5 files changed, 101 insertions(+), 20 deletions(-) create mode 100644 README.md delete mode 100644 textures/blank.png delete mode 100644 textures/glider_struts.png~ diff --git a/README.md b/README.md new file mode 100644 index 0000000..56c6a48 --- /dev/null +++ b/README.md @@ -0,0 +1,38 @@ +Hang Glider Mod for Minetest +---------------------------- +This is a fork of the minetest-hangglider mod by Piezo_ (orderofthefourthwall@gmail.com) + +Which is located at: + + +**This version is an experimental version that is not intended for general use.** + +It includes the following changes by David G (kestral246@gmail.com): + +- Give visual indication that hangglider is equiped. + - Display simple overlay with blurred struts when equiped. + - Issue: don't know how to disable overlay when using third person view. + +- Also unequip hangglider when landing on water. + +- Attempt to linearize parabolic flight path. + - Start gravity stronger, but gradually reduce it as descent velocity increases. + - Don't use airstopper when equipped from the ground (descent velocity is low). + - Slightly increase flight speed to 1.25. + +- Unequip/equip cycling mid-flight should not fly farther than continuous flight. + - When equipping mid-air (descent velocity higher), use airstopper but increase descent slope afterwards. + - Create airbreak flag so all equips mid-flight use faster descent. + - Reset airbreak flag only when land (canExist goes false). + - Issue: it wouldn't reset if land in water, use fly, and launch from air, before I added test for water, + - Not sure if there are other such cases. + +- Did another round of parameter tuning. + - Commented out hud debug display code with prefix "--debug:". + +- For Minetest 5.x the glider's set_attach point needs to be offset by 1 node. + - Provided alternate commented out version of this line that has the correct offset. + +- Discovered that sprint mod interferes with this mod's speed settings. + - It's likely that other mods that affect player_physics will have this same problem. + - May need to consider adding player_monoid support to this mod. diff --git a/depends.txt b/depends.txt index be420a3..f3e3b6d 100755 --- a/depends.txt +++ b/depends.txt @@ -1,2 +1,3 @@ default -wool \ No newline at end of file +wool +minetest_systemd? \ No newline at end of file diff --git a/init.lua b/init.lua index c694f0e..b246906 100644 --- a/init.lua +++ b/init.lua @@ -41,6 +41,10 @@ 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 @@ -64,13 +68,17 @@ minetest.register_entity("hangglider:airstopper", { --A one-instant entity that 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 @@ -79,6 +87,22 @@ minetest.register_entity("hangglider:airstopper", { --A one-instant entity that end }) +if minetestd and minetestd.services.gravityctl.enabled then +minetestd.gravityctl.register_gravity_effect("hangglider", + function(player) + return hangglider.use[player:get_player_name()] + end, + function(gravity, player) + local vel = player:get_player_velocity() + if debug then player:hud_change(hangglider.debug[pname].id, "text", vel.y..', '..player:get_physics_override().gravity..', '..tostring(hangglider.airbreak[pname])) end + return ((vel.y + 3)/20) + end, + 7, + 1000 +) +end + +local step_v minetest.register_entity("hangglider:glider", { visual = "mesh", visual_size = {x = 12, y = 12}, @@ -98,19 +122,31 @@ minetest.register_entity("hangglider:glider", { if mrn_name then if not (mrn_name.walkable or (mrn_name.drowning and mrn_name.drowning == 1)) then canExist = true - local vel = player:get_player_velocity() + step_v = player:get_player_velocity().y + if step_v < 0 then + player:set_physics_override({speed=math.abs(step_v/2) + 0.75}) + else + player:set_physics_override({speed=1}) + end + if not minetestd then + if debug then player:hud_change(hangglider.debug[pname].id, "text", step_v..', '..player:get_physics_override().gravity..', '..tostring(hangglider.airbreak[pname])) end + player:set_physics_override({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 canExist then player:set_physics_override({ - gravity = 1, jump = 1, speed = 1, }) + if not minetestd then + player:set_physics_override({gravity=1}) + end hangglider.use[pname] = false if HUD_Overlay then player:hud_change(hangglider.id[pname], "text", "blank.png") @@ -174,38 +210,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() + local pos = player:get_pos() + local pname = player:get_player_name() if minetest.get_node(pos).name == "air" and 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 + 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}) + 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 - 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}) + 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 + player:set_physics_override({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, @@ -225,4 +267,4 @@ minetest.register_craft({ {"default:stick", "", "default:stick"}, {"", "default:stick", ""}, } -}) +}) \ No newline at end of file diff --git a/textures/blank.png b/textures/blank.png deleted file mode 100644 index de728ad..0000000 Binary files a/textures/blank.png and /dev/null differ diff --git a/textures/glider_struts.png~ b/textures/glider_struts.png~ deleted file mode 100644 index 55dd0d2..0000000 Binary files a/textures/glider_struts.png~ and /dev/null differ -- cgit v1.2.3