diff --git a/forestry_bees/bee_drops.lua b/forestry_bees/bee_drops.lua index ee798d2..5b5ca5d 100644 --- a/forestry_bees/bee_drops.lua +++ b/forestry_bees/bee_drops.lua @@ -7,9 +7,32 @@ local function register_drop(bee_type, drop_name, basechance) forestry_bees.bee_drops[bee_type][drop_name] = basechance end +--mundane branch register_drop("forest", "forestry_bees:honey_comb", 0.3) -register_drop("meadow", "forestry_bees:honey_comb", 0.3) +register_drop("meadows", "forestry_bees:honey_comb", 0.3) +register_drop("modest", "forestry_bees:parched_comb", 0.3) +register_drop("tropical", "forestry_bees:silky_comb", 0.3) +register_drop("wintry", "forestry_bees:frozen_comb", 0.3) +register_drop("marshy", "forestry_bees:mossy_comb", 0.3) +--common branch register_drop("common", "forestry_bees:honey_comb", 0.35) register_drop("cultivated", "forestry_bees:honey_comb", 0.4) +--noble branch register_drop("noble", "forestry_bees:dripping_comb", 0.2) -register_drop("diligent", "forestry_bees:stringy_comb", 0.2) \ No newline at end of file +register_drop("majestic", "forestry_bees:dripping_comb", 0.2) +register_drop("imperial", "forestry_bees:dripping_comb", 0.2) +register_drop("imperial", "forestry_bees:royal_jelly", 0.2) +--industrious branch +register_drop("diligent", "forestry_bees:stringy_comb", 0.2) +register_drop("unweary", "forestry_bees:stringy_comb", 0.2) +register_drop("industrious", "forestry_bees:stringy_comb", 0.2) +register_drop("industrious", "forestry_bees:pollen_cluster", 0.2) +---heroic branch +---infernal branch +--- austere branch +---end branch +---tropical branch +---frozen branch +---festive branch +--agrarian branch +register_drop("rural", "forestry_bees:wheaten_comb", 0.3) \ No newline at end of file diff --git a/forestry_bees/bee_genes.lua b/forestry_bees/bee_genes.lua index 728b775..d8f7fa5 100644 --- a/forestry_bees/bee_genes.lua +++ b/forestry_bees/bee_genes.lua @@ -23,9 +23,34 @@ end function forestry_bees.return_genes(bee_type) return forestry_bees.bee_base_genes[bee_type] end -register_base_gene("forest",{production = 0.3, fertility = 3, lifespan = 10, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) -register_base_gene("meadow",{production = 0.3, fertility = 2, lifespan = 10, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) -register_base_gene("common",{production = 0.6, fertility = 2, lifespan = 10, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) + +--based on +--https://docs.google.com/spreadsheets/d/1_moZHLnL35_u-bJ7kFDxWDxY9OuMWK_4l0EB4wIx0_s/edit?f=true&noheader=false&gid=1#gid=1 + +--mundane branch +register_base_gene("forest",{production = 0.3, fertility = 3, lifespan = 20, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("meadows",{production = 0.3, fertility = 2, lifespan = 20, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("modest",{production = 0.6, fertility = 2, lifespan = 30, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("tropical",{production = 0.6, fertility = 2, lifespan = 30, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("wintry",{production = 0.6, fertility = 4, lifespan = 30, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("marshy",{production = 0.3, fertility = 2, lifespan = 10, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +--common branch +register_base_gene("common",{production = 0.6, fertility = 2, lifespan = 20, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) register_base_gene("cultivated",{production = 1.2, fertility = 2, lifespan = 10, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +--noble branch register_base_gene("noble",{production = 0.6, fertility = 2, lifespan = 30, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) -register_base_gene("diligent",{production = 0.6, fertility = 2, lifespan = 30, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) \ No newline at end of file +register_base_gene("majestic",{production = 1, fertility = 4, lifespan = 35, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("imperial",{production = 0.6, fertility = 2, lifespan = 40, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +--industrious branch +register_base_gene("diligent",{production = 0.6, fertility = 2, lifespan = 30, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("unweary",{production = 1, fertility = 2, lifespan = 35, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +register_base_gene("indostrious",{production = 0.6, fertility = 2, lifespan = 40, nocturnal = false, cave = false, flyer = false, flower = "flowers"}) +---heroic branch +---infernal branch +--- austere branch +---end branch +---tropical branch +---frozen branch +---festive branch +--agrarian branch +register_base_gene("rural",{production = 0.6, fertility = 2, lifespan = 10, nocturnal = false, cave = false, flyer = false, flower = "wheat"}) \ No newline at end of file diff --git a/forestry_bees/mutations.lua b/forestry_bees/mutations.lua index 8db0d79..6724ff8 100644 --- a/forestry_bees/mutations.lua +++ b/forestry_bees/mutations.lua @@ -27,10 +27,27 @@ local function register_mutation(bee_type_in1,bee_type_in2,bee_type_out,chance) forestry_bees.bee_mutations[bee_type_in2][bee_type_in1][bee_type_out] = chance end -register_mutation("forest","meadow","common",0.15) +--common branch +register_mutation("forest","meadows","common",0.15) register_mutation("forest","common","cultivated",0.12) -register_mutation("meadow","common","cultivated",0.12) +register_mutation("meadows","common","cultivated",0.12) +--noble branch register_mutation("common","cultivated","noble",0.10) +register_mutation("noble","cultivated","majestic",0.08) +register_mutation("noble","majestic","imperial",0.08) +--industrious branch register_mutation("common","cultivated","diligent",0.10) +register_mutation("diligent","cultivated","unweary",0.08) +register_mutation("diligent","unweary","industrious",0.08) +---heroic branch +---infernal branch +--- austere branch +---end branch +---tropical branch +---frozen branch +---festive branch +--agrarian branch +register_mutation("diligent","meadows","rural",0.12) --ATTENTION WE SHOULD RESTRICT THIS TO THE PLAINS BIOME + --print(forestry_bees.mutations["meadows"]["forest"]["common"]) diff --git a/forestry_bees/register.lua b/forestry_bees/register.lua index a6495f0..328ff4c 100644 --- a/forestry_bees/register.lua +++ b/forestry_bees/register.lua @@ -78,13 +78,102 @@ minetest.register_node("forestry_bees:meadow_beehive", { drop = { max_items = 3, items = { - {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("princess", forestry_bees.return_all_genes_double("meadow"))}}, - {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("drone", forestry_bees.return_all_genes_double("meadow"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("princess", forestry_bees.return_all_genes_double("meadows"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("drone", forestry_bees.return_all_genes_double("meadows"))}}, {tool_groups = {"scoop_tool"}, rarity = 2, items = {"forestry_bees:honey_comb"}} } } }) +minetest.register_node("forestry_bees:modest_beehive", { + description = "Modest Beehive", + tiles = { + "forestry_bees_modest_beehive_top.png", + "forestry_bees_modest_beehive_top.png", + "forestry_bees_modest_beehive_side.png", + "forestry_bees_modest_beehive_side.png", + "forestry_bees_modest_beehive_side.png", + "forestry_bees_modest_beehive_side.png", + }, + groups = {scoopy = 1}, + diggable = true, + drop = { + max_items = 3, + items = { + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("princess", forestry_bees.return_all_genes_double("modest"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("drone", forestry_bees.return_all_genes_double("modest"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {"forestry_bees:parched_comb"}} + } + } +}) + +minetest.register_node("forestry_bees:tropical_beehive", { + description = "Tropical Beehive", + tiles = { + "forestry_bees_tropical_beehive_top.png", + "forestry_bees_tropical_beehive_top.png", + "forestry_bees_tropical_beehive_side.png", + "forestry_bees_tropical_beehive_side.png", + "forestry_bees_tropical_beehive_side.png", + "forestry_bees_tropical_beehive_side.png", + }, + groups = {scoopy = 1}, + diggable = true, + drop = { + max_items = 3, + items = { + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("princess", forestry_bees.return_all_genes_double("tropical"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("drone", forestry_bees.return_all_genes_double("tropical"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {"forestry_bees:silky_comb"}} + } + } +}) + +minetest.register_node("forestry_bees:wintry_beehive", { + description = "Wintry Beehive", + tiles = { + "forestry_bees_wintry_beehive_top.png", + "forestry_bees_wintry_beehive_top.png", + "forestry_bees_wintry_beehive_side.png", + "forestry_bees_wintry_beehive_side.png", + "forestry_bees_wintry_beehive_side.png", + "forestry_bees_wintry_beehive_side.png", + }, + groups = {scoopy = 1}, + diggable = true, + drop = { + max_items = 3, + items = { + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("princess", forestry_bees.return_all_genes_double("wintry"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("drone", forestry_bees.return_all_genes_double("wintry"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {"forestry_bees:frozen_comb"}} + } + } +}) + +minetest.register_node("forestry_bees:marshy_beehive", { + description = "Marshy Beehive", + tiles = { + "forestry_bees_marshy_beehive_top.png", + "forestry_bees_marshy_beehive_top.png", + "forestry_bees_marshy_beehive_side.png", + "forestry_bees_marshy_beehive_side.png", + "forestry_bees_marshy_beehive_side.png", + "forestry_bees_marshy_beehive_side.png", + }, + groups = {scoopy = 1}, + diggable = true, + drop = { + max_items = 3, + items = { + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("princess", forestry_bees.return_all_genes_double("marshy"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {forestry_bees.Bee("drone", forestry_bees.return_all_genes_double("marshy"))}}, + {tool_groups = {"scoop_tool"}, rarity = 2, items = {"forestry_bees:mossy_comb"}} + } + } +}) + + minetest.register_tool("forestry_bees:scoop", { description = "Scoop", inventory_image = "forestry_bees_scoop.png", @@ -101,20 +190,59 @@ minetest.register_tool("forestry_bees:scoop", { }, }, }) - +--mundane branch register_bee("forest","#ffdc16","#19d0ec") -register_bee("meadow","#ffdc16","#ef131e") +register_bee("meadows","#ffdc16","#ef131e") +register_bee("modest","#ffdc16","#c5be86") +register_bee("tropical","#ffdc16","#378020") +register_bee("wintry","#ffdc16","#a0ffc8") +register_bee("marshy","#ffdc16","#546626") +--common branch register_bee("common","#ffdc16","#b2b2b2") register_bee("cultivated","#ffdc16","#5734ec") +--noble branch register_bee("noble","#ffdc16","#ec9a19") +register_bee("majestic","#ffdc16","#7f0000") +register_bee("imperial","#ffdc16","#a3e02f") +--industrious branch register_bee("diligent","#ffdc16","#c219ec") - +register_bee("unweary","#ffdc16","#19ec5a") +register_bee("industrious","#ffdc16","#ffffff") +---heroic branch +---infernal branch +--- austere branch +---end branch +---tropical branch +---frozen branch +---festive branch +--agrarian branch +register_bee("rural","#ffdc16","#feff8f") minetest.register_craftitem("forestry_bees:honey_comb", { description = "Honey Comb", groups = {comb = 1}, inventory_image = "(bee_combs.0.png^[colorize:#ffa12b:155)^(bee_combs.1.png^[colorize:#e8d56a:255)" }) +minetest.register_craftitem("forestry_bees:parched_comb", { + description = "Parched Comb", + groups = {comb = 1}, + inventory_image = "(bee_combs.0.png^[colorize:#ffff00:155)^(bee_combs.1.png^[colorize:#dcbe13:255)" +}) +minetest.register_craftitem("forestry_bees:silky_comb", { + description = "Silky Comb", + groups = {comb = 1}, + inventory_image = "(bee_combs.0.png^[colorize:#ddff00:155)^(bee_combs.1.png^[colorize:#508907:255)" +}) +minetest.register_craftitem("forestry_bees:frozen_comb", { + description = "Frozen Comb", + groups = {comb = 1}, + inventory_image = "(bee_combs.0.png^[colorize:#a0ffff:155)^(bee_combs.1.png^[colorize:#f9ffff:255)" +}) +minetest.register_craftitem("forestry_bees:mossy_comb", { + description = "Mossy Comb", + groups = {comb = 1}, + inventory_image = "(bee_combs.0.png^[colorize:#7e9939:155)^(bee_combs.1.png^[colorize:#2a3313:255)" +}) minetest.register_craftitem("forestry_bees:dripping_comb", { description = "Dripping Comb", groups = {comb = 1}, @@ -125,3 +253,18 @@ minetest.register_craftitem("forestry_bees:stringy_comb", { groups = {comb = 1}, inventory_image = "(bee_combs.0.png^[colorize:#bda93e:155)^(bee_combs.1.png^[colorize:#c8be67:255)" }) +minetest.register_craftitem("forestry_bees:wheaten_comb", { + description = "Wheaten Comb", + groups = {comb = 1}, + inventory_image = "(bee_combs.0.png^[colorize:#ffffff:155)^(bee_combs.1.png^[colorize:#feff8f:255)" +}) +minetest.register_craftitem("forestry_bees:royal_jelly", { + description = "Royal Jelly", + groups = {comb = 1}, + inventory_image = "royal_jelly.png" +}) +minetest.register_craftitem("forestry_bees:pollen_cluster", { + description = "Pollen Cluster", + groups = {comb = 1}, + inventory_image = "(pollen.0.png^[colorize:#a28a25:155)^(pollen.1.png^[colorize:#a28a25:255)" +}) diff --git a/forestry_bees/textures/beehives/forestry_bees_marshy_beehive_side.png b/forestry_bees/textures/beehives/forestry_bees_marshy_beehive_side.png new file mode 100644 index 0000000..7596f40 Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_marshy_beehive_side.png differ diff --git a/forestry_bees/textures/beehives/forestry_bees_marshy_beehive_top.png b/forestry_bees/textures/beehives/forestry_bees_marshy_beehive_top.png new file mode 100644 index 0000000..234e4d4 Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_marshy_beehive_top.png differ diff --git a/forestry_bees/textures/beehives/forestry_bees_modest_beehive_side.png b/forestry_bees/textures/beehives/forestry_bees_modest_beehive_side.png new file mode 100644 index 0000000..8ae20b1 Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_modest_beehive_side.png differ diff --git a/forestry_bees/textures/beehives/forestry_bees_modest_beehive_top.png b/forestry_bees/textures/beehives/forestry_bees_modest_beehive_top.png new file mode 100644 index 0000000..39e0f43 Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_modest_beehive_top.png differ diff --git a/forestry_bees/textures/beehives/forestry_bees_tropical_beehive_side.png b/forestry_bees/textures/beehives/forestry_bees_tropical_beehive_side.png new file mode 100644 index 0000000..e1ca0ed Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_tropical_beehive_side.png differ diff --git a/forestry_bees/textures/beehives/forestry_bees_tropical_beehive_top.png b/forestry_bees/textures/beehives/forestry_bees_tropical_beehive_top.png new file mode 100644 index 0000000..4de7979 Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_tropical_beehive_top.png differ diff --git a/forestry_bees/textures/beehives/forestry_bees_wintry_beehive_side.png b/forestry_bees/textures/beehives/forestry_bees_wintry_beehive_side.png new file mode 100644 index 0000000..26af3b4 Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_wintry_beehive_side.png differ diff --git a/forestry_bees/textures/beehives/forestry_bees_wintry_beehive_top.png b/forestry_bees/textures/beehives/forestry_bees_wintry_beehive_top.png new file mode 100644 index 0000000..16015b6 Binary files /dev/null and b/forestry_bees/textures/beehives/forestry_bees_wintry_beehive_top.png differ diff --git a/forestry_bees/textures/items/pollen.0.png b/forestry_bees/textures/items/pollen.0.png new file mode 100644 index 0000000..d354091 Binary files /dev/null and b/forestry_bees/textures/items/pollen.0.png differ diff --git a/forestry_bees/textures/items/pollen.1.png b/forestry_bees/textures/items/pollen.1.png new file mode 100644 index 0000000..834e359 Binary files /dev/null and b/forestry_bees/textures/items/pollen.1.png differ diff --git a/forestry_bees/textures/items/royal_jelly.png b/forestry_bees/textures/items/royal_jelly.png new file mode 100644 index 0000000..c66cad5 Binary files /dev/null and b/forestry_bees/textures/items/royal_jelly.png differ