diff options
| -rw-r--r-- | modules.txt | 2 | ||||
| -rw-r--r-- | src/main/god_stick.lua | 2 | ||||
| -rw-r--r-- | src/main/lucky_block.lua | 8 | ||||
| -rw-r--r-- | src/main/shopping.lua | 13 | ||||
| -rw-r--r-- | src/onload/shop_signs.lua (renamed from src/onload/shop.lua) | 14 |
5 files changed, 22 insertions, 17 deletions
diff --git a/modules.txt b/modules.txt index ebcf94d..8d349fb 100644 --- a/modules.txt +++ b/modules.txt @@ -1 +1 @@ -return {common={"common","random","request","schems",},main={"alpha","commands","flower_spread","god_stick","join_skyblock_mob","lobby","lucky_block","mapgen","money","netherrack_fix","plots","ranks","spawns","tpa","trade","wither_spawn",},onload={"lava_cooling","lobby_grass","monster_egg_stone_block","nether_portal","sapling_mutation","shop","spawn","void",},}
\ No newline at end of file +return {common={"common","random","request","schems",},main={"alpha","commands","flower_spread","god_stick","join_skyblock_mob","lobby","lucky_block","mapgen","money","netherrack_fix","plots","ranks","shopping","spawns","tpa","trade","wither_spawn",},onload={"lava_cooling","lobby_grass","monster_egg_stone_block","nether_portal","sapling_mutation","shop_signs","spawn","void",},}
\ No newline at end of file diff --git a/src/main/god_stick.lua b/src/main/god_stick.lua index e1ce23d..a405538 100644 --- a/src/main/god_stick.lua +++ b/src/main/god_stick.lua @@ -21,7 +21,7 @@ minetest.register_tool("skycraft:god_stick", { minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage) if hitter:get_wielded_item():get_name() == "skycraft:god_stick" then lightning.strike(player:get_pos()) - minetest.ban_player(player:get_player_name()) + minetest.after(0.5, minetest.ban_player, player:get_player_name()) return true end end) diff --git a/src/main/lucky_block.lua b/src/main/lucky_block.lua index a372b8e..7bb00d4 100644 --- a/src/main/lucky_block.lua +++ b/src/main/lucky_block.lua @@ -24,6 +24,12 @@ end lucky_block:add_blocks({ {"dro", {"mcl_core:dirt", "mcl_core:sand", "mcl_core:gravel"}, 100}, - {"dro", discs, 1} + {"dro", discs, 1}, + {"spw", "mobs_mc:zombie", 5}, + {"spw", "mobs_mc:spider", 4}, + {"spw", "mobs_mc:skeleton", 2}, + {"spw", "mobs_mc:creeper", 1}, + {"spw", "mobs_mc:enderman", 1}, + }) diff --git a/src/main/shopping.lua b/src/main/shopping.lua new file mode 100644 index 0000000..8e80617 --- /dev/null +++ b/src/main/shopping.lua @@ -0,0 +1,13 @@ +function skycraft.sell(player, item, money) + local inv = player:get_inventory() + if not inv:contains_item("main", item) then return minetest.chat_send_player(player:get_player_name(), "You don't have enough items!") end + inv:remove_item("main", item) + skycraft.give_money(player, money) +end + +function skycraft.buy(player, item, money) + local inv = player:get_inventory() + if not inv:room_for_item("main", item) then return minetest.chat_send_player(player:get_player_name(), "You don't have enough space in your inventory!") end + if not skycraft.take_money(player, money) then return end + inv:add_item("main", item) +end diff --git a/src/onload/shop.lua b/src/onload/shop_signs.lua index cffafcf..217049e 100644 --- a/src/onload/shop.lua +++ b/src/onload/shop_signs.lua @@ -1,17 +1,3 @@ -function skycraft.sell(player, item, money) - local inv = player:get_inventory() - if not inv:contains_item("main", item) then return minetest.chat_send_player(player:get_player_name(), "You don't have enough items!") end - inv:remove_item("main", item) - skycraft.give_money(player, money) -end - -function skycraft.buy(player, item, money) - local inv = player:get_inventory() - if not inv:room_for_item("main", item) then return minetest.chat_send_player(player:get_player_name(), "You don't have enough space in your inventory!") end - if not skycraft.take_money(player, money) then return end - inv:add_item("main", item) -end - for nodename, nodedef in pairs(minetest.registered_nodes) do if nodename:find("mcl_signs:") then minetest.override_item(nodename, { |