diff --git a/mods/gold/init.lua b/mods/gold/init.lua index 1e45682..31ef2c3 100644 --- a/mods/gold/init.lua +++ b/mods/gold/init.lua @@ -24,23 +24,33 @@ if minetest.get_modpath("mobs") ~= nil then -- crafts {"gold:ingot_gold 7", "", "farming:cotton_bale 3"}, - -- materials - {"default:planks 3", "farming:cotton_bale 3", "bed:bed"}, - -- tool repair {"gold:ingot_gold 6", "default:shovel_stone", "default:shovel_stone"}, {"gold:ingot_gold 8", "default:shovel_steel", "default:shovel_steel"}, {"gold:ingot_gold 10", "default:shovel_carbon_steel", "default:shovel_carbon_steel"}, + + -- filling buckets + {"gold:ingot_gold", "default:bucket", "default:bucket_water"}, } - gold.trades["tavernkeeper"] = { + gold.trades["carpenter"] = { -- materials {"gold:ingot_gold 2", "", "default:planks 12"}, {"gold:ingot_gold 2", "", "default:planks_birch 8"}, + {"gold:ingot_gold 3", "", "default:planks_oak 10"}, + {"gold:ingot_gold 5", "", "default:frame 10"}, + {"gold:ingot_gold 10", "", "default:reinforced_frame 10"}, -- useables {"gold:ingot_gold 9", "", "bed:bed"}, {"gold:ingot_gold 5", "", "default:chest"}, - {"default:planks_birch 3", "mobs:wool 3", "bed:bed"}, + {"gold:ingot_gold 5", "mobs:wool 3", "bed:bed"}, + } + gold.trades["tavernkeeper"] = { + -- edibles + {"gold:ingot_gold", "", "default:apple 3"}, + {"gold:ingot_gold", "", "farming:bread"}, + {"gold:ingot_gold 2", "", "mobs:meat"}, + {"gold:ingot_gold 3", "", "mobs:pork"}, -- filling buckets {"gold:ingot_gold", "default:bucket", "default:bucket_water"}, @@ -73,13 +83,6 @@ if minetest.get_modpath("mobs") ~= nil then {"gold:ingot_gold 16", "default:pick_carbon_steel", "default:pick_carbon_steel"}, } gold.trades["butcher"] = { - -- materials - {"gold:ingot_gold 3", "", "default:planks_oak 10"}, - - -- cooked edibles - {"gold:ingot_gold 2", "", "mobs:meat"}, - {"gold:ingot_gold 3", "", "mobs:pork"}, - -- raw edibles {"gold:ingot_gold 2", "", "mobs:meat_raw 2"}, {"gold:ingot_gold 3", "", "mobs:pork_raw 2"}, @@ -105,7 +108,8 @@ if minetest.get_modpath("mobs") ~= nil then table.insert(gold.trades["farmer"], {"jewels:jewel 2", "", "gold:ingot_gold 20"}) table.insert(gold.trades["farmer"], {"jewels:jewel 4", "", "gold:ingot_gold 32"}) - table.insert(gold.trades["farmer"], {"default:planks 6", "", "gold:ingot_gold"}) + -- carpenter + table.insert(gold.trades["carpenter"], {"default:tree 2", "", "gold:ingot_gold"}) -- tavern keeper table.insert(gold.trades["tavernkeeper"], {"gold:ingot_gold 14", "", "jewels:jewel"}) @@ -125,6 +129,7 @@ if minetest.get_modpath("mobs") ~= nil then gold.trade_names["farmer"] = S("Farmer") gold.trade_names["tavernkeeper"] = S("Tavern Keeper") + gold.trade_names["carpenter"] = S("Carpenter") gold.trade_names["blacksmith"] = S("Blacksmith") gold.trade_names["butcher"] = S("Butcher") end diff --git a/mods/gold/locale/gold.de.tr b/mods/gold/locale/gold.de.tr index ee3d4d7..f285f3c 100644 --- a/mods/gold/locale/gold.de.tr +++ b/mods/gold/locale/gold.de.tr @@ -3,6 +3,7 @@ Farmer=Bauer Tavern Keeper=Wirt Blacksmith=Schmied Butcher=Fleischer +Carpenter=Schreiner Cancel=Abbrechen Trade=Handeln Trading Book=Handelsbuch diff --git a/mods/gold/locale/template.txt b/mods/gold/locale/template.txt index a0c7965..8047e56 100644 --- a/mods/gold/locale/template.txt +++ b/mods/gold/locale/template.txt @@ -3,6 +3,7 @@ Farmer= Tavern Keeper= Blacksmith= Butcher= +Carpenter= Cancel= Trade= Trading Book= diff --git a/mods/mobs/locale/mobs.de.tr b/mods/mobs/locale/mobs.de.tr index bda599f..2be980e 100644 --- a/mods/mobs/locale/mobs.de.tr +++ b/mods/mobs/locale/mobs.de.tr @@ -62,3 +62,5 @@ My head hurts.=Mein Kopf tut weh. I have a bad day today.=Ich hab heute einen schlechten Tag. @1 (disabled)=@1 (deaktiviert) Hostile mobs are disabled!=Feindliche Mobs sind deaktiviert! +Carpenter=Schreiner +Hi! I'm a carpenter. Making things out of wood is my job.=Hallo! Ich bin eine Schreiner. Mein Beruf ist es, Dinge aus Holz zu fertigen. diff --git a/mods/mobs/locale/template.txt b/mods/mobs/locale/template.txt index 737ae1d..d88885c 100644 --- a/mods/mobs/locale/template.txt +++ b/mods/mobs/locale/template.txt @@ -64,3 +64,5 @@ My head hurts.= I have a bad day today.= @1 (disabled)= Hostile mobs are disabled!= +Carpenter= +Hi! I'm a carpenter. Making things out of wood is my job.= diff --git a/mods/mobs/mob_npc.lua b/mods/mobs/mob_npc.lua index 502cc7b..77b99ca 100644 --- a/mods/mobs/mob_npc.lua +++ b/mods/mobs/mob_npc.lua @@ -8,6 +8,7 @@ local npc_types = { { "tavernkeeper", S("Tavern Keeper") }, { "blacksmith", S("Blacksmith") }, { "butcher", S("Butcher") }, + { "carpenter", S("Carpenter") }, } local msgs = { @@ -16,6 +17,7 @@ local msgs = { tavernkeeper = S("Hi! I'm a tavernkeeper. I trade with assorted goods."), blacksmith = S("Hi! I'm a blacksmith. I sell metal products."), butcher = S("Hi! I'm a butcher. Want to buy something?"), + carpenter = S("Hi! I'm a carpenter. Making thinks out of wood is my job."), }, trade = { S("If you want to trade, show me a trading book."), diff --git a/mods/mobs/textures/mobs_npc_carpenter_inventory.png b/mods/mobs/textures/mobs_npc_carpenter_inventory.png new file mode 100644 index 0000000..6474b34 Binary files /dev/null and b/mods/mobs/textures/mobs_npc_carpenter_inventory.png differ diff --git a/mods/village/generate.lua b/mods/village/generate.lua index edd33f9..791c9f3 100644 --- a/mods/village/generate.lua +++ b/mods/village/generate.lua @@ -141,7 +141,7 @@ village.chunkdefs["livestock_pen"] = { village.chunkdefs["lamppost"] = { -- not road because of road height limit of 1 nodes entity_chance = 2, entities = { - ["mobs:npc_butcher"] = 1, + ["mobs:npc_carpenter"] = 1, }, } village.chunkdefs["well"] = { @@ -153,7 +153,7 @@ village.chunkdefs["well"] = { village.chunkdefs["house"] = { entity_chance = 2, entities = { - ["mobs:npc_farmer"] = 1, + ["mobs:npc_carpenter"] = 1, }, } village.chunkdefs["tavern"] = {