Fixed merge conflicts and made shit a falling node
This commit is contained in:
parent
f5f3af44e4
commit
346e410cfd
@ -275,7 +275,7 @@ minetest.register_node("poop:floor", {
|
||||
minetest.register_node("poop:Poop", {
|
||||
description = "Just Shit",
|
||||
tiles = {"Poop.png"},
|
||||
drop = 'poop:PoopItem', groups = {cracky=3, stone=1},
|
||||
drop = 'poop:PoopItem', groups = {falling_node = 1, cracky=3, stone=1},
|
||||
})
|
||||
|
||||
minetest.register_node("poop:tv", {
|
||||
@ -342,10 +342,10 @@ minetest.register_node("poop:glass", {
|
||||
drop = 'poop:glass', groups = {cracky=3, stone=1},
|
||||
})
|
||||
minetest.register_node("poop:Poop2", {
|
||||
description = "Poop with more density",
|
||||
description = "Diarrhea",
|
||||
tiles = {"sraka.png"},
|
||||
|
||||
drop = 'poop:Poop', groups = {cracky=3, stone=1},
|
||||
drop = 'poop:Poop', groups = {falling_node = 1, cracky=3, stone=1},
|
||||
})
|
||||
|
||||
minetest.register_node("poop:glowing_block", {
|
||||
@ -456,15 +456,19 @@ minetest.register_craftitem("poop:pooper", {
|
||||
local node = minetest.get_node(pointed_thing.above)
|
||||
if node.name == "air" then
|
||||
minetest.add_node(pointed_thing.above, {name="poop:Poop"})
|
||||
minetest.check_for_falling(pointed_thing.above)
|
||||
else
|
||||
minetest.add_node(pointed_thing.under, {name="poop:Poop"})
|
||||
minetest.check_for_falling(pointed_thing.under)
|
||||
end
|
||||
else
|
||||
local node = minetest.get_node(pointed_thing.above)
|
||||
if node.name == "air" then
|
||||
minetest.add_node(pointed_thing.above, {name="poop:Poop2"})
|
||||
minetest.check_for_falling(pointed_thing.above)
|
||||
else
|
||||
minetest.add_node(pointed_thing.under, {name="poop:Poop2"})
|
||||
minetest.check_for_falling(pointed_thing.under)
|
||||
end
|
||||
end
|
||||
sraj_dzwiek()
|
||||
|
@ -2,13 +2,9 @@ local numberOfCops = 0
|
||||
|
||||
minetest.register_abm({
|
||||
nodenames = {"poop:grey_bricks"},
|
||||
<<<<<<< HEAD
|
||||
|
||||
interval = 20,
|
||||
chance = 300,
|
||||
=======
|
||||
interval = 30,
|
||||
chance = 200,
|
||||
>>>>>>> bcfc53e3489d47918c04d9ae562a665c71fc33ee
|
||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||
if numberOfCops < 50 then
|
||||
minetest.add_entity({x = pos.x, y = pos.y + 1, z = pos.z}, "robocops:robocop")
|
||||
|
Loading…
x
Reference in New Issue
Block a user