Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
-- autofly by cora
|
|
|
|
-- gui shit shamelessly stolen from advmarkers
|
|
|
|
-- https://git.minetest.land/luk3yx/advmarkers-csm
|
|
|
|
--[[
|
|
|
|
PATCHING MINETEST: (for autoaim)
|
|
|
|
in l_localplayer.h add:
|
|
|
|
static int l_set_yaw(lua_State *L);
|
|
|
|
static int l_set_pitch(lua_State *L);
|
|
|
|
|
|
|
|
in l_localplayer.cpp add:
|
|
|
|
int LuaLocalPlayer::l_set_yaw(lua_State *L)
|
|
|
|
{
|
|
|
|
LocalPlayer *player = getobject(L, 1);
|
|
|
|
f32 p = (float) luaL_checkinteger(L, 2);
|
|
|
|
player->setYaw(p);
|
|
|
|
g_game->cam_view.camera_yaw = p;
|
|
|
|
g_game->cam_view_target.camera_yaw = p;
|
|
|
|
player->setYaw(p);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
int LuaLocalPlayer::l_set_pitch(lua_State *L)
|
|
|
|
{
|
|
|
|
LocalPlayer *player = getobject(L, 1);
|
|
|
|
f32 p = (float) luaL_checkinteger(L, 2);
|
|
|
|
player->setPitch(p);
|
|
|
|
g_game->cam_view.camera_pitch = p;
|
|
|
|
g_game->cam_view_target.camera_pitch = p;
|
|
|
|
player->setPitch(p);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
in src/client/game.h, below class Game { public: add:
|
|
|
|
CameraOrientation cam_view = {0};
|
|
|
|
CameraOrientation cam_view_target = { 0 };
|
|
|
|
|
|
|
|
from src/client/game.cpp remove
|
|
|
|
CameraOrientation cam_view = {0};
|
|
|
|
CameraOrientation cam_view_target = { 0 };
|
|
|
|
|
|
|
|
--]]
|
|
|
|
|
|
|
|
-- Chat commands:
|
|
|
|
-- .wa x,y,z name - add waypoint with coords and name
|
|
|
|
-- .wah - quickadd this location (name will be time and date)
|
|
|
|
-- .wp - open the selection menu
|
|
|
|
-- .cls - remove hud
|
|
|
|
|
|
|
|
autofly = {}
|
|
|
|
wps={}
|
|
|
|
local landing_distance=100
|
|
|
|
local speed=0;
|
|
|
|
local ltime=0
|
|
|
|
|
|
|
|
local storage = minetest.get_mod_storage()
|
2020-10-25 11:15:08 +01:00
|
|
|
local oldpm=false
|
2020-11-01 16:09:09 +01:00
|
|
|
local lpos={x=0,y=0,z=0}
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
local info=minetest.get_server_info()
|
|
|
|
local stprefix="autofly-".. info['address'] .. '-'
|
2020-11-14 23:45:34 +01:00
|
|
|
autofly.flying=false
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
|
|
|
|
local modname = minetest.get_current_modname()
|
|
|
|
local modpath = minetest.get_modpath(modname)
|
|
|
|
dofile(modpath .. "/wpforms.lua")
|
|
|
|
|
|
|
|
local hud_wp
|
|
|
|
local hud_info
|
|
|
|
-- /COMMON
|
|
|
|
local function pos_to_string(pos)
|
|
|
|
if type(pos) == 'table' then
|
|
|
|
pos = minetest.pos_to_string(vector.round(pos))
|
|
|
|
end
|
|
|
|
if type(pos) == 'string' then
|
|
|
|
return pos
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local function string_to_pos(pos)
|
|
|
|
if type(pos) == 'string' then
|
|
|
|
pos = minetest.string_to_pos(pos)
|
|
|
|
end
|
|
|
|
if type(pos) == 'table' then
|
|
|
|
return vector.round(pos)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
function round2(num, numDecimalPlaces)
|
|
|
|
return tonumber(string.format("%." .. (numDecimalPlaces or 0) .. "f", num))
|
|
|
|
end
|
|
|
|
|
2020-11-15 23:16:56 +01:00
|
|
|
function autofly.get2ddst(pos1,pos2)
|
|
|
|
return vector.distance({x=pos1.x,y=0,z=pos1.z},{x=pos2.x,y=0,z=pos2.z})
|
|
|
|
end
|
|
|
|
|
2020-11-08 17:34:26 +00:00
|
|
|
local last_sprint = false
|
|
|
|
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
minetest.register_globalstep(function()
|
2020-11-14 14:05:13 +01:00
|
|
|
autofly.axissnap()
|
2020-11-01 16:28:27 +01:00
|
|
|
if minetest.settings:get_bool("autosprint") or (minetest.settings:get_bool("continuous_forward") and minetest.settings:get_bool("autofsprint")) then
|
2020-10-23 02:19:12 +02:00
|
|
|
core.set_keypress("special1", true)
|
2020-11-08 17:34:26 +00:00
|
|
|
last_sprint = true
|
|
|
|
elseif last_sprint then
|
2020-11-01 16:28:27 +01:00
|
|
|
core.set_keypress("special1", false)
|
2020-11-08 17:34:26 +00:00
|
|
|
last_sprint = false
|
2020-10-23 02:19:12 +02:00
|
|
|
end
|
2020-11-01 16:28:27 +01:00
|
|
|
|
|
|
|
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
if not minetest.localplayer then return end
|
2020-11-14 23:45:34 +01:00
|
|
|
if not autofly.flying then autofly.set_hud_info("")
|
|
|
|
else
|
|
|
|
local pos = autofly.last_coords
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
if pos then
|
|
|
|
local dst = vector.distance(pos,minetest.localplayer:get_pos())
|
|
|
|
local etatime=-1
|
|
|
|
if not (speed == 0) then etatime = round2(dst / speed / 60,2) end
|
2020-11-20 15:50:33 +01:00
|
|
|
autofly.etatime=etatime
|
2020-11-14 23:45:34 +01:00
|
|
|
autofly.set_hud_info(autofly.last_name .. "\n" .. pos_to_string(pos) .. "\n" .. "ETA" .. etatime .. " mins")
|
2020-11-15 04:10:41 +01:00
|
|
|
if autofly.flying and dst < landing_distance then
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
autofly.arrived()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2020-11-15 17:27:14 +00:00
|
|
|
if not minetest.settings:get_bool("freecam") and autofly.flying and (minetest.settings:get_bool('afly_autoaim')) then
|
2020-11-14 23:45:34 +01:00
|
|
|
autofly.aim(autofly.last_coords)
|
2020-11-15 17:27:14 +00:00
|
|
|
--core.set_keypress("special1", true)
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
if ( os.time() < ltime + 1 ) then return end
|
|
|
|
ltime=os.time()
|
|
|
|
if lpos then
|
|
|
|
local dst=vector.distance(minetest.localplayer:get_pos(),lpos)
|
|
|
|
speed=round2(dst,1)
|
2020-11-01 16:09:09 +01:00
|
|
|
autofly.speed=speed
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
|
|
|
lpos=minetest.localplayer:get_pos()
|
2020-11-15 23:16:56 +01:00
|
|
|
autofly.cruise()
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end)
|
|
|
|
|
2020-11-15 23:16:56 +01:00
|
|
|
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
function autofly.set_hud_wp(pos, title)
|
|
|
|
if hud_wp then
|
|
|
|
minetest.localplayer:hud_remove(hud_wp)
|
|
|
|
end
|
|
|
|
pos = string_to_pos(pos)
|
|
|
|
hud_wp=nil
|
|
|
|
if not pos then return end
|
|
|
|
if not title then
|
|
|
|
title = pos.x .. ', ' .. pos.y .. ', ' .. pos.z
|
|
|
|
end
|
2020-11-14 23:45:34 +01:00
|
|
|
autofly.last_name=title
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
if hud_wp then
|
|
|
|
minetest.localplayer:hud_change(hud_wp, 'name', title)
|
|
|
|
minetest.localplayer:hud_change(hud_wp, 'world_pos', pos)
|
|
|
|
else
|
|
|
|
hud_wp = minetest.localplayer:hud_add({
|
|
|
|
hud_elem_type = 'waypoint',
|
|
|
|
name = title,
|
|
|
|
text = 'm',
|
|
|
|
number = 0x00ff00,
|
|
|
|
world_pos = pos
|
|
|
|
})
|
|
|
|
end
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
local hud_info
|
|
|
|
function autofly.set_hud_info(text)
|
|
|
|
if not minetest.localplayer then return end
|
2020-11-20 15:50:33 +01:00
|
|
|
if type(text) ~= "string" then return end
|
2020-11-14 14:05:13 +01:00
|
|
|
local vspeed=minetest.localplayer:get_velocity()
|
2020-11-14 23:49:05 +01:00
|
|
|
local ttext=text.."\nSpeed: "..speed.."n/s\n"..round2(vspeed.x,2) ..','..round2(vspeed.y,2) ..','..round2(vspeed.z,2) .."\nYaw:"..round2(minetest.localplayer:get_yaw(),2).."° Pitch:" ..round2(minetest.localplayer:get_pitch(),2).."°"
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
if hud_info then
|
|
|
|
minetest.localplayer:hud_change(hud_info,'text',ttext)
|
|
|
|
else
|
|
|
|
hud_info = minetest.localplayer:hud_add({
|
|
|
|
hud_elem_type = 'text',
|
|
|
|
name = "Flight Info",
|
|
|
|
text = ttext,
|
|
|
|
number = 0x00ff00,
|
|
|
|
direction = 0,
|
2020-11-15 23:16:56 +01:00
|
|
|
position = {x=0,y=0.90},
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
alignment ={x=1,y=1},
|
|
|
|
offset = {x=0, y=0}
|
|
|
|
})
|
|
|
|
end
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function autofly.display_waypoint(name)
|
2020-11-20 15:50:33 +01:00
|
|
|
local pos=autofly.get_waypoint(name)
|
|
|
|
autofly.last_name = name
|
|
|
|
autofly.last_coords = pos
|
|
|
|
autofly.set_hud_info(name)
|
|
|
|
autofly.aim(autofly.last_coords)
|
|
|
|
autofly.set_hud_wp(autofly.last_coords, autofly.last_name)
|
|
|
|
return true
|
2020-10-23 11:55:48 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.goto_waypoint(name)
|
2020-11-20 15:50:33 +01:00
|
|
|
local wp=autofly.get_waypoint(name)
|
|
|
|
autofly.goto(wp)
|
2020-11-14 23:49:05 +01:00
|
|
|
autofly.last_name=name
|
2020-11-20 20:20:53 +00:00
|
|
|
autofly.display_waypoint(autofly.last_name)
|
2020-11-20 15:50:33 +01:00
|
|
|
return true
|
2020-11-14 23:45:34 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.goto(pos)
|
2020-11-20 15:50:33 +01:00
|
|
|
oldpm=minetest.settings:get_bool("pitch_move")
|
|
|
|
minetest.settings:set_bool("pitch_move",true)
|
|
|
|
minetest.settings:set_bool("continuous_forward",true)
|
2020-11-20 20:20:53 +00:00
|
|
|
if minetest.settings:get_bool("afly_sprint") then
|
|
|
|
minetest.settings:set_bool("autofsprint",true)
|
|
|
|
minetest.settings:set_bool("autoeat_timed",true)
|
|
|
|
end
|
2020-11-20 15:50:33 +01:00
|
|
|
minetest.settings:set_bool("afly_autoaim",true)
|
|
|
|
autofly.last_coords = pos
|
|
|
|
autofly.last_name = minetest.pos_to_string(pos)
|
|
|
|
autofly.aim(autofly.last_coords)
|
|
|
|
autofly.flying=true
|
2020-11-20 20:20:53 +00:00
|
|
|
autofly.set_hud_wp(autofly.last_coords, autofly.last_name)
|
2020-11-20 15:50:33 +01:00
|
|
|
return true
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.arrived()
|
2020-11-20 15:50:33 +01:00
|
|
|
if not autofly.flying then return end
|
|
|
|
minetest.settings:set("continuous_forward", "false")
|
|
|
|
minetest.settings:set_bool("autofsprint",false)
|
|
|
|
minetest.settings:set_bool("pitch_move",oldpm)
|
|
|
|
minetest.settings:set_bool("afly_autoaim",false)
|
|
|
|
minetest.settings:set_bool("autoeat_timed",false)
|
|
|
|
autofly.set_hud_info("Arrived at destination")
|
|
|
|
autofly.flying = false
|
|
|
|
minetest.localplayer:hud_change(hud_info,'text',autofly.last_name .. "\n" .. "Arrived at destination.")
|
|
|
|
minetest.sound_play({name = "default_alert", gain = 1.0})
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
|
|
|
|
2020-11-15 23:16:56 +01:00
|
|
|
function autofly.cruise()
|
|
|
|
if not minetest.settings:get_bool('afly_cruise') then return end
|
|
|
|
local lp=minetest.localplayer:get_pos()
|
|
|
|
local pos2=vector.add(lp,{x=0,y=-50,z=0})
|
|
|
|
local air, blck = minetest.line_of_sight(lp, pos2)
|
2020-11-15 23:36:04 +01:00
|
|
|
if blck==nil then return end
|
|
|
|
local nd=minetest.get_node_or_nil(blck)
|
2020-11-15 23:16:56 +01:00
|
|
|
if not air and nd ~= nil then
|
|
|
|
minetest.localplayer:set_pos({x=lp.x,y=blck.y+25,z=lp.z} )
|
|
|
|
minetest.settings:set_bool("free_move",true)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-11-20 15:50:33 +01:00
|
|
|
function autofly.aim(tpos)
|
|
|
|
local ppos=minetest.localplayer:get_pos()
|
|
|
|
--local dir=tpos
|
|
|
|
local dir=vector.direction(ppos,tpos)
|
|
|
|
local yyaw=0;
|
|
|
|
local pitch=0;
|
|
|
|
if dir.x < 0 then
|
|
|
|
yyaw = math.atan2(-dir.x, dir.z) + (math.pi * 2)
|
|
|
|
else
|
|
|
|
yyaw = math.atan2(-dir.x, dir.z)
|
|
|
|
end
|
|
|
|
yyaw = round2(math.deg(yyaw),0)
|
|
|
|
pitch = round2(math.deg(math.asin(-dir.y) * 1),0);
|
|
|
|
minetest.localplayer:set_yaw(yyaw)
|
|
|
|
minetest.localplayer:set_pitch(pitch)
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
|
2020-11-20 15:50:33 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.autotp(tpname)
|
|
|
|
if minetest.localplayer == nil then return end
|
|
|
|
local tpos=nil
|
|
|
|
if tpname == nil then
|
|
|
|
tpos = autofly.get_waypoint('AUTOTP')
|
|
|
|
else
|
|
|
|
tpos=autofly.get_waypoint(tpname)
|
|
|
|
end
|
|
|
|
if tpos == nil then return end
|
|
|
|
local lp=minetest.localplayer
|
|
|
|
local dst=vector.distance(lp:get_pos(),tpos)
|
|
|
|
if (dst < 500) then
|
|
|
|
minetest.sound_play({name = "default_alert", gain = 3.0})
|
|
|
|
autofly.delete_waypoint('AUTOTP')
|
|
|
|
return
|
|
|
|
end
|
|
|
|
autofly.set_waypoint(tpos,'AUTOTP')
|
|
|
|
for k, v in ipairs(lp.get_nearby_objects(4)) do
|
|
|
|
local txt = v:get_item_textures()
|
|
|
|
if ( txt:find('mcl_boats_texture')) then
|
|
|
|
autofly.aim(vector.add(v:get_pos(),{x=0,y=-1.5,z=0}))
|
|
|
|
minetest.after("0.2",function()
|
2020-11-21 19:49:58 +00:00
|
|
|
minetest.interact("place") end)
|
2020-11-20 15:50:33 +01:00
|
|
|
minetest.after("2.5",function()
|
|
|
|
autofly.warpae('AUTOTP')
|
|
|
|
end)
|
|
|
|
return
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
2020-11-20 15:50:33 +01:00
|
|
|
end
|
|
|
|
minetest.sound_play({name = "default_alert", gain = 3.0})
|
|
|
|
autofly.delete_waypoint('AUTOTP')
|
|
|
|
end
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
|
2020-11-20 15:50:33 +01:00
|
|
|
function autofly.axissnap()
|
|
|
|
if not minetest.settings:get_bool('afly_snap') then return end
|
|
|
|
local y=minetest.localplayer:get_yaw()
|
|
|
|
local yy=nil
|
|
|
|
if ( y < 45 or y > 315 ) then
|
|
|
|
yy=0
|
|
|
|
elseif (y < 135) then
|
|
|
|
yy=90
|
|
|
|
elseif (y < 225 ) then
|
|
|
|
yy=180
|
|
|
|
elseif ( y < 315 ) then
|
|
|
|
yy=270
|
|
|
|
end
|
|
|
|
if yy ~= nil then
|
|
|
|
minetest.localplayer:set_yaw(yy)
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-11-20 15:50:33 +01:00
|
|
|
minetest.register_on_death(function()
|
|
|
|
if minetest.localplayer then
|
|
|
|
local name = 'Death waypoint'
|
|
|
|
local pos = minetest.localplayer:get_pos()
|
|
|
|
autofly.last_coords = pos
|
|
|
|
autofly.set_waypoint(pos, name)
|
|
|
|
autofly.display_waypoint(name)
|
|
|
|
end
|
|
|
|
end)
|
|
|
|
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
function autofly.warp(name)
|
|
|
|
local pos=vector.add(autofly.get_waypoint(name),{x=0,y=150,z=0})
|
|
|
|
if pos then
|
|
|
|
minetest.localplayer:set_pos(pos)
|
2020-11-20 15:50:33 +01:00
|
|
|
return true
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
function autofly.warpae(name)
|
|
|
|
local s, m = autofly.warp(name)
|
|
|
|
if s then
|
|
|
|
minetest.disconnect()
|
|
|
|
end
|
2020-11-20 15:50:33 +01:00
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.getwps()
|
|
|
|
local wp={}
|
|
|
|
for name, _ in pairs(storage:to_table().fields) do
|
|
|
|
if name:sub(1, string.len(stprefix)) == stprefix then
|
|
|
|
table.insert(wp, name:sub(string.len(stprefix)+1))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
table.sort(wp)
|
|
|
|
return wp
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.set_waypoint(pos, name)
|
|
|
|
pos = pos_to_string(pos)
|
|
|
|
if not pos then return end
|
|
|
|
storage:set_string(stprefix .. tostring(name), pos)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.delete_waypoint(name)
|
|
|
|
storage:set_string(stprefix .. tostring(name), '')
|
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.get_waypoint(name)
|
|
|
|
return string_to_pos(storage:get_string(stprefix .. tostring(name)))
|
|
|
|
end
|
|
|
|
|
|
|
|
function autofly.rename_waypoint(oldname, newname)
|
|
|
|
oldname, newname = tostring(oldname), tostring(newname)
|
|
|
|
local pos = autofly.get_waypoint(oldname)
|
|
|
|
if not pos or not autofly.set_waypoint(pos, newname) then return end
|
|
|
|
if oldname ~= newname then
|
|
|
|
autofly.delete_waypoint(oldname)
|
|
|
|
end
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
local function register_chatcommand_alias(old, ...)
|
|
|
|
local def = assert(minetest.registered_chatcommands[old])
|
|
|
|
def.name = nil
|
|
|
|
for i = 1, select('#', ...) do
|
|
|
|
minetest.register_chatcommand(select(i, ...), table.copy(def))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
minetest.register_chatcommand('waypoints', {
|
|
|
|
params = '',
|
|
|
|
description = 'Open the autofly GUI',
|
2020-11-21 04:34:50 +01:00
|
|
|
func = function(param) autofly.display_formspec() end
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
})
|
|
|
|
|
|
|
|
register_chatcommand_alias('waypoints','wp', 'wps', 'waypoint')
|
|
|
|
|
|
|
|
-- Add a waypoint
|
|
|
|
minetest.register_chatcommand('add_waypoint', {
|
|
|
|
params = '<pos / "here" / "there"> <name>',
|
|
|
|
description = 'Adds a waypoint.',
|
|
|
|
func = function(param)
|
|
|
|
local s, e = param:find(' ')
|
|
|
|
if not s or not e then
|
|
|
|
return false, 'Invalid syntax! See .help add_mrkr for more info.'
|
|
|
|
end
|
|
|
|
local pos = param:sub(1, s - 1)
|
|
|
|
local name = param:sub(e + 1)
|
|
|
|
|
|
|
|
-- Validate the position
|
|
|
|
if not pos then
|
|
|
|
return false, err
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Validate the name
|
|
|
|
if not name or #name < 1 then
|
|
|
|
return false, 'Invalid name!'
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Set the waypoint
|
|
|
|
return autofly.set_waypoint(pos, name), 'Done!'
|
|
|
|
end
|
|
|
|
})
|
|
|
|
register_chatcommand_alias('add_waypoint','wa', 'add_wp')
|
|
|
|
|
|
|
|
|
|
|
|
minetest.register_chatcommand('add_waypoint_here', {
|
|
|
|
params = 'name',
|
|
|
|
description = 'marks the current position',
|
|
|
|
func = function(param)
|
|
|
|
local name = os.date("%Y-%m-%d %H:%M:%S")
|
|
|
|
local pos = minetest.localplayer:get_pos()
|
|
|
|
return autofly.set_waypoint(pos, name), 'Done!'
|
|
|
|
end
|
|
|
|
})
|
|
|
|
register_chatcommand_alias('add_waypoint_here', 'wah', 'add_wph')
|
2020-11-20 15:50:33 +01:00
|
|
|
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
minetest.register_chatcommand('clear_waypoint', {
|
|
|
|
params = '',
|
|
|
|
description = 'Hides the displayed waypoint.',
|
|
|
|
func = function(param)
|
2020-11-14 23:45:34 +01:00
|
|
|
if autofly.flying then autofly.flying=false end
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
if hud_wp then
|
|
|
|
minetest.localplayer:hud_remove(hud_wp)
|
|
|
|
hud_wp = nil
|
|
|
|
return true, 'Hidden the currently displayed waypoint.'
|
|
|
|
elseif not minetest.localplayer.hud_add then
|
|
|
|
minetest.run_server_chatcommand('clrmrkr')
|
|
|
|
return
|
|
|
|
elseif not hud_wp then
|
|
|
|
return false, 'No waypoint is currently being displayed!'
|
|
|
|
end
|
|
|
|
for k,v in wps do
|
|
|
|
minetest.localplayer:hud_remove(v)
|
|
|
|
table.remove(k)
|
|
|
|
end
|
|
|
|
|
|
|
|
end,
|
|
|
|
})
|
2020-11-20 15:50:33 +01:00
|
|
|
register_chatcommand_alias('clear_waypoint', 'cwp','cls')
|
|
|
|
|
|
|
|
minetest.register_chatcommand('autotp', {
|
2020-11-11 20:25:05 +01:00
|
|
|
params = 'position',
|
|
|
|
description = 'autotp',
|
|
|
|
func = function(param)
|
2020-11-11 21:33:12 +01:00
|
|
|
autofly.autotp(minetest.string_to_pos(param))
|
2020-11-11 20:25:05 +01:00
|
|
|
end
|
|
|
|
})
|
2020-11-20 15:50:33 +01:00
|
|
|
register_chatcommand_alias('autotp', 'atp')
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
|
2020-11-14 14:05:13 +01:00
|
|
|
|
2020-11-12 00:16:22 +01:00
|
|
|
minetest.after("3.0",function()
|
2020-11-11 21:33:12 +01:00
|
|
|
if autofly.get_waypoint('AUTOTP') ~= nil then autofly.autotp(nil) end
|
2020-11-12 00:16:22 +01:00
|
|
|
end)
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
|
2020-11-20 15:50:33 +01:00
|
|
|
|
2020-11-20 20:20:53 +00:00
|
|
|
math.randomseed(os.time())
|
|
|
|
|
|
|
|
local randflying = false
|
|
|
|
|
|
|
|
minetest.register_globalstep(function()
|
|
|
|
if randflying and not autofly.flying then
|
|
|
|
local x = math.random(-31000, 31000)
|
|
|
|
local y = math.random(2000, 31000)
|
|
|
|
local z = math.random(-31000, 31000)
|
|
|
|
|
|
|
|
autofly.goto({x = x, y = y, z = z})
|
|
|
|
end
|
|
|
|
end)
|
|
|
|
|
|
|
|
local function randfly()
|
|
|
|
if not randflying then
|
|
|
|
randflying = true
|
|
|
|
local lp = minetest.localplayer:get_pos()
|
|
|
|
autofly.goto(turtle.coord(lp.x, 6000, lp.z))
|
|
|
|
else
|
|
|
|
randflying = false
|
|
|
|
autofly.arrived()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
minetest.register_chatcommand("randfly", {
|
|
|
|
description = "Randomly fly up high (toggle).",
|
|
|
|
func = randfly
|
|
|
|
})
|
|
|
|
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
|
2020-11-01 00:20:41 +01:00
|
|
|
if (_G["minetest"]["register_cheat"] == nil) then
|
2020-11-04 23:22:43 +00:00
|
|
|
minetest.settings:set_bool("afly_autoaim", false)
|
|
|
|
minetest.settings:set_bool("afly_softlanding", true)
|
2020-11-20 20:20:53 +00:00
|
|
|
minetest.settings:set_bool("afly_sprint", true)
|
2020-11-04 23:22:43 +00:00
|
|
|
else
|
|
|
|
minetest.register_cheat("Aim", "Autofly", "afly_autoaim")
|
2020-11-14 14:05:13 +01:00
|
|
|
minetest.register_cheat("AxisSnap", "Autofly", "afly_snap")
|
2020-11-15 23:16:56 +01:00
|
|
|
minetest.register_cheat("Cruise", "Autofly", "afly_cruise")
|
2020-11-20 20:20:53 +00:00
|
|
|
minetest.register_cheat("Sprint", "Autofly", "afly_sprint")
|
2020-11-04 23:22:43 +00:00
|
|
|
minetest.register_cheat("Waypoints", "Autofly", autofly.display_formspec)
|
Add changes from waspsaliva initial commit
This commit contains changes best credited to flyc0r
<flyc0r@localhost.localdomain>, although the changes were separated
out from waspsaliva's original initial commit rev. 0e9e1f352, which
added the files from DFC work tree, and squashed in numerous additions
by flyc0r and collaborators. That commit log:
commit 0e9e1f3528c3d2fa1f1e9a79d4a00576be8552f5
Author: flyc0r <flyc0r@localhost.localdomain>
Date: Sun Oct 4 03:37:08 2020 +0200
init
This rebase had the effect of griefing the git history xD, so
for example `git blame` of DFC and even upstream Minetest sources
appear to be originally authored by `flyc0r` in that commit.
To fix this, I will recommit only the changes onto the appropriate
commit in DFC, and recreate the following git history (incl. merges).
After this, the git history will be at least visually the same as the
original Waspsaliva, even if commit sha1sums have changed.
AFAICT, the closest commit from DFC was af085acbd. That commit was
found simply by running `git diff wsc-master <some_DFC_rev>`, and
locating the commit with the smallest number of differences.
This commit was then created as follows:
# Check out the DFC base commit
git checkout af085acbd
# Check out the *files* from WSC's initial commit
git checkout 0e9e1f352 -- .
# Make sure everything is added and commit the changes
git add -A
git commit
2020-10-04 03:37:08 +02:00
|
|
|
end
|