Skip to content

Commit 650730d

Browse files
authored
Merge pull request #94 from olliy1or/make-level4-completable
Make level 4 completable
2 parents 5f5bd8b + db48329 commit 650730d

File tree

3 files changed

+41
-4
lines changed

3 files changed

+41
-4
lines changed

skyblock_levels/skyblock.feats.lua

+25-1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,15 @@ function skyblock.feats.on_placenode(pos, newnode, placer, oldnode)
206206
end
207207
minetest.register_on_placenode(skyblock.feats.on_placenode)
208208

209+
--track hoe use
210+
function skyblock.feats.hoe_on_use(itemstack, user, pointed_thing)
211+
local player_name = user:get_player_name()
212+
local level = skyblock.feats.get_level(player_name)
213+
if skyblock.levels[level].hoe_on_use then
214+
skyblock.levels[level].hoe_on_use(player_name, pointed_thing, itemstack:get_name())
215+
end
216+
end
217+
209218
-- track on_place of items with their own on_place
210219
local function on_place(v, is_craftitem)
211220
local entity = minetest.registered_items[v]
@@ -428,8 +437,23 @@ for _, material in pairs({"wood", "stone", "steel", "bronze", "mese", "diamond"}
428437
on_use = function(itemstack, user, pointed_thing)
429438
if not minetest.is_protected(pointed_thing.above, user:get_player_name()) then
430439
old_use(itemstack, user, pointed_thing)
440+
skyblock.feats.hoe_on_use(itemstack, user, pointed_thing)
431441
end
432-
end
442+
end,
443+
groups = {not_in_creative_inventory = 0}
444+
})
445+
end
446+
447+
--make uncraftable hoes craftable
448+
local uncraftable_hoes = {bronze="bronze_ingot", mese="mese_crystal", diamond="diamond"}
449+
for hoe, material in pairs(uncraftable_hoes) do
450+
minetest.register_craft({
451+
output = "farming:hoe_" .. hoe,
452+
recipe = {
453+
{"default:" .. material, "default:" .. material,},
454+
{"", "default:stick"},
455+
{"", "default:stick"}
456+
}
433457
})
434458
end
435459

skyblock_levels/skyblock.levels.4.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ License: GPLv3
1212
Level 4 mostly revolving around farming and dying
1313
level 4 feats and rewards:
1414
15-
* craft_diamondhoe farming:seed_wheat
15+
* craft_mesehoe farming:seed_wheat
1616
* use_hoe x40 farming:melon_slice
1717
* plant_wheatseed default:cactus
1818
* craft_flour farming:seed_cotton x10
@@ -50,7 +50,8 @@ skyblock.levels[level].feats = {
5050
feat = "use_hoe",
5151
count = 40,
5252
reward = "farming:melon_slice",
53-
hoeuse = {}
53+
hoeuse = {},
54+
use_item = "farming:hoe_mese"
5455
},
5556
{
5657
name = "Plant 10 wheat seeds",

skyblock_levels/skyblock.levels.lua

+13-1
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,16 @@ function skyblock.levels.bucket_lava_on_use(level,player_name,pointed_thing)
282282
end
283283
end
284284
end
285-
end
285+
end
286+
287+
-- track hoe feats
288+
function skyblock.levels.hoe_on_use(level, player_name, pointed_thing, itemname)
289+
for _,v in ipairs(skyblock.levels[level].feats) do
290+
if v.hoeuse then
291+
if itemname == v.use_item then
292+
skyblock.feats.add(level, player_name, v.feat)
293+
return
294+
end
295+
end
296+
end
297+
end

0 commit comments

Comments
 (0)