Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history 
~ Code Cleanup
~ Move ladder node above/below check to inside ladder check
  • Loading branch information
@sirrobzeroone
sirrobzeroone committed Aug 18, 2022
1 parent 586d450 commit 98dbe16
Show file tree
Hide file tree
Showing 3 changed files with 313 additions and 292 deletions.
13 changes: 10 additions & 3 deletions i_example_cape.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
-------------------------------------------
-- Example Cape --
-------------------------------------------
------------------------------------------------------------
-- ___ _ __ ___ _ --
-- | __| |_ _ / _|___ / __|_ __ _(_)_ __ --
-- | _|| | || | > _|_ _| \__ \ V V / | ' \ --
-- |_| |_|\_, | \_____| |___/\_/\_/|_|_|_|_| --
-- |__/ --
-- Crouch and Climb --
------------------------------------------------------------
-- Example Cape --
------------------------------------------------------------
armor:register_armor("3d_armor_flyswim:demo_cape", {
description = "Someones Cape",
inventory_image = "3d_armor_flyswim_demo_cape_inv.png",
Expand Down
173 changes: 88 additions & 85 deletions i_functions.lua
View file
Original file line number Diff line number Diff line change
@@ -1,94 +1,100 @@
------------------------------------------------------------------
-- ___________ __ .__ --
-- \_ _____/_ __ ____ _____/ |_|__| ____ ____ ______ --
-- | __)| | \/ \_/ ___\ __\ |/ _ \ / \ / ___/ --
-- | \ | | / | \ \___| | | ( <_> ) | \\___ \ --
-- \___ / |____/|___| /\___ >__| |__|\____/|___| /____ > --
-- \/ \/ \/ \/ \/ --
------------------------------------------------------------------
------------------------------------------------------------
-- ___ _ __ ___ _ --
-- | __| |_ _ / _|___ / __|_ __ _(_)_ __ --
-- | _|| | || | > _|_ _| \__ \ V V / | ' \ --
-- |_| |_|\_, | \_____| |___/\_/\_/|_|_|_|_| --
-- |__/ --
-- Crouch and Climb --
------------------------------------------------------------
-- Functions --
------------------------------------------------------------

----------------------------------------
-- Get Player model and textures

function armor_fly_swim.get_player_model()

local player_mod = "character_sf.b3d" -- Swim, Fly
local texture = {"character.png",

-- player_api only (simple_skins uses)
local player_mod = "character_sf.b3d"
local texture = {"character.png",
"3d_armor_trans.png"}

if armor_fly_swim.is_3d_armor and
not armor_fly_swim.add_capes and
-- 3d_armor only nil capes (simple_skins uses)
if armor_fly_swim.is_3d_armor and
not armor_fly_swim.add_capes and
not armor_fly_swim.is_skinsdb then
player_mod = "3d_armor_character_sf.b3d" -- Swim Fly
texture = {armor.default_skin..".png",
"3d_armor_trans.png",

player_mod = "3d_armor_character_sf.b3d"
texture = {armor.default_skin..".png",
"3d_armor_trans.png",
"3d_armor_trans.png"}
end

if armor_fly_swim.is_3d_armor and
armor_fly_swim.add_capes and
-- 3d_armor only with capes (simple_skins uses)
if armor_fly_swim.is_3d_armor and
armor_fly_swim.add_capes and
not armor_fly_swim.is_skinsdb then
player_mod = "3d_armor_character_sfc.b3d" -- Swim Fly Capes
texture = {armor.default_skin..".png",
"3d_armor_trans.png",

player_mod = "3d_armor_character_sfc.b3d"
texture = {armor.default_skin..".png",
"3d_armor_trans.png",
"3d_armor_trans.png"}
end

if armor_fly_swim.is_skinsdb then
player_mod = "skinsdb_3d_armor_character_5.b3d" -- Swim Fly Capes
texture = {"blank.png",
"blank.png",
"blank.png",
-- skins_db with 3d_armor or without
if armor_fly_swim.is_skinsdb then
player_mod = "skinsdb_3d_armor_character_5.b3d"
texture = {"blank.png",
"blank.png",
"blank.png",
"blank.png"}
end
end

return player_mod,texture
end

----------------------------------------
-- Get WASD, pressed = true
-- Get WASD, pressed = true

function armor_fly_swim.get_wasd_state(controls)

local rtn = false
if controls.up == true or
controls.down == true or
controls.left == true or
local rtn = false

if controls.up == true or
controls.down == true or
controls.left == true or
controls.right == true then

rtn = true
end

return rtn
end

----------------------------------------
-- Check specific node fly/swim --
-- 1=player feet, 2=one below feet, --
-- Thanks Gundul --
----------------------------------------
-- Check specific node fly/swim
-- 1=player feet, 2=one below feet,
-- Thanks Gundul

function node_fsable(pos,num,type)

local draw_ta = {"airlike"}
local draw_tl = {"liquid","flowingliquid"}
local compare = draw_ta
local node = minetest.get_node({x=pos.x,y=pos.y-(num-1),z=pos.z})
local n_draw

if minetest.registered_nodes[node.name] then
n_draw = minetest.registered_nodes[node.name].drawtype
else
n_draw = "normal"
end

if type == "s" then
compare = draw_tl
end
for k,v in ipairs(compare) do

for k,v in ipairs(compare) do
if n_draw == v then
return true
end
Expand All @@ -97,8 +103,8 @@ function node_fsable(pos,num,type)
end

-----------------------------------------------
-- Check X number nodes down fly/Swimmable --
-----------------------------------------------
-- Check X number nodes down fly/Swimmable

function node_down_fsable(pos,num,type)

local draw_ta = {"airlike"}
Expand All @@ -114,25 +120,25 @@ local compare = draw_ta

if type == "s" then
compare = draw_tl
end
end

local n_draw
for k,v in pairs(nodes) do
local n_draw

if minetest.registered_nodes[v.name] then
n_draw = minetest.registered_nodes[v.name].drawtype
else
n_draw = "normal"
end
for k2,v2 in ipairs(compare) do

for k2,v2 in ipairs(compare) do
if n_draw == v2 then
table.insert(result,"t")
end
end
end
end

if #result == num then
return true
else
Expand All @@ -141,43 +147,40 @@ local compare = draw_ta
end

------------------------------------------
-- Workaround for odd crouch behaviour --
------------------------------------------
-- Workaround for slab edge crouch

function crouch_wa(player,pos)
local is_slab = 0 -- is_slab var holder 0=not_slab, 1=slab
local pos_w = {} -- Empty table
local is_slab = 0
local pos_w = {}
local angle = (player:get_look_horizontal())*180/math.pi -- Convert Look direction to angles

if angle <= 45 or angle >= 315 then -- +Z North

-- +Z North
if angle <= 45 or angle >= 315 then
pos_w={x=pos.x,y=pos.y+1,z=pos.z+1}

elseif angle > 45 and angle < 135 then -- -X West
pos_w={x=pos.x-1,y=pos.y+1,z=pos.z}

elseif angle >= 135 and angle <= 225 then -- -Z South
pos_w={x=pos.x,y=pos.y+1,z=pos.z-1}

elseif angle > 225 and angle < 315 then -- +X East
pos_w={x=pos.x+1,y=pos.y+1,z=pos.z}
end

local check = minetest.get_node(pos_w) -- Get the node that is in front of the players look direction

if minetest.registered_nodes[check.name] then
local check_g = minetest.registered_nodes[check.name].groups -- Get the groups assigned to node
for k,v in pairs(check_g) do
if k == "slab" then -- Any of the keys == slab then slab
is_slab = 1 -- is_slab set to 1
end
end
end

return is_slab -- return 1 or 0

end
-- -X West
elseif angle > 45 and angle < 135 then
pos_w={x=pos.x-1,y=pos.y+1,z=pos.z}

-- -Z South
elseif angle >= 135 and angle <= 225 then
pos_w={x=pos.x,y=pos.y+1,z=pos.z-1}

-- +X East
elseif angle > 225 and angle < 315 then
pos_w={x=pos.x+1,y=pos.y+1,z=pos.z}
end

local check = minetest.get_node(pos_w)

if minetest.registered_nodes[check.name] then
local check_g = minetest.get_item_group(check.name, "slab")

if check_g ~= 0 then
is_slab = 1
end
end

-- return 1 or 0, need to update to bool
return is_slab
end
Loading

0 comments on commit 98dbe16

Please sign in to comment.