forked from VoxeLibre/VoxeLibre
Compare commits
1 Commits
master
...
cherry_boa
Author | SHA1 | Date |
---|---|---|
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 | 0143ee1cc5 |
|
@ -96,8 +96,8 @@ function mcl_damage.finish_reason(mcl_reason)
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_damage.from_mt(mt_reason)
|
function mcl_damage.from_mt(mt_reason)
|
||||||
if mt_reason._mcl_cached_reason then
|
if mt_reason._mcl_chached_reason then
|
||||||
return mt_reason._mcl_cached_reason
|
return mt_reason._mcl_chached_reason
|
||||||
end
|
end
|
||||||
|
|
||||||
local mcl_reason
|
local mcl_reason
|
||||||
|
|
|
@ -169,9 +169,10 @@ local professions = {
|
||||||
jobsite = "mcl_fletching_table:fletching_table",
|
jobsite = "mcl_fletching_table:fletching_table",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_core:stick", 32, 32 }, E1 },
|
{ { "mcl_mobitems:string", 15, 20 }, E1 },
|
||||||
{ E1, { "mcl_bows:arrow", 8, 12 } },
|
{ E1, { "mcl_bows:arrow", 8, 12 } },
|
||||||
{ { "mcl_core:gravel", 10, 10, "mcl_core:emerald", 1, 1 }, { "mcl_core:flint", 6, 10 } },
|
{ { "mcl_core:gravel", 10, 10, "mcl_core:emerald", 1, 1 }, { "mcl_core:flint", 6, 10 } },
|
||||||
|
{ { "mcl_core:stick", 32, 32 }, E1 },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
{ { "mcl_core:flint", 26, 26 }, E1 },
|
{ { "mcl_core:flint", 26, 26 }, E1 },
|
||||||
|
@ -182,7 +183,7 @@ local professions = {
|
||||||
{ { "mcl_core:emerald", 3, 3 }, { "mcl_bows:crossbow", 1, 1 } },
|
{ { "mcl_core:emerald", 3, 3 }, { "mcl_bows:crossbow", 1, 1 } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:feather", 24, 24 }, E1 },
|
{ { "mcl_mobitems:string", 24, 24 }, E1 },
|
||||||
{ { "mcl_core:emerald", 7, 21 } , { "mcl_bows:bow_enchanted", 1, 1 } },
|
{ { "mcl_core:emerald", 7, 21 } , { "mcl_bows:bow_enchanted", 1, 1 } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -350,7 +351,7 @@ local professions = {
|
||||||
leatherworker = {
|
leatherworker = {
|
||||||
name = N("Leatherworker"),
|
name = N("Leatherworker"),
|
||||||
texture = "mobs_mc_villager_leatherworker.png",
|
texture = "mobs_mc_villager_leatherworker.png",
|
||||||
jobsite = "group:cauldron",
|
jobsite = "mcl_cauldrons:cauldron",
|
||||||
trades = {
|
trades = {
|
||||||
{
|
{
|
||||||
{ { "mcl_mobitems:leather", 9, 12 }, E1 },
|
{ { "mcl_mobitems:leather", 9, 12 }, E1 },
|
||||||
|
@ -1007,15 +1008,7 @@ end
|
||||||
----- JOBSITE LOGIC
|
----- JOBSITE LOGIC
|
||||||
local function get_profession_by_jobsite(js)
|
local function get_profession_by_jobsite(js)
|
||||||
for k,v in pairs(professions) do
|
for k,v in pairs(professions) do
|
||||||
if v.jobsite == js then
|
if v.jobsite == js then return k end
|
||||||
return k
|
|
||||||
-- Catch Nitwit doesn't have a jobsite
|
|
||||||
elseif v.jobsite and v.jobsite:find("^group:") then
|
|
||||||
local group = v.jobsite:gsub("^group:", "")
|
|
||||||
if minetest.get_item_group(js, group) > 0 then
|
|
||||||
return k
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 250 B After Width: | Height: | Size: 413 B |
Binary file not shown.
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 489 B |
Loading…
Reference in New Issue