nalc/hangglider
1
0
Fork 0
forked from mtcontrib/hangglider
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: nalc:206704ffabcdddc61150ed798c88add9965a110d
Branches Tags
nalc:master
...
compare: nalc:cd67eb2d19aa8c3a7381c862228dc26b8e60d0bc
Branches Tags
nalc:master mtcontrib:master mtcontrib:fly_checks mtcontrib:FLAKprivXP

9 Commits
206704ffab ... cd67eb2d19

Author SHA1 Message Date
Niklp
cd67eb2d19 fixes #1 (#5) 
* partially fixes #1

* remove support for "minetestmd" and "wardzones"
 2022-07-04 21:48:01 +02:00
Niklp
bbde71805a Replace deprecated functions (#4) 
* Replace deprecated functions

* add min_minetest_version
 2022-06-18 21:15:23 +02:00
Luke aka SwissalpS
b65b6473c7 add Z-Index (#2) 
* whitespace indents

* add z_index

* changelog
 2022-05-17 06:47:15 +02:00
OgelGames
54afc348ee update luacheck 2021-01-14 14:54:56 +11:00
OgelGames
0b5b18732a correct check for fake player 
fixes pandorabox-io/pandorabox.io#547
 2021-01-14 14:46:06 +11:00
Buckaroo Banzai
d6af7437b2 check for "is_player()" on "on_use" 
fixes https://github.com/pandorabox-io/pandorabox.io/issues/547
 2020-10-05 07:00:23 +02:00
OgelGames
a814fbe160 don't shoot down area owners 2020-05-31 20:00:06 +10:00
BuckarooBanzay
c01518913b add luacheck and fix common errors 
also fixes https://github.com/pandorabox-io/pandorabox.io/issues/493
 2020-04-27 10:44:56 +02:00
BuckarooBanzay
e2d8721a52 check areas only for flak 
fixes https://github.com/pandorabox-io/pandorabox.io/issues/377
 2020-02-13 14:01:30 +01:00
5 changed files with 75 additions and 71 deletions
Expand all files Collapse all files

13
.github/workflows/luacheck.yml vendored Normal file
View File

@ -0,0 +1,13 @@
name: luacheck
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: apt
run: sudo apt-get install -y luarocks
- name: luacheck install
run: luarocks install --local luacheck
- name: luacheck run
run: $HOME/.luarocks/bin/luacheck ./

15
.luacheckrc Normal file
View File

@ -0,0 +1,15 @@
globals = {
"hangglider",
"areas"
}
read_globals = {
-- Minetest
"minetest",
"vector", "ItemStack",
-- Mod deps
"wardzones",
"minetestd",
"player_monoids"
}

5
depends.txt
View File

@ -1,5 +0,0 @@
default
wool
minetest_systemd?
areas?
player_monoids?

110
init.lua
View File

@ -49,18 +49,21 @@
-- 2018-12-29
-- Physics overrides use player_monoids mod if available
-- Modifications by SwissalpS
-- 2022-05-16
-- Add Z-index to theoretically be behind hotbar and practically behind other HUDs
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
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
hangglider.id = {} -- hud id for displaying overlay with struts
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
@ -99,7 +102,7 @@ minetest.register_entity("hangglider:airstopper", { --A one-instant entity that
end
})]]
if core.global_exists("areas") then
if minetest.global_exists("areas") then
hangglider.flak = true
-- chat command definition essentially copied from areas mod.
minetest.register_chatcommand("area_flak",{
@ -124,41 +127,19 @@ if core.global_exists("areas") then
})
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
if areas and hangglider.flak then
local flak = false
local owners = {}
for _, area in pairs(areas:getAreasAtPos(pos)) do
if area.flak then
flak = true
end
owners[area.owner] = true
end
if flak and not owners[pname] then
return false
end
end
return true
@ -174,7 +155,7 @@ end
local physics_attrs = {"jump", "speed", "gravity"}
local function apply_physics_override(player, overrides)
if player_monoids then
if minetest.get_modpath("player_monoids") then
for _, attr in pairs(physics_attrs) do
if overrides[attr] then
player_monoids[attr]:add_change(player, overrides[attr], "hangglider:glider")
@ -188,7 +169,7 @@ 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
if minetest.global_exists("player_monoids") then
player_monoids[attr]:del_change(player, "hangglider:glider")
else
player:set_physics_override({[attr] = 1})
@ -211,7 +192,7 @@ minetest.register_entity("hangglider:glider", {
if self.object:get_attach() then
local player = self.object:get_attach("parent")
if player then
local pos = player:getpos()
local pos = player:get_pos()
local pname = player:get_player_name()
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]
@ -219,8 +200,7 @@ minetest.register_entity("hangglider:glider", {
if not (mrn_name.walkable or mrn_name.liquidtype ~= "none") then
canExist = true
if not minetestd then
step_v = player:get_player_velocity().y
step_v = player:get_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.
@ -228,14 +208,12 @@ minetest.register_entity("hangglider:glider", {
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
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
@ -254,12 +232,7 @@ minetest.register_entity("hangglider:glider", {
end
if not canExist then
if not minetestd then
remove_physics_override(player, {
gravity=1,
jump = 1,
speed = 1,})
end
remove_physics_override(player, { gravity=1, jump = 1, speed = 1,})
hangglider.use[pname] = false
if HUD_Overlay then
player:hud_change(hangglider.id[pname], "text", "blank.png")
@ -292,14 +265,16 @@ minetest.register_on_joinplayer(function(player)
})
hangglider.use[pname] = false
if HUD_Overlay then
hangglider.id[pname] = player:hud_add({
hud_elem_type = "image",
text = "blank.png",
position = {x=0, y=0},
scale = {x=-100, y=-100},
alignment = {x=1, y=1},
offset = {x=0, y=0}
}) end
hangglider.id[pname] = player:hud_add({
hud_elem_type = "image",
text = "blank.png",
position = {x=0, y=0},
scale = {x=-100, y=-100},
alignment = {x=1, y=1},
offset = {x=0, y=0},
z_index = -150
})
end
if debug then
hangglider.debug[pname] = {id = player:hud_add({hud_elem_type = "text",
position = {x=0.5, y=0.1},
@ -323,8 +298,9 @@ minetest.register_tool("hangglider:hangglider", {
description = "Glider",
inventory_image = "glider_item.png",
stack_max=1,
on_use = function(itemstack, player, pointed_thing)
if not player then
on_use = function(itemstack, player)
if not player or player.is_fake_player then
-- player does not exist or is created from an automated machine (fake_player)
return
end
local pos = player:get_pos()
@ -333,7 +309,6 @@ minetest.register_tool("hangglider:hangglider", {
minetest.sound_play("bedsheet", {pos=pos, max_hear_distance = 8, gain = 1.0})
if HUD_Overlay then player:hud_change(hangglider.id[pname], "text", "glider_struts.png") end
local airbreak = false
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
@ -370,7 +345,10 @@ minetest.register_tool("hangglider:hangglider", {
minetest.register_craft({
type = "shapeless",
output = "hangglider:hangglider",
recipe = {"default:paper", "default:paper", "default:paper", "default:paper", "hangglider:hangglider", "default:paper", "default:paper", "default:paper", "default:paper"},
recipe = {"default:paper", "default:paper", "default:paper",
"default:paper", "hangglider:hangglider", "default:paper",
"default:paper", "default:paper", "default:paper"
},
})
minetest.register_craft({

3
mod.conf
View File

@ -1 +1,4 @@
name = hangglider
depends = default, wool
optional_depends = areas, player_monoids
min_minetest_version = 5.0