Skip to content

Commit

Permalink
Use mod.conf (5.0.0+), move craft recipes (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
Panquesito7 authored and SmallJoker committed Nov 7, 2019
1 parent 8e236eb commit 34a09a6
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 34 deletions.
9 changes: 9 additions & 0 deletions crafting.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
minetest.register_craft({
output = "prefab:boat",
recipe = {
{"", "", ""},
{"prefab:concrete_slab", "", "prefab:concrete_slab"},
{"prefab:concrete_slab", "prefab:concrete_slab", "prefab:concrete_slab"},
},
})

minetest.register_craft({
output = 'prefab:concrete 4',
recipe = {
Expand Down
2 changes: 0 additions & 2 deletions depends.txt

This file was deleted.

1 change: 0 additions & 1 deletion description.txt

This file was deleted.

4 changes: 2 additions & 2 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dofile(minetest.get_modpath("prefab").."/other.lua")
print("Prefab Other loaded!")
print("Prefab Loaded!")

local creative = minetest.setting_getbool("creative_mode")
local creative = minetest.settings:get_bool("creative_mode")

local damage = tonumber(minetest.settings:get("prefab.electric_fence_damage")) or 30
if creative then damage = 0 end
Expand Down Expand Up @@ -425,4 +425,4 @@ minetest.register_node("prefab:concrete_catwalk",{
},
groups={cracky=2},
drop = "prefab:concrete_catwalk",
})
})
2 changes: 2 additions & 0 deletions mod.conf
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
name = prefab
depends = default, doors
description = Adds pre-fabricated concrete elements.
48 changes: 19 additions & 29 deletions other.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function boat:on_rightclick(clicker)
elseif not self.driver then
self.driver = clicker
clicker:set_attach(self.object, "", {x=0,y=5,z=0}, {x=0,y=0,z=0})
self.object:setyaw(clicker:get_look_yaw())
self.object:set_yaw(clicker:get_look_horizontal())
end
end

Expand All @@ -75,7 +75,7 @@ function boat:on_punch(puncher, time_from_last_punch, tool_capabilities, directi
end

function boat:on_step(dtime)
self.v = get_v(self.object:getvelocity())*get_sign(self.v)
self.v = get_v(self.object:get_velocity())*get_sign(self.v)
if self.driver then
local ctrl = self.driver:get_player_control()
if ctrl.up then
Expand All @@ -85,60 +85,59 @@ function boat:on_step(dtime)
self.v = self.v-0.03
end
if ctrl.left then
self.object:setyaw(self.object:getyaw()+math.pi/120+dtime*math.pi/120)
self.object:set_yaw(self.object:get_yaw()+math.pi/120+dtime*math.pi/120)
end
if ctrl.right then
self.object:setyaw(self.object:getyaw()-math.pi/120-dtime*math.pi/120)
self.object:set_yaw(self.object:get_yaw()-math.pi/120-dtime*math.pi/120)
end
end
local s = get_sign(self.v)
self.v = self.v - 0.02*s
if s ~= get_sign(self.v) then
self.object:setvelocity({x=0, y=0, z=0})
self.object:set_velocity({x=0, y=0, z=0})
self.v = 0
return
end
if math.abs(self.v) > 4.5 then
self.v = 4.5*get_sign(self.v)
end

local p = self.object:getpos()
local p = self.object:get_pos()
p.y = p.y-0.5
if not is_water(p) then
if minetest.registered_nodes[minetest.get_node(p).name].walkable then
self.v = 0
end
self.object:setacceleration({x=0, y=-10, z=0})
self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y))
self.object:set_acceleration({x=0, y=-10, z=0})
self.object:set_velocity(get_velocity(self.v, self.object:get_yaw(), self.object:get_velocity().y))
else
p.y = p.y+1
if is_water(p) then
self.object:setacceleration({x=0, y=3, z=0})
local y = self.object:getvelocity().y
self.object:set_acceleration({x=0, y=3, z=0})
local y = self.object:get_elocity().y
if y > 2 then
y = 2
end
if y < 0 then
self.object:setacceleration({x=0, y=10, z=0})
self.object:set_acceleration({x=0, y=10, z=0})
end
self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), y))
self.object:set_velocity(get_velocity(self.v, self.object:getyaw(), y))
else
self.object:setacceleration({x=0, y=0, z=0})
if math.abs(self.object:getvelocity().y) < 1 then
local pos = self.object:getpos()
self.object:set_acceleration({x=0, y=0, z=0})
if math.abs(self.object:get_velocity().y) < 1 then
local pos = self.object:get_pos()
pos.y = math.floor(pos.y)+0.5
self.object:setpos(pos)
self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), 0))
self.object:set_pos(pos)
self.object:set_velocity(get_velocity(self.v, self.object:get_yaw(), 0))
else
self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y))
self.object:set_velocity(get_velocity(self.v, self.object:get_yaw(), self.object:get_velocity().y))
end
end
end
end

minetest.register_entity("prefab:boat", boat)


minetest.register_craftitem("prefab:boat", {
description = "Prefab Concrete Barge",
inventory_image = "prefab_boat_inventory.png",
Expand All @@ -157,13 +156,4 @@ minetest.register_craftitem("prefab:boat", {
itemstack:take_item()
return itemstack
end,
})

minetest.register_craft({
output = "prefab:boat",
recipe = {
{"", "", ""},
{"prefab:concrete_slab", "", "prefab:concrete_slab"},
{"prefab:concrete_slab", "prefab:concrete_slab", "prefab:concrete_slab"},
},
})
})

0 comments on commit 34a09a6

Please sign in to comment.