merged pull request 4 from original repo

master
Amy 2021-07-13 16:00:04 -04:00
parent 64f88263e2
commit f60143f24e
4 changed files with 129 additions and 69 deletions

View File

@ -1,7 +1,7 @@
# Scythes & Sickles
Adds scythes and sickles with unique applications for farming
![](https://raw.githubusercontent.com/t-affeldt/sickles/master/screenshot.png)
![screenshot](screenshot.png)
Scythes allow you to quickly sweep through your fields. They can only break fully grown crops and harvest multiple plants at once.
They also replant harvested crops automatically. Alternatively, they can be used as an effective weapon with higher range.
@ -40,4 +40,4 @@ The entire source code is written by me and licensed under *GNU LGPL v3*. You ca
in the supplied license file.
Textures for tools and moss items are made by Cap for this mod and licensed under *CC BY-SA 3.0*.
Textures for placed moss node and flower petals are by Vanessa Ezekowitz under *CC BY-SA 4.0* for her [plantlife modpack](https://forum.minetest.net/viewtopic.php?t=3898).
The sound effect for placing or breaking moss blocks is made by DrMinky under *CC BY 3.0* and can be found on [FreeSound](https://freesound.org/people/DrMinky/sounds/167073/).
The sound effect for placing or breaking moss blocks is made by DrMinky under *CC BY 3.0* and can be found on [FreeSound](https://freesound.org/people/DrMinky/sounds/167073/).

View File

@ -13,6 +13,7 @@ local mod_df_mapitems = minetest.get_modpath("df_mapitems") ~= nil
local mod_df_primordial_items = minetest.get_modpath("df_primordial_items") ~= nil
local mod_ethereal = minetest.get_modpath("ethereal") ~= nil
local mod_gloopblocks = minetest.get_modpath("gloopblocks") ~= nil
local mod_underch = minetest.get_modpath("underch") ~= nil
sickles.register_cuttable("default:dirt_with_grass", "default:dirt", "default:grass_1")
sickles.register_cuttable("default:dirt_with_dry_grass", "default:dirt", "default:dry_grass_1")
@ -23,109 +24,145 @@ sickles.register_cuttable("default:permafrost_with_moss", "default:permafrost",
sickles.register_cuttable("default:mossycobble", "default:cobble", "sickles:moss")
if mod_walls then
sickles.register_cuttable("walls:mossycobble", "walls:cobble", "sickles:moss")
sickles.register_cuttable("walls:mossycobble", "walls:cobble", "sickles:moss")
end
if mod_stairs then
sickles.register_cuttable("stairs:slab_mossycobble", "stairs:slab_cobble", "sickles:moss")
sickles.register_cuttable("stairs:stair_mossycobble", "stairs:stair_cobble", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_mossycobble", "stairs:stair_inner_cobble", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_mossycobble", "stairs:stair_outer_cobble", "sickles:moss")
sickles.register_cuttable("stairs:slab_mossycobble", "stairs:slab_cobble", "sickles:moss")
sickles.register_cuttable("stairs:stair_mossycobble", "stairs:stair_cobble", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_mossycobble", "stairs:stair_inner_cobble", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_mossycobble", "stairs:stair_outer_cobble", "sickles:moss")
end
if mod_footprints then
sickles.register_cuttable("footprints:dirt_with_dry_grass", "default:dirt", "default:dry_grass_1")
sickles.register_cuttable("footprints:dry_dirt_with_dry_grass", "default:dry_dirt", "default:dry_grass_1")
sickles.register_cuttable("footprints:dirt_with_rainforest_litter", "default:dirt", "default:junglegrass")
sickles.register_cuttable("footprints:dirt_with_coniferous_litter", "default:dirt", "default:dry_grass_1")
sickles.register_cuttable("footprints:dirt_with_dry_grass", "default:dirt", "default:dry_grass_1")
sickles.register_cuttable("footprints:dry_dirt_with_dry_grass", "default:dry_dirt", "default:dry_grass_1")
sickles.register_cuttable("footprints:dirt_with_rainforest_litter", "default:dirt", "default:junglegrass")
sickles.register_cuttable("footprints:dirt_with_coniferous_litter", "default:dirt", "default:dry_grass_1")
end
if mod_nature and not mod_moretrees then
sickles.register_cuttable("nature:blossom", "default:leaves", "sickles:petals")
sickles.register_cuttable("nature:blossom", "default:leaves", "sickles:petals")
end
if mod_moretrees then
sickles.register_cuttable("moretrees:apple_blossoms", "moretrees:apple_tree_leaves", "sickles:petals")
sickles.register_cuttable("moretrees:apple_blossoms", "moretrees:apple_tree_leaves", "sickles:petals")
end
if mod_woodsoils then
sickles.register_cuttable("woodsoils:grass_with_leaves_1", "default:dirt", "default:dry_grass_1")
sickles.register_cuttable("woodsoils:grass_with_leaves_2", "default:dirt", "default:dry_grass_1")
sickles.register_cuttable("woodsoils:grass_with_leaves_1", "default:dirt", "default:grass_1")
sickles.register_cuttable("woodsoils:grass_with_leaves_2", "default:dirt", "default:grass_1")
sickles.register_cuttable("woodsoils:grass_with_leaves_1", "default:dirt", "default:dry_grass_1")
sickles.register_cuttable("woodsoils:grass_with_leaves_2", "default:dirt", "default:dry_grass_1")
sickles.register_cuttable("woodsoils:grass_with_leaves_1", "default:dirt", "default:grass_1")
sickles.register_cuttable("woodsoils:grass_with_leaves_2", "default:dirt", "default:grass_1")
end
if mod_farming then
sickles.register_trimmable("farming:wheat_8", "farming:wheat_2")
sickles.register_trimmable("farming:wheat_8", "farming:wheat_2")
sickles.register_trimmable("farming:cotton_8", "farming:cotton_2")
end
if mod_farming and farming ~= nil and farming.mod == "redo" then
sickles.register_trimmable("farming:rye_8", "farming:rye_2")
sickles.register_trimmable("farming:oat_8", "farming:oat_2")
sickles.register_trimmable("farming:barley_7", "farming:barley_2")
sickles.register_trimmable("farming:rice_8", "farming:rice_2")
sickles.register_trimmable("farming:rye_8", "farming:rye_2")
sickles.register_trimmable("farming:oat_8", "farming:oat_2")
sickles.register_trimmable("farming:barley_7", "farming:barley_2")
sickles.register_trimmable("farming:rice_8", "farming:rice_2")
sickles.register_trimmable("farming:pineapple_8", "farming:pineapple_1")
sickles.register_trimmable("farming:coffee_5", "farming:coffee_1")
sickles.register_trimmable("farming:tomato_8", "farming:tomato_1")
sickles.register_trimmable("farming:carrot_8", "farming:carrot_1")
sickles.register_trimmable("farming:grapes_8", "farming:grapes_1")
sickles.register_trimmable("farming:beetroot_5", "farming:beetroot_1")
sickles.register_trimmable("farming:rice_8", "farming:rice_2")
sickles.register_trimmable("farming:beanpole_5", "farming:beanpole_1")
sickles.register_trimmable("farming:rhubarb_3", "farming:rhubarb_1")
sickles.register_trimmable("farming:cabbage_6", "farming:cabbage_1")
sickles.register_trimmable("farming:corn_8", "farming:corn_1")
sickles.register_trimmable("farming:pepper_7", "farming:pepper_1")
sickles.register_trimmable("farming:potato_4", "farming:potato_1")
sickles.register_trimmable("farming:vanilla_8", "farming:vanilla_1")
sickles.register_trimmable("farming:lettuce_5", "farming:lettuce_1")
sickles.register_trimmable("farming:cucumber_4", "farming:cucumber_1")
sickles.register_trimmable("farming:pea_5", "farming:pea_1")
sickles.register_trimmable("farming:blueberry_4", "farming:blueberry_1")
sickles.register_trimmable("farming:raspberry_4", "farming:raspberry_1")
sickles.register_trimmable("farming:blackberry_4", "farming:blackberry_1")
sickles.register_trimmable("farming:chili_8", "farming:chili_1")
sickles.register_trimmable("farming:melon_8", "farming:melon_1")
sickles.register_trimmable("farming:pumpkin_8", "farming:pumpkin_1")
sickles.register_trimmable("farming:soy_7", "farming:soy_1")
sickles.register_trimmable("farming:mint_4", "farming:mint_1")
sickles.register_trimmable("farming:onion_5", "farming:onion_1")
end
if mod_grains then
sickles.register_trimmable("grains:rye_8", "grains:rye_2")
sickles.register_trimmable("grains:oat_8", "grains:oat_2")
sickles.register_trimmable("grains:barley_8", "grains:barley_2")
sickles.register_trimmable("grains:rice_8", "grains:rice_2")
sickles.register_trimmable("grains:rye_8", "grains:rye_2")
sickles.register_trimmable("grains:oat_8", "grains:oat_2")
sickles.register_trimmable("grains:barley_8", "grains:barley_2")
sickles.register_trimmable("grains:rice_8", "grains:rice_2")
end
if mod_cucina_vegana then
sickles.register_trimmable("cucina_vegana:rice_6", "cucina_vegana:rice_2")
sickles.register_trimmable("cucina_vegana:rice_6", "cucina_vegana:rice_2")
end
if mod_caverealms then
sickles.register_cuttable("caverealms:stone_with_moss", "default:cobble", "sickles:moss")
sickles.register_cuttable("caverealms:stone_with_lichen", "default:cobble", "sickles:moss_purple")
sickles.register_cuttable("caverealms:stone_with_algae", "default:cobble", "sickles:moss_yellow")
sickles.register_cuttable("caverealms:stone_with_moss", "default:cobble", "sickles:moss")
sickles.register_cuttable("caverealms:stone_with_lichen", "default:cobble", "sickles:moss_purple")
sickles.register_cuttable("caverealms:stone_with_algae", "default:cobble", "sickles:moss_yellow")
end
if mod_df_mapitems then
sickles.register_cuttable("df_mapitems:dirt_with_cave_moss", "default:cobble", "sickles:moss_blue")
sickles.register_cuttable("df_mapitems:cobble_with_floor_fungus", "default:cobble", "sickles:moss_yellow")
sickles.register_cuttable("df_mapitems:cobble_with_floor_fungus_fine", "default:cobble", "sickles:moss_yellow")
sickles.register_cuttable("df_mapitems:ice_with_hoar_moss", "default:ice", "sickles:moss_blue")
sickles.register_cuttable("df_mapitems:dirt_with_cave_moss", "default:cobble", "sickles:moss_blue")
sickles.register_cuttable("df_mapitems:cobble_with_floor_fungus", "default:cobble", "sickles:moss_yellow")
sickles.register_cuttable("df_mapitems:cobble_with_floor_fungus_fine", "default:cobble", "sickles:moss_yellow")
sickles.register_cuttable("df_mapitems:ice_with_hoar_moss", "default:ice", "sickles:moss_blue")
end
if mod_df_primordial_items then
sickles.register_cuttable("df_primordial_items:dirt_with_mycelium", "default:dirt", "df_primordial_items:fungal_grass_1")
sickles.register_cuttable("df_primordial_items:jungle_tree_mossy", "df_primordial_items:jungle_tree", "sickles:moss")
sickles.register_cuttable("df_primordial_items:jungle_tree_glowing", "df_primordial_items:jungle_tree", "df_primordial_items:mushroom_gills_glowing")
sickles.register_cuttable("df_primordial_items:dirt_with_jungle_grass", "default:dirt", "df_primordial_items:jungle_grass_1")
sickles.register_cuttable("df_primordial_items:dirt_with_mycelium", "default:dirt", "df_primordial_items:fungal_grass_1")
sickles.register_cuttable("df_primordial_items:jungle_tree_mossy", "df_primordial_items:jungle_tree", "sickles:moss")
sickles.register_cuttable("df_primordial_items:jungle_tree_glowing", "df_primordial_items:jungle_tree", "df_primordial_items:mushroom_gills_glowing")
sickles.register_cuttable("df_primordial_items:dirt_with_jungle_grass", "default:dirt", "df_primordial_items:jungle_grass_1")
end
if mod_ethereal then
sickles.register_cuttable("ethereal:bamboo_dirt", "default:dirt", "default:grass_1")
sickles.register_cuttable("ethereal:cold_dirt", "default:dirt", "default:grass_1")
sickles.register_cuttable("ethereal:crystal_dirt", "default:dirt", "ethereal:crytalgrass")
sickles.register_cuttable("ethereal:fiery_dirt", "default:dirt", "ethereal:dry_shrub")
sickles.register_cuttable("ethereal:gray_dirt", "default:dirt", "ethereal:snowygrass")
sickles.register_cuttable("ethereal:grovel_dirt", "default:dirt", "sickles:moss")
sickles.register_cuttable("ethereal:jungle_dirt", "default:dirt", "default:junglegrass")
sickles.register_cuttable("ethereal:mushroom_dirt", "default:dirt", "flowers:mushroom_red")
sickles.register_cuttable("ethereal:prairie_dirt", "default:dirt", "sickles:petals")
sickles.register_cuttable("ethereal:bamboo_dirt", "default:dirt", "default:grass_1")
sickles.register_cuttable("ethereal:cold_dirt", "default:dirt", "default:grass_1")
sickles.register_cuttable("ethereal:crystal_dirt", "default:dirt", "ethereal:crystalgrass")
sickles.register_cuttable("ethereal:fiery_dirt", "default:dirt", "ethereal:dry_shrub")
sickles.register_cuttable("ethereal:gray_dirt", "default:dirt", "ethereal:snowygrass")
sickles.register_cuttable("ethereal:grove_dirt", "default:dirt", "sickles:moss")
sickles.register_cuttable("ethereal:dry_dirt", "default:dirt", "default:coal_lump")
sickles.register_cuttable("ethereal:jungle_dirt", "default:dirt", "default:junglegrass")
sickles.register_cuttable("ethereal:mushroom_dirt", "default:dirt", "flowers:mushroom_red")
sickles.register_cuttable("ethereal:prairie_dirt", "default:dirt", "sickles:petals")
sickles.register_cuttable("ethereal:onion_5", "ethereal:onion_1", "ethereal:wild_onion_plant")
sickles.register_cuttable("ethereal:strawberry_8", "ethereal:strawberry_1", "ethereal:strawberry")
end
if mod_gloopblocks then
sickles.register_cuttable("gloopblocks:stone_brick_mossy", "default:stonebrick", "sickles:moss")
sickles.register_cuttable("gloopblocks:stone_mossy", "default:stone", "sickles:moss")
sickles.register_cuttable("gloopblocks:cobble_road_mossy", "gloopblocks:cobble_road", "sickles:moss")
sickles.register_cuttable("gloopblocks:stone_brick_mossy", "default:stonebrick", "sickles:moss")
sickles.register_cuttable("gloopblocks:stone_mossy", "default:stone", "sickles:moss")
sickles.register_cuttable("gloopblocks:cobble_road_mossy", "gloopblocks:cobble_road", "sickles:moss")
end
if mod_gloopblocks and mod_stairs then
sickles.register_cuttable("stairs:stair_stone_mossy", "stairs:stair_stone", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_stone_mossy", "stairs:stair_inner_stone", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_stone_mossy", "stairs:stair_outer_stone", "sickles:moss")
sickles.register_cuttable("stairs:slab_stone_mossy", "stairs:slab_stone", "sickles:moss")
sickles.register_cuttable("stairs:stair_stone_brick_mossy", "stairs:stair_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_stone_brick_mossy", "stairs:stair_inner_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_stone_brick_mossy", "stairs:stair_outer_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:slab_stone_brick_mossy", "stairs:slab_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:stair_cobble_road_mossy", "stairs:stair_cobble_road", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_cobble_road_mossy", "stairs:stair_inner_cobble_road", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_cobble_road_mossy", "stairs:stair_outer_cobble_road", "sickles:moss")
sickles.register_cuttable("stairs:slab_cobble_road_mossy", "stairs:slab_cobble_road", "sickles:moss")
end
sickles.register_cuttable("stairs:stair_stone_mossy", "stairs:stair_stone", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_stone_mossy", "stairs:stair_inner_stone", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_stone_mossy", "stairs:stair_outer_stone", "sickles:moss")
sickles.register_cuttable("stairs:slab_stone_mossy", "stairs:slab_stone", "sickles:moss")
sickles.register_cuttable("stairs:stair_stone_brick_mossy", "stairs:stair_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_stone_brick_mossy", "stairs:stair_inner_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_stone_brick_mossy", "stairs:stair_outer_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:slab_stone_brick_mossy", "stairs:slab_stonebrick", "sickles:moss")
sickles.register_cuttable("stairs:stair_cobble_road_mossy", "stairs:stair_cobble_road", "sickles:moss")
sickles.register_cuttable("stairs:stair_inner_cobble_road_mossy", "stairs:stair_inner_cobble_road", "sickles:moss")
sickles.register_cuttable("stairs:stair_outer_cobble_road_mossy", "stairs:stair_outer_cobble_road", "sickles:moss")
sickles.register_cuttable("stairs:slab_cobble_road_mossy", "stairs:slab_cobble_road", "sickles:moss")
end
if mod_underch then
sickles.register_cuttable("underch:mossy_dirt", "default:dirt", "sickles:moss")
sickles.register_cuttable("underch:mossy_gravel", "default:gravel", "sickles:moss")
end

View File

@ -10,7 +10,7 @@ minetest.register_tool("sickles:sickle_bronze", {
full_punch_interval = 0.8,
max_drop_level = 1,
groupcaps = {
snappy = { times = { [1] = 2.75, [2] = 1.30, [3] = 0.375 }, uses = 60, maxlevel = 2 }
snappy = { times = { [1] = 2.75, [2] = 1.30, [3] = 0.375 }, uses = 100, maxlevel = 2 }
},
damage_groups = { fleshy = 3 },
punch_attack_uses = 110
@ -36,7 +36,7 @@ minetest.register_tool("sickles:sickle_steel", {
full_punch_interval = 0.8,
max_drop_level = 1,
groupcaps = {
snappy = { times = { [1] = 2.5, [2] = 1.20, [3] = 0.35 }, uses = 60, maxlevel = 2 }
snappy = { times = { [1] = 2.5, [2] = 1.20, [3] = 0.35 }, uses = 150, maxlevel = 2 }
},
damage_groups = { fleshy = 3 },
punch_attack_uses = 120
@ -62,7 +62,7 @@ minetest.register_tool("sickles:sickle_gold", {
full_punch_interval = 0.8,
max_drop_level = 1,
groupcaps = {
snappy = { times = { [1] = 2.0, [2] = 1.00, [3] = 0.35 }, uses = 45, maxlevel = 3 }
snappy = { times = { [1] = 2.0, [2] = 1.00, [3] = 0.35 }, uses = 200, maxlevel = 3 }
},
damage_groups = { fleshy = 2 },
punch_attack_uses = 90
@ -91,7 +91,7 @@ minetest.register_tool("sickles:scythe_bronze", {
},
range = 12,
on_use = sickles.use_scythe,
groups = { scythe = 2, scythe_uses = 25 },
groups = { scythe = 2, scythe_uses = 100 },
sound = { breaks = "default_tool_breaks" }
})
@ -114,7 +114,7 @@ minetest.register_tool("sickles:scythe_steel", {
},
range = 12,
on_use = sickles.use_scythe,
groups = { scythe = 2, scythe_uses = 30 },
groups = { scythe = 2, scythe_uses = 200 },
sound = { breaks = "default_tool_breaks" }
})
@ -135,4 +135,4 @@ if is_farming_redo then
minetest.clear_craft({
output = "farming:scythe_mithril"
})
end
end

23
locale/sickles.es.tr Normal file
View File

@ -0,0 +1,23 @@
# textdomain:sickles
Bronze Sickle=Hoz de Bronce
Steel Sickle=Hoz de Acero
Golden Sickle=Hoz de Oro
Bronze Scythe=Guadaña de Bronce
Steel Scythe=Guadaña de Acero
Moss=Musgo
Purple Moss=Musgo Morado
Blue Moss=Musgo Azul
Yellow Moss=Musgo Amarillo
Moss Block=Bloque de Musgo
Purple Moss Block=Bloque de Musgo Morado
Blue Moss Block=Bloque de Musgo Azul
Yellow Moss Block=Bloque de Musgo Amarillo
Moss Stair=Escalera de Musgo
Purple Moss Stair=Escalera de Musgo Morado
Blue Moss Stair=Escalera de Musgo Azul
Yellow Moss Stair=Escalera de Musgo Amarillo
Moss Slab=Losa de Musgo
Purple Moss Slab=Losa de Musgo Morado
Blue Moss Slab=Losa de Musgo Azul
Yellow Moss Slab=Losa de Musgo Amarillo
Flower Petals=Pétalos de Flores