Skip to content

Commit

Permalink
Fixing bugs (help from Emerald)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerold55 committed May 6, 2020
1 parent 0e8bcf2 commit bb3a59d
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 21 deletions.
12 changes: 6 additions & 6 deletions mods/crafting/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ minetest.register_craft({
type = "shapeless",
output = "crafting:crafting_table",
recipe = {
"ws_core:planks_dead", "ws_core:planks_dead",
"ws_core:planks_dead", "ws_core:planks_dead"
"group:wood", "group:wood",
"group:wood", "group:wood"
},
})

Expand Down Expand Up @@ -133,9 +133,9 @@ minetest.register_node("crafting:crafting_table_progressive", {
api.recipes.add_implementor("crafting_table_progressive", "crafting:crafting_table_progressive")

local recipe = api.recipes.add("multiblock_3_3",
{"crafting:crafting_table", "ws_core:wood", "crafting:crafting_table",
"ws_core:wood", "crafting:crafting_table", "ws_core:wood",
"crafting:crafting_table", "ws_core:wood", "crafting:crafting_table"},
{"crafting:crafting_table", "group:wood", "crafting:crafting_table",
"group:wood", "crafting:crafting_table", "group:wood",
"crafting:crafting_table", "group:wood", "crafting:crafting_table"},
{"crafting:crafting_table_progressive"}, {h = 0, activator = "ws_core:knife_bone"})

local removing = {
Expand All @@ -147,5 +147,5 @@ local removing = {
api.make_activated_multiblock(recipe, removing)

api.recipes.add("crafting_table_progressive",
{"ws_core:wood", "ws_core:wood", [4] = "ws_core:wood", [5] = "ws_core:wood", [10] = "crafting:crafting_table"},
{"group:wood", "group:wood", [4] = "group:wood", [5] = "group:wood", [10] = "crafting:crafting_table"},
{"crafting:crafting_table_progressive"}, {width = 2, height = 2})
8 changes: 4 additions & 4 deletions mods/dewcollector/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ minetest.register_node("dewcollector:barrel_filled", {
local w = "group:wood"
local c = "" --should be plastic sheeting, does not exist yet
minetest.register_craft({
output="rainbarrel:barrel_closed",
output="dewcollector:barrel_closed",
recipe={
{w, c,w},
{w,"",w},
{w, w,w},
{"group:wood", "", "group:wood"},
{"group:wood","","group:wood"},
{"group:wood", "group:wood","group:wood"},
}
})
2 changes: 1 addition & 1 deletion mods/ruins/loot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local loot = {
{name="ws_core:pick_scrap",mid=.2,var=1},
--on average 8 wood min 0 max 16
--25% chance to get 0 wood
{name="ws_core:planks_dead",mid=8,var=16},
{name="ws_core:planks_oak_dry",mid=8,var=16},
{name="ws_core:hatchet_bone",mid=.15,var=1},
{name="ws_core:knife_bone",mid=.15,var=1},
}
Expand Down
27 changes: 18 additions & 9 deletions mods/ws_core/crafting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@
-- ===========

minetest.register_craft({
output = 'ws_core:planks_dead 4',
recipe = {{'ws_core:log_dead'},}
output = 'ws_core:planks_oak_dry',
recipe = {{'ws_core:log_oak_dry'},}
})

minetest.register_craft({
output = 'ws_core:planks_dead 4',
recipe = {{'ws_core:log_dead_stripped'},}
output = 'ws_core:planks_oak_dry',
recipe = {{'ws_core:log_oak_stripped_dry'},}
})

minetest.register_craft({
output = 'ws_core:planks_oak 4',
output = 'ws_core:planks_oak',
recipe = {{'ws_core:log_oak'},}
})

minetest.register_craft({
output = 'ws_core:planks_oak 4',
output = 'ws_core:planks_oak',
recipe = {{'ws_core:log_oak_stripped'},}
})

minetest.register_craft({
output = 'ws_core:planks_balsa 4',
output = 'ws_core:planks_balsa',
recipe = {{'ws_core:log_balsa'},}
})

minetest.register_craft({
output = 'ws_core:planks_balsa 4',
output = 'ws_core:planks_balsa',
recipe = {{'ws_core:log_balsa_stripped'},}
})

Expand All @@ -41,7 +41,7 @@ minetest.register_craft({

minetest.register_craft({
type = "shapeless",
output = "ws_core:planks_dead",
output = "ws_core:planks_oak_dry",
recipe = {
"ws_core:stick", "ws_core:stick",
"ws_core:stick", "ws_core:stick"
Expand Down Expand Up @@ -127,6 +127,15 @@ minetest.register_craft({
}
})

minetest.register_craft({
output = 'ws_core:furnace_top',
recipe = {
{'group:wood', 'group:wood', 'group:wood'},
{'group:wood', 'ws_core:coal', 'group:wood'},
{'group:wood', 'group:wood', 'group:wood'},
}
})

-- =====
-- TOOLS
-- =====
Expand Down
3 changes: 2 additions & 1 deletion mods/ws_core/functions.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
local barks_to_strip = {
["ws_core:log_dead"] = "ws_core:log_dead_stripped",
["ws_core:log_oak_dry"] = "ws_core:log_oak_stripped_dry",
["ws_core:log_oak"] = "ws_core:log_oak_stripped",
["ws_core:log_balsa"] = "ws_core:log_balsa_stripped",
["ws_core:log_balsa_dry"] = "ws_core:log_balsa_stripped_dry",
}

-- if pointed_thing.under is a suitable block, replace it with a stripped variant
Expand Down
40 changes: 40 additions & 0 deletions mods/ws_core/mapgen.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,27 @@ function ws_core.register_mgv6_ores()

-- Blob ore
-- These first to avoid other ores in blobs
--Clay

minetest.register_ore({
ore_type = "blob",
ore = "ws_core:clay",
wherein = {"ws_core:sandy_dirt"},
clust_scarcity = 16 * 16 * 16,
clust_size = 5,
y_max = 2,
y_min = -15,
noise_threshold = 0.0,
noise_params = {
offset = 0.5,
scale = 0.2,
spread = {x = 5, y = 5, z = 5},
seed = -316,
octaves = 1,
persist = 0.0
},
})

-- Sand

minetest.register_ore({
Expand Down Expand Up @@ -355,6 +376,25 @@ function ws_core.register_ores()
-- Blob ore.
-- These before scatter ores to avoid other ores in blobs.

minetest.register_ore({
ore_type = "blob",
ore = "ws_core:clay",
wherein = {"ws_core:dirt_dry"},
clust_scarcity = 20 * 20 * 20,
clust_size = 5,
y_max = 200,
y_min = -40,
noise_threshold = 0.0,
noise_params = {
offset = 0.5,
scale = 0.2,
spread = {x = 5, y = 5, z = 5},
seed = 17676,
octaves = 1,
persist = 0.0
},
})

minetest.register_ore({
ore_type = "blob",
ore = "ws_core:dirt_coarse",
Expand Down
1 change: 1 addition & 0 deletions mods/ws_core/nodes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ minetest.register_node("ws_core:clay_dirt", {
max_items = 1,
items = {
{items = {'ws_core:bone'}, rarity = 13},
{items = {'ws_core:clay_lump'}, rarity = 13},
{items = {'ws_core:clay_dirt'}}
}
}
Expand Down

0 comments on commit bb3a59d

Please sign in to comment.