diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index 4027ee50..4eb47062 100755 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -435,6 +435,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "default:sword_nyan", + recipe = { + {"default:nyancat"}, + {"default:nyancat"}, + {"group:stick"}, + } +}) + minetest.register_craft({ output = 'default:sword_diamond', recipe = { @@ -444,12 +453,12 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "default:sword_nyan", +minetest.register_craft({ -- Ultimate Warrior weapon + output = 'default:dungeon_master_s_blood_sword', recipe = { - {"default:nyancat"}, - {"default:nyancat"}, - {"group:stick"}, + {"mobs:dungeon_master_blood", "nether:white", "mobs:dungeon_master_blood"}, + {"mobs:dungeon_master_blood", "mobs:dungeon_master_diamond", "mobs:dungeon_master_blood"}, + {"moreores:mithril_block", "mobs:zombie_tibia", "moreores:mithril_block"}, } }) diff --git a/minetestforfun_game/mods/default/textures/default_tool_dungeon_master_s_blood_sword.png b/minetestforfun_game/mods/default/textures/default_tool_dungeon_master_s_blood_sword.png new file mode 100755 index 00000000..ada5f644 Binary files /dev/null and b/minetestforfun_game/mods/default/textures/default_tool_dungeon_master_s_blood_sword.png differ diff --git a/minetestforfun_game/mods/default/tools.lua b/minetestforfun_game/mods/default/tools.lua index ab1245ed..a084bdc5 100755 --- a/minetestforfun_game/mods/default/tools.lua +++ b/minetestforfun_game/mods/default/tools.lua @@ -439,8 +439,20 @@ minetest.register_tool("default:sword_diamond", { full_punch_interval = 0.6, max_drop_level = 1, groupcaps = { - snappy = {times = {[1] = 1.9, [2] = 0.85, [3] = 0.125}, uses = 30, maxlevel = 3}, + snappy = {times = {[1] = 1.9, [2] = 0.85, [3] = 0.125}, uses = 50, maxlevel = 3}, }, damage_groups = {fleshy = 7}, } }) +minetest.register_tool("default:dungeon_master_s_blood_sword", { --Warrior Only + description = "Dungeon Master's Blood Sword", + inventory_image = "default_tool_dungeon_master_s_blood_sword.png", + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 1, + groupcaps = { + snappy = {times = {[1] = 1.9, [2] = 0.85, [3] = 0.125}, uses = 250, maxlevel = 3}, + }, + damage_groups = {fleshy = 10}, + } +}) diff --git a/mods/mobs/dungeonmaster.lua b/mods/mobs/dungeonmaster.lua index 742df4ee..08f5be5d 100755 --- a/mods/mobs/dungeonmaster.lua +++ b/mods/mobs/dungeonmaster.lua @@ -45,14 +45,18 @@ mobs:register_mob("mobs:dungeon_master", { drops = { {name = "default:mese_crystal_fragment", chance = 1, min = 1, max = 3,}, - {name = "default:diamond", - chance = 5, min = 1, max = 3,}, {name = "default:mese_crystal", chance = 2, min = 1, max = 3,}, - {name = "default:diamond_block", - chance = 30, min = 1, max = 1,}, + {name = "mobs:dungeon_master_blood", + chance = 4, min = 1, max = 2,}, + {name = "default:diamond", + chance = 5, min = 1, max = 3,}, + {name = "mobs:dungeon_master_diamond", + chance = 8, min = 1, max = 1,}, {name = "maptools:gold_coin", chance = 20, min = 1, max = 1,}, + {name = "default:diamond_block", + chance = 30, min = 1, max = 1,}, }, -- damaged by water_damage = 1, @@ -98,3 +102,15 @@ mobs:register_arrow("mobs:fireball", { mobs:explosion(pos, 1, 1, 0) end }) + +minetest.register_craftitem("mobs:dungeon_master_blood", { + description = "Dungeon Master Blood", + inventory_image = "mobs_dungeon_master_blood.png", + groups = {magic = 1}, +}) + +minetest.register_craftitem("mobs:dungeon_master_diamond", { + description = "Dungeon Master Diamond", + inventory_image = "mobs_dungeon_master_diamond.png", + groups = {magic = 1}, +}) diff --git a/mods/mobs/minotaur.lua b/mods/mobs/minotaur.lua index 8488e4a5..a63f9fa5 100755 --- a/mods/mobs/minotaur.lua +++ b/mods/mobs/minotaur.lua @@ -40,10 +40,10 @@ mobs:register_mob("mobs:minotaur", { drops = { {name = "maptools:gold_coin", chance = 40, min = 1, max = 1,}, - {name = "mobs:minotaur_eye", -- NOT IMPLEMENTED YET - used for runes mod - chance = 1, min = 1, max = 2,}, - {name = "mobs:minotaur_horn", -- NOT IMPLEMENTED YET - used for 3d_armor/throwing_enhanced mod - chance = 1, min = 1, max = 2,}, + {name = "mobs:minotaur_eye", + chance = 2, min = 1, max = 2,}, + {name = "mobs:minotaur_horn", + chance = 4, min = 1, max = 2,}, }, water_damage = 1, lava_damage = 5, @@ -62,7 +62,6 @@ mobs:register_spawn("mobs:minotaur", {"default:desert_sand"}, 20, -1, 30000, 1, -- register spawn egg mobs:register_egg("mobs:minotaur", "Minotaur", "default_desert_sand.png", 1) - minetest.register_craftitem("mobs:minotaur_eye", { description = "Minotaur Eye", inventory_image = "mobs_minotaur_eye.png", diff --git a/mods/mobs/zombie.lua b/mods/mobs/zombie.lua index 89d6dd83..5445ccec 100755 --- a/mods/mobs/zombie.lua +++ b/mods/mobs/zombie.lua @@ -39,6 +39,8 @@ mobs:register_mob("mobs:zombie", { drops = { {name = "nether:apple", chance = 4, min = 1, max = 1,}, + {name = "mobs:zombie_tibia", + chance = 10, min = 1, max = 1,}, {name = "maptools:silver_coin", chance = 1, min = 1, max = 1,}, }, @@ -61,3 +63,8 @@ mobs:register_spawn("mobs:zombie", {"nether:dirt_top"}, 5, -1, 6000, 1, 31000) -- register spawn egg mobs:register_egg("mobs:zombie", "Zombie", "mobs_zombie_head.png", 1) +minetest.register_craftitem("mobs:zombie_tibia", { + description = "Zombie Tibia", + inventory_image = "mobs_zombie_tibia.png", + groups = {magic = 1}, +}) diff --git a/other_things/Tableau-valeurs-MFF.ods b/other_things/Tableau-valeurs-MFF.ods index e4c4d842..7ce57189 100755 Binary files a/other_things/Tableau-valeurs-MFF.ods and b/other_things/Tableau-valeurs-MFF.ods differ