From 489d3b7da6637db4884c642ad03a1d3748aeb9d3 Mon Sep 17 00:00:00 2001 From: AFCMS Date: Sun, 4 Dec 2022 17:28:04 +0100 Subject: [PATCH 1/4] Format file --- mods/ENTITIES/mobs_mc/silverfish.lua | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua index 5b1325f19..4ac24295a 100644 --- a/mods/ENTITIES/mobs_mc/silverfish.lua +++ b/mods/ENTITIES/mobs_mc/silverfish.lua @@ -15,15 +15,15 @@ mcl_mobs.register_mob("mobs_mc:silverfish", { hp_max = 8, xp_min = 5, xp_max = 5, - armor = {fleshy = 100, arthropod = 100}, - collisionbox = {-0.4, -0.01, -0.4, 0.4, 0.44, 0.4}, + armor = { fleshy = 100, arthropod = 100 }, + collisionbox = { -0.4, -0.01, -0.4, 0.4, 0.44, 0.4 }, visual = "mesh", mesh = "mobs_mc_silverfish.b3d", textures = { - {"mobs_mc_silverfish.png"}, + { "mobs_mc_silverfish.png" }, }, pathfinding = 1, - visual_size = {x=3, y=3}, + visual_size = { x = 3, y = 3 }, sounds = { random = "mobs_mc_silverfish_idle", death = "mobs_mc_silverfish_death", @@ -36,19 +36,19 @@ mcl_mobs.register_mob("mobs_mc:silverfish", { jump = true, fear_height = 4, replace_what = { - {"mcl_core:stone", "mcl_monster_eggs:monster_egg_stone", -1}, - {"mcl_core:cobble", "mcl_monster_eggs:monster_egg_cobble", -1}, - {"mcl_core:stonebrick", "mcl_monster_eggs:monster_egg_stonebrick", -1}, - {"mcl_core:stonebrickmossy", "mcl_monster_eggs:monster_egg_stonebrickmossy", -1}, - {"mcl_core:stonebrickcracked", "mcl_monster_eggs:monster_egg_stonebrickcracked", -1}, - {"mcl_core:stonebrickcarved", "mcl_monster_eggs:monster_egg_stonebrickcarved", -1}, + { "mcl_core:stone", "mcl_monster_eggs:monster_egg_stone", -1 }, + { "mcl_core:cobble", "mcl_monster_eggs:monster_egg_cobble", -1 }, + { "mcl_core:stonebrick", "mcl_monster_eggs:monster_egg_stonebrick", -1 }, + { "mcl_core:stonebrickmossy", "mcl_monster_eggs:monster_egg_stonebrickmossy", -1 }, + { "mcl_core:stonebrickcracked", "mcl_monster_eggs:monster_egg_stonebrickcracked", -1 }, + { "mcl_core:stonebrickcarved", "mcl_monster_eggs:monster_egg_stonebrickcarved", -1 }, }, replace_rate = 2, animation = { - speed_normal = 25, speed_run = 50, - stand_start = 0, stand_end = 20, - walk_start = 0, walk_end = 20, - run_start = 0, run_end = 20, + speed_normal = 25, speed_run = 50, + stand_start = 0, stand_end = 20, + walk_start = 0, walk_end = 20, + run_start = 0, run_end = 20, }, view_range = 16, attack_type = "dogfight", @@ -67,8 +67,8 @@ if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then end minetest.register_node("mobs_mc:monster_egg_stone", { description = "Stone Monster Egg", - tiles = {"default_stone.png"}, - groups = {oddly_breakable_by_hand = 2, spawns_silverfish = 1}, + tiles = { "default_stone.png" }, + groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, drop = '', is_ground_content = true, sounds = default.node_sound_stone_defaults(), @@ -77,9 +77,9 @@ if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then minetest.register_node("mobs_mc:monster_egg_cobble", { description = "Cobblestone Monster Egg", - tiles = {"default_cobble.png"}, + tiles = { "default_cobble.png" }, is_ground_content = false, - groups = {oddly_breakable_by_hand = 2, spawns_silverfish = 1}, + groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, drop = '', sounds = default.node_sound_stone_defaults(), after_dig_node = spawn_silverfish, @@ -87,9 +87,9 @@ if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then minetest.register_node("mobs_mc:monster_egg_mossycobble", { description = "Mossy Cobblestone Monster Egg", - tiles = {"default_mossycobble.png"}, + tiles = { "default_mossycobble.png" }, is_ground_content = false, - groups = {oddly_breakable_by_hand = 2, spawns_silverfish = 1}, + groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, drop = '', sounds = default.node_sound_stone_defaults(), after_dig_node = spawn_silverfish, @@ -99,9 +99,9 @@ if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then description = "Stone Brick Monster Egg", paramtype2 = "facedir", place_param2 = 0, - tiles = {"default_stone_brick.png"}, + tiles = { "default_stone_brick.png" }, is_ground_content = false, - groups = {oddly_breakable_by_hand = 2, spawns_silverfish = 1}, + groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, drop = '', sounds = default.node_sound_stone_defaults(), after_dig_node = spawn_silverfish, @@ -109,9 +109,9 @@ if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then minetest.register_node("mobs_mc:monster_egg_stone_block", { description = "Stone Block Monster Egg", - tiles = {"default_stone_block.png"}, + tiles = { "default_stone_block.png" }, is_ground_content = false, - groups = {oddly_breakable_by_hand = 2, spawns_silverfish = 1}, + groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, drop = '', sounds = default.node_sound_stone_defaults(), after_dig_node = spawn_silverfish, From 3153c41f3a95181f9669c4ccd3dcc05a4e721827 Mon Sep 17 00:00:00 2001 From: AFCMS Date: Sun, 4 Dec 2022 17:28:22 +0100 Subject: [PATCH 2/4] Remove mtg compatibility code --- mods/ENTITIES/mobs_mc/silverfish.lua | 81 ---------------------------- 1 file changed, 81 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua index 4ac24295a..d5553e715 100644 --- a/mods/ENTITIES/mobs_mc/silverfish.lua +++ b/mods/ENTITIES/mobs_mc/silverfish.lua @@ -57,84 +57,3 @@ mcl_mobs.register_mob("mobs_mc:silverfish", { }) mcl_mobs.register_egg("mobs_mc:silverfish", S("Silverfish"), "#6d6d6d", "#313131", 0) - --- Monster egg blocks (Minetest Game) -if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then - local spawn_silverfish = function(pos, oldnode, oldmetadata, digger) - if not minetest.is_creative_enabled(digger:get_player_name()) then - minetest.add_entity(pos, "mobs_mc:silverfish") - end - end - minetest.register_node("mobs_mc:monster_egg_stone", { - description = "Stone Monster Egg", - tiles = { "default_stone.png" }, - groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, - drop = '', - is_ground_content = true, - sounds = default.node_sound_stone_defaults(), - after_dig_node = spawn_silverfish, - }) - - minetest.register_node("mobs_mc:monster_egg_cobble", { - description = "Cobblestone Monster Egg", - tiles = { "default_cobble.png" }, - is_ground_content = false, - groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, - drop = '', - sounds = default.node_sound_stone_defaults(), - after_dig_node = spawn_silverfish, - }) - - minetest.register_node("mobs_mc:monster_egg_mossycobble", { - description = "Mossy Cobblestone Monster Egg", - tiles = { "default_mossycobble.png" }, - is_ground_content = false, - groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, - drop = '', - sounds = default.node_sound_stone_defaults(), - after_dig_node = spawn_silverfish, - }) - - minetest.register_node("mobs_mc:monster_egg_stonebrick", { - description = "Stone Brick Monster Egg", - paramtype2 = "facedir", - place_param2 = 0, - tiles = { "default_stone_brick.png" }, - is_ground_content = false, - groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, - drop = '', - sounds = default.node_sound_stone_defaults(), - after_dig_node = spawn_silverfish, - }) - - minetest.register_node("mobs_mc:monster_egg_stone_block", { - description = "Stone Block Monster Egg", - tiles = { "default_stone_block.png" }, - is_ground_content = false, - groups = { oddly_breakable_by_hand = 2, spawns_silverfish = 1 }, - drop = '', - sounds = default.node_sound_stone_defaults(), - after_dig_node = spawn_silverfish, - }) - - -- Randomly spawn stone monster eggs in the world - local mg_name = minetest.get_mapgen_setting("mg_name") - local scarcity - if mg_name == "v6" then - scarcity = 28 * 28 * 28 - else - scarcity = 22 * 22 * 22 - end - minetest.register_ore({ - ore_type = "scatter", - ore = "mobs_mc:monster_egg_stone", - wherein = "default:stone", - clust_scarcity = scarcity, - clust_num_ores = 3, - clust_size = 2, - y_min = -31000, - y_max = 31000, - biomes = { "grassland" }, - }) - -end From 34a7cf3e9fa5ea34fd2b8aec9aaf1fec71b78c37 Mon Sep 17 00:00:00 2001 From: AFCMS Date: Sun, 4 Dec 2022 17:28:45 +0100 Subject: [PATCH 3/4] Remove duplicated `reach` field --- mods/ENTITIES/mobs_mc/silverfish.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua index d5553e715..d2fdb8bec 100644 --- a/mods/ENTITIES/mobs_mc/silverfish.lua +++ b/mods/ENTITIES/mobs_mc/silverfish.lua @@ -53,7 +53,6 @@ mcl_mobs.register_mob("mobs_mc:silverfish", { view_range = 16, attack_type = "dogfight", damage = 1, - reach = 1, }) mcl_mobs.register_egg("mobs_mc:silverfish", S("Silverfish"), "#6d6d6d", "#313131", 0) From bbf21762a6527ada82bb2c9be110408defb2d5f1 Mon Sep 17 00:00:00 2001 From: AFCMS Date: Sun, 4 Dec 2022 17:37:50 +0100 Subject: [PATCH 4/4] Format again --- mods/ENTITIES/mobs_mc/silverfish.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua index d2fdb8bec..e0bcc23aa 100644 --- a/mods/ENTITIES/mobs_mc/silverfish.lua +++ b/mods/ENTITIES/mobs_mc/silverfish.lua @@ -15,15 +15,15 @@ mcl_mobs.register_mob("mobs_mc:silverfish", { hp_max = 8, xp_min = 5, xp_max = 5, - armor = { fleshy = 100, arthropod = 100 }, - collisionbox = { -0.4, -0.01, -0.4, 0.4, 0.44, 0.4 }, + armor = {fleshy = 100, arthropod = 100}, + collisionbox = {-0.4, -0.01, -0.4, 0.4, 0.44, 0.4}, visual = "mesh", mesh = "mobs_mc_silverfish.b3d", textures = { - { "mobs_mc_silverfish.png" }, + {"mobs_mc_silverfish.png"}, }, pathfinding = 1, - visual_size = { x = 3, y = 3 }, + visual_size = {x = 3, y = 3}, sounds = { random = "mobs_mc_silverfish_idle", death = "mobs_mc_silverfish_death", @@ -36,12 +36,12 @@ mcl_mobs.register_mob("mobs_mc:silverfish", { jump = true, fear_height = 4, replace_what = { - { "mcl_core:stone", "mcl_monster_eggs:monster_egg_stone", -1 }, - { "mcl_core:cobble", "mcl_monster_eggs:monster_egg_cobble", -1 }, - { "mcl_core:stonebrick", "mcl_monster_eggs:monster_egg_stonebrick", -1 }, - { "mcl_core:stonebrickmossy", "mcl_monster_eggs:monster_egg_stonebrickmossy", -1 }, - { "mcl_core:stonebrickcracked", "mcl_monster_eggs:monster_egg_stonebrickcracked", -1 }, - { "mcl_core:stonebrickcarved", "mcl_monster_eggs:monster_egg_stonebrickcarved", -1 }, + {"mcl_core:stone", "mcl_monster_eggs:monster_egg_stone", -1}, + {"mcl_core:cobble", "mcl_monster_eggs:monster_egg_cobble", -1}, + {"mcl_core:stonebrick", "mcl_monster_eggs:monster_egg_stonebrick", -1}, + {"mcl_core:stonebrickmossy", "mcl_monster_eggs:monster_egg_stonebrickmossy", -1}, + {"mcl_core:stonebrickcracked", "mcl_monster_eggs:monster_egg_stonebrickcracked", -1}, + {"mcl_core:stonebrickcarved", "mcl_monster_eggs:monster_egg_stonebrickcarved", -1}, }, replace_rate = 2, animation = {