diff --git a/mods/3d_armor/3d_armor/README.md b/mods/3d_armor/3d_armor/README.md index dd87d81..32fc07e 100644 --- a/mods/3d_armor/3d_armor/README.md +++ b/mods/3d_armor/3d_armor/README.md @@ -53,6 +53,7 @@ Change the following default settings by going to Main Menu>>Settings(Tab)>>All armor_material_gold = true armor_material_mithril = true armor_material_crystal = true + armor_material_nether = true ### Initialization glitches when a player first joins **Increase to prevent glitches** diff --git a/mods/3d_armor/3d_armor/api.lua b/mods/3d_armor/3d_armor/api.lua index 3fbff1e..5088527 100644 --- a/mods/3d_armor/3d_armor/api.lua +++ b/mods/3d_armor/3d_armor/api.lua @@ -134,6 +134,7 @@ armor = { mithril = "moreores:mithril_ingot", crystal = "ethereal:crystal_ingot", lava = "lavastuff:ingot", + nether = "nether:nether_ingot", }, fire_nodes = { {"nether:lava_source", 5, 8}, @@ -179,6 +180,7 @@ armor.config = { material_mithril = true, material_crystal = true, material_lava = true, + material_nether = true, set_elements = "head torso legs feet shield", set_multiplier = 1.1, water_protect = true, diff --git a/mods/3d_armor/3d_armor/armor.conf.example b/mods/3d_armor/3d_armor/armor.conf.example index 9ce34b4..af40396 100644 --- a/mods/3d_armor/3d_armor/armor.conf.example +++ b/mods/3d_armor/3d_armor/armor.conf.example @@ -15,6 +15,7 @@ ARMOR_MATERIALS = { gold = "default:gold_ingot", mithril = "moreores:mithril_ingot", crystal = "ethereal:crystal_ingot", + nether = "nether:nether_ingot", } -- Enable fire protection (defaults true if using ethereal mod) diff --git a/mods/3d_armor/3d_armor/armor.lua b/mods/3d_armor/3d_armor/armor.lua index a4c4497..7a364ad 100644 --- a/mods/3d_armor/3d_armor/armor.lua +++ b/mods/3d_armor/3d_armor/armor.lua @@ -868,6 +868,92 @@ if armor.materials.crystal then end +--- Nether +-- +-- Requires `armor_material_nether`. +-- +-- @section nether + +if armor.materials.nether then + --- Nether Helmet + -- + -- @helmet 3d_armor:helmet_nether + -- @img 3d_armor_inv_helmet_nether.png + -- @grp armor_head 1 + -- @grp armor_heal 14 + -- @grp armor_use 200 + -- @grp armor_fire 1 + -- @armorgrp fleshy 18 + -- @damagegrp cracky 3 + -- @damagegrp snappy 2 + -- @damagegrp level 3 + armor:register_armor("3d_armor:helmet_nether", { + description = S("Nether Helmet"), + inventory_image = "3d_armor_inv_helmet_nether.png", + groups = {armor_head=1, armor_heal=14, armor_use=100, armor_fire=1}, + armor_groups = {fleshy=18}, + damage_groups = {cracky=3, snappy=2, level=3}, + }) + --- Nether Chestplate + -- + -- @chestplate 3d_armor:chestplate_nether + -- @img 3d_armor_inv_chestplate_nether.png + -- @grp armor_torso 1 + -- @grp armor_heal 14 + -- @grp armor_use 200 + -- @grp armor_fire 1 + -- @armorgrp fleshy 25 + -- @damagegrp cracky 3 + -- @damagegrp snappy 2 + -- @damagegrp level 3 + armor:register_armor("3d_armor:chestplate_nether", { + description = S("Nether Chestplate"), + inventory_image = "3d_armor_inv_chestplate_nether.png", + groups = {armor_torso=1, armor_heal=14, armor_use=200, armor_fire=1}, + armor_groups = {fleshy=25}, + damage_groups = {cracky=3, snappy=2, level=3}, + }) + --- Nether Leggings + -- + -- @leggings 3d_armor:leggings_nether + -- @img 3d_armor_inv_leggings_nether.png + -- @grp armor_legs 1 + -- @grp armor_heal 14 + -- @grp armor_use 200 + -- @grp armor_fire 1 + -- @armorgrp fleshy 25 + -- @damagegrp cracky 3 + -- @damagegrp snappy 2 + -- @damagegrp level 3 + armor:register_armor("3d_armor:leggings_nether", { + description = S("Nether Leggings"), + inventory_image = "3d_armor_inv_leggings_nether.png", + groups = {armor_legs=1, armor_heal=14, armor_use=200, armor_fire=1}, + armor_groups = {fleshy=25}, + damage_groups = {cracky=3, snappy=2, level=3}, + }) + --- Nether Boots + -- + -- @boots 3d_armor:boots_nether + -- @img 3d_armor_inv_boots_nether.png + -- @grp armor_feet 1 + -- @grp armor_heal 14 + -- @grp armor_use 200 + -- @grp armor_fire 1 + -- @armorgrp fleshy 18 + -- @damagegrp cracky 3 + -- @damagegrp snappy 2 + -- @damagegrp level 3 + armor:register_armor("3d_armor:boots_nether", { + description = S("Nether Boots"), + inventory_image = "3d_armor_inv_boots_nether.png", + groups = {armor_feet=1, armor_heal=14, armor_use=200, armor_fire=1}, + armor_groups = {fleshy=18}, + damage_groups = {cracky=3, snappy=2, level=3}, + }) +end + + --- Crafting -- -- @section craft @@ -886,6 +972,7 @@ end -- - gold: default:gold_ingot -- - mithril: moreores:mithril_ingot -- - crystal: ethereal:crystal_ingot +-- - nether: nether:nether_ingot -- -- helmet: chestplate: leggings: -- ┌───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┐ diff --git a/mods/3d_armor/3d_armor/crafting_guide.txt b/mods/3d_armor/3d_armor/crafting_guide.txt index abd1519..1a121d8 100644 --- a/mods/3d_armor/3d_armor/crafting_guide.txt +++ b/mods/3d_armor/3d_armor/crafting_guide.txt @@ -19,6 +19,7 @@ Helmets: [3d_armor:helmet_gold] X = [default:gold_ingot] [3d_armor:helmet_mithril] X = [moreores:mithril_ingot] * [3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:helmet_nether] X = [ethereal:nether_ingot] ** Chestplates: @@ -38,6 +39,7 @@ Chestplates: [3d_armor:chestplate_gold] X = [default:gold_ingot] [3d_armor:chestplate_mithril] X = [moreores:mithril_ingot] * [3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:chestplate_nether] X = [ethereal:nether_ingot] ** Leggings: @@ -57,6 +59,7 @@ Leggings: [3d_armor:leggings_gold] X = [default:gold_ingot] [3d_armor:leggings_mithril] X = [moreores:mithril_ingot] * [3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:leggings_nether] X = [ethereal:nether_ingot] ** Boots: @@ -74,6 +77,8 @@ Boots: [3d_armor:boots_gold] X = [default:gold_ingot] [3d_armor:boots_mithril] X = [moreores:mithril_ingot] * [3d_armor:boots_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:boots_nether] X = [ethereal:nether_ingot] ** * Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549 ** Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal +** Requires nether mod - https://github.com/minetest-mods/nether.git diff --git a/mods/3d_armor/3d_armor/depends.txt b/mods/3d_armor/3d_armor/depends.txt index f101e69..ef233db 100644 --- a/mods/3d_armor/3d_armor/depends.txt +++ b/mods/3d_armor/3d_armor/depends.txt @@ -6,3 +6,4 @@ fire? ethereal? bakedclay? moreores? +nether? diff --git a/mods/3d_armor/3d_armor/init.lua b/mods/3d_armor/3d_armor/init.lua index 6102287..2d75e37 100644 --- a/mods/3d_armor/3d_armor/init.lua +++ b/mods/3d_armor/3d_armor/init.lua @@ -104,6 +104,9 @@ end if not minetest.get_modpath("ethereal") then armor.materials.crystal = nil end +if not minetest.get_modpath("nether") then + armor.materials.nether = nil +end dofile(modpath.."/armor.lua") diff --git a/mods/3d_armor/3d_armor/locale/3d_armor.de.tr b/mods/3d_armor/3d_armor/locale/3d_armor.de.tr new file mode 100644 index 0000000..8238919 --- /dev/null +++ b/mods/3d_armor/3d_armor/locale/3d_armor.de.tr @@ -0,0 +1,62 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor : Abgetrennter Rüstungsbestand ist nicht gesetzt: @1 +3d_armor: Player name is nil @1=3d_armor : Spielername ist nicht gesetzt: @1 +3d_armor: Player reference is nil @1=3d_armor : Spielerreferenz ist nicht gesetzt: @1 + +### armor.lua ### + +Admin Boots=Adminstiefel +Admin Chestplate=Adminbrustplatte +Admin Helmet=Adminhelm +Admin Leggings=Adminhose +Bronze Boots=Bronzestiefel +Bronze Chestplate=Bronzebrustplatte +Bronze Helmet=Bronzehelm +Bronze Leggings=Bronzehose +Cactus Boots=Kaktusstiefel +Cactus Chestplate=Kaktusbrustplatte +Cactus Helmet=Kaktushelm +Cactus Leggings=Kaktushose +Crystal Boots=Kristallstiefel +Crystal Chestplate=Kristallbrustplatte +Crystal Helmet=Kristallhelm +Crystal Leggings=Kristallhose +Nether Boots=Netherstiefel +Nether Chestplate=Netherbrustplatte +Nether Helmet=Netherhelm +Nether Leggings=Netherhose +Diamond Boots=Diamantstiefel +Diamond Chestplate=Diamantbrustplatte +Diamond Helmet=Diamanthelm +Diamond Leggings=Diamanthose +Gold Boots=Goldstiefel +Gold Chestplate=Goldbrustplatte +Gold Helmet=Goldhelm +Gold Leggings=Goldhose +Mithril Boots=Mithrilstiefel +Mithril Chestplate=Mithrilbrustplatte +Mithril Helmet=Mithrilhelm +Mithril Leggings=Mithrilhose +Steel Boots=Stahlstiefel +Steel Chestplate=Stahlbrustplatte +Steel Helmet=Stahlhelm +Steel Leggings=Stahlhose +Wood Boots=Holzstiefel +Wood Chestplate=Holzbrustplatte +Wood Helmet=Holzhelm +Wood Leggings=Holzhose + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor : Initialisierung des Spielers fehlgeschlagen +Fire=Feuer +Heal=Heilen +Level=Stufe +Radiation=Strahlen +Your @1 got destroyed!=Deine @1 wurde zerstört! +Your @1 is almost broken!=Deine @1 ist fast kaputt! +[3d_armor] Fire Nodes disabled=[3d_armor] Feuer-Knoten deaktiviert diff --git a/mods/3d_armor/3d_armor/locale/3d_armor.es.tr b/mods/3d_armor/3d_armor/locale/3d_armor.es.tr index 86a44db..61ff5f9 100644 --- a/mods/3d_armor/3d_armor/locale/3d_armor.es.tr +++ b/mods/3d_armor/3d_armor/locale/3d_armor.es.tr @@ -25,6 +25,10 @@ Crystal Boots=Botas de cristal Crystal Chestplate=Peto de cristal Crystal Helmet=Casco de cristal Crystal Leggings=Grebas de cristal +Nether Boots=Botas de nether +Nether Chestplate=Peto de nether +Nether Helmet=Casco de nether +Nether Leggings=Grebas de nether Diamond Boots=Botas de diamante Diamond Chestplate=Peto de diamante Diamond Helmet=Casco de diamante diff --git a/mods/3d_armor/3d_armor/locale/3d_armor.fr.tr b/mods/3d_armor/3d_armor/locale/3d_armor.fr.tr index 849a0f1..458fb15 100644 --- a/mods/3d_armor/3d_armor/locale/3d_armor.fr.tr +++ b/mods/3d_armor/3d_armor/locale/3d_armor.fr.tr @@ -25,6 +25,10 @@ Crystal Boots=Bottes en cristal Crystal Chestplate=Cuirasse en cristal Crystal Helmet=Casque en cristal Crystal Leggings=Jambières en cristal +Nether Boots=Bottes en nether +Nether Chestplate=Cuirasse en nether +Nether Helmet=Casque en nether +Nether Leggings=Jambières en nether Diamond Boots=Bottes en diamant Diamond Chestplate=Cuirasse en diamant Diamond Helmet=Casque en diamant diff --git a/mods/3d_armor/3d_armor/locale/3d_armor.it.tr b/mods/3d_armor/3d_armor/locale/3d_armor.it.tr index d8be62e..fbbd45b 100644 --- a/mods/3d_armor/3d_armor/locale/3d_armor.it.tr +++ b/mods/3d_armor/3d_armor/locale/3d_armor.it.tr @@ -25,6 +25,10 @@ Crystal Boots=Stivali di cristallo Crystal Chestplate=Corazza di cristallo Crystal Helmet=Elmo di cristallo Crystal Leggings=Gambali di cristallo +Nether Boots=Stivali di nether +Nether Chestplate=Corazza di nether +Nether Helmet=Elmo di nether +Nether Leggings=Gambali di nether Diamond Boots=Stivali di diamante Diamond Chestplate=Corazza di diamante Diamond Helmet=Elmo di diamante @@ -83,3 +87,4 @@ Diamond Shield=Scudo di diamante Gold Shield=Scudo d'oro Mithril Shield=Scudo di mithril Crystal Shield=Scudo di cristallo +Nether Shield=Scudo di nether diff --git a/mods/3d_armor/3d_armor/locale/3d_armor.ms.tr b/mods/3d_armor/3d_armor/locale/3d_armor.ms.tr index b76dd61..dab2012 100644 --- a/mods/3d_armor/3d_armor/locale/3d_armor.ms.tr +++ b/mods/3d_armor/3d_armor/locale/3d_armor.ms.tr @@ -25,6 +25,10 @@ Crystal Boots=But Kristal Crystal Chestplate=Perisai Dada Kristal Crystal Helmet=Helmet Kristal Crystal Leggings=Perisai Kaki Kristal +Nether Boots=But Nether +Nether Chestplate=Perisai Dada Nether +Nether Helmet=Helmet Nether +Nether Leggings=Perisai Kaki Nether Diamond Boots=But Intan Diamond Chestplate=Perisai Dada Intan Diamond Helmet=Helmet Intan @@ -83,3 +87,4 @@ Diamond Shield=Perisai Pegang Intan Gold Shield=Perisai Pegang Emas Mithril Shield=Perisai Pegang Mithril Crystal Shield=Perisai Pegang Kristal +Nether Shield=Perisai Pegang Nether diff --git a/mods/3d_armor/3d_armor/locale/3d_armor.pt.tr b/mods/3d_armor/3d_armor/locale/3d_armor.pt.tr index 8fc689d..e9e296e 100644 --- a/mods/3d_armor/3d_armor/locale/3d_armor.pt.tr +++ b/mods/3d_armor/3d_armor/locale/3d_armor.pt.tr @@ -25,6 +25,10 @@ Crystal Boots=Botas de Cristal Crystal Chestplate=Peitoral de Cristal Crystal Helmet=Capacete de Cristal Crystal Leggings=Calças de Cristal +Nether Boots=Botas de Nether +Nether Chestplate=Peitoral de Nether +Nether Helmet=Capacete de Nether +Nether Leggings=Calças de Nether Diamond Boots=Botas de Diamante Diamond Chestplate=Peitoral de Diamante Diamond Helmet=Capacete de Diamante @@ -83,3 +87,4 @@ Diamond Shield=Escudo de Diamante Gold Shield=Escudo de Ouro Mithril Shield=Escudo de Mithril Crystal Shield=Escudo de Cristal +Nether Shield=Escudo de Nether diff --git a/mods/3d_armor/3d_armor/locale/3d_armor.pt_BR.tr b/mods/3d_armor/3d_armor/locale/3d_armor.pt_BR.tr index 8fc689d..e9e296e 100644 --- a/mods/3d_armor/3d_armor/locale/3d_armor.pt_BR.tr +++ b/mods/3d_armor/3d_armor/locale/3d_armor.pt_BR.tr @@ -25,6 +25,10 @@ Crystal Boots=Botas de Cristal Crystal Chestplate=Peitoral de Cristal Crystal Helmet=Capacete de Cristal Crystal Leggings=Calças de Cristal +Nether Boots=Botas de Nether +Nether Chestplate=Peitoral de Nether +Nether Helmet=Capacete de Nether +Nether Leggings=Calças de Nether Diamond Boots=Botas de Diamante Diamond Chestplate=Peitoral de Diamante Diamond Helmet=Capacete de Diamante @@ -83,3 +87,4 @@ Diamond Shield=Escudo de Diamante Gold Shield=Escudo de Ouro Mithril Shield=Escudo de Mithril Crystal Shield=Escudo de Cristal +Nether Shield=Escudo de Nether diff --git a/mods/3d_armor/3d_armor/locale/template.txt b/mods/3d_armor/3d_armor/locale/template.txt index cedd538..0898a63 100644 --- a/mods/3d_armor/3d_armor/locale/template.txt +++ b/mods/3d_armor/3d_armor/locale/template.txt @@ -25,6 +25,10 @@ Crystal Boots= Crystal Chestplate= Crystal Helmet= Crystal Leggings= +Nether Boots= +Nether Chestplate= +Nether Helmet= +Nether Leggings= Diamond Boots= Diamond Chestplate= Diamond Helmet= diff --git a/mods/3d_armor/3d_armor/mod.conf b/mods/3d_armor/3d_armor/mod.conf index ddf6e66..9d2cc68 100644 --- a/mods/3d_armor/3d_armor/mod.conf +++ b/mods/3d_armor/3d_armor/mod.conf @@ -1,4 +1,4 @@ name = 3d_armor depends = default -optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, moreores +optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, moreores, nether description = Adds craftable armor that is visible to other players. diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_nether.png new file mode 100644 index 0000000..745b765 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_boots_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_boots_nether_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_boots_nether_preview.png new file mode 100644 index 0000000..e459d95 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_boots_nether_preview.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_nether.png new file mode 100644 index 0000000..c26bf2d Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_nether_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_nether_preview.png new file mode 100644 index 0000000..818c305 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_nether_preview.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_nether.png new file mode 100644 index 0000000..202a8d5 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_nether_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_nether_preview.png new file mode 100644 index 0000000..0f2c0e1 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_nether_preview.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_nether.png new file mode 100644 index 0000000..97e4781 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_inv_boots_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_nether.png new file mode 100644 index 0000000..8fa2aec Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_inv_chestplate_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_nether.png new file mode 100644 index 0000000..2882244 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_inv_helmet_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_nether.png new file mode 100644 index 0000000..94b0876 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_inv_leggings_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_nether.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_nether.png new file mode 100644 index 0000000..772c486 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_nether.png differ diff --git a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_nether_preview.png b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_nether_preview.png new file mode 100644 index 0000000..32bceb8 Binary files /dev/null and b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_nether_preview.png differ diff --git a/mods/3d_armor/3d_armor/textures/preview_index.txt b/mods/3d_armor/3d_armor/textures/preview_index.txt index 9e2fe9d..5b08da8 100644 --- a/mods/3d_armor/3d_armor/textures/preview_index.txt +++ b/mods/3d_armor/3d_armor/textures/preview_index.txt @@ -38,6 +38,11 @@ 3d_armor/textures/3d_armor_leggings_crystal.png:legs 3d_armor/textures/3d_armor_boots_crystal.png:feet +3d_armor/textures/3d_armor_helmet_nether.png:head +3d_armor/textures/3d_armor_chestplate_nether.png:torso +3d_armor/textures/3d_armor_leggings_nether.png:legs +3d_armor/textures/3d_armor_boots_nether.png:feet + 3d_armor/textures/3d_armor_helmet_admin.png:head 3d_armor/textures/3d_armor_chestplate_admin.png:torso 3d_armor/textures/3d_armor_leggings_admin.png:legs diff --git a/mods/3d_armor/settingtypes.txt b/mods/3d_armor/settingtypes.txt index a873995..3606dcd 100644 --- a/mods/3d_armor/settingtypes.txt +++ b/mods/3d_armor/settingtypes.txt @@ -8,6 +8,7 @@ armor_material_diamond (Enable diamond armor) bool true armor_material_gold (Enable gold armor) bool true armor_material_mithril (Enable mithril armor) bool true armor_material_crystal (Enable crystal armor) bool true +armor_material_nether (Enable nether armor) bool true # Increase this if you get initialization glitches when a player first joins. armor_init_delay (Initialization delay) int 2 diff --git a/mods/3d_armor/shields/crafting_guide.txt b/mods/3d_armor/shields/crafting_guide.txt index 9b61dde..689da8c 100644 --- a/mods/3d_armor/shields/crafting_guide.txt +++ b/mods/3d_armor/shields/crafting_guide.txt @@ -17,6 +17,7 @@ Shields -- Crafting Guide [shields:shield_gold] X = [default:gold_ingot] [shields:shield_mithril] X = [moreores:mithril_ingot] [shields:shield_crystal] X = [ethereal:crystal_ingot] +[shields:shield_nether] X = [ethereal:nether_ingot] Enhanced Shields ---------------- diff --git a/mods/3d_armor/shields/init.lua b/mods/3d_armor/shields/init.lua index 80e34ac..63b4e22 100644 --- a/mods/3d_armor/shields/init.lua +++ b/mods/3d_armor/shields/init.lua @@ -370,6 +370,35 @@ if armor.materials.crystal then }) end +if armor.materials.nether then + --- Nether Shield + -- + -- @shield shields:shield_nether + -- @img shields_inv_shield_nether.png + -- @grp armor_shield 1 + -- @grp armor_heal 17 + -- @grp armor_use 200 + -- @grp armor_fire 1 + -- @armorgrp fleshy 20 + -- @damagegrp cracky 3 + -- @damagegrp snappy 2 + -- @damagegrp level 3 + armor:register_armor("shields:shield_nether", { + description = S("Nether Shield"), + inventory_image = "shields_inv_shield_nether.png", + groups = {armor_shield=1, armor_heal=17, armor_use=200, armor_fire=1}, + armor_groups = {fleshy=20}, + damage_groups = {cracky=3, snappy=2, level=3}, + reciprocate_damage = true, + on_damage = function(player, index, stack) + play_sound_effect(player, "default_glass_footstep") + end, + on_destroy = function(player, index, stack) + play_sound_effect(player, "default_break_glass") + end, + }) +end + for k, v in pairs(armor.materials) do minetest.register_craft({ output = "shields:shield_"..k, diff --git a/mods/3d_armor/shields/locale/shields.de.tr b/mods/3d_armor/shields/locale/shields.de.tr new file mode 100644 index 0000000..341563c --- /dev/null +++ b/mods/3d_armor/shields/locale/shields.de.tr @@ -0,0 +1,17 @@ +# textdomain: shields + + +### init.lua ### + +Admin Shield=Adminschild +Bronze Shield=Bronzeschild +Cactus Shield=Kaktusschild +Crystal Shield=Kristallschild +Nether Shield=Netherschild +Diamond Shield=Diamantschild +Enhanced Cactus Shield=verbessert Kaktusschild +Enhanced Wood Shield=verbessert Holzschild +Gold Shield=Goldschild +Mithril Shield=Mithrilschild +Steel Shield=Stahlschild +Wooden Shield=Holzschild diff --git a/mods/3d_armor/shields/locale/shields.fr.tr b/mods/3d_armor/shields/locale/shields.fr.tr index 730c9bf..081c794 100644 --- a/mods/3d_armor/shields/locale/shields.fr.tr +++ b/mods/3d_armor/shields/locale/shields.fr.tr @@ -7,6 +7,7 @@ Admin Shield=Bouclier d'admin Bronze Shield=Bouclier en bronze Cactus Shield=Bouclier en cactus Crystal Shield=Bouclier en cristal +Nether Shield=Bouclier en nether Diamond Shield=Bouclier en diamant Enhanced Cactus Shield=Bouclier en cactus amélioré Enhanced Wood Shield=Bouclier en bois amélioré diff --git a/mods/3d_armor/shields/locale/template.txt b/mods/3d_armor/shields/locale/template.txt index ecaffd7..9c30ca7 100644 --- a/mods/3d_armor/shields/locale/template.txt +++ b/mods/3d_armor/shields/locale/template.txt @@ -7,6 +7,7 @@ Admin Shield= Bronze Shield= Cactus Shield= Crystal Shield= +Nether Shield= Diamond Shield= Enhanced Cactus Shield= Enhanced Wood Shield= diff --git a/mods/3d_armor/shields/textures/preview_index.txt b/mods/3d_armor/shields/textures/preview_index.txt index 4408c61..8298ea7 100644 --- a/mods/3d_armor/shields/textures/preview_index.txt +++ b/mods/3d_armor/shields/textures/preview_index.txt @@ -8,4 +8,5 @@ shields/textures/shields_shield_gold.png:shield shields/textures/shields_shield_diamond.png:shield shields/textures/shields_shield_mithril.png:shield shields/textures/shields_shield_crystal.png:shield +shields/textures/shields_shield_nether.png:shield shields/textures/shields_shield_admin.png:shield diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_nether.png b/mods/3d_armor/shields/textures/shields_inv_shield_nether.png new file mode 100644 index 0000000..dbafb53 Binary files /dev/null and b/mods/3d_armor/shields/textures/shields_inv_shield_nether.png differ diff --git a/mods/3d_armor/shields/textures/shields_shield_nether.png b/mods/3d_armor/shields/textures/shields_shield_nether.png new file mode 100644 index 0000000..e7e3da2 Binary files /dev/null and b/mods/3d_armor/shields/textures/shields_shield_nether.png differ diff --git a/mods/3d_armor/shields/textures/shields_shield_nether_preview.png b/mods/3d_armor/shields/textures/shields_shield_nether_preview.png new file mode 100644 index 0000000..a54a64b Binary files /dev/null and b/mods/3d_armor/shields/textures/shields_shield_nether_preview.png differ diff --git a/mods/aquaz/init.lua b/mods/aquaz/init.lua index 1344822..9edeed0 100644 --- a/mods/aquaz/init.lua +++ b/mods/aquaz/init.lua @@ -298,6 +298,26 @@ aquaz.grass= { special_tiles = "aquaz_stars_anemons_2.png", drop = "aquaz:tall_grass" }, + { + name = "aquaz:aquamarine_coral_branch", + description= "Aquamarine Coral Branch", + special_tiles = "aquaz_aquamarine_coral_branch.png", + }, + { + name = "aquaz:pink_birdnest_coral", + description= "Pink Birdnest Coral", + special_tiles = "aquaz_pink_birdnest_coral.png", + }, + { + name = "aquaz:sea_cucumbers", + description= "Sea Cucumbers", + special_tiles = "aquaz_sea_cucumbers.png", + }, + { + name = "aquaz:sword_plant", + description= "Aquatic Sword Plant", + special_tiles = "aquaz_sword_plant.png", + }, } for i = 1, #aquaz.grass do @@ -308,7 +328,7 @@ for i = 1, #aquaz.grass do drop = aquaz.grass[i].name end minetest.register_node(aquaz.grass[i].name, { - description = aquaz.grass[i].description, + description = S(aquaz.grass[i].description), drawtype = "plantlike_rooted", waving = 1, paramtype = "light", @@ -410,7 +430,7 @@ if mg_name ~= "v6" and mg_name ~= "singlenode" then offset = 0.0005, scale = 0.04, spread = {x = 250, y = 250, z = 250}, - seed = 733, + seed = 343, octaves = 3, persist = 0.66 }, @@ -453,6 +473,118 @@ if mg_name ~= "v6" and mg_name ~= "singlenode" then param2 = 48, param2_max = 96, }) + minetest.register_decoration({ + name = "aquaz:aquamarine_coral_branch", + decoration = { + "aquaz:aquamarine_coral_branch", + }, + deco_type = "simple", + place_on = {"default:sand"}, + place_offset_y = -1, + sidelen = 16, + noise_params = { + offset = 0.0005, + scale = 0.04, + spread = {x = 250, y = 250, z = 250}, + seed = 82, + octaves = 3, + persist = 0.66 + }, + biomes = { + "grassland_ocean", + "coniferous_forest_ocean", + "deciduous_forest_ocean" + }, + y_max = -5, + y_min = -10, + flags = "force_placement", + param2 = 48, + param2_max = 96, + }) + minetest.register_decoration({ + name = "aquaz:pink_birdnest_coral", + decoration = { + "aquaz:pink_birdnest_coral", + }, + deco_type = "simple", + place_on = {"default:sand"}, + place_offset_y = -1, + sidelen = 16, + noise_params = { + offset = 0.0005, + scale = 0.04, + spread = {x = 250, y = 250, z = 250}, + seed = 1729, + octaves = 3, + persist = 0.66 + }, + biomes = { + "grassland_ocean", + "coniferous_forest_ocean", + "deciduous_forest_ocean" + }, + y_max = -5, + y_min = -10, + flags = "force_placement", + param2 = 48, + param2_max = 96, + }) + minetest.register_decoration({ + name = "aquaz:sea_cucumbers", + decoration = { + "aquaz:sea_cucumbers", + }, + deco_type = "simple", + place_on = {"default:sand"}, + place_offset_y = -1, + sidelen = 16, + noise_params = { + offset = 0.0005, + scale = 0.04, + spread = {x = 250, y = 250, z = 250}, + seed = 568, + octaves = 3, + persist = 0.66 + }, + biomes = { + "grassland_ocean", + "coniferous_forest_ocean", + "deciduous_forest_ocean" + }, + y_max = -5, + y_min = -10, + flags = "force_placement", + param2 = 48, + param2_max = 96, + }) + minetest.register_decoration({ + name = "aquaz:sword_plant", + decoration = { + "aquaz:sword_plant", + }, + deco_type = "simple", + place_on = {"default:sand"}, + place_offset_y = -1, + sidelen = 16, + noise_params = { + offset = 0.0005, + scale = 0.04, + spread = {x = 250, y = 250, z = 250}, + seed = 568, + octaves = 3, + persist = 0.66 + }, + biomes = { + "grassland_ocean", + "coniferous_forest_ocean", + "deciduous_forest_ocean" + }, + y_max = -5, + y_min = -10, + flags = "force_placement", + param2 = 48, + param2_max = 96, + }) end --Wrecked Pillar diff --git a/mods/aquaz/locale/aquaz.es.tr b/mods/aquaz/locale/aquaz.es.tr index 1d83538..cc8cfc7 100644 --- a/mods/aquaz/locale/aquaz.es.tr +++ b/mods/aquaz/locale/aquaz.es.tr @@ -14,3 +14,13 @@ Wrecked Pillar Capital=Capitel de pilar ruinoso Purple Alga Remains=Restos de alga púrpura Orange Alga Remains=Restos de alga naranja Red Alga Remains=Restos de alga roja +Red Alga Remains=Restos de alga roja +Aquatic Grass=Hierba acuática +Aquatic Tall Grass=Hierba acuática alta +Grass with Stars and Anemons=Hierba con estrellas y anémonas +Aquamarine Coral Branch=Rama de coral aguamarina +Pink Birdnest Coral=Coral nido de pájaro rosa +Sea Cucumbers=Pepinos de mar +Aquatic Sword Plant=Planta espada acuática + + diff --git a/mods/aquaz/textures/aquaz_aquamarina.png b/mods/aquaz/textures/aquaz_aquamarina.png new file mode 100644 index 0000000..6d63d2c Binary files /dev/null and b/mods/aquaz/textures/aquaz_aquamarina.png differ diff --git a/mods/aquaz/textures/aquaz_aquamarine_coral_branch.png b/mods/aquaz/textures/aquaz_aquamarine_coral_branch.png new file mode 100644 index 0000000..0cf4c7d Binary files /dev/null and b/mods/aquaz/textures/aquaz_aquamarine_coral_branch.png differ diff --git a/mods/aquaz/textures/aquaz_pink_birdnest_coral.png b/mods/aquaz/textures/aquaz_pink_birdnest_coral.png new file mode 100644 index 0000000..7dfb740 Binary files /dev/null and b/mods/aquaz/textures/aquaz_pink_birdnest_coral.png differ diff --git a/mods/aquaz/textures/aquaz_sea_cucumbers.png b/mods/aquaz/textures/aquaz_sea_cucumbers.png new file mode 100644 index 0000000..574f3d0 Binary files /dev/null and b/mods/aquaz/textures/aquaz_sea_cucumbers.png differ diff --git a/mods/aquaz/textures/aquaz_stars_anemons.png b/mods/aquaz/textures/aquaz_stars_anemons.png index f4a3ebe..3d41be8 100644 Binary files a/mods/aquaz/textures/aquaz_stars_anemons.png and b/mods/aquaz/textures/aquaz_stars_anemons.png differ diff --git a/mods/aquaz/textures/aquaz_stars_anemons_2.png b/mods/aquaz/textures/aquaz_stars_anemons_2.png index be437d1..5482388 100644 Binary files a/mods/aquaz/textures/aquaz_stars_anemons_2.png and b/mods/aquaz/textures/aquaz_stars_anemons_2.png differ diff --git a/mods/aquaz/textures/aquaz_sword_plant.png b/mods/aquaz/textures/aquaz_sword_plant.png index 833b8fc..b80fb50 100644 Binary files a/mods/aquaz/textures/aquaz_sword_plant.png and b/mods/aquaz/textures/aquaz_sword_plant.png differ diff --git a/mods/aquaz/textures/aquaz_tall_grass.png b/mods/aquaz/textures/aquaz_tall_grass.png index f814327..a639f16 100644 Binary files a/mods/aquaz/textures/aquaz_tall_grass.png and b/mods/aquaz/textures/aquaz_tall_grass.png differ diff --git a/mods/aquaz/textures/aquaz_yellow_coral.png b/mods/aquaz/textures/aquaz_yellow_coral.png deleted file mode 100644 index cbe7b8a..0000000 Binary files a/mods/aquaz/textures/aquaz_yellow_coral.png and /dev/null differ diff --git a/mods/cool_trees/cacaotree/init.lua b/mods/cool_trees/cacaotree/init.lua index c8e2174..5f2a6ed 100644 --- a/mods/cool_trees/cacaotree/init.lua +++ b/mods/cool_trees/cacaotree/init.lua @@ -1,195 +1,3 @@ -schematic = { - size = {x=5, y=7, z=5}, - yslice_prob = { - {ypos=0, prob=254}, - {ypos=1, prob=254}, - {ypos=2, prob=254}, - {ypos=3, prob=254}, - {ypos=4, prob=254}, - {ypos=5, prob=254}, - {ypos=6, prob=254}, - }, - data = { - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:liana", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:flower_creeper", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:flower_creeper", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:flower_creeper", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:liana", prob=254, param2=0}, - {name="cacaotree:liana", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:pod", prob=254, param2=4}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:trunk", prob=254, param2=3}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:trunk", prob=254, param2=3}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:pod", prob=254, param2=2}, - {name="cacaotree:trunk", prob=254, param2=2}, - {name="cacaotree:pod", prob=254, param2=3}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:liana", prob=254, param2=1}, - {name="cacaotree:trunk", prob=254, param2=1}, - {name="cacaotree:liana", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:pod", prob=254, param2=5}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:flower_creeper", prob=254, param2=2}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:flower_creeper", prob=254, param2=2}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:liana", prob=254, param2=2}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:liana", prob=254, param2=2}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="cacaotree:leaves", prob=254, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - {name="air", prob=0, param2=0}, - }, -} - - - -- -- Cacao Tree -- @@ -402,7 +210,7 @@ minetest.register_node("cacaotree:leaves", { drop = { max_items = 1, items = { - {items = {"cacaotree:sapling"}, rarity = 20}, + {items = {"cacaotree:sapling"}, rarity = 12}, {items = {"cacaotree:leaves"}} } }, diff --git a/mods/cool_trees/cherrytree/init.lua b/mods/cool_trees/cherrytree/init.lua index 048775d..dd61ddc 100644 --- a/mods/cool_trees/cherrytree/init.lua +++ b/mods/cool_trees/cherrytree/init.lua @@ -168,7 +168,7 @@ minetest.register_node("cherrytree:blossom_leaves", { drop = { max_items = 1, items = { - {items = {"cherrytree:sapling"}, rarity = 20}, + {items = {"cherrytree:sapling"}, rarity = 12}, {items = {"cherrytree:blossom_leaves"}} } }, diff --git a/mods/cool_trees/clementinetree/init.lua b/mods/cool_trees/clementinetree/init.lua index 6915eb6..00756d9 100644 --- a/mods/cool_trees/clementinetree/init.lua +++ b/mods/cool_trees/clementinetree/init.lua @@ -145,7 +145,7 @@ minetest.register_node("clementinetree:leaves", { drop = { max_items = 1, items = { - {items = {"clementinetree:sapling"}, rarity = 20}, + {items = {"clementinetree:sapling"}, rarity = 13}, {items = {"clementinetree:leaves"}} } }, diff --git a/mods/cool_trees/lemontree/init.lua b/mods/cool_trees/lemontree/init.lua index b7a5e6d..bc411fd 100644 --- a/mods/cool_trees/lemontree/init.lua +++ b/mods/cool_trees/lemontree/init.lua @@ -166,7 +166,7 @@ minetest.register_node("lemontree:leaves", { drop = { max_items = 1, items = { - {items = {"lemontree:sapling"}, rarity = 20}, + {items = {"lemontree:sapling"}, rarity = 15}, {items = {"lemontree:leaves"}} } }, diff --git a/mods/cool_trees/pomegranate/init.lua b/mods/cool_trees/pomegranate/init.lua index bdd7912..cab42a3 100644 --- a/mods/cool_trees/pomegranate/init.lua +++ b/mods/cool_trees/pomegranate/init.lua @@ -145,7 +145,7 @@ minetest.register_node("pomegranate:leaves", { drop = { max_items = 1, items = { - {items = {"pomegranate:sapling"}, rarity = 20}, + {items = {"pomegranate:sapling"}, rarity = 10}, {items = {"pomegranate:leaves"}} } }, diff --git a/mods/cool_trees/sequoia/schematics/sequoia_03.mts b/mods/cool_trees/sequoia/schematics/sequoia_03.mts index b464ddf..bb61217 100644 Binary files a/mods/cool_trees/sequoia/schematics/sequoia_03.mts and b/mods/cool_trees/sequoia/schematics/sequoia_03.mts differ diff --git a/mods/hbhunger/README.md b/mods/hbhunger/README.md index 759b794..c8e3ffc 100644 --- a/mods/hbhunger/README.md +++ b/mods/hbhunger/README.md @@ -1,6 +1,6 @@ # Hunger with HUD bar [`hbhunger`] -* Version: 1.0.1 +* Version: 1.1.2 ## Using the mod @@ -39,7 +39,7 @@ All mods which add food through standard measures (`minetest.item_eat`) are alre supported automatically. Poisoned food needs special support. ### Known supported food mods -* Apple from Minetest Game [`default`] +* Apple and Blueberries from Minetest Game [`default`] * Red and brown mushroom from Minetest Game [`flowers`] * Bread from Minetest Game [`farming`] * [`animalmaterials`] (Mob Framework (`mobf` modpack)) @@ -72,10 +72,9 @@ supported automatically. Poisoned food needs special support. * Food ([`food`], [`food_basic`]) * Sweet Foods [`food_sweet`] -### Examples +### Example * Eating an apple (from Minetest Game) increases your satiation by 2; -* eating a bread (from Minetest Game) increases your satiation by 4. ## Licensing This mod is free software. @@ -91,7 +90,7 @@ This mod is free software. * `hbhunger_icon.png`—PilzAdam ([MIT License](https://opensource.org/licenses/MIT)), modified by BlockMen * `hbhunger_bgicon.png`—PilzAdam (MIT License), modified by BlockMen -* `hbhunger_bar.png—Wuzzy` (MIT License) +* `hbhunger_bar.png`—Wuzzy (MIT License) * `hbhunger_icon_health_poison.png`—celeron55 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)), modified by BlockMen, modified again by Wuzzy * Everything else: MIT License, by BlockMen and Wuzzy diff --git a/mods/hbhunger/hunger.lua b/mods/hbhunger/hunger.lua index 05f3564..2e0f49e 100644 --- a/mods/hbhunger/hunger.lua +++ b/mods/hbhunger/hunger.lua @@ -7,11 +7,11 @@ function hbhunger.load_hunger(player) end -- wrapper for minetest.item_eat (this way we make sure other mods can't break this one) -local org_eat = core.do_item_eat -core.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing) +local org_eat = minetest.do_item_eat +minetest.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing) local old_itemstack = itemstack itemstack = hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing) - for _, callback in pairs(core.registered_on_item_eats) do + for _, callback in pairs(minetest.registered_on_item_eats) do local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing, old_itemstack) if result then return result @@ -39,7 +39,7 @@ function hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thi def = {} if type(hp_change) ~= "number" then hp_change = 1 - core.log("error", "Wrong on_use() definition for item '" .. item .. "'") + minetest.log("error", "Wrong on_use() definition for item '" .. item .. "'") end def.saturation = hp_change * 1.3 def.replace = replace_with_item @@ -79,18 +79,29 @@ function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound if h == nil or hp == nil then return end - minetest.sound_play( - {name = sound or "hbhunger_eat_generic", - gain = 1}, - {object=user, - max_hear_distance = 16, - pitch = 1 + math.random(-10, 10)*0.005,} - ) + if user:is_player() then + local object, object_pos + -- Check if user is a "fake player" (unofficial imitation of a the player data structure) + if type(user) == "userdata" then + object = user + else + object_pos = user:get_pos() + end + minetest.sound_play( + {name = sound or "hbhunger_eat_generic", + gain = 1}, + {object=object, + pos=object_pos, + max_hear_distance = 16, + pitch = 1 + math.random(-10, 10)*0.005,}, + true + ) + end -- Saturation - if h < 30 and hunger_change then + if h < hbhunger.SAT_MAX and hunger_change then h = h + hunger_change - if h > 30 then h = 30 end + if h > hbhunger.SAT_MAX then h = hbhunger.SAT_MAX end hbhunger.hunger[name] = h hbhunger.set_hunger_raw(user) end @@ -115,7 +126,7 @@ function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound if inv:room_for_item("main", replace_with_item) then inv:add_item("main", replace_with_item) else - minetest.add_item(user:getpos(), replace_with_item) + minetest.add_item(user:get_pos(), replace_with_item) end end end @@ -123,336 +134,6 @@ function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound end end -if minetest.get_modpath("default") ~= nil then - hbhunger.register_food("default:apple", 2) -end -if minetest.get_modpath("flowers") ~= nil then - hbhunger.register_food("flowers:mushroom_brown", 1) - hbhunger.register_food("flowers:mushroom_red", 1, "", 3) -end -if minetest.get_modpath("farming") ~= nil then - hbhunger.register_food("farming:bread", 4) -end - -if minetest.get_modpath("mobs") ~= nil then - if mobs.mod ~= nil and mobs.mod == "redo" then - hbhunger.register_food("mobs:cheese", 4) - hbhunger.register_food("mobs:meat", 8) - hbhunger.register_food("mobs:meat_raw", 4) - hbhunger.register_food("mobs:rat_cooked", 4) - hbhunger.register_food("mobs:honey", 2) - hbhunger.register_food("mobs:pork_raw", 3, "", 3) - hbhunger.register_food("mobs:pork_cooked", 8) - hbhunger.register_food("mobs:chicken_cooked", 6) - hbhunger.register_food("mobs:chicken_raw", 2, "", 3) - hbhunger.register_food("mobs:chicken_egg_fried", 2) - if minetest.get_modpath("bucket") then - hbhunger.register_food("mobs:bucket_milk", 3, "bucket:bucket_empty") - end - else - hbhunger.register_food("mobs:meat", 6) - hbhunger.register_food("mobs:meat_raw", 3) - hbhunger.register_food("mobs:rat_cooked", 5) - end -end - -if minetest.get_modpath("moretrees") ~= nil then - hbhunger.register_food("moretrees:coconut_milk", 1) - hbhunger.register_food("moretrees:raw_coconut", 2) - hbhunger.register_food("moretrees:acorn_muffin", 3) - hbhunger.register_food("moretrees:spruce_nuts", 1) - hbhunger.register_food("moretrees:pine_nuts", 1) - hbhunger.register_food("moretrees:fir_nuts", 1) -end - -if minetest.get_modpath("dwarves") ~= nil then - hbhunger.register_food("dwarves:beer", 2) - hbhunger.register_food("dwarves:apple_cider", 1) - hbhunger.register_food("dwarves:midus", 2) - hbhunger.register_food("dwarves:tequila", 2) - hbhunger.register_food("dwarves:tequila_with_lime", 2) - hbhunger.register_food("dwarves:sake", 2) -end - -if minetest.get_modpath("animalmaterials") ~= nil then - hbhunger.register_food("animalmaterials:milk", 2) - hbhunger.register_food("animalmaterials:meat_raw", 3) - hbhunger.register_food("animalmaterials:meat_pork", 3) - hbhunger.register_food("animalmaterials:meat_beef", 3) - hbhunger.register_food("animalmaterials:meat_chicken", 3) - hbhunger.register_food("animalmaterials:meat_lamb", 3) - hbhunger.register_food("animalmaterials:meat_venison", 3) - hbhunger.register_food("animalmaterials:meat_undead", 3, "", 3) - hbhunger.register_food("animalmaterials:meat_toxic", 3, "", 5) - hbhunger.register_food("animalmaterials:meat_ostrich", 3) - hbhunger.register_food("animalmaterials:fish_bluewhite", 2) - hbhunger.register_food("animalmaterials:fish_clownfish", 2) -end - -if minetest.get_modpath("fishing") ~= nil then - hbhunger.register_food("fishing:fish_raw", 2) - hbhunger.register_food("fishing:fish_cooked", 5) - hbhunger.register_food("fishing:sushi", 6) - hbhunger.register_food("fishing:shark", 4) - hbhunger.register_food("fishing:shark_cooked", 8) - hbhunger.register_food("fishing:pike", 4) - hbhunger.register_food("fishing:pike_cooked", 8) -end - -if minetest.get_modpath("glooptest") ~= nil then - hbhunger.register_food("glooptest:kalite_lump", 1) -end - -if minetest.get_modpath("bushes") ~= nil then - hbhunger.register_food("bushes:sugar", 1) - hbhunger.register_food("bushes:strawberry", 2) - hbhunger.register_food("bushes:berry_pie_raw", 3) - hbhunger.register_food("bushes:berry_pie_cooked", 4) - hbhunger.register_food("bushes:basket_pies", 15) -end - -if minetest.get_modpath("bushes_classic") then - -- bushes_classic mod, as found in the plantlife modpack - local berries = { - "strawberry", - "blackberry", - "blueberry", - "raspberry", - "gooseberry", - "mixed_berry"} - for _, berry in ipairs(berries) do - if berry ~= "mixed_berry" then - hbhunger.register_food("bushes:"..berry, 1) - end - hbhunger.register_food("bushes:"..berry.."_pie_raw", 2) - hbhunger.register_food("bushes:"..berry.."_pie_cooked", 5) - hbhunger.register_food("bushes:basket_"..berry, 15) - end -end - -if minetest.get_modpath("mushroom") ~= nil then - hbhunger.register_food("mushroom:brown", 1) - hbhunger.register_food("mushroom:red", 1, "", 3) - -- mushroom potions: red = strong poison, brown = light restorative - if minetest.get_modpath("vessels") then - hbhunger.register_food("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4) - hbhunger.register_food("mushroom:poison", 1, "vessels:glass_bottle", 10) - end -end - -if minetest.get_modpath("docfarming") ~= nil then - hbhunger.register_food("docfarming:carrot", 3) - hbhunger.register_food("docfarming:cucumber", 2) - hbhunger.register_food("docfarming:corn", 3) - hbhunger.register_food("docfarming:potato", 4) - hbhunger.register_food("docfarming:bakedpotato", 5) - hbhunger.register_food("docfarming:raspberry", 3) -end - -if minetest.get_modpath("farming_plus") ~= nil then - hbhunger.register_food("farming_plus:carrot_item", 3) - hbhunger.register_food("farming_plus:banana", 2) - hbhunger.register_food("farming_plus:orange_item", 2) - hbhunger.register_food("farming:pumpkin_bread", 4) - hbhunger.register_food("farming_plus:strawberry_item", 2) - hbhunger.register_food("farming_plus:tomato_item", 2) - hbhunger.register_food("farming_plus:potato_item", 4) - hbhunger.register_food("farming_plus:rhubarb_item", 2) -end - -if minetest.get_modpath("mtfoods") ~= nil then - hbhunger.register_food("mtfoods:dandelion_milk", 1) - hbhunger.register_food("mtfoods:sugar", 1) - hbhunger.register_food("mtfoods:short_bread", 4) - hbhunger.register_food("mtfoods:cream", 1) - hbhunger.register_food("mtfoods:chocolate", 2) - hbhunger.register_food("mtfoods:cupcake", 2) - hbhunger.register_food("mtfoods:strawberry_shortcake", 2) - hbhunger.register_food("mtfoods:cake", 3) - hbhunger.register_food("mtfoods:chocolate_cake", 3) - hbhunger.register_food("mtfoods:carrot_cake", 3) - hbhunger.register_food("mtfoods:pie_crust", 3) - hbhunger.register_food("mtfoods:apple_pie", 3) - hbhunger.register_food("mtfoods:rhubarb_pie", 2) - hbhunger.register_food("mtfoods:banana_pie", 3) - hbhunger.register_food("mtfoods:pumpkin_pie", 3) - hbhunger.register_food("mtfoods:cookies", 2) - hbhunger.register_food("mtfoods:mlt_burger", 5) - hbhunger.register_food("mtfoods:potato_slices", 2) - hbhunger.register_food("mtfoods:potato_chips", 3) - --mtfoods:medicine - hbhunger.register_food("mtfoods:casserole", 3) - hbhunger.register_food("mtfoods:glass_flute", 2) - hbhunger.register_food("mtfoods:orange_juice", 2) - hbhunger.register_food("mtfoods:apple_juice", 2) - hbhunger.register_food("mtfoods:apple_cider", 2) - hbhunger.register_food("mtfoods:cider_rack", 2) -end - -if minetest.get_modpath("fruit") ~= nil then - hbhunger.register_food("fruit:apple", 2) - hbhunger.register_food("fruit:pear", 2) - hbhunger.register_food("fruit:bananna", 3) - hbhunger.register_food("fruit:orange", 2) -end - -if minetest.get_modpath("mush45") ~= nil then - hbhunger.register_food("mush45:meal", 4) -end - -if minetest.get_modpath("seaplants") ~= nil then - hbhunger.register_food("seaplants:kelpgreen", 1) - hbhunger.register_food("seaplants:kelpbrown", 1) - hbhunger.register_food("seaplants:seagrassgreen", 1) - hbhunger.register_food("seaplants:seagrassred", 1) - hbhunger.register_food("seaplants:seasaladmix", 6) - hbhunger.register_food("seaplants:kelpgreensalad", 1) - hbhunger.register_food("seaplants:kelpbrownsalad", 1) - hbhunger.register_food("seaplants:seagrassgreensalad", 1) - hbhunger.register_food("seaplants:seagrassgreensalad", 1) -end - -if minetest.get_modpath("mobfcooking") ~= nil then - hbhunger.register_food("mobfcooking:cooked_pork", 6) - hbhunger.register_food("mobfcooking:cooked_ostrich", 6) - hbhunger.register_food("mobfcooking:cooked_beef", 6) - hbhunger.register_food("mobfcooking:cooked_chicken", 6) - hbhunger.register_food("mobfcooking:cooked_lamb", 6) - hbhunger.register_food("mobfcooking:cooked_venison", 6) - hbhunger.register_food("mobfcooking:cooked_fish", 6) -end - -if minetest.get_modpath("creatures") ~= nil then - hbhunger.register_food("creatures:meat", 6) - hbhunger.register_food("creatures:flesh", 3) - hbhunger.register_food("creatures:rotten_flesh", 3, "", 3) -end - -if minetest.get_modpath("ethereal") then - hbhunger.register_food("ethereal:strawberry", 1) - hbhunger.register_food("ethereal:banana", 4) - hbhunger.register_food("ethereal:pine_nuts", 1) - hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3) - hbhunger.register_food("ethereal:fern_tubers", 1) - hbhunger.register_food("ethereal:banana_bread", 7) - hbhunger.register_food("ethereal:mushroom_plant", 2) - hbhunger.register_food("ethereal:coconut_slice", 2) - hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10) - hbhunger.register_food("ethereal:wild_onion_plant", 2) - hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl") - hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl") - hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl", 3) - hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl") - if minetest.get_modpath("bucket") then - hbhunger.register_food("ethereal:bucket_cactus", 2, "bucket:bucket_empty") - end - hbhunger.register_food("ethereal:fish_raw", 2) - hbhunger.register_food("ethereal:fish_cooked", 5) - hbhunger.register_food("ethereal:seaweed", 1) - hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1) - hbhunger.register_food("ethereal:sashimi", 4) - hbhunger.register_food("ethereal:orange", 2) -end - -if minetest.get_modpath("farming") and farming.mod == "redo" then - hbhunger.register_food("farming:bread", 6) - hbhunger.register_food("farming:potato", 1) - hbhunger.register_food("farming:baked_potato", 6) - hbhunger.register_food("farming:cucumber", 4) - hbhunger.register_food("farming:tomato", 4) - hbhunger.register_food("farming:carrot", 3) - hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8) - hbhunger.register_food("farming:corn", 3) - hbhunger.register_food("farming:corn_cob", 5) - hbhunger.register_food("farming:melon_slice", 2) - hbhunger.register_food("farming:pumpkin_slice", 1) - hbhunger.register_food("farming:pumpkin_bread", 9) - hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup") - hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) - hbhunger.register_food("farming:cookie", 2) - hbhunger.register_food("farming:chocolate_dark", 3) - hbhunger.register_food("farming:donut", 4) - hbhunger.register_food("farming:donut_chocolate", 6) - hbhunger.register_food("farming:donut_apple", 6) - hbhunger.register_food("farming:raspberries", 1) - hbhunger.register_food("farming:blueberries", 1) - hbhunger.register_food("farming:muffin_blueberry", 4) - if minetest.get_modpath("vessels") then - hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass") - end - hbhunger.register_food("farming:rhubarb", 1) - hbhunger.register_food("farming:rhubarb_pie", 6) - hbhunger.register_food("farming:beans", 1) -end - -if minetest.get_modpath("kpgmobs") ~= nil then - hbhunger.register_food("kpgmobs:uley", 3) - hbhunger.register_food("kpgmobs:meat", 6) - hbhunger.register_food("kpgmobs:rat_cooked", 5) - hbhunger.register_food("kpgmobs:med_cooked", 4) - if minetest.get_modpath("bucket") then - hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty") - end -end - -if minetest.get_modpath("jkfarming") ~= nil then - hbhunger.register_food("jkfarming:carrot", 3) - hbhunger.register_food("jkfarming:corn", 3) - hbhunger.register_food("jkfarming:melon_part", 2) - hbhunger.register_food("jkfarming:cake", 3) -end - -if minetest.get_modpath("jkanimals") ~= nil then - hbhunger.register_food("jkanimals:meat", 6) -end - -if minetest.get_modpath("jkwine") ~= nil then - hbhunger.register_food("jkwine:grapes", 2) - hbhunger.register_food("jkwine:winebottle", 1) -end - -if minetest.get_modpath("cooking") ~= nil then - hbhunger.register_food("cooking:meat_beef_cooked", 4) - hbhunger.register_food("cooking:fish_bluewhite_cooked", 3) - hbhunger.register_food("cooking:fish_clownfish_cooked", 1) - hbhunger.register_food("cooking:meat_chicken_cooked", 2) - hbhunger.register_food("cooking:meat_cooked", 2) - hbhunger.register_food("cooking:meat_pork_cooked", 3) - hbhunger.register_food("cooking:meat_toxic_cooked", -3) - hbhunger.register_food("cooking:meat_venison_cooked", 3) - hbhunger.register_food("cooking:meat_undead_cooked", 1) -end - --- ferns mod of plantlife_modpack -if minetest.get_modpath("ferns") ~= nil then - hbhunger.register_food("ferns:fiddlehead", 1, "", 1) - hbhunger.register_food("ferns:fiddlehead_roasted", 3) - hbhunger.register_food("ferns:ferntuber_roasted", 3) - hbhunger.register_food("ferns:horsetail_01", 1) -end - -if minetest.get_modpath("pizza") ~= nil then - hbhunger.register_food("pizza:pizza", 30, "", nil, 30) - hbhunger.register_food("pizza:pizzaslice", 5, "", nil, 5) -end - -if minetest.get_modpath("nssm") then - hbhunger.register_food("nssm:werewolf_leg", 3) - hbhunger.register_food("nssm:heron_leg", 2) - hbhunger.register_food("nssm:chichibios_heron_leg", 4) - hbhunger.register_food("nssm:crocodile_tail", 3) - hbhunger.register_food("nssm:duck_legs", 1) - hbhunger.register_food("nssm:ant_leg", 1) - hbhunger.register_food("nssm:spider_leg", 1) - hbhunger.register_food("nssm:tentacle", 2) - hbhunger.register_food("nssm:worm_flesh", 2, "", 2) -- poisonous - hbhunger.register_food("nssm:amphibian_heart", 1) - hbhunger.register_food("nssm:raw_scrausics_wing", 1) - -- superfoods - hbhunger.register_food("nssm:phoenix_nuggets", 20, "", nil, 20) - hbhunger.register_food("nssm:phoenix_tear", 20, "", nil, 20) -end - -- player-action based hunger changes function hbhunger.handle_node_actions(pos, oldnode, player, ext) -- is_fake_player comes from the pipeworks, we are not interested in those diff --git a/mods/hbhunger/init.lua b/mods/hbhunger/init.lua index ee5019f..8d19e16 100644 --- a/mods/hbhunger/init.lua +++ b/mods/hbhunger/init.lua @@ -25,6 +25,9 @@ hbhunger.EXHAUST_DIG = 3 -- exhaustion increased this value after digged node hbhunger.EXHAUST_PLACE = 1 -- exhaustion increased this value after placed hbhunger.EXHAUST_MOVE = 0.3 -- exhaustion increased this value if player movement detected hbhunger.EXHAUST_LVL = 160 -- at what exhaustion player satiation gets lowerd +hbhunger.SAT_MAX = 30 -- maximum satiation points +hbhunger.SAT_INIT = 20 -- initial satiation points +hbhunger.SAT_HEAL = 15 -- required satiation points to start healing --load custom settings @@ -39,9 +42,10 @@ local function custom_hud(player) end dofile(minetest.get_modpath("hbhunger").."/hunger.lua") +dofile(minetest.get_modpath("hbhunger").."/register_foods.lua") -- register satiation hudbar -hb.register_hudbar("satiation", 0xFFFFFF, S("Satiation"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png", bar = "hbhunger_bar.png" }, 20, 30, false, nil, { format_value = "%.1f", format_max_value = "%d" }) +hb.register_hudbar("satiation", 0xFFFFFF, S("Satiation"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png", bar = "hbhunger_bar.png" }, hbhunger.SAT_INIT, hbhunger.SAT_MAX, false, nil, { format_value = "%.1f", format_max_value = "%d" }) -- update hud elemtens if value has changed local function update_hud(player) @@ -73,7 +77,7 @@ hbhunger.set_hunger_raw = function(player) local name = player:get_player_name() local value = hbhunger.hunger[name] if not inv or not value then return nil end - if value > 30 then value = 30 end + if value > hbhunger.SAT_MAX then value = hbhunger.SAT_MAX end if value < 0 then value = 0 end inv:set_stack("hunger", 1, ItemStack({name=":", count=value+1})) @@ -96,7 +100,7 @@ end) minetest.register_on_respawnplayer(function(player) -- reset hunger (and save) local name = player:get_player_name() - hbhunger.hunger[name] = 20 + hbhunger.hunger[name] = hbhunger.SAT_INIT hbhunger.set_hunger_raw(player) hbhunger.exhaustion[name] = 0 end) @@ -116,10 +120,10 @@ minetest.register_globalstep(function(dtime) local h = tonumber(hbhunger.hunger[name]) local hp = player:get_hp() if timer > 4 then - -- heal player by 1 hp if not dead and satiation is > 15 (of 30) - if h > 15 and hp > 0 and player:get_breath() > 0 then + -- heal player by 1 hp if not dead and satiation is > hbhunger.SAT_HEAL + if h > hbhunger.SAT_HEAL and hp > 0 and player:get_breath() > 0 then player:set_hp(hp+1) - -- or damage player by 1 hp if satiation is < 2 (of 30) + -- or damage player by 1 hp if satiation is < 2 elseif h <= 1 then if hp-1 >= 0 then player:set_hp(hp-1) end end @@ -147,4 +151,38 @@ minetest.register_globalstep(function(dtime) if timer2 > hbhunger.HUNGER_TICK then timer2 = 0 end end) +minetest.register_chatcommand("satiation", { + privs = {["server"]=true}, + params = S("[] "), + description = S("Set satiation of player or yourself"), + func = function(name, param) + if minetest.settings:get_bool("enable_damage") == false then + return false, S("Not possible, damage is disabled.") + end + local targetname, satiation = string.match(param, "(%S+) (%S+)") + if not targetname then + satiation = param + end + satiation = tonumber(satiation) + if not satiation then + return false, S("Invalid satiation!") + end + if not targetname then + targetname = name + end + local target = minetest.get_player_by_name(targetname) + if target == nil then + return false, S("Player @1 does not exist.", targetname) + end + if satiation > hbhunger.SAT_MAX then + satiation = hbhunger.SAT_MAX + elseif satiation < 0 then + satiation = 0 + end + hbhunger.hunger[targetname] = satiation + hbhunger.set_hunger_raw(target) + return true + end, +}) + end diff --git a/mods/hbhunger/locale/hbhunger.de.tr b/mods/hbhunger/locale/hbhunger.de.tr index 4223564..988b457 100644 --- a/mods/hbhunger/locale/hbhunger.de.tr +++ b/mods/hbhunger/locale/hbhunger.de.tr @@ -1,2 +1,7 @@ # textdomain:hbhunger Satiation=Sättigung +Set satiation of player or yourself=Sättigung von Spieler oder Ihnen selbst setzen +Not possible, damage is disabled.=Nicht möglich, Schaden ist deaktiviert. +Invalid satiation!=Ungültige Sättigung! +Player @1 does not exist.=Spieler @1 existiert nicht. +[] =[] diff --git a/mods/hbhunger/locale/hbhunger.fr.tr b/mods/hbhunger/locale/hbhunger.fr.tr new file mode 100644 index 0000000..0a8a382 --- /dev/null +++ b/mods/hbhunger/locale/hbhunger.fr.tr @@ -0,0 +1,2 @@ +# textdomain:hbhunger +Satiation=Satiété diff --git a/mods/hbhunger/locale/template.txt b/mods/hbhunger/locale/template.txt index 84ad832..507e005 100644 --- a/mods/hbhunger/locale/template.txt +++ b/mods/hbhunger/locale/template.txt @@ -1,2 +1,7 @@ # textdomain:hbhunger Satiation= +Set satiation of player or yourself= +Not possible, damage is disabled.= +Invalid satiation!= +Player @1 does not exist.= +[] = diff --git a/mods/hbhunger/register_foods.lua b/mods/hbhunger/register_foods.lua new file mode 100644 index 0000000..c7dd5b0 --- /dev/null +++ b/mods/hbhunger/register_foods.lua @@ -0,0 +1,331 @@ +if minetest.get_modpath("default") ~= nil then + hbhunger.register_food("default:apple", 2) + hbhunger.register_food("default:blueberries", 2) +end +if minetest.get_modpath("flowers") ~= nil then + hbhunger.register_food("flowers:mushroom_brown", 1) + hbhunger.register_food("flowers:mushroom_red", 1, "", 3) +end +if minetest.get_modpath("farming") ~= nil then + hbhunger.register_food("farming:bread", 5) +end + +if minetest.get_modpath("mobs") ~= nil then + if mobs.mod ~= nil and mobs.mod == "redo" then + hbhunger.register_food("mobs:cheese", 4) + hbhunger.register_food("mobs:meat", 8) + hbhunger.register_food("mobs:meat_raw", 4) + hbhunger.register_food("mobs:rat_cooked", 4) + hbhunger.register_food("mobs:honey", 2) + hbhunger.register_food("mobs:pork_raw", 3, "", 3) + hbhunger.register_food("mobs:pork_cooked", 8) + hbhunger.register_food("mobs:chicken_cooked", 6) + hbhunger.register_food("mobs:chicken_raw", 2, "", 3) + hbhunger.register_food("mobs:chicken_egg_fried", 2) + if minetest.get_modpath("bucket") then + hbhunger.register_food("mobs:bucket_milk", 3, "bucket:bucket_empty") + end + else + hbhunger.register_food("mobs:meat", 6) + hbhunger.register_food("mobs:meat_raw", 3) + hbhunger.register_food("mobs:rat_cooked", 5) + end +end + +if minetest.get_modpath("moretrees") ~= nil then + hbhunger.register_food("moretrees:coconut_milk", 1) + hbhunger.register_food("moretrees:raw_coconut", 2) + hbhunger.register_food("moretrees:acorn_muffin", 3) + hbhunger.register_food("moretrees:spruce_nuts", 1) + hbhunger.register_food("moretrees:pine_nuts", 1) + hbhunger.register_food("moretrees:fir_nuts", 1) +end + +if minetest.get_modpath("dwarves") ~= nil then + hbhunger.register_food("dwarves:beer", 2) + hbhunger.register_food("dwarves:apple_cider", 1) + hbhunger.register_food("dwarves:midus", 2) + hbhunger.register_food("dwarves:tequila", 2) + hbhunger.register_food("dwarves:tequila_with_lime", 2) + hbhunger.register_food("dwarves:sake", 2) +end + +if minetest.get_modpath("animalmaterials") ~= nil then + hbhunger.register_food("animalmaterials:milk", 2) + hbhunger.register_food("animalmaterials:meat_raw", 3) + hbhunger.register_food("animalmaterials:meat_pork", 3) + hbhunger.register_food("animalmaterials:meat_beef", 3) + hbhunger.register_food("animalmaterials:meat_chicken", 3) + hbhunger.register_food("animalmaterials:meat_lamb", 3) + hbhunger.register_food("animalmaterials:meat_venison", 3) + hbhunger.register_food("animalmaterials:meat_undead", 3, "", 3) + hbhunger.register_food("animalmaterials:meat_toxic", 3, "", 5) + hbhunger.register_food("animalmaterials:meat_ostrich", 3) + hbhunger.register_food("animalmaterials:fish_bluewhite", 2) + hbhunger.register_food("animalmaterials:fish_clownfish", 2) +end + +if minetest.get_modpath("fishing") ~= nil then + hbhunger.register_food("fishing:fish_raw", 2) + hbhunger.register_food("fishing:fish_cooked", 5) + hbhunger.register_food("fishing:sushi", 6) + hbhunger.register_food("fishing:shark", 4) + hbhunger.register_food("fishing:shark_cooked", 8) + hbhunger.register_food("fishing:pike", 4) + hbhunger.register_food("fishing:pike_cooked", 8) +end + +if minetest.get_modpath("glooptest") ~= nil then + hbhunger.register_food("glooptest:kalite_lump", 1) +end + +if minetest.get_modpath("bushes") ~= nil then + hbhunger.register_food("bushes:sugar", 1) + hbhunger.register_food("bushes:strawberry", 2) + hbhunger.register_food("bushes:berry_pie_raw", 3) + hbhunger.register_food("bushes:berry_pie_cooked", 4) + hbhunger.register_food("bushes:basket_pies", 15) +end + +if minetest.get_modpath("bushes_classic") then + -- bushes_classic mod, as found in the plantlife modpack + local berries = { + "strawberry", + "blackberry", + "blueberry", + "raspberry", + "gooseberry", + "mixed_berry"} + for _, berry in ipairs(berries) do + if berry ~= "mixed_berry" then + hbhunger.register_food("bushes:"..berry, 1) + end + hbhunger.register_food("bushes:"..berry.."_pie_raw", 2) + hbhunger.register_food("bushes:"..berry.."_pie_cooked", 5) + hbhunger.register_food("bushes:basket_"..berry, 15) + end +end + +if minetest.get_modpath("mushroom") ~= nil then + hbhunger.register_food("mushroom:brown", 1) + hbhunger.register_food("mushroom:red", 1, "", 3) + -- mushroom potions: red = strong poison, brown = light restorative + if minetest.get_modpath("vessels") then + hbhunger.register_food("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4) + hbhunger.register_food("mushroom:poison", 1, "vessels:glass_bottle", 10) + end +end + +if minetest.get_modpath("docfarming") ~= nil then + hbhunger.register_food("docfarming:carrot", 3) + hbhunger.register_food("docfarming:cucumber", 2) + hbhunger.register_food("docfarming:corn", 3) + hbhunger.register_food("docfarming:potato", 4) + hbhunger.register_food("docfarming:bakedpotato", 5) + hbhunger.register_food("docfarming:raspberry", 3) +end + +if minetest.get_modpath("farming_plus") ~= nil then + hbhunger.register_food("farming_plus:carrot_item", 3) + hbhunger.register_food("farming_plus:banana", 2) + hbhunger.register_food("farming_plus:orange_item", 2) + hbhunger.register_food("farming:pumpkin_bread", 4) + hbhunger.register_food("farming_plus:strawberry_item", 2) + hbhunger.register_food("farming_plus:tomato_item", 2) + hbhunger.register_food("farming_plus:potato_item", 4) + hbhunger.register_food("farming_plus:rhubarb_item", 2) +end + +if minetest.get_modpath("mtfoods") ~= nil then + hbhunger.register_food("mtfoods:dandelion_milk", 1) + hbhunger.register_food("mtfoods:sugar", 1) + hbhunger.register_food("mtfoods:short_bread", 4) + hbhunger.register_food("mtfoods:cream", 1) + hbhunger.register_food("mtfoods:chocolate", 2) + hbhunger.register_food("mtfoods:cupcake", 2) + hbhunger.register_food("mtfoods:strawberry_shortcake", 2) + hbhunger.register_food("mtfoods:cake", 3) + hbhunger.register_food("mtfoods:chocolate_cake", 3) + hbhunger.register_food("mtfoods:carrot_cake", 3) + hbhunger.register_food("mtfoods:pie_crust", 3) + hbhunger.register_food("mtfoods:apple_pie", 3) + hbhunger.register_food("mtfoods:rhubarb_pie", 2) + hbhunger.register_food("mtfoods:banana_pie", 3) + hbhunger.register_food("mtfoods:pumpkin_pie", 3) + hbhunger.register_food("mtfoods:cookies", 2) + hbhunger.register_food("mtfoods:mlt_burger", 5) + hbhunger.register_food("mtfoods:potato_slices", 2) + hbhunger.register_food("mtfoods:potato_chips", 3) + --mtfoods:medicine + hbhunger.register_food("mtfoods:casserole", 3) + hbhunger.register_food("mtfoods:glass_flute", 2) + hbhunger.register_food("mtfoods:orange_juice", 2) + hbhunger.register_food("mtfoods:apple_juice", 2) + hbhunger.register_food("mtfoods:apple_cider", 2) + hbhunger.register_food("mtfoods:cider_rack", 2) +end + +if minetest.get_modpath("fruit") ~= nil then + hbhunger.register_food("fruit:apple", 2) + hbhunger.register_food("fruit:pear", 2) + hbhunger.register_food("fruit:bananna", 3) + hbhunger.register_food("fruit:orange", 2) +end + +if minetest.get_modpath("mush45") ~= nil then + hbhunger.register_food("mush45:meal", 4) +end + +if minetest.get_modpath("seaplants") ~= nil then + hbhunger.register_food("seaplants:kelpgreen", 1) + hbhunger.register_food("seaplants:kelpbrown", 1) + hbhunger.register_food("seaplants:seagrassgreen", 1) + hbhunger.register_food("seaplants:seagrassred", 1) + hbhunger.register_food("seaplants:seasaladmix", 6) + hbhunger.register_food("seaplants:kelpgreensalad", 1) + hbhunger.register_food("seaplants:kelpbrownsalad", 1) + hbhunger.register_food("seaplants:seagrassgreensalad", 1) + hbhunger.register_food("seaplants:seagrassgreensalad", 1) +end + +if minetest.get_modpath("mobfcooking") ~= nil then + hbhunger.register_food("mobfcooking:cooked_pork", 6) + hbhunger.register_food("mobfcooking:cooked_ostrich", 6) + hbhunger.register_food("mobfcooking:cooked_beef", 6) + hbhunger.register_food("mobfcooking:cooked_chicken", 6) + hbhunger.register_food("mobfcooking:cooked_lamb", 6) + hbhunger.register_food("mobfcooking:cooked_venison", 6) + hbhunger.register_food("mobfcooking:cooked_fish", 6) +end + +if minetest.get_modpath("creatures") ~= nil then + hbhunger.register_food("creatures:meat", 6) + hbhunger.register_food("creatures:flesh", 3) + hbhunger.register_food("creatures:rotten_flesh", 3, "", 3) +end + +if minetest.get_modpath("ethereal") then + hbhunger.register_food("ethereal:strawberry", 1) + hbhunger.register_food("ethereal:banana", 4) + hbhunger.register_food("ethereal:pine_nuts", 1) + hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3) + hbhunger.register_food("ethereal:fern_tubers", 1) + hbhunger.register_food("ethereal:banana_bread", 7) + hbhunger.register_food("ethereal:mushroom_plant", 2) + hbhunger.register_food("ethereal:coconut_slice", 2) + hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10) + hbhunger.register_food("ethereal:wild_onion_plant", 2) + hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl") + hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl") + hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl") + hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl") + if minetest.get_modpath("bucket") then + hbhunger.register_food("ethereal:bucket_cactus", 2, "bucket:bucket_empty") + end + hbhunger.register_food("ethereal:fish_raw", 2) + hbhunger.register_food("ethereal:fish_cooked", 5) + hbhunger.register_food("ethereal:seaweed", 1) + hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1) + hbhunger.register_food("ethereal:sashimi", 4) + hbhunger.register_food("ethereal:orange", 2) +end + +if minetest.get_modpath("farming") and farming.mod == "redo" then + hbhunger.register_food("farming:bread", 6) + hbhunger.register_food("farming:potato", 1) + hbhunger.register_food("farming:baked_potato", 6) + hbhunger.register_food("farming:cucumber", 4) + hbhunger.register_food("farming:tomato", 4) + hbhunger.register_food("farming:carrot", 3) + hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8) + hbhunger.register_food("farming:corn", 3) + hbhunger.register_food("farming:corn_cob", 5) + hbhunger.register_food("farming:melon_slice", 2) + hbhunger.register_food("farming:pumpkin_slice", 1) + hbhunger.register_food("farming:pumpkin_bread", 9) + hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup") + hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) + hbhunger.register_food("farming:cookie", 2) + hbhunger.register_food("farming:chocolate_dark", 3) + hbhunger.register_food("farming:donut", 4) + hbhunger.register_food("farming:donut_chocolate", 6) + hbhunger.register_food("farming:donut_apple", 6) + hbhunger.register_food("farming:raspberries", 1) + hbhunger.register_food("farming:blueberries", 1) + hbhunger.register_food("farming:muffin_blueberry", 4) + if minetest.get_modpath("vessels") then + hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass") + end + hbhunger.register_food("farming:rhubarb", 1) + hbhunger.register_food("farming:rhubarb_pie", 6) + hbhunger.register_food("farming:beans", 1) +end + +if minetest.get_modpath("kpgmobs") ~= nil then + hbhunger.register_food("kpgmobs:uley", 3) + hbhunger.register_food("kpgmobs:meat", 6) + hbhunger.register_food("kpgmobs:rat_cooked", 5) + hbhunger.register_food("kpgmobs:med_cooked", 4) + if minetest.get_modpath("bucket") then + hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty") + end +end + +if minetest.get_modpath("jkfarming") ~= nil then + hbhunger.register_food("jkfarming:carrot", 3) + hbhunger.register_food("jkfarming:corn", 3) + hbhunger.register_food("jkfarming:melon_part", 2) + hbhunger.register_food("jkfarming:cake", 3) +end + +if minetest.get_modpath("jkanimals") ~= nil then + hbhunger.register_food("jkanimals:meat", 6) +end + +if minetest.get_modpath("jkwine") ~= nil then + hbhunger.register_food("jkwine:grapes", 2) + hbhunger.register_food("jkwine:winebottle", 1) +end + +if minetest.get_modpath("cooking") ~= nil then + hbhunger.register_food("cooking:meat_beef_cooked", 4) + hbhunger.register_food("cooking:fish_bluewhite_cooked", 3) + hbhunger.register_food("cooking:fish_clownfish_cooked", 1) + hbhunger.register_food("cooking:meat_chicken_cooked", 2) + hbhunger.register_food("cooking:meat_cooked", 2) + hbhunger.register_food("cooking:meat_pork_cooked", 3) + hbhunger.register_food("cooking:meat_toxic_cooked", -3) + hbhunger.register_food("cooking:meat_venison_cooked", 3) + hbhunger.register_food("cooking:meat_undead_cooked", 1) +end + +-- ferns mod of plantlife_modpack +if minetest.get_modpath("ferns") ~= nil then + hbhunger.register_food("ferns:fiddlehead", 1, "", 1) + hbhunger.register_food("ferns:fiddlehead_roasted", 3) + hbhunger.register_food("ferns:ferntuber_roasted", 3) + hbhunger.register_food("ferns:horsetail_01", 1) +end + +if minetest.get_modpath("pizza") ~= nil then + hbhunger.register_food("pizza:pizza", 30, "", nil, 30) + hbhunger.register_food("pizza:pizzaslice", 5, "", nil, 5) +end + +if minetest.get_modpath("nssm") then + hbhunger.register_food("nssm:werewolf_leg", 3) + hbhunger.register_food("nssm:heron_leg", 2) + hbhunger.register_food("nssm:chichibios_heron_leg", 4) + hbhunger.register_food("nssm:crocodile_tail", 3) + hbhunger.register_food("nssm:duck_legs", 1) + hbhunger.register_food("nssm:ant_leg", 1) + hbhunger.register_food("nssm:spider_leg", 1) + hbhunger.register_food("nssm:tentacle", 2) + hbhunger.register_food("nssm:worm_flesh", 2, "", 2) -- poisonous + hbhunger.register_food("nssm:amphibian_heart", 1) + hbhunger.register_food("nssm:raw_scrausics_wing", 1) + -- superfoods + hbhunger.register_food("nssm:phoenix_nuggets", 20, "", nil, 20) + hbhunger.register_food("nssm:phoenix_tear", 20, "", nil, 20) +end + diff --git a/mods/juanchi/srvz/init.lua b/mods/juanchi/srvz/init.lua new file mode 100644 index 0000000..3f893db --- /dev/null +++ b/mods/juanchi/srvz/init.lua @@ -0,0 +1,19 @@ +svrz = {} +local modname = minetest.get_current_modname() +local S = minetest.get_translator(modname) +local modpath = minetest.get_modpath(modname) +local settings = Settings(modpath .. "/srvz.conf") +svrz.settings = {} +svrz.settings.reserved = tonumber(settings:get("reserved")) or 0 + +minetest.register_on_prejoinplayer(function(player) + if minetest.check_player_privs(player, {server = true}) then + return + end + local connected_players = minetest.get_connected_players() + local max_players = tonumber(minetest.setting_get("max_users")) + if max_players <= #connected_players + svrz.settings.reserved then + msg = S("Server full of players! Retry later.") + return msg + end +end) diff --git a/mods/juanchi/srvz/locale/srvz.es.tr b/mods/juanchi/srvz/locale/srvz.es.tr new file mode 100644 index 0000000..623a638 --- /dev/null +++ b/mods/juanchi/srvz/locale/srvz.es.tr @@ -0,0 +1,2 @@ +# textdomain: srvz +Server full of players! Retry later.=¡Servidor lleno de jugadores! Reinténtalo más tarde. diff --git a/mods/juanchi/srvz/mod.conf b/mods/juanchi/srvz/mod.conf new file mode 100644 index 0000000..d4d86c0 --- /dev/null +++ b/mods/juanchi/srvz/mod.conf @@ -0,0 +1,2 @@ +name = srvz +depends = sfinv diff --git a/mods/juanchi/srvz/srvz.conf b/mods/juanchi/srvz/srvz.conf new file mode 100644 index 0000000..b8cc199 --- /dev/null +++ b/mods/juanchi/srvz/srvz.conf @@ -0,0 +1 @@ +reserved=1 diff --git a/mods/juanchi/srvz/svrz.conf b/mods/juanchi/srvz/svrz.conf new file mode 100644 index 0000000..b8cc199 --- /dev/null +++ b/mods/juanchi/srvz/svrz.conf @@ -0,0 +1 @@ +reserved=1 diff --git a/mods/minetest_game/.github/workflows/build.yml b/mods/minetest_game/.github/workflows/build.yml new file mode 100644 index 0000000..fea960c --- /dev/null +++ b/mods/minetest_game/.github/workflows/build.yml @@ -0,0 +1,16 @@ +name: build +on: [push, pull_request] + +jobs: + luacheck: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Luarocks + run: | + sudo apt-get update -qyy + sudo apt-get install luarocks -qyy + - name: Install Luacheck + run: luarocks install --local luacheck + - name: Run Luacheck + run: $HOME/.luarocks/bin/luacheck mods diff --git a/mods/minetest_game/beds/locale/beds.ja.tr b/mods/minetest_game/beds/locale/beds.ja.tr new file mode 100644 index 0000000..5034456 --- /dev/null +++ b/mods/minetest_game/beds/locale/beds.ja.tr @@ -0,0 +1,10 @@ +# textdomain: beds +Fancy Bed=ファンシーなベッド +Simple Bed=シンプルなベッド +This bed is already occupied!=ベッドはすでに使われています！ +You have to stop moving before going to bed!=寝るときは動かないでください！ +Good morning.=おはようございます。 +@1 of @2 players are in bed=ベッドに@1 / @2人います +Force night skip=強制的に夜をスキップします +You can only sleep at night.=夜しか寝れません。 +Leave Bed=ベッドから出ます diff --git a/mods/minetest_game/beds/locale/beds.ru.tr b/mods/minetest_game/beds/locale/beds.ru.tr index ac5bd2e..73db735 100644 --- a/mods/minetest_game/beds/locale/beds.ru.tr +++ b/mods/minetest_game/beds/locale/beds.ru.tr @@ -1,8 +1,8 @@ # textdomain: beds Fancy Bed=Детализированная Кровать Simple Bed=Обычная Кровать -This bed is already occupied!= -You have to stop moving before going to bed!= +This bed is already occupied!=Эта кровать уже занята! +You have to stop moving before going to bed!=Нельзя воспользоваться кроватью на ходу! Good morning.=Доброе утро. @1 of @2 players are in bed=@1 из @2 игроков в кровати Force night skip=Пропустить ночь diff --git a/mods/minetest_game/beds/locale/beds.zh_CN.tr b/mods/minetest_game/beds/locale/beds.zh_CN.tr index 6a06e09..7e6cfc7 100644 --- a/mods/minetest_game/beds/locale/beds.zh_CN.tr +++ b/mods/minetest_game/beds/locale/beds.zh_CN.tr @@ -1,8 +1,8 @@ # textdomain: beds Fancy Bed=花式床 Simple Bed=简易床 -This bed is already occupied!= -You have to stop moving before going to bed!= +This bed is already occupied!=床上已有人！ +You have to stop moving before going to bed!=上床前要停止移动！ Good morning.=早安！ @1 of @2 players are in bed=@2位玩家中的@1位在床上 Force night skip=强制跳过夜晚 diff --git a/mods/minetest_game/binoculars/locale/binoculars.ja.tr b/mods/minetest_game/binoculars/locale/binoculars.ja.tr new file mode 100644 index 0000000..9766f46 --- /dev/null +++ b/mods/minetest_game/binoculars/locale/binoculars.ja.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=双眼鏡 +Use with 'Zoom' key=ズームキーで使います diff --git a/mods/minetest_game/boats/locale/boats.ja.tr b/mods/minetest_game/boats/locale/boats.ja.tr new file mode 100644 index 0000000..ee2d086 --- /dev/null +++ b/mods/minetest_game/boats/locale/boats.ja.tr @@ -0,0 +1,4 @@ +# textdomain: boats +Boat cruise mode on=クルージングモード・オン +Boat cruise mode off=クルージングモード・オフ +Boat=ボート diff --git a/mods/minetest_game/bones/locale/bones.ja.tr b/mods/minetest_game/bones/locale/bones.ja.tr new file mode 100644 index 0000000..8c3f732 --- /dev/null +++ b/mods/minetest_game/bones/locale/bones.ja.tr @@ -0,0 +1,8 @@ +# textdomain: bones +Bones=骨 +@1's old bones=@1の古い骨 +@1 died at @2.=@1は@2で死亡しました。 +@1 died at @2, and dropped their inventory.=@1は@2で死亡して持ち物を落としました。 +@1 died at @2, and bones were placed.=@1は@2で死亡して骨が残されました。 +@1's fresh bones=@1の新鮮な骨 +@1's bones=@1の骨 diff --git a/mods/minetest_game/bones/locale/bones.zh_CN.tr b/mods/minetest_game/bones/locale/bones.zh_CN.tr index dadf55e..7911e37 100644 --- a/mods/minetest_game/bones/locale/bones.zh_CN.tr +++ b/mods/minetest_game/bones/locale/bones.zh_CN.tr @@ -2,7 +2,7 @@ Bones=骨骸 @1's old bones=@1的旧骨骸 @1 died at @2.=@1在@2死亡。 -@1 died at @2, and dropped their inventory.=@1在@2死亡，丢掉了物品栏。 -@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。 +@1 died at @2, and dropped their inventory.=@1在@2死亡，丢掉了所有物品。 +@1 died at @2, and bones were placed.=@1在@2死亡，已放置骨骸。 @1's fresh bones=@1的新鲜骨骸 @1's bones=@1的骨骸 diff --git a/mods/minetest_game/bucket/locale/bucket.ja.tr b/mods/minetest_game/bucket/locale/bucket.ja.tr new file mode 100644 index 0000000..df3bbb6 --- /dev/null +++ b/mods/minetest_game/bucket/locale/bucket.ja.tr @@ -0,0 +1,5 @@ +# textdomain: bucket +Empty Bucket=空のバケツ +Water Bucket=水入りバケツ +River Water Bucket=川の水入りバケツ +Lava Bucket=溶岩入りバケツ diff --git a/mods/minetest_game/butterflies/README.txt b/mods/minetest_game/butterflies/README.txt deleted file mode 100644 index a7f52a0..0000000 --- a/mods/minetest_game/butterflies/README.txt +++ /dev/null @@ -1,14 +0,0 @@ -Minetest Game mod: Butterflies -============================== -Adds butterflies to the world on mapgen, which can be caught in a net if the -fireflies mod is also enabled. - -Authors of source code ----------------------- -Shara RedCat (MIT) - -Authors of media (textures) ---------------------------- -Shara RedCat (CC BY-SA 3.0): - butterflies_butterfly_*.png - butterflies_butterfly_*_animated.png \ No newline at end of file diff --git a/mods/minetest_game/butterflies/init.lua b/mods/minetest_game/butterflies/init.lua deleted file mode 100644 index 49240ee..0000000 --- a/mods/minetest_game/butterflies/init.lua +++ /dev/null @@ -1,137 +0,0 @@ --- butterflies/init.lua - --- Load support for MT game translation. -local S = minetest.get_translator("butterflies") - --- register butterflies -local butter_list = { - {"white", S("White Butterfly")}, - {"red", S("Red Butterfly")}, - {"violet", S("Violet Butterfly")} -} - -for i in ipairs (butter_list) do - local name = butter_list[i][1] - local desc = butter_list[i][2] - - minetest.register_node("butterflies:butterfly_"..name, { - description = desc, - drawtype = "plantlike", - tiles = {{ - name = "butterflies_butterfly_"..name.."_animated.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 3 - }, - }}, - inventory_image = "butterflies_butterfly_"..name..".png", - wield_image = "butterflies_butterfly_"..name..".png", - waving = 1, - paramtype = "light", - sunlight_propagates = true, - buildable_to = true, - walkable = false, - groups = {catchable = 1}, - selection_box = { - type = "fixed", - fixed = {-0.1, -0.1, -0.1, 0.1, 0.1, 0.1}, - }, - floodable = true, - on_place = function(itemstack, placer, pointed_thing) - local player_name = placer:get_player_name() - local pos = pointed_thing.above - - if not minetest.is_protected(pos, player_name) and - not minetest.is_protected(pointed_thing.under, player_name) and - minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "butterflies:butterfly_"..name}) - minetest.get_node_timer(pos):start(1) - itemstack:take_item() - end - return itemstack - end, - on_timer = function(pos, elapsed) - if minetest.get_node_light(pos) < 11 then - minetest.set_node(pos, {name = "butterflies:hidden_butterfly_"..name}) - end - minetest.get_node_timer(pos):start(30) - end - }) - - minetest.register_node("butterflies:hidden_butterfly_"..name, { - drawtype = "airlike", - inventory_image = "butterflies_butterfly_"..name..".png^default_invisible_node_overlay.png", - wield_image = "butterflies_butterfly_"..name..".png^default_invisible_node_overlay.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - pointable = false, - diggable = false, - drop = "", - groups = {not_in_creative_inventory = 1}, - floodable = true, - on_place = function(itemstack, placer, pointed_thing) - local player_name = placer:get_player_name() - local pos = pointed_thing.above - - if not minetest.is_protected(pos, player_name) and - not minetest.is_protected(pointed_thing.under, player_name) and - minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "butterflies:hidden_butterfly_"..name}) - minetest.get_node_timer(pos):start(1) - itemstack:take_item() - end - return itemstack - end, - on_timer = function(pos, elapsed) - if minetest.get_node_light(pos) >= 11 then - minetest.set_node(pos, {name = "butterflies:butterfly_"..name}) - end - minetest.get_node_timer(pos):start(30) - end - }) -end - --- register decoration -minetest.register_decoration({ - name = "butterflies:butterfly", - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - place_offset_y = 2, - sidelen = 80, - fill_ratio = 0.005, - biomes = {"grassland", "deciduous_forest"}, - y_max = 31000, - y_min = 1, - decoration = { - "butterflies:butterfly_white", - "butterflies:butterfly_red", - "butterflies:butterfly_violet" - }, - spawn_by = "group:flower", - num_spawn_by = 1 -}) - --- get decoration ID -local butterflies = minetest.get_decoration_id("butterflies:butterfly") -minetest.set_gen_notify({decoration = true}, {butterflies}) - --- start nodetimers -minetest.register_on_generated(function(minp, maxp, blockseed) - local gennotify = minetest.get_mapgen_object("gennotify") - local poslist = {} - - for _, pos in ipairs(gennotify["decoration#"..butterflies] or {}) do - local deco_pos = {x = pos.x, y = pos.y + 3, z = pos.z} - table.insert(poslist, deco_pos) - end - - if #poslist ~= 0 then - for i = 1, #poslist do - local pos = poslist[i] - minetest.get_node_timer(pos):start(1) - end - end -end) diff --git a/mods/minetest_game/butterflies/license.txt b/mods/minetest_game/butterflies/license.txt deleted file mode 100644 index eebdad6..0000000 --- a/mods/minetest_game/butterflies/license.txt +++ /dev/null @@ -1,58 +0,0 @@ -License of source code ----------------------- - -The MIT License (MIT) -Copyright (c) 2018 Shara RedCat - -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, and to permit -persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or -substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -For more details: -https://opensource.org/licenses/MIT - -Licenses of media (textures) ----------------------------- - -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2018 Shara RedCat - -You are free to: -Share — copy and redistribute the material in any medium or format. -Adapt — remix, transform, and build upon the material for any purpose, even commercially. -The licensor cannot revoke these freedoms as long as you follow the license terms. - -Under the following terms: - -Attribution — You must give appropriate credit, provide a link to the license, and -indicate if changes were made. You may do so in any reasonable manner, but not in any way -that suggests the licensor endorses you or your use. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -No additional restrictions — You may not apply legal terms or technological measures that -legally restrict others from doing anything the license permits. - -Notices: - -You do not have to comply with the license for elements of the material in the public -domain or where your use is permitted by an applicable exception or limitation. -No warranties are given. The license may not give you all of the permissions necessary -for your intended use. For example, other rights such as publicity, privacy, or moral -rights may limit how you use the material. - -For more details: -http://creativecommons.org/licenses/by-sa/3.0/ \ No newline at end of file diff --git a/mods/minetest_game/butterflies/locale/butterflies.de.tr b/mods/minetest_game/butterflies/locale/butterflies.de.tr deleted file mode 100644 index 2f1b982..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.de.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Weißer Schmetterling -Red Butterfly=Roter Schmetterling -Violet Butterfly=Violetter Schmetterling diff --git a/mods/minetest_game/butterflies/locale/butterflies.eo.tr b/mods/minetest_game/butterflies/locale/butterflies.eo.tr deleted file mode 100644 index 3dec04e..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.eo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Blanka Papilio -Red Butterfly=Ruĝa Papilio -Violet Butterfly=Viola Papilio diff --git a/mods/minetest_game/butterflies/locale/butterflies.es.tr b/mods/minetest_game/butterflies/locale/butterflies.es.tr deleted file mode 100644 index 59a28eb..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.es.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Mariposa blanca -Red Butterfly=Mariposa roja -Violet Butterfly=Mariposa violeta diff --git a/mods/minetest_game/butterflies/locale/butterflies.fr.tr b/mods/minetest_game/butterflies/locale/butterflies.fr.tr deleted file mode 100644 index 8f5c094..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.fr.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Papillon blanc -Red Butterfly=Papillon rouge -Violet Butterfly=Papillon violet diff --git a/mods/minetest_game/butterflies/locale/butterflies.id.tr b/mods/minetest_game/butterflies/locale/butterflies.id.tr deleted file mode 100644 index d4429a6..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.id.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Kupu-Kupu Putih -Red Butterfly=Kupu-Kupu Merah -Violet Butterfly=Kupu-Kupu Ungu diff --git a/mods/minetest_game/butterflies/locale/butterflies.it.tr b/mods/minetest_game/butterflies/locale/butterflies.it.tr deleted file mode 100644 index ec65da6..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.it.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Farfalla bianca -Red Butterfly=Farfalla rossa -Violet Butterfly=Farfalla viola diff --git a/mods/minetest_game/butterflies/locale/butterflies.jbo.tr b/mods/minetest_game/butterflies/locale/butterflies.jbo.tr deleted file mode 100644 index f003e00..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.jbo.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=lo blabi toldi -Red Butterfly=lo xunre toldi -Violet Butterfly=lo zirpu toldi diff --git a/mods/minetest_game/butterflies/locale/butterflies.ms.tr b/mods/minetest_game/butterflies/locale/butterflies.ms.tr deleted file mode 100644 index b8bde85..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.ms.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Rama-Rama Putih -Red Butterfly=Rama-Rama Merah -Violet Butterfly=Rama-Rama Ungu diff --git a/mods/minetest_game/butterflies/locale/butterflies.pt_BR.tr b/mods/minetest_game/butterflies/locale/butterflies.pt_BR.tr deleted file mode 100644 index d89503a..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.pt_BR.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly= -Red Butterfly= -Violet Butterfly= diff --git a/mods/minetest_game/butterflies/locale/butterflies.ru.tr b/mods/minetest_game/butterflies/locale/butterflies.ru.tr deleted file mode 100644 index 7a79ed8..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.ru.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Белая Бабочка -Red Butterfly=Красная Бабочка -Violet Butterfly=Фиолетовая Бабочка diff --git a/mods/minetest_game/butterflies/locale/butterflies.se.tr b/mods/minetest_game/butterflies/locale/butterflies.se.tr deleted file mode 100644 index 77bfb34..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.se.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Vit fjäril -Red Butterfly=Röd fjäril -Violet Butterfly=Violett fjäril diff --git a/mods/minetest_game/butterflies/locale/butterflies.sk.tr b/mods/minetest_game/butterflies/locale/butterflies.sk.tr deleted file mode 100644 index c3086e7..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.sk.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=Biely motýlik -Red Butterfly=Červený motýlik -Violet Butterfly=Fialový motýlik diff --git a/mods/minetest_game/butterflies/locale/butterflies.zh_CN.tr b/mods/minetest_game/butterflies/locale/butterflies.zh_CN.tr deleted file mode 100644 index 24e0bd1..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.zh_CN.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=白蝴蝶 -Red Butterfly=红蝴蝶 -Violet Butterfly=紫蝴蝶 diff --git a/mods/minetest_game/butterflies/locale/butterflies.zh_TW.tr b/mods/minetest_game/butterflies/locale/butterflies.zh_TW.tr deleted file mode 100644 index 8d927c1..0000000 --- a/mods/minetest_game/butterflies/locale/butterflies.zh_TW.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly=白蝴蝶 -Red Butterfly=紅蝴蝶 -Violet Butterfly=紫蝴蝶 diff --git a/mods/minetest_game/butterflies/locale/template.txt b/mods/minetest_game/butterflies/locale/template.txt deleted file mode 100644 index d89503a..0000000 --- a/mods/minetest_game/butterflies/locale/template.txt +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: butterflies -White Butterfly= -Red Butterfly= -Violet Butterfly= diff --git a/mods/minetest_game/butterflies/mod.conf b/mods/minetest_game/butterflies/mod.conf deleted file mode 100644 index 1c66497..0000000 --- a/mods/minetest_game/butterflies/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = butterflies -description = Minetest Game mod: Butterflies -depends = default, flowers diff --git a/mods/minetest_game/butterflies/textures/butterflies_butterfly_red.png b/mods/minetest_game/butterflies/textures/butterflies_butterfly_red.png deleted file mode 100644 index 8edfc36..0000000 Binary files a/mods/minetest_game/butterflies/textures/butterflies_butterfly_red.png and /dev/null differ diff --git a/mods/minetest_game/butterflies/textures/butterflies_butterfly_red_animated.png b/mods/minetest_game/butterflies/textures/butterflies_butterfly_red_animated.png deleted file mode 100644 index 4a2097b..0000000 Binary files a/mods/minetest_game/butterflies/textures/butterflies_butterfly_red_animated.png and /dev/null differ diff --git a/mods/minetest_game/butterflies/textures/butterflies_butterfly_violet.png b/mods/minetest_game/butterflies/textures/butterflies_butterfly_violet.png deleted file mode 100644 index 8b8c29d..0000000 Binary files a/mods/minetest_game/butterflies/textures/butterflies_butterfly_violet.png and /dev/null differ diff --git a/mods/minetest_game/butterflies/textures/butterflies_butterfly_violet_animated.png b/mods/minetest_game/butterflies/textures/butterflies_butterfly_violet_animated.png deleted file mode 100644 index 3f9d72e..0000000 Binary files a/mods/minetest_game/butterflies/textures/butterflies_butterfly_violet_animated.png and /dev/null differ diff --git a/mods/minetest_game/butterflies/textures/butterflies_butterfly_white.png b/mods/minetest_game/butterflies/textures/butterflies_butterfly_white.png deleted file mode 100644 index db4eaec..0000000 Binary files a/mods/minetest_game/butterflies/textures/butterflies_butterfly_white.png and /dev/null differ diff --git a/mods/minetest_game/butterflies/textures/butterflies_butterfly_white_animated.png b/mods/minetest_game/butterflies/textures/butterflies_butterfly_white_animated.png deleted file mode 100644 index e7cada3..0000000 Binary files a/mods/minetest_game/butterflies/textures/butterflies_butterfly_white_animated.png and /dev/null differ diff --git a/mods/minetest_game/carts/locale/carts.ja.tr b/mods/minetest_game/carts/locale/carts.ja.tr new file mode 100644 index 0000000..30c14ce --- /dev/null +++ b/mods/minetest_game/carts/locale/carts.ja.tr @@ -0,0 +1,6 @@ +# textdomain: carts +Cart=トロッコ +(Sneak+Click to pick up)=(スニークキーとクリックで乗ります) +Rail=レール +Powered Rail=パワードレール +Brake Rail=ブレーキレール diff --git a/mods/minetest_game/creative/inventory.lua b/mods/minetest_game/creative/inventory.lua index 141c287..9d83396 100644 --- a/mods/minetest_game/creative/inventory.lua +++ b/mods/minetest_game/creative/inventory.lua @@ -125,7 +125,7 @@ function creative.update_creative_inventory(player_name, tab_content) end -- Create the trash field -local trash = minetest.create_detached_inventory("creative_trash", { +local trash = minetest.create_detached_inventory("trash", { -- Allow the stack to be placed and remove it in on_put() -- This allows the creative inventory to restore the stack allow_put = function(inv, listname, index, stack, player) @@ -178,7 +178,11 @@ function creative.register_tab(name, title) [[ image[3.08,4.2;0.8,0.8;creative_trash_icon.png] listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] +<<<<<<< HEAD:creative/inventory.lua list[detached:creative_trash;main;3.02,4.1;1,1;] +======= + list[detached:trash;main;4.02,4.1;1,1;] +>>>>>>> upstream/master:mods/creative/inventory.lua listring[] image_button[5.5,4.05;0.8,0.8;creative_prev_icon.png;creative_prev;] image_button[7.2,4.05;0.8,0.8;creative_next_icon.png;creative_next;] diff --git a/mods/minetest_game/creative/locale/creative.ja.tr b/mods/minetest_game/creative/locale/creative.ja.tr new file mode 100644 index 0000000..1c215bb --- /dev/null +++ b/mods/minetest_game/creative/locale/creative.ja.tr @@ -0,0 +1,10 @@ +# textdomain: creative +Allow player to use creative inventory=プレーヤーにクリエイティブ インベントリーの使用を許可する +Search=検索 +Reset=リセット +Previous page=前のページ +Next page=次のページ +All=すべて +Nodes=ブロック +Tools=道具 +Items=アイテム diff --git a/mods/minetest_game/default/craftitems.lua b/mods/minetest_game/default/craftitems.lua index 955231c..7fc2c1f 100644 --- a/mods/minetest_game/default/craftitems.lua +++ b/mods/minetest_game/default/craftitems.lua @@ -3,6 +3,46 @@ -- support for MT game translation. local S = default.get_translator +local esc = minetest.formspec_escape +local formspec_size = "size[8,8]" + +local function formspec_core(tab) + if tab == nil then tab = 1 else tab = tostring(tab) end + return "tabheader[0,0;book_header;" .. + esc(S("Write")) .. "," .. + esc(S("Read")) .. ";" .. + tab .. ";false;false]" +end + +local function formspec_write(title, text) + return "field[0.5,1;7.5,0;title;" .. esc(S("Title:")) .. ";" .. + esc(title) .. "]" .. + "textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents:")) .. ";" .. + esc(text) .. "]" .. + "button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]" +end + +local function formspec_read(owner, title, string, text, page, page_max) + return "label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" .. + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" .. + "textarea[0.5,1.5;7.5,7;;" .. + esc(string ~= "" and string or text) .. ";]" .. + "button[2.4,7.6;0.8,0.8;book_prev;<]" .. + "label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" .. + "button[4.9,7.6;0.8,0.8;book_next;>]" +end + +local function formspec_string(lpp, page, lines, string) + for i = ((lpp * page) - lpp) + 1, lpp * page do + if not lines[i] then break end + string = string .. lines[i] .. "\n" + end + return string +end + +local tab_number local lpp = 14 -- Lines per book's page local function book_on_use(itemstack, user) local player_name = user:get_player_name() @@ -19,8 +59,8 @@ local function book_on_use(itemstack, user) local data = meta:to_table().fields if data.owner then - title = data.title - text = data.text + title = data.title or "" + text = data.text or "" owner = data.owner for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do @@ -30,37 +70,26 @@ local function book_on_use(itemstack, user) if data.page then page = data.page page_max = data.page_max - - for i = ((lpp * page) - lpp) + 1, lpp * page do - if not lines[i] then break end - string = string .. lines[i] .. "\n" - end + string = formspec_string(lpp, page, lines, string) end end local formspec - local esc = minetest.formspec_escape - if owner == player_name then - formspec = "size[8,8]" .. - "field[0.5,1;7.5,0;title;" .. esc(S("Title:")) .. ";" .. - esc(title) .. "]" .. - "textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents:")) .. ";" .. - esc(text) .. "]" .. - "button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]" + if title == "" and text == "" then + formspec = formspec_write(title, text) + elseif owner == player_name then + local tab = tab_number or 1 + if tab == 2 then + formspec = formspec_core(tab) .. + formspec_read(owner, title, string, text, page, page_max) + else + formspec = formspec_core(tab) .. formspec_write(title, text) + end else - formspec = "size[8,8]" .. - "label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" .. - "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" .. - "textarea[0.5,1.5;7.5,7;;" .. - minetest.formspec_escape(string ~= "" and string or text) .. ";]" .. - "button[2.4,7.6;0.8,0.8;book_prev;<]" .. - "label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" .. - "button[4.9,7.6;0.8,0.8;book_next;>]" + formspec = formspec_read(owner, title, string, text, page, page_max) end - minetest.show_formspec(player_name, "default:book", formspec) + minetest.show_formspec(player_name, "default:book", formspec_size .. formspec) return itemstack end @@ -69,12 +98,37 @@ local max_title_size = 80 local short_title_size = 35 minetest.register_on_player_receive_fields(function(player, formname, fields) if formname ~= "default:book" then return end + local player_name = player:get_player_name() local inv = player:get_inventory() local stack = player:get_wielded_item() + local data = stack:get_meta():to_table().fields - if fields.save and fields.title and fields.text - and fields.title ~= "" and fields.text ~= "" then - local new_stack, data + local title = data.title or "" + local text = data.text or "" + + if fields.book_header ~= nil and data.owner == player_name then + local contents + local tab = tonumber(fields.book_header) + if tab == 1 then + contents = formspec_core(tab) .. + formspec_write(title, text) + elseif tab == 2 then + local lines, string = {}, "" + for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do + lines[#lines+1] = str + end + string = formspec_string(lpp, data.page, lines, string) + contents = formspec_read(player_name, title, string, + text, data.page, data.page_max) + end + tab_number = tab + local formspec = formspec_size .. formspec_core(tab) .. contents + minetest.show_formspec(player_name, "default:book", formspec) + return + end + + if fields.save and fields.title and fields.text then + local new_stack if stack:get_name() ~= "default:book_written" then local count = stack:get_count() if count == 1 then @@ -83,11 +137,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) stack:set_count(count - 1) new_stack = ItemStack("default:book_written") end - else - data = stack:get_meta():to_table().fields end - if data and data.owner and data.owner ~= player:get_player_name() then + if data.owner ~= player_name and title ~= "" and text ~= "" then return end @@ -117,8 +169,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end elseif fields.book_next or fields.book_prev then - local data = stack:get_meta():to_table().fields - if not data or not data.page then + if not data.page then return end diff --git a/mods/minetest_game/default/furnace.lua b/mods/minetest_game/default/furnace.lua index d5703cd..b164b8a 100644 --- a/mods/minetest_game/default/furnace.lua +++ b/mods/minetest_game/default/furnace.lua @@ -177,8 +177,15 @@ local function furnace_node_timer(pos, elapsed) fuel_totaltime = 0 src_time = 0 else - -- Take fuel from fuel list - inv:set_stack("fuel", 1, afterfuel.items[1]) + -- prevent blocking of fuel inventory (for automatization mods) + local is_fuel = minetest.get_craft_result({method = "fuel", width = 1, items = {afterfuel.items[1]:to_string()}}) + if is_fuel.time == 0 then + table.insert(fuel.replacements, afterfuel.items[1]) + inv:set_stack("fuel", 1, "") + else + -- Take fuel from fuel list + inv:set_stack("fuel", 1, afterfuel.items[1]) + end -- Put replacements in dst list or drop them on the furnace. local replacements = fuel.replacements if replacements[1] then diff --git a/mods/minetest_game/default/locale/default.ja.tr b/mods/minetest_game/default/locale/default.ja.tr new file mode 100644 index 0000000..232e971 --- /dev/null +++ b/mods/minetest_game/default/locale/default.ja.tr @@ -0,0 +1,215 @@ +# textdomain: default +Locked Chest=鍵のかかったチェスト +Locked Chest (owned by @1)=鍵のかかったチェスト(@1所有) +You do not own this chest.=あなたはこのチェストの所有者ではありません。 +a locked chest=ロックされたチェスト +Chest=チェスト +Title:=題名 +Contents:=内容 +Save=保存 +by @1=@1著 +Page @1 of @2=@1 / @2 ページ +"@1" by @2=@2著「@1」 +Skeleton Key=スケルトンの鍵 +Key to @1's @2=@1の@2への鍵 +Blueberries=ブルーベリー +Book=本 +Book with Text=テキストが書かれた本 +Bronze Ingot=青銅インゴット +Clay Brick=粘土レンガ +Clay Lump=粘土の塊 +Coal Lump=石炭 +Copper Ingot=銅インゴット +Copper Lump=銅の塊 +Diamond=ダイヤモンド +Flint=火打ち石 +Gold Ingot=金インゴット +Gold Lump=金の塊 +Iron Lump=鉄の塊 +Mese Crystal=メセクリスタル +Mese Crystal Fragment=メセクリスタルの破片 +Obsidian Shard=黒曜石の破片 +Paper=紙 +Steel Ingot=鉄インゴット +Stick=棒 +Tin Ingot=スズインゴット +Tin Lump=スズの塊 +Furnace is empty=かまどは空です +100% (output full)=100%(フル出力) +@1%=@1% +Not cookable=調理できません +Empty=空 +Furnace active=かまどは燃えてます +Furnace inactive=かまどは消えています +(Item: @1; Fuel: @2)=(アイテム: @1; 燃料: @2) +Furnace=かまど +Stone=石 +Cobblestone=丸石 +Stone Brick=石レンガ +Stone Block=石ブロック +Mossy Cobblestone=苔むした丸石 +Desert Stone=砂漠の石 +Desert Cobblestone=砂漠の丸石 +Desert Stone Brick=砂漠の石レンガ +Desert Stone Block=砂漠の石ブロック +Sandstone=砂岩 +Sandstone Brick=砂岩レンガ +Sandstone Block=砂岩ブロック +Desert Sandstone=砂漠の砂岩 +Desert Sandstone Brick=砂漠の砂岩レンガ +Desert Sandstone Block=砂漠の砂岩ブロック +Silver Sandstone=銀の砂岩 +Silver Sandstone Brick=銀の砂岩レンガ +Silver Sandstone Block=銀の砂岩ブロック +Obsidian=黒曜石 +Obsidian Brick=黒曜石レンガ +Obsidian Block=黒曜石ブロック +Dirt=土 +Dirt with Grass=草のついた土 +Dirt with Grass and Footsteps=足あとと草のついた土 +Dirt with Savanna Grass=サバンナの草のついた土 +Dirt with Snow=雪のついた土 +Dirt with Rainforest Litter=熱帯雨林のよごれた土 +Dirt with Coniferous Litter=針葉樹のよごれた土 +Savanna Dirt=サバンナの土 +Savanna Dirt with Savanna Grass=サバンナの草のついたサバンナの土 +Permafrost=永久凍土 +Permafrost with Stones=石のついた永久凍土 +Permafrost with Moss=苔のついた永久凍土 +Sand=砂 +Desert Sand=砂漠の砂 +Silver Sand=銀の砂 +Gravel=砂利 +Clay=粘土 +Snow=雪 +Snow Block=雪ブロック +Ice=氷 +Cave Ice=洞窟の氷 +Apple Tree=リンゴの木 +Apple Wood Planks=リンゴの板材 +Apple Tree Sapling=リンゴの苗木 +Apple Tree Leaves=リンゴの葉 +Apple=リンゴ +Apple Marker=リンゴのマーカー +Jungle Tree=ジャングルの木 +Jungle Wood Planks=ジャングルの板材 +Jungle Tree Leaves=ジャングルの木の葉 +Jungle Tree Sapling=ジャングルの木の苗木 +Emergent Jungle Tree Sapling=新芽のジャングルの木の苗木 +Pine Tree=マツの木 +Pine Wood Planks=マツの板材 +Pine Needles=マツの葉 +Pine Tree Sapling=マツの苗木 +Acacia Tree=アカシアの木 +Acacia Wood Planks=アカシアの板材 +Acacia Tree Leaves=アカシアの葉 +Acacia Tree Sapling=アカシアの苗木 +Aspen Tree=ポプラの木 +Aspen Wood Planks=ポプラの板材 +Aspen Tree Leaves=ポプラの葉 +Aspen Tree Sapling=ポプラの苗木 +Coal Ore=石炭鉱石 +Coal Block=石炭ブロック +Iron Ore=鉄の鉱石 +Steel Block=鉄ブロック +Copper Ore=銅の鉱石 +Copper Block=銅ブロック +Tin Ore=スズの鉱石 +Tin Block=スズブロック +Bronze Block=青銅ブロック +Mese Ore=メセ鉱石 +Mese Block=メセブロック +Gold Ore=金の鉱石 +Gold Block=金ブロック +Diamond Ore=ダイヤモンドの鉱石 +Diamond Block=ダイヤモンドブロック +Cactus=サボテン +Large Cactus Seedling=大きなサボテンの苗 +Papyrus=パピルス +Dry Shrub=枯れた低木 +Jungle Grass=ジャングルの草 +Grass=草 +Savanna Grass=サバンナの草 +Fern=シダ +Marram Grass=マラムの草 +Bush Stem=低木の幹 +Bush Leaves=低木の葉 +Bush Sapling=低木の苗木 +Blueberry Bush Leaves with Berries=ブルーベリーの低木と実 +Blueberry Bush Leaves=ブルーベリーの低木の葉 +Blueberry Bush Sapling=ブルーベリーの低木の苗木 +Acacia Bush Stem=アカシアの低木の幹 +Acacia Bush Leaves=アカシアの低木の葉 +Acacia Bush Sapling=アカシアの低木の苗木 +Pine Bush Stem=マツの低木の幹 +Pine Bush Needles=マツの低木の葉 +Pine Bush Sapling=マツの低木の苗木 +Kelp=コンブ +Green Coral=緑色のサンゴ +Pink Coral=桃色のサンゴ +Cyan Coral=青緑色のサンゴ +Brown Coral=茶色のサンゴ +Orange Coral=橙色のサンゴ +Coral Skeleton=サンゴのしがい +Water Source=水源 +Flowing Water=水流 +River Water Source=川の水源 +Flowing River Water=川の水流 +Lava Source=溶岩 +Flowing Lava=流れる溶岩 +Empty Bookshelf=空の本棚 +Bookshelf (@1 written, @2 empty books)=本棚(記述済み @1 冊, 未記述 @2 冊) +Bookshelf=本棚 +Text too long=テキストが長すぎます +"@1"=「@1」 +Wooden Sign=木の看板 +Steel Sign=鉄の看板 +Wooden Ladder=木のはしご +Steel Ladder=鉄のはしご +Apple Wood Fence=リンゴのフェンス +Acacia Wood Fence=アカシアのフェンス +Jungle Wood Fence=ジャングルのフェンス +Pine Wood Fence=マツのフェンス +Aspen Wood Fence=ポプラのフェンス +Apple Wood Fence Rail=リンゴのフェンスレール +Acacia Wood Fence Rail=アカシアのフェンスレール +Jungle Wood Fence Rail=ジャングルのフェンスレール +Pine Wood Fence Rail=マツのフェンスレール +Aspen Wood Fence Rail=ポプラのフェンスレール +Glass=ガラス +Obsidian Glass=黒曜石のガラス +Brick Block=レンガブロック +Mese Lamp=メセの塊 +Apple Wood Mese Post Light=リンゴのメセ灯柱 +Acacia Wood Mese Post Light=アカシアのメセ灯柱 +Jungle Wood Mese Post Light=ジャングルのメセ灯柱 +Pine Wood Mese Post Light=マツのメセ灯柱 +Aspen Wood Mese Post Light=ポプラのメセ灯柱 +Cloud=雲 +Wooden Pickaxe=木のつるはし +Stone Pickaxe=石のつるはし +Bronze Pickaxe=青銅のつるはし +Steel Pickaxe=鉄のつるはし +Mese Pickaxe=メセのつるはし +Diamond Pickaxe=ダイヤモンドのつるはし +Wooden Shovel=木のシャベル +Stone Shovel=石のシャベル +Bronze Shovel=青銅のシャベル +Steel Shovel=鉄のシャベル +Mese Shovel=メセのシャベル +Diamond Shovel=ダイヤモンドのシャベル +Wooden Axe=木の斧 +Stone Axe=石の斧 +Bronze Axe=青銅の斧 +Steel Axe=鉄の斧 +Mese Axe=メセの斧 +Diamond Axe=ダイヤモンドの斧 +Wooden Sword=木の剣 +Stone Sword=石の剣 +Bronze Sword=青銅の剣 +Steel Sword=鉄の剣 +Mese Sword=メセの剣 +Diamond Sword=ダイヤモンドの剣 +Key=鍵 +Torch=松明 +@1 will intersect protection on growth.=@1は成長するとき保護と交差します。 diff --git a/mods/minetest_game/default/locale/default.ru.tr b/mods/minetest_game/default/locale/default.ru.tr index 27b3511..64e83ae 100644 --- a/mods/minetest_game/default/locale/default.ru.tr +++ b/mods/minetest_game/default/locale/default.ru.tr @@ -67,12 +67,12 @@ Obsidian Block=Обсидиановый Блок Dirt=Земля Dirt with Grass=Земля с Травой Dirt with Grass and Footsteps=Земля с Травой и Следами -Dirt with Savanna Grass= +Dirt with Savanna Grass=Земля с Саванной Травой Dirt with Snow=Земля Со Снегом Dirt with Rainforest Litter=Земля с Тропической Подстилкой Dirt with Coniferous Litter=Земля с Сосновой Подстилкой -Savanna Dirt= -Savanna Dirt with Savanna Grass= +Savanna Dirt=Саванная Земля +Savanna Dirt with Savanna Grass=Саванная Земля с Травой Permafrost=Замороженная Почва Permafrost with Stones=Замороженная Почва с Камнями Permafrost with Moss=Замороженная Почва с Мхом @@ -129,7 +129,7 @@ Papyrus=Папирус Dry Shrub=Сухой Куст Jungle Grass=Тропическая Трава Grass=Трава -Savanna Grass= +Savanna Grass=Саванная Трава Fern=Папоротник Marram Grass=Песколюб Bush Stem=Стебли Куста @@ -180,11 +180,11 @@ Glass=Стекло Obsidian Glass=Обсидиановое Стекло Brick Block=Кирпичный Блок Mese Lamp=Месе Лампа -Apple Wood Mese Post Light= -Acacia Wood Mese Post Light= -Jungle Wood Mese Post Light= -Pine Wood Mese Post Light= -Aspen Wood Mese Post Light= +Apple Wood Mese Post Light=Столбовой Месе светильник из Яблони +Acacia Wood Mese Post Light=Столбовой Месе светильник из Акации +Jungle Wood Mese Post Light=Столбовой Месе светильник из Тропического дерева +Pine Wood Mese Post Light=Столбовой Месе светильник из Сосны +Aspen Wood Mese Post Light=Столбовой Месе светильник из Осины Cloud=Облако Wooden Pickaxe=Деревянная Кирка Stone Pickaxe=Каменная Кирка diff --git a/mods/minetest_game/default/locale/default.zh_CN.tr b/mods/minetest_game/default/locale/default.zh_CN.tr index 0db652d..9726e83 100644 --- a/mods/minetest_game/default/locale/default.zh_CN.tr +++ b/mods/minetest_game/default/locale/default.zh_CN.tr @@ -1,6 +1,6 @@ # textdomain: default Locked Chest=已上锁的箱子 -Locked Chest (owned by @1)=已上锁的箱子（属于@1所有） +Locked Chest (owned by @1)=已上锁的箱子（属于@1） You do not own this chest.=这个箱子不属于你所有。 a locked chest=一个已上锁的箱子 Chest=箱子 @@ -66,13 +66,13 @@ Obsidian Brick=黑曜石砖 Obsidian Block=黑曜石方块 Dirt=土方块 Dirt with Grass=草方块 -Dirt with Grass and Footsteps=草方块及脚印 +Dirt with Grass and Footsteps=带有脚印的草方块 Dirt with Savanna Grass=草原草方块 Dirt with Snow=雪土方块 -Dirt with Rainforest Litter=雨林腐土 -Dirt with Coniferous Litter=针叶林腐土 +Dirt with Rainforest Litter=雨林凋落物土 +Dirt with Coniferous Litter=针叶林凋落物土 Savanna Dirt=草原土 -Savanna Dirt with Savanna Grass=草原草方块（草原土） +Savanna Dirt with Savanna Grass=草原草方块 Permafrost=多年冻土 Permafrost with Stones=带石头的多年冻土 Permafrost with Moss=生苔的多年冻土 @@ -95,7 +95,7 @@ Jungle Tree=丛林树 Jungle Wood Planks=丛林树木板 Jungle Tree Leaves=丛林树叶 Jungle Tree Sapling=丛林树苗 -Emergent Jungle Tree Sapling=应急丛林树苗 +Emergent Jungle Tree Sapling=露生层丛林树苗 Pine Tree=松树 Pine Wood Planks=松树木板 Pine Needles=松针 @@ -129,13 +129,13 @@ Papyrus=莎草纸 Dry Shrub=干灌木 Jungle Grass=丛林草 Grass=草 -Savanna Grass= +Savanna Grass=草原草 Fern=蕨 Marram Grass=滨草 Bush Stem=灌木 Bush Leaves=灌木叶 Bush Sapling=灌木苗 -Blueberry Bush Leaves with Berries=蓝莓灌木叶与浆果 +Blueberry Bush Leaves with Berries=长蓝莓的蓝莓灌木叶 Blueberry Bush Leaves=蓝莓灌木叶 Blueberry Bush Sapling=蓝莓灌木苗 Acacia Bush Stem=相思灌木 @@ -212,7 +212,7 @@ Mese Sword=黄石剑 Diamond Sword=钻石剑 Key=钥匙 Torch=火把 -@1 will intersect protection on growth.=@1将与增长的保护相交。 +@1 will intersect protection on growth.=@1生长时将与保护区域相交。 ##### not used anymore ##### diff --git a/mods/minetest_game/default/mapgen.lua b/mods/minetest_game/default/mapgen.lua index 427a139..5c5fa72 100644 --- a/mods/minetest_game/default/mapgen.lua +++ b/mods/minetest_game/default/mapgen.lua @@ -2098,7 +2098,7 @@ function default.register_decorations() schematic = { size = {x = 1, y = 5, z = 1}, data = { - {name = "default:dirt", force_place = true},{name = "swaz:reed"}, {name = "swaz:reed"}, {name = "swaz:reed"}, {name = "swaz:reed"} + {name = "default:dirt", force_place = true}, {name = "swaz:reed"}, {name = "swaz:reed"}, {name = "swaz:reed"}, {name = "swaz:reed"} } }, place_offset_y = 1, diff --git a/mods/minetest_game/doors/init.lua b/mods/minetest_game/doors/init.lua index 455dfe7..f601b87 100644 --- a/mods/minetest_game/doors/init.lua +++ b/mods/minetest_game/doors/init.lua @@ -264,6 +264,7 @@ function doors.register(name, def) return itemstack end + local doorname = itemstack:get_name() local node = minetest.get_node(pointed_thing.under) local pdef = minetest.registered_nodes[node.name] if pdef and pdef.on_rightclick and @@ -315,10 +316,10 @@ function doors.register(name, def) local state = 0 if minetest.get_item_group(minetest.get_node(aside).name, "door") == 1 then state = state + 2 - minetest.set_node(pos, {name = name .. "_b", param2 = dir}) + minetest.set_node(pos, {name = doorname .. "_b", param2 = dir}) minetest.set_node(above, {name = "doors:hidden", param2 = (dir + 3) % 4}) else - minetest.set_node(pos, {name = name .. "_a", param2 = dir}) + minetest.set_node(pos, {name = doorname .. "_a", param2 = dir}) minetest.set_node(above, {name = "doors:hidden", param2 = dir}) end @@ -775,8 +776,8 @@ function doors.register_fencegate(name, def) sounds = def.sounds, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local node_def = minetest.registered_nodes[node.name] - minetest.swap_node(pos, {name = node_def.gate, param2 = node.param2}) - minetest.sound_play(node_def.sound, {pos = pos, gain = 0.15, + minetest.swap_node(pos, {name = node_def._gate, param2 = node.param2}) + minetest.sound_play(node_def._gate_sound, {pos = pos, gain = 0.15, max_hear_distance = 8}, true) return itemstack end, @@ -804,8 +805,8 @@ function doors.register_fencegate(name, def) local fence_closed = table.copy(fence) fence_closed.mesh = "doors_fencegate_closed.obj" - fence_closed.gate = name .. "_open" - fence_closed.sound = "doors_fencegate_open" + fence_closed._gate = name .. "_open" + fence_closed._gate_sound = "doors_fencegate_open" fence_closed.collision_box = { type = "fixed", fixed = {-1/2, -1/2, -1/8, 1/2, 1/2 + fence_collision_extra, 1/8} @@ -813,8 +814,8 @@ function doors.register_fencegate(name, def) local fence_open = table.copy(fence) fence_open.mesh = "doors_fencegate_open.obj" - fence_open.gate = name .. "_closed" - fence_open.sound = "doors_fencegate_close" + fence_open._gate = name .. "_closed" + fence_open._gate_sound = "doors_fencegate_close" fence_open.groups.not_in_creative_inventory = 1 fence_open.collision_box = { type = "fixed", diff --git a/mods/minetest_game/doors/locale/doors.ja.tr b/mods/minetest_game/doors/locale/doors.ja.tr new file mode 100644 index 0000000..910e0ae --- /dev/null +++ b/mods/minetest_game/doors/locale/doors.ja.tr @@ -0,0 +1,18 @@ +# textdomain: doors +Hidden Door Segment=隠しドアの区切り +Owned by @1=所有者 @1 +You do not own this locked door.=あなたはこのロックされたドアの所有者ではありません。 +a locked door=ロックされたドア +Wooden Door=木のドア +Steel Door=鉄のドア +Glass Door=ガラスのドア +Obsidian Glass Door=黒曜石のガラスのドア +You do not own this trapdoor.=あなたはこのトラップドアの所有者ではありません。 +a locked trapdoor=ロックされたトラップドア +Wooden Trapdoor=木のトラップドア +Steel Trapdoor=鉄のトラップドア +Apple Wood Fence Gate=リンゴのフェンスゲート +Acacia Wood Fence Gate=アカシアのフェンスゲート +Jungle Wood Fence Gate=ジャングルのフェンスゲート +Pine Wood Fence Gate=マツのフェンスゲート +Aspen Wood Fence Gate=ポプラのフェンスゲート diff --git a/mods/minetest_game/doors/locale/doors.zh_CN.tr b/mods/minetest_game/doors/locale/doors.zh_CN.tr index 50f38c0..cf32996 100644 --- a/mods/minetest_game/doors/locale/doors.zh_CN.tr +++ b/mods/minetest_game/doors/locale/doors.zh_CN.tr @@ -1,13 +1,13 @@ # textdomain: doors Hidden Door Segment=隐藏门段 -Owned by @1=由@1拥有 -You do not own this locked door.=这个门不属于你所有。 +Owned by @1=由@1所有 +You do not own this locked door.=这个门不属于你。 a locked door=一扇已上锁的门 Wooden Door=木门 Steel Door=铁门 Glass Door=玻璃门 Obsidian Glass Door=黑曜石玻璃门 -You do not own this trapdoor.=这个活板门不属于你所有。 +You do not own this trapdoor.=这个活板门不属于你。 a locked trapdoor=一扇已上锁的活板门 Wooden Trapdoor=木活板门 Steel Trapdoor=铁活板门 diff --git a/mods/minetest_game/dye/locale/dye.ja.tr b/mods/minetest_game/dye/locale/dye.ja.tr new file mode 100644 index 0000000..d7ae306 --- /dev/null +++ b/mods/minetest_game/dye/locale/dye.ja.tr @@ -0,0 +1,16 @@ +# textdomain: dye +White Dye=白色の染料 +Grey Dye=灰色の染料 +Dark Grey Dye=濃灰色の染料 +Black Dye=黒色の染料 +Violet Dye=紫色の染料 +Blue Dye=青色の染料 +Cyan Dye=青緑色の染料 +Dark Green Dye=濃緑色の染料 +Green Dye=緑色の染料 +Yellow Dye=黄色の染料 +Brown Dye=茶色の染料 +Orange Dye=橙色の染料 +Red Dye=赤色の染料 +Magenta Dye=赤紫色の染料 +Pink Dye=桃色の染料 diff --git a/mods/minetest_game/farming/locale/farming.ja.tr b/mods/minetest_game/farming/locale/farming.ja.tr new file mode 100644 index 0000000..a95d40c --- /dev/null +++ b/mods/minetest_game/farming/locale/farming.ja.tr @@ -0,0 +1,28 @@ +# textdomain: farming +Hoe=クワ +Seed=種 +Wooden Hoe=木のクワ +Stone Hoe=石のクワ +Steel Hoe=鉄のクワ +Bronze Hoe=青銅のクワ +Mese Hoe=メセのクワ +Diamond Hoe=ダイヤモンドのクワ +Wheat Seed=小麦の種 +Wheat=小麦 +Flour=小麦粉 +Bread=パン +Cotton Seed=綿の種 +Cotton=綿 +String=糸 +Soil=土壌 +Wet Soil=湿った土壌 +Savanna Soil=サバンナの土壌 +Wet Savanna Soil=湿ったサバンナの土壌 +Desert Sand Soil=砂漠の砂の土壌 +Wet Desert Sand Soil=湿った砂漠の砂の土壌 +Straw=ワラ +Straw Stair=ワラの階段 +Inner Straw Stair=へっこんだワラの階段 +Outer Straw Stair=でっぱったワラの階段 +Straw Slab=ワラのハーフブロック +Wild Cotton=天然綿 diff --git a/mods/minetest_game/farming/locale/farming.ru.tr b/mods/minetest_game/farming/locale/farming.ru.tr index a6d1b6d..7b77139 100644 --- a/mods/minetest_game/farming/locale/farming.ru.tr +++ b/mods/minetest_game/farming/locale/farming.ru.tr @@ -1,6 +1,6 @@ # textdomain: farming -Hoe= -Seed= +Hoe=Мотыга +Seed=Семя Wooden Hoe=Деревянная Мотыга Stone Hoe=Каменная Мотыга Steel Hoe=Стальная Мотыга @@ -16,8 +16,8 @@ Cotton=Хлопок String=Нить Soil=Почва Wet Soil=Влажная Почва -Savanna Soil= -Wet Savanna Soil= +Savanna Soil=Саванная Почва +Wet Savanna Soil=Влажная Саванная Почва Desert Sand Soil=Пустынная Песчаная Почва Wet Desert Sand Soil=Влажная Пустынная Песчаная Почва Straw=Солома @@ -25,7 +25,7 @@ Straw Stair=Соломенная Ступень Inner Straw Stair=Угловая Соломенная Ступень (Внутренний Угол) Outer Straw Stair=Угловая Соломенная Ступень (Внешний Угол) Straw Slab=Соломенная Плита -Wild Cotton= +Wild Cotton=Неокультуренный Хлопок ##### not used anymore ##### diff --git a/mods/minetest_game/farming/locale/farming.zh_CN.tr b/mods/minetest_game/farming/locale/farming.zh_CN.tr index 741ba45..33ad9be 100644 --- a/mods/minetest_game/farming/locale/farming.zh_CN.tr +++ b/mods/minetest_game/farming/locale/farming.zh_CN.tr @@ -1,6 +1,6 @@ # textdomain: farming -Hoe= -Seed= +Hoe=锄头 +Seed=种子 Wooden Hoe=木锄头 Stone Hoe=石锄头 Steel Hoe=铁锄头 @@ -16,8 +16,8 @@ Cotton=棉 String=线 Soil=土 Wet Soil=湿土 -Savanna Soil= -Wet Savanna Soil= +Savanna Soil=草原土 +Wet Savanna Soil=湿草原土 Desert Sand Soil=沙漠沙土 Wet Desert Sand Soil=湿沙漠沙土 Straw=稻草 @@ -25,7 +25,7 @@ Straw Stair=稻草台阶 Inner Straw Stair=稻草内楼梯 Outer Straw Stair=稻草外楼梯 Straw Slab=稻草板 -Wild Cotton= +Wild Cotton=野棉花 ##### not used anymore ##### diff --git a/mods/minetest_game/fire/locale/fire.ja.tr b/mods/minetest_game/fire/locale/fire.ja.tr new file mode 100644 index 0000000..bf5fec4 --- /dev/null +++ b/mods/minetest_game/fire/locale/fire.ja.tr @@ -0,0 +1,4 @@ +# textdomain: fire +Fire=炎 +Permanent Fire=燃え続ける炎 +Flint and Steel=火打ち石と打ち金 diff --git a/mods/minetest_game/fire/locale/fire.ru.tr b/mods/minetest_game/fire/locale/fire.ru.tr index d2cb81f..496e81c 100644 --- a/mods/minetest_game/fire/locale/fire.ru.tr +++ b/mods/minetest_game/fire/locale/fire.ru.tr @@ -1,6 +1,6 @@ # textdomain: fire -Fire= -Permanent Fire= +Fire=Огонь +Permanent Fire=Вечный Огонь Flint and Steel=Огниво diff --git a/mods/minetest_game/fire/locale/fire.zh_CN.tr b/mods/minetest_game/fire/locale/fire.zh_CN.tr index 052089a..7b0a472 100644 --- a/mods/minetest_game/fire/locale/fire.zh_CN.tr +++ b/mods/minetest_game/fire/locale/fire.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: fire Fire=火焰 Permanent Fire=永久火焰 -Flint and Steel=火石和钢 +Flint and Steel=火石和划片 diff --git a/mods/minetest_game/fireflies/README.txt b/mods/minetest_game/fireflies/README.txt deleted file mode 100644 index 7382578..0000000 --- a/mods/minetest_game/fireflies/README.txt +++ /dev/null @@ -1,22 +0,0 @@ -Minetest Game mod: fireflies -============================ -Adds fireflies to the world on mapgen, which can then be caught in a net and placed in -bottles to provide light. - -Authors of source code ----------------------- -Shara RedCat (MIT) - -Authors of media (textures) ---------------------------- -Shara RedCat (CC BY-SA 3.0): - fireflies_firefly.png - fireflies_firefly_animated.png - fireflies_bugnet.png - fireflies_bottle.png - fireflies_bottle_animated.png - -fireflies_bugnet.png is modified from a texture by tenplus1 (CC0) - -fireflies_bottle.png and fireflies_bottle_animated.png are -modified from a texture by Vanessa Ezekowitz (CC BY-SA 3.0) \ No newline at end of file diff --git a/mods/minetest_game/fireflies/init.lua b/mods/minetest_game/fireflies/init.lua deleted file mode 100644 index 59a40c5..0000000 --- a/mods/minetest_game/fireflies/init.lua +++ /dev/null @@ -1,291 +0,0 @@ --- firefly/init.lua - --- Load support for MT game translation. -local S = minetest.get_translator("fireflies") - - -minetest.register_node("fireflies:firefly", { - description = S("Firefly"), - drawtype = "plantlike", - tiles = {{ - name = "fireflies_firefly_animated.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 1.5 - }, - }}, - inventory_image = "fireflies_firefly.png", - wield_image = "fireflies_firefly.png", - waving = 1, - paramtype = "light", - sunlight_propagates = true, - buildable_to = true, - walkable = false, - groups = {catchable = 1}, - selection_box = { - type = "fixed", - fixed = {-0.1, -0.1, -0.1, 0.1, 0.1, 0.1}, - }, - light_source = 6, - floodable = true, - on_place = function(itemstack, placer, pointed_thing) - local player_name = placer:get_player_name() - local pos = pointed_thing.above - - if not minetest.is_protected(pos, player_name) and - not minetest.is_protected(pointed_thing.under, player_name) and - minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "fireflies:firefly"}) - minetest.get_node_timer(pos):start(1) - itemstack:take_item() - end - return itemstack - end, - on_timer = function(pos, elapsed) - if minetest.get_node_light(pos) > 11 then - minetest.set_node(pos, {name = "fireflies:hidden_firefly"}) - end - minetest.get_node_timer(pos):start(30) - end -}) - -minetest.register_node("fireflies:hidden_firefly", { - description = S("Hidden Firefly"), - drawtype = "airlike", - inventory_image = "fireflies_firefly.png^default_invisible_node_overlay.png", - wield_image = "fireflies_firefly.png^default_invisible_node_overlay.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - pointable = false, - diggable = false, - buildable_to = true, - drop = "", - groups = {not_in_creative_inventory = 1}, - floodable = true, - on_place = function(itemstack, placer, pointed_thing) - local player_name = placer:get_player_name() - local pos = pointed_thing.above - - if not minetest.is_protected(pos, player_name) and - not minetest.is_protected(pointed_thing.under, player_name) and - minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "fireflies:hidden_firefly"}) - minetest.get_node_timer(pos):start(1) - itemstack:take_item() - end - return itemstack - end, - on_timer = function(pos, elapsed) - if minetest.get_node_light(pos) <= 11 then - minetest.set_node(pos, {name = "fireflies:firefly"}) - end - minetest.get_node_timer(pos):start(30) - end -}) - - --- bug net -minetest.register_tool("fireflies:bug_net", { - description = S("Bug Net"), - inventory_image = "fireflies_bugnet.png", - on_use = function(itemstack, player, pointed_thing) - local player_name = player and player:get_player_name() or "" - if not pointed_thing or pointed_thing.type ~= "node" or - minetest.is_protected(pointed_thing.under, player_name) then - return - end - local node_name = minetest.get_node(pointed_thing.under).name - local inv = player:get_inventory() - if minetest.get_item_group(node_name, "catchable") == 1 then - minetest.set_node(pointed_thing.under, {name = "air"}) - local stack = ItemStack(node_name.." 1") - local leftover = inv:add_item("main", stack) - if leftover:get_count() > 0 then - minetest.add_item(pointed_thing.under, node_name.." 1") - end - end - if not minetest.is_creative_enabled(player_name) then - itemstack:add_wear(256) - return itemstack - end - end -}) - -minetest.register_craft( { - output = "fireflies:bug_net", - recipe = { - {"farming:string", "farming:string"}, - {"farming:string", "farming:string"}, - {"group:stick", ""} - } -}) - - --- firefly in a bottle -minetest.register_node("fireflies:firefly_bottle", { - description = S("Firefly in a Bottle"), - inventory_image = "fireflies_bottle.png", - wield_image = "fireflies_bottle.png", - tiles = {{ - name = "fireflies_bottle_animated.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 1.5 - }, - }}, - drawtype = "plantlike", - paramtype = "light", - sunlight_propagates = true, - light_source = 9, - walkable = false, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - selection_box = { - type = "fixed", - fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} - }, - sounds = default.node_sound_glass_defaults(), - on_rightclick = function(pos, node, player, itemstack, pointed_thing) - local lower_pos = {x = pos.x, y = pos.y + 1, z = pos.z} - if minetest.is_protected(pos, player:get_player_name()) or - minetest.get_node(lower_pos).name ~= "air" then - return - end - - local upper_pos = {x = pos.x, y = pos.y + 2, z = pos.z} - local firefly_pos - - if not minetest.is_protected(upper_pos, player:get_player_name()) and - minetest.get_node(upper_pos).name == "air" then - firefly_pos = upper_pos - elseif not minetest.is_protected(lower_pos, player:get_player_name()) then - firefly_pos = lower_pos - end - - if firefly_pos then - minetest.set_node(pos, {name = "vessels:glass_bottle"}) - minetest.set_node(firefly_pos, {name = "fireflies:firefly"}) - minetest.get_node_timer(firefly_pos):start(1) - end - end -}) - -minetest.register_craft( { - output = "fireflies:firefly_bottle", - recipe = { - {"fireflies:firefly"}, - {"vessels:glass_bottle"} - } -}) - - --- register fireflies as decorations - -if minetest.get_mapgen_setting("mg_name") == "v6" then - - minetest.register_decoration({ - name = "fireflies:firefly_low", - deco_type = "simple", - place_on = "default:dirt_with_grass", - place_offset_y = 2, - sidelen = 80, - fill_ratio = 0.0002, - y_max = 31000, - y_min = 1, - decoration = "fireflies:hidden_firefly", - }) - - minetest.register_decoration({ - name = "fireflies:firefly_high", - deco_type = "simple", - place_on = "default:dirt_with_grass", - place_offset_y = 3, - sidelen = 80, - fill_ratio = 0.0002, - y_max = 31000, - y_min = 1, - decoration = "fireflies:hidden_firefly", - }) - -else - - minetest.register_decoration({ - name = "fireflies:firefly_low", - deco_type = "simple", - place_on = { - "default:dirt_with_grass", - "default:dirt_with_coniferous_litter", - "default:dirt_with_rainforest_litter", - "default:dirt" - }, - place_offset_y = 2, - sidelen = 80, - fill_ratio = 0.0005, - biomes = { - "deciduous_forest", - "coniferous_forest", - "rainforest", - "rainforest_swamp" - }, - y_max = 31000, - y_min = -1, - decoration = "fireflies:hidden_firefly", - }) - - minetest.register_decoration({ - name = "fireflies:firefly_high", - deco_type = "simple", - place_on = { - "default:dirt_with_grass", - "default:dirt_with_coniferous_litter", - "default:dirt_with_rainforest_litter", - "default:dirt" - }, - place_offset_y = 3, - sidelen = 80, - fill_ratio = 0.0005, - biomes = { - "deciduous_forest", - "coniferous_forest", - "rainforest", - "rainforest_swamp" - }, - y_max = 31000, - y_min = -1, - decoration = "fireflies:hidden_firefly", - }) - -end - - --- get decoration IDs -local firefly_low = minetest.get_decoration_id("fireflies:firefly_low") -local firefly_high = minetest.get_decoration_id("fireflies:firefly_high") - -minetest.set_gen_notify({decoration = true}, {firefly_low, firefly_high}) - --- start nodetimers -minetest.register_on_generated(function(minp, maxp, blockseed) - local gennotify = minetest.get_mapgen_object("gennotify") - local poslist = {} - - for _, pos in ipairs(gennotify["decoration#"..firefly_low] or {}) do - local firefly_low_pos = {x = pos.x, y = pos.y + 3, z = pos.z} - table.insert(poslist, firefly_low_pos) - end - for _, pos in ipairs(gennotify["decoration#"..firefly_high] or {}) do - local firefly_high_pos = {x = pos.x, y = pos.y + 4, z = pos.z} - table.insert(poslist, firefly_high_pos) - end - - if #poslist ~= 0 then - for i = 1, #poslist do - local pos = poslist[i] - minetest.get_node_timer(pos):start(1) - end - end -end) diff --git a/mods/minetest_game/fireflies/license.txt b/mods/minetest_game/fireflies/license.txt deleted file mode 100644 index eebdad6..0000000 --- a/mods/minetest_game/fireflies/license.txt +++ /dev/null @@ -1,58 +0,0 @@ -License of source code ----------------------- - -The MIT License (MIT) -Copyright (c) 2018 Shara RedCat - -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, and to permit -persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or -substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -For more details: -https://opensource.org/licenses/MIT - -Licenses of media (textures) ----------------------------- - -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2018 Shara RedCat - -You are free to: -Share — copy and redistribute the material in any medium or format. -Adapt — remix, transform, and build upon the material for any purpose, even commercially. -The licensor cannot revoke these freedoms as long as you follow the license terms. - -Under the following terms: - -Attribution — You must give appropriate credit, provide a link to the license, and -indicate if changes were made. You may do so in any reasonable manner, but not in any way -that suggests the licensor endorses you or your use. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -No additional restrictions — You may not apply legal terms or technological measures that -legally restrict others from doing anything the license permits. - -Notices: - -You do not have to comply with the license for elements of the material in the public -domain or where your use is permitted by an applicable exception or limitation. -No warranties are given. The license may not give you all of the permissions necessary -for your intended use. For example, other rights such as publicity, privacy, or moral -rights may limit how you use the material. - -For more details: -http://creativecommons.org/licenses/by-sa/3.0/ \ No newline at end of file diff --git a/mods/minetest_game/fireflies/locale/fireflies.de.tr b/mods/minetest_game/fireflies/locale/fireflies.de.tr deleted file mode 100644 index c5d116a..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.de.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Glühwürmchen -Hidden Firefly=Verborgenes Glühwürmchen -Bug Net=Insektennetz -Firefly in a Bottle=Glühwürmchen in einer Flasche diff --git a/mods/minetest_game/fireflies/locale/fireflies.eo.tr b/mods/minetest_game/fireflies/locale/fireflies.eo.tr deleted file mode 100644 index 7145cf9..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.eo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Fulgoro -Hidden Firefly=Kaŝita Fulgoro -Bug Net=Cima Reto -Firefly in a Bottle=Fulgoro en Botelo diff --git a/mods/minetest_game/fireflies/locale/fireflies.es.tr b/mods/minetest_game/fireflies/locale/fireflies.es.tr deleted file mode 100644 index 95d053e..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.es.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Luciérnaga -Hidden Firefly=Luciérnaga oculta -Bug Net=Red de insectos -Firefly in a Bottle=Luciérnaga en botella diff --git a/mods/minetest_game/fireflies/locale/fireflies.fr.tr b/mods/minetest_game/fireflies/locale/fireflies.fr.tr deleted file mode 100644 index 3deda66..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.fr.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Luciole -Hidden Firefly=Luciole cachée -Bug Net=Filet à papillon -Firefly in a Bottle=Luciole en bouteille diff --git a/mods/minetest_game/fireflies/locale/fireflies.id.tr b/mods/minetest_game/fireflies/locale/fireflies.id.tr deleted file mode 100644 index bc6434e..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.id.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Kunang-Kunang -Hidden Firefly=Kunang-Kunang Tersembunyi -Bug Net=Jaring Serangga -Firefly in a Bottle=Kunang-Kunang dalam Botol diff --git a/mods/minetest_game/fireflies/locale/fireflies.it.tr b/mods/minetest_game/fireflies/locale/fireflies.it.tr deleted file mode 100644 index 22ad57b..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.it.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Lucciola -Hidden Firefly=Lucciola nascosta -Bug Net=Retino -Firefly in a Bottle=Lucciola imbottigliata diff --git a/mods/minetest_game/fireflies/locale/fireflies.jbo.tr b/mods/minetest_game/fireflies/locale/fireflies.jbo.tr deleted file mode 100644 index 4e69ab4..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.jbo.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=lo gusycinki -Hidden Firefly=lo se mipri gusycinki -Bug Net=lo cinki julne -Firefly in a Bottle=lo gusycinki poi nenri lo botpi diff --git a/mods/minetest_game/fireflies/locale/fireflies.ms.tr b/mods/minetest_game/fireflies/locale/fireflies.ms.tr deleted file mode 100644 index 509d03d..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.ms.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Kelip-Kelip -Hidden Firefly=Kelip-Kelip Tersembunyi -Bug Net=Jaring Pepijat -Firefly in a Bottle=Kelip-Kelip dalam Botol diff --git a/mods/minetest_game/fireflies/locale/fireflies.pt_BR.tr b/mods/minetest_game/fireflies/locale/fireflies.pt_BR.tr deleted file mode 100644 index 543c00b..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.pt_BR.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Vaga-lume -Hidden Firefly=Vaga-lume escondido -Bug Net=Rede de Insetos -Firefly in a Bottle=Vaga-lume em uma garrafa diff --git a/mods/minetest_game/fireflies/locale/fireflies.ru.tr b/mods/minetest_game/fireflies/locale/fireflies.ru.tr deleted file mode 100644 index c05f288..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.ru.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Светлячок -Hidden Firefly=Притаившийся Светлячок -Bug Net=Сачок Для Ловли Насекомых -Firefly in a Bottle=Светлячок в Бутылке diff --git a/mods/minetest_game/fireflies/locale/fireflies.se.tr b/mods/minetest_game/fireflies/locale/fireflies.se.tr deleted file mode 100644 index ebd0cf9..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.se.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Eldfluga -Hidden Firefly=Gömd Eldfluga -Bug Net=Buggernät -Firefly in a Bottle=Eldfluga i en flaska diff --git a/mods/minetest_game/fireflies/locale/fireflies.sk.tr b/mods/minetest_game/fireflies/locale/fireflies.sk.tr deleted file mode 100644 index b68674d..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.sk.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=Svetluška -Hidden Firefly=Skrytá svetluška -Bug Net=Sieťka na hmyz -Firefly in a Bottle=Svetluška vo fľaši diff --git a/mods/minetest_game/fireflies/locale/fireflies.zh_CN.tr b/mods/minetest_game/fireflies/locale/fireflies.zh_CN.tr deleted file mode 100644 index 5971785..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.zh_CN.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=萤火虫 -Hidden Firefly=隐藏的萤火虫 -Bug Net=虫网 -Firefly in a Bottle=放在瓶子里的萤火虫 diff --git a/mods/minetest_game/fireflies/locale/fireflies.zh_TW.tr b/mods/minetest_game/fireflies/locale/fireflies.zh_TW.tr deleted file mode 100644 index af754a9..0000000 --- a/mods/minetest_game/fireflies/locale/fireflies.zh_TW.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly=螢火蟲 -Hidden Firefly=隱藏的螢火蟲 -Bug Net=蟲網 -Firefly in a Bottle=放在瓶子裡的螢火蟲 diff --git a/mods/minetest_game/fireflies/locale/template.txt b/mods/minetest_game/fireflies/locale/template.txt deleted file mode 100644 index 91aa8ff..0000000 --- a/mods/minetest_game/fireflies/locale/template.txt +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: fireflies -Firefly= -Hidden Firefly= -Bug Net= -Firefly in a Bottle= diff --git a/mods/minetest_game/fireflies/mod.conf b/mods/minetest_game/fireflies/mod.conf deleted file mode 100644 index a533588..0000000 --- a/mods/minetest_game/fireflies/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = fireflies -description = Minetest Game mod: fireflies -depends = default, vessels diff --git a/mods/minetest_game/fireflies/textures/fireflies_bottle.png b/mods/minetest_game/fireflies/textures/fireflies_bottle.png deleted file mode 100644 index ecca036..0000000 Binary files a/mods/minetest_game/fireflies/textures/fireflies_bottle.png and /dev/null differ diff --git a/mods/minetest_game/fireflies/textures/fireflies_bottle_animated.png b/mods/minetest_game/fireflies/textures/fireflies_bottle_animated.png deleted file mode 100644 index 294ff97..0000000 Binary files a/mods/minetest_game/fireflies/textures/fireflies_bottle_animated.png and /dev/null differ diff --git a/mods/minetest_game/fireflies/textures/fireflies_bugnet.png b/mods/minetest_game/fireflies/textures/fireflies_bugnet.png deleted file mode 100644 index 8ec3d33..0000000 Binary files a/mods/minetest_game/fireflies/textures/fireflies_bugnet.png and /dev/null differ diff --git a/mods/minetest_game/fireflies/textures/fireflies_firefly.png b/mods/minetest_game/fireflies/textures/fireflies_firefly.png deleted file mode 100644 index c086689..0000000 Binary files a/mods/minetest_game/fireflies/textures/fireflies_firefly.png and /dev/null differ diff --git a/mods/minetest_game/fireflies/textures/fireflies_firefly_animated.png b/mods/minetest_game/fireflies/textures/fireflies_firefly_animated.png deleted file mode 100644 index e6932e3..0000000 Binary files a/mods/minetest_game/fireflies/textures/fireflies_firefly_animated.png and /dev/null differ diff --git a/mods/minetest_game/flowers/locale/flowers.ja.tr b/mods/minetest_game/flowers/locale/flowers.ja.tr new file mode 100644 index 0000000..bea87e2 --- /dev/null +++ b/mods/minetest_game/flowers/locale/flowers.ja.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=赤色のバラ +Orange Tulip=橙色のチューリップ +Yellow Dandelion=黄色のタンポポ +Green Chrysanthemum=緑色のキク +Blue Geranium=青色のゼラニウム +Viola=ビオラ +White Dandelion=白色のタンポポ +Black Tulip=黒色のチューリップ +Red Mushroom=赤色のキノコ +Brown Mushroom=茶色のキノコ +Waterlily=スイレン diff --git a/mods/minetest_game/game_commands/locale/game_commands.ja.tr b/mods/minetest_game/game_commands/locale/game_commands.ja.tr new file mode 100644 index 0000000..b6c77dc --- /dev/null +++ b/mods/minetest_game/game_commands/locale/game_commands.ja.tr @@ -0,0 +1,4 @@ +# textdomain: game_commands +Kill yourself to respawn=リセットしてリスポーンします +No static_spawnpoint defined=static_spawnpoint が設定されていません +You need to be online to be killed!=リセットするにはオンラインである必要があります diff --git a/mods/minetest_game/game_commands/locale/game_commands.zh_CN.tr b/mods/minetest_game/game_commands/locale/game_commands.zh_CN.tr index 3c69dfb..ba9a027 100644 --- a/mods/minetest_game/game_commands/locale/game_commands.zh_CN.tr +++ b/mods/minetest_game/game_commands/locale/game_commands.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: game_commands -Kill yourself to respawn=杀死自己并重生 +Kill yourself to respawn=自杀并重生 No static_spawnpoint defined=static_spawnpoint 未定义 You need to be online to be killed!=您需要在线才能被杀死！ diff --git a/mods/minetest_game/give_initial_stuff/init.lua b/mods/minetest_game/give_initial_stuff/init.lua index 741d394..a6fe20e 100644 --- a/mods/minetest_game/give_initial_stuff/init.lua +++ b/mods/minetest_game/give_initial_stuff/init.lua @@ -1,8 +1,8 @@ -- gave_initial_stuff/init.lua local stuff_string = minetest.settings:get("initial_stuff") or - "default:pick_wood,default:axe_wood,default:shovel_wood,default:apple,".. - "farming:bread" + "default:pick_wood,default:axe_wood,default:shovel_wood,default:apple 7,".. + "farming:bread 5" give_initial_stuff = { items = {} diff --git a/mods/minetest_game/map/locale/map.ja.tr b/mods/minetest_game/map/locale/map.ja.tr new file mode 100644 index 0000000..7205f24 --- /dev/null +++ b/mods/minetest_game/map/locale/map.ja.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=地図キット +Use with 'Minimap' key=ミニマップキーで使います diff --git a/mods/minetest_game/mtg_craftguide/locale/mtg_craftguide.ja.tr b/mods/minetest_game/mtg_craftguide/locale/mtg_craftguide.ja.tr new file mode 100644 index 0000000..c6ec66a --- /dev/null +++ b/mods/minetest_game/mtg_craftguide/locale/mtg_craftguide.ja.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=石炭 +Any sand=砂 +Any wool=羊毛 +Any stick=棒 +Any vessel=瓶 +Any wood planks=板材 +Any kind of stone block=石のブロック +Any red flower=赤色の花 +Any blue flower=青色の花 +Any black flower=黒色の花 +Any green flower=緑色の花 +Any white flower=白色の花 +Any orange flower=橙色の花 +Any violet flower=紫色の花 +Any yellow flower=黄色の花 +Any red dye=赤色の染料 +Any blue dye=青色の染料 +Any cyan dye=青緑色の染料 +Any grey dye=灰色の染料 +Any pink dye=桃色の染料 +Any black dye=黒色の染料 +Any brown dye=茶色の染料 +Any green dye=緑色の染料 +Any white dye=白色の染料 +Any orange dye=橙色の染料 +Any violet dye=紫色の染料 +Any yellow dye=黄色の染料 +Any magenta dye=赤紫色の染料 +Any dark grey dye=濃灰色の染料 +Any dark green dye=濃緑色の染料 +# Label for group ingredients +G= +Any item belonging to the group(s): @1=グループに属するアイテム: @1 +Unknown Item=不明なアイテム +Fuel=燃料 +Usage @1 of @2=利用方法 @1 / @2 +Recipe @1 of @2=レシピ @1 / @2 +Previous recipe=前のレシピ +Next recipe=次のレシピ +Recipe is too big to be displayed.=レシピが大きすぎて表示できません。 +Shapeless=無形 +Cooking time: @1=調理時間: @1 +Search=検索 +Reset=リセット +Previous page=前のページ +Next page=次のページ +No items to show.=表示する項目がありません。 +No usages.=利用方法がありません。 +Click again to show recipes.=もう一度クリックするとレシピを表示します。 +No recipes.=レシピがありません。 +Click again to show usages.=もう一度クリックすると使用方法を表示します。 +Recipes=レシピ diff --git a/mods/minetest_game/mtg_craftguide/locale/mtg_craftguide.ru.tr b/mods/minetest_game/mtg_craftguide/locale/mtg_craftguide.ru.tr new file mode 100644 index 0000000..8c74106 --- /dev/null +++ b/mods/minetest_game/mtg_craftguide/locale/mtg_craftguide.ru.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=Любой уголь +Any sand=Любой песок +Any wool=Любая шерсть +Any stick=Любая палка +Any vessel=Любой сосуд +Any wood planks=Любые деревянные палки +Any kind of stone block=Любой каменный блок +Any red flower=Любой красный цветок +Any blue flower=Любой синий цветок +Any black flower=Любой чёрный цветок +Any green flower=Любой зелёный цветок +Any white flower=Любой белый цветок +Any orange flower=Любой оранжевый цветок +Any violet flower=Любой фиолетовый цветок +Any yellow flower=Любой жёлтый цветок +Any red dye=Любая красная краска +Any blue dye=Любая синяя краска +Any cyan dye=Любая сине-зелёная краска +Any grey dye=Любая серая краска +Any pink dye=Любая розовая краска +Any black dye=Любая чёрная краска +Any brown dye=Любая коричневая краска +Any green dye=Любая зелёная краска +Any white dye=Любая белая краска +Any orange dye=Любая оранжевая краска +Any violet dye=Любая фиолетовая краска +Any yellow dye=Любая жёлтая краска +Any magenta dye=Любая пурпурная краска +Any dark grey dye=Любая тёмно-серая краска +Any dark green dye=Любая тёмно-зелёная краска +# Label for group ingredients +G= +Any item belonging to the group(s): @1=Любой предмет из групп(ы): @1 +Unknown Item=Неизвествый предмет +Fuel=Топливо +Usage @1 of @2= +Recipe @1 of @2= +Previous recipe=Предыдущий рецепт +Next recipe=Следующий рецепт +Recipe is too big to be displayed.=Рецепт слишком большой для показа +Shapeless= +Cooking time: @1=Время изготовления: @1 +Search=Поиск +Reset=Сбросить +Previous page=Предыдущая страница +Next page=Следующая страница +No items to show.=Нет элементов для отображения. +No usages.= +Click again to show recipes.=Нажмите снова для отображения рецептов. +No recipes.=Нет рецептов. +Click again to show usages.= +Recipes=Рецепты diff --git a/mods/minetest_game/player_api/init.lua b/mods/minetest_game/player_api/init.lua index de77180..27508e6 100644 --- a/mods/minetest_game/player_api/init.lua +++ b/mods/minetest_game/player_api/init.lua @@ -56,6 +56,11 @@ minetest.register_on_joinplayer(function(player) local player_name = player:get_player_name() player_api.player_attached[player_name] = false local gender = player_api.get_gender(player) + if minetest.get_modpath("ptol") ~= nil then + if player:get_meta():get_int("ptol:level") == 0 then + player:get_meta():set_int("ptol:level", 4) + end + end if gender == "" then player_api.select_gender(player_name) --select the gender else diff --git a/mods/minetest_game/player_api/textures/player_red_eye.png b/mods/minetest_game/player_api/textures/player_red_eye.png new file mode 100644 index 0000000..f76dd85 Binary files /dev/null and b/mods/minetest_game/player_api/textures/player_red_eye.png differ diff --git a/mods/minetest_game/screwdriver/locale/screwdriver.ja.tr b/mods/minetest_game/screwdriver/locale/screwdriver.ja.tr new file mode 100644 index 0000000..55690f2 --- /dev/null +++ b/mods/minetest_game/screwdriver/locale/screwdriver.ja.tr @@ -0,0 +1,3 @@ +# textdomain: screwdriver +Screwdriver=ドライバー +(left-click rotates face, right-click rotates axis)=(左クリックで面が回転。右クリックで軸が回転) diff --git a/mods/minetest_game/sethome/locale/sethome.ja.tr b/mods/minetest_game/sethome/locale/sethome.ja.tr new file mode 100644 index 0000000..3d636b5 --- /dev/null +++ b/mods/minetest_game/sethome/locale/sethome.ja.tr @@ -0,0 +1,8 @@ +# textdomain: sethome +Can use /sethome and /home=/sethomeと/homeが使えます +Teleport you to your home point=ホーム地点にテレポートします +Teleported to home!=ホームにテレポート！ +Set a home using /sethome=/sethomeを使ってホームを設定します +Set your home point=ホーム地点を設定します +Home set!=ホーム地点をセット！ +Player not found!=プレーヤーが見つかりません！ diff --git a/mods/minetest_game/sethome/locale/sethome.zh_CN.tr b/mods/minetest_game/sethome/locale/sethome.zh_CN.tr index 9e3780a..0af54ce 100644 --- a/mods/minetest_game/sethome/locale/sethome.zh_CN.tr +++ b/mods/minetest_game/sethome/locale/sethome.zh_CN.tr @@ -1,6 +1,6 @@ # textdomain: sethome Can use /sethome and /home=可以使用/sethome和/home -Teleport you to your home point=传送您到您家的地点 +Teleport you to your home point=将您传送到家 Teleported to home!=已传送到家！ Set a home using /sethome=使用/sethome设定家 Set your home point=设定您家的地点 diff --git a/mods/minetest_game/sfinv/locale/sfinv.ja.tr b/mods/minetest_game/sfinv/locale/sfinv.ja.tr new file mode 100644 index 0000000..04122d7 --- /dev/null +++ b/mods/minetest_game/sfinv/locale/sfinv.ja.tr @@ -0,0 +1,2 @@ +# textdomain: sfinv +Crafting=クラフト diff --git a/mods/minetest_game/stairs/locale/stairs.ja.tr b/mods/minetest_game/stairs/locale/stairs.ja.tr new file mode 100644 index 0000000..73e2703 --- /dev/null +++ b/mods/minetest_game/stairs/locale/stairs.ja.tr @@ -0,0 +1,145 @@ +# textdomain: stairs +Glass Stair=ガラスの階段 +Glass Slab=ガラスのハーフブロック +Inner Glass Stair=へっこんだガラスの階段 +Outer Glass Stair=でっぱったガラスの階段 +Obsidian Glass Stair=黒曜石ガラスの階段 +Obsidian Glass Slab=黒曜石ガラスのハーフブロック +Inner Obsidian Glass Stair=へっこんだ黒曜石ガラスの階段 +Outer Obsidian Glass Stair=でっぱった黒曜石ガラスの階段 +Wooden Stair=木の階段 +Inner Wooden Stair=へっこんだ木の階段 +Outer Wooden Stair=でっぱった木の階段 +Wooden Slab=木のハーフブロック +Jungle Wood Stair=ジャングルの階段 +Inner Jungle Wood Stair=へっこんだジャングルの階段 +Outer Jungle Wood Stair=でっぱったジャングルの階段 +Jungle Wood Slab=ジャングルのハーフブロック +Pine Wood Stair=マツの木の階段 +Inner Pine Wood Stair=へっこんだマツの階段 +Outer Pine Wood Stair=でっぱったマツの階段 +Pine Wood Slab=マツのハーフブロック +Acacia Wood Stair=アカシアの階段 +Inner Acacia Wood Stair=へっこんだアカシアの階段 +Outer Acacia Wood Stair=でっぱったアカシアの階段 +Acacia Wood Slab=アカシアのハーフブロック +Aspen Wood Stair=ポプラの階段 +Inner Aspen Wood Stair=へっこんだポプラの階段 +Outer Aspen Wood Stair=でっぱったポプラの階段 +Aspen Wood Slab=ポプラのハーフブロック +Stone Stair=石の階段 +Inner Stone Stair=へっこんだ石の階段 +Outer Stone Stair=でっぱった石の階段 +Stone Slab=石のハーフブロック +Cobblestone Stair=丸石の階段 +Inner Cobblestone Stair=へっこんだ丸石の階段 +Outer Cobblestone Stair=でっぱった丸石の階段 +Cobblestone Slab=丸石のハーフブロック +Mossy Cobblestone Stair=苔むした丸石の階段 +Inner Mossy Cobblestone Stair=へっこんだ苔むした丸石の階段 +Outer Mossy Cobblestone Stair=でっぱった苔むした丸石の階段 +Mossy Cobblestone Slab=苔むした丸石のハーフブロック +Stone Brick Stair=石レンガの階段 +Inner Stone Brick Stair=へっこんだ石レンガの階段 +Outer Stone Brick Stair=でっぱった石レンガの階段 +Stone Brick Slab=石レンガのハーフブロック +Stone Block Stair=石ブロックの階段 +Inner Stone Block Stair=へっこんだ石ブロックの階段 +Outer Stone Block Stair=でっぱった石ブロックの階段 +Stone Block Slab=石ブロックのハーフブロック +Desert Stone Stair=砂漠の石の階段 +Inner Desert Stone Stair=へっこんだ砂漠の石の階段 +Outer Desert Stone Stair=でっぱった砂漠の石の階段 +Desert Stone Slab=砂漠の石のハーフブロック +Desert Cobblestone Stair=砂漠の丸石の階段 +Inner Desert Cobblestone Stair=へっこんだ砂漠の丸石の階段 +Outer Desert Cobblestone Stair=でっぱった砂漠の丸石の階段 +Desert Cobblestone Slab=砂漠の丸石のハーフブロック +Desert Stone Brick Stair=砂漠の石レンガの階段 +Inner Desert Stone Brick Stair=へっこんだ砂漠の石レンガの階段 +Outer Desert Stone Brick Stair=でっぱった砂漠の石レンガの階段 +Desert Stone Brick Slab=砂漠の石レンガのハーフブロック +Desert Stone Block Stair=砂漠の石ブロックの階段 +Inner Desert Stone Block Stair=へっこんだ砂漠の石ブロックの階段 +Outer Desert Stone Block Stair=でっぱった砂漠の石ブロックの階段 +Desert Stone Block Slab=砂漠の石ブロックのハーフブロック +Sandstone Stair=砂岩の階段 +Inner Sandstone Stair=へっこんだ砂岩の階段 +Outer Sandstone Stair=でっぱった砂岩の階段 +Sandstone Slab=砂岩のハーフブロック +Sandstone Brick Stair=砂岩レンガの階段 +Inner Sandstone Brick Stair=へっこんだ砂岩レンガの階段 +Outer Sandstone Brick Stair=でっぱった砂岩レンガの階段 +Sandstone Brick Slab=砂岩レンガのハーフブロック +Sandstone Block Stair=砂岩ブロックの階段 +Inner Sandstone Block Stair=へっこんだ砂岩ブロックの階段 +Outer Sandstone Block Stair=でっぱった砂岩ブロックの階段 +Sandstone Block Slab=砂岩ブロックのハーフブロック +Desert Sandstone Stair=砂漠の砂岩の階段 +Inner Desert Sandstone Stair=へっこんだ砂漠の砂岩の階段 +Outer Desert Sandstone Stair=でっぱった砂漠の砂岩の階段 +Desert Sandstone Slab=砂漠の砂岩のハーフブロック +Desert Sandstone Brick Stair=砂漠の砂岩レンガの階段 +Inner Desert Sandstone Brick Stair=へっこんだ砂漠の砂岩レンガの階段 +Outer Desert Sandstone Brick Stair=でっぱった砂漠の砂岩レンガの階段 +Desert Sandstone Brick Slab=砂漠の砂岩レンガのハーフブロック +Desert Sandstone Block Stair=砂漠の砂岩ブロックの階段 +Inner Desert Sandstone Block Stair=へっこんだ砂漠の砂岩ブロックの階段 +Outer Desert Sandstone Block Stair=でっぱった砂漠の砂岩ブロックの階段 +Desert Sandstone Block Slab=砂漠の砂岩ブロックのハーフブロック +Silver Sandstone Stair=銀の砂岩の階段 +Inner Silver Sandstone Stair=へっこんだ銀の砂岩の階段 +Outer Silver Sandstone Stair=でっぱった銀の砂岩の階段 +Silver Sandstone Slab=銀の砂岩のハーフブロック +Silver Sandstone Brick Stair=銀の砂岩レンガの階段 +Inner Silver Sandstone Brick Stair=へっこんだ銀の砂岩レンガの階段 +Outer Silver Sandstone Brick Stair=でっぱった銀の砂岩レンガの階段 +Silver Sandstone Brick Slab=銀の砂岩レンガのハーフブロック +Silver Sandstone Block Stair=銀の砂岩ブロックの階段 +Inner Silver Sandstone Block Stair=へっこんだ銀の砂岩ブロックの階段 +Outer Silver Sandstone Block Stair=でっぱった銀の砂岩ブロックの階段 +Silver Sandstone Block Slab=銀の砂岩ブロックのハーフブロック +Obsidian Stair=黒曜石の階段 +Inner Obsidian Stair=へっこんだ黒曜石の階段 +Outer Obsidian Stair=でっぱった黒曜石の階段 +Obsidian Slab=黒曜石のハーフブロック +Obsidian Brick Stair=黒曜石レンガの階段 +Inner Obsidian Brick Stair=へっこんだ黒曜石レンガの階段 +Outer Obsidian Brick Stair=でっぱった黒曜石レンガの階段 +Obsidian Brick Slab=黒曜石レンガのハーフブロック +Obsidian Block Stair=黒曜石ブロックの階段 +Inner Obsidian Block Stair=へっこんだ黒曜石ブロックの階段 +Outer Obsidian Block Stair=でっぱった黒曜石ブロックの階段 +Obsidian Block Slab=黒曜石ブロックのハーフブロック +Brick Stair=レンガの階段 +Inner Brick Stair=へっこんだレンガの階段 +Outer Brick Stair=でっぱったレンガの階段 +Brick Slab=レンガのハーフブロック +Steel Block Stair=鉄ブロックの階段 +Inner Steel Block Stair=へっこんだ鉄ブロックの階段 +Outer Steel Block Stair=でっぱった鉄ブロックの階段 +Steel Block Slab=鉄ブロックのハーフブロック +Tin Block Stair=スズの階段 +Inner Tin Block Stair=へっこんだスズの階段 +Outer Tin Block Stair=でっぱったスズの階段 +Tin Block Slab=スズのハーフブロック +Copper Block Stair=銅ブロックの階段 +Inner Copper Block Stair=へっこんだ銅ブロックの階段 +Outer Copper Block Stair=でっぱった銅ブロックの階段 +Copper Block Slab=銅ブロックのハーフブロック +Bronze Block Stair=青銅ブロックの階段 +Inner Bronze Block Stair=へっこんだ青銅ブロックの階段 +Outer Bronze Block Stair=でっぱった青銅ブロックの階段 +Bronze Block Slab=青銅ブロックのハーフブロック +Gold Block Stair=金ブロックの階段 +Inner Gold Block Stair=へっこんだ金ブロックの階段 +Outer Gold Block Stair=でっぱった金ブロックの階段 +Gold Block Slab=金ブロックのハーフブロック +Ice Stair=氷の階段 +Inner Ice Stair=へっこんだ氷の階段 +Outer Ice Stair=でっぱった氷の階段 +Ice Slab=氷のハーフブロック +Snow Block Stair=雪の階段 +Inner Snow Block Stair=へっこんだ雪の階段 +Outer Snow Block Stair=でっぱった雪の階段 +Snow Block Slab=雪のハーフブロック diff --git a/mods/minetest_game/stairs/locale/stairs.zh_CN.tr b/mods/minetest_game/stairs/locale/stairs.zh_CN.tr index 8564665..e37ebcb 100644 --- a/mods/minetest_game/stairs/locale/stairs.zh_CN.tr +++ b/mods/minetest_game/stairs/locale/stairs.zh_CN.tr @@ -7,10 +7,10 @@ Obsidian Glass Stair=黑曜石玻璃楼梯 Obsidian Glass Slab=黑曜石玻璃台阶 Inner Obsidian Glass Stair=黑曜石玻璃楼梯(内) Outer Obsidian Glass Stair=黑曜石玻璃楼梯(外) -Wooden Stair=木制楼梯 +Wooden Stair=木楼梯 Inner Wooden Stair=木楼梯(内) Outer Wooden Stair=木楼梯(外) -Wooden Slab=木制台阶 +Wooden Slab=木台阶 Jungle Wood Stair=丛林木楼梯 Inner Jungle Wood Stair=丛林木楼梯(内) Outer Jungle Wood Stair=丛林木楼梯(外) @@ -31,14 +31,14 @@ Stone Stair=石楼梯 Inner Stone Stair=石楼梯(内) Outer Stone Stair=石楼梯(外) Stone Slab=石台阶 -Cobblestone Stair=圆石楼梯 -Inner Cobblestone Stair=圆石楼梯(内) -Outer Cobblestone Stair=圆石楼梯(外) -Cobblestone Slab=圆石台阶 -Mossy Cobblestone Stair=苔石楼梯 -Inner Mossy Cobblestone Stair=苔石楼梯(内) -Outer Mossy Cobblestone Stair=苔石楼梯(外) -Mossy Cobblestone Slab=苔石台阶 +Cobblestone Stair=鹅卵石楼梯 +Inner Cobblestone Stair=鹅卵石楼梯(内) +Outer Cobblestone Stair=鹅卵石楼梯(外) +Cobblestone Slab=鹅卵石台阶 +Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯 +Inner Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯(内) +Outer Mossy Cobblestone Stair=苔藓覆盖的鹅卵石楼梯(外) +Mossy Cobblestone Slab=苔藓覆盖的鹅卵石台阶 Stone Brick Stair=石砖楼梯 Inner Stone Brick Stair=石砖楼梯(内) Outer Stone Brick Stair=石砖楼梯(外) @@ -51,10 +51,10 @@ Desert Stone Stair=沙漠石楼梯 Inner Desert Stone Stair=沙漠石楼梯(内) Outer Desert Stone Stair=沙漠石楼梯(外) Desert Stone Slab=沙漠石台阶 -Desert Cobblestone Stair=沙漠圆石楼梯 -Inner Desert Cobblestone Stair=沙漠圆石楼梯(内) -Outer Desert Cobblestone Stair=沙漠圆石楼梯(外) -Desert Cobblestone Slab=沙漠圆石台阶 +Desert Cobblestone Stair=沙漠鹅卵石楼梯 +Inner Desert Cobblestone Stair=沙漠鹅卵石楼梯(内) +Outer Desert Cobblestone Stair=沙漠鹅卵石楼梯(外) +Desert Cobblestone Slab=沙漠鹅卵石台阶 Desert Stone Brick Stair=沙漠石砖楼梯 Inner Desert Stone Brick Stair=沙漠石砖楼梯(内) Outer Desert Stone Brick Stair=沙漠石砖楼梯(外) @@ -114,7 +114,7 @@ Obsidian Block Slab=黑曜石块台阶 Brick Stair=砖楼梯 Inner Brick Stair=砖楼梯(内) Outer Brick Stair=砖楼梯(外) -Brick Slab=砖制台阶 +Brick Slab=砖台阶 Steel Block Stair=铁块楼梯 Inner Steel Block Stair=铁块楼梯(内) Outer Steel Block Stair=铁块楼梯(外) @@ -135,7 +135,7 @@ Gold Block Stair=金块楼梯 Inner Gold Block Stair=金块楼梯(内) Outer Gold Block Stair=金块楼梯(外) Gold Block Slab=金块台阶 -Ice Stair=冰阶梯 +Ice Stair=冰楼梯 Inner Ice Stair=冰块楼梯(内) Outer Ice Stair=冰块楼梯(外) Ice Slab=冰台阶 diff --git a/mods/minetest_game/tnt/locale/tnt.ja.tr b/mods/minetest_game/tnt/locale/tnt.ja.tr new file mode 100644 index 0000000..d7af9f5 --- /dev/null +++ b/mods/minetest_game/tnt/locale/tnt.ja.tr @@ -0,0 +1,4 @@ +# textdomain: tnt +Gun Powder=火薬 +TNT Stick=ダイナマイト +TNT=TNT diff --git a/mods/minetest_game/tnt/locale/tnt.zh_CN.tr b/mods/minetest_game/tnt/locale/tnt.zh_CN.tr index 0a3294e..4cb2e94 100644 --- a/mods/minetest_game/tnt/locale/tnt.zh_CN.tr +++ b/mods/minetest_game/tnt/locale/tnt.zh_CN.tr @@ -1,4 +1,4 @@ # textdomain: tnt Gun Powder=火药粉 -TNT Stick=炸药棒 -TNT=炸药包 +TNT Stick=三硝基甲苯棒 +TNT=三硝基甲苯 diff --git a/mods/minetest_game/vessels/locale/vessels.ja.tr b/mods/minetest_game/vessels/locale/vessels.ja.tr new file mode 100644 index 0000000..451489a --- /dev/null +++ b/mods/minetest_game/vessels/locale/vessels.ja.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Empty Vessels Shelf=空の瓶の棚 +Vessels Shelf (@1 items)=瓶の棚(@1 本) +Vessels Shelf=瓶の棚 +Empty Glass Bottle=空のガラス瓶 +Empty Drinking Glass=空のガラスコップ +Empty Heavy Steel Bottle=空の重い鉄瓶 +Glass Fragments=ガラスの破片 diff --git a/mods/minetest_game/walls/locale/walls.ja.tr b/mods/minetest_game/walls/locale/walls.ja.tr new file mode 100644 index 0000000..66e497d --- /dev/null +++ b/mods/minetest_game/walls/locale/walls.ja.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=丸石の壁 +Mossy Cobblestone Wall=苔むした丸石の壁 +Desert Cobblestone Wall=砂漠の丸石の壁 diff --git a/mods/minetest_game/wool/locale/wool.ja.tr b/mods/minetest_game/wool/locale/wool.ja.tr new file mode 100644 index 0000000..5051f9e --- /dev/null +++ b/mods/minetest_game/wool/locale/wool.ja.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=白色の羊毛 +Grey Wool=灰色の羊毛 +Dark Grey Wool=濃灰色の羊毛 +Black Wool=黒色の羊毛 +Violet Wool=紫色の羊毛 +Blue Wool=青色の羊毛 +Cyan Wool=青緑色の羊毛 +Dark Green Wool=濃緑色の羊毛 +Green Wool=緑色の羊毛 +Yellow Wool=黄色の羊毛 +Brown Wool=茶色の羊毛 +Orange Wool=橙色の羊毛 +Red Wool=赤色の羊毛 +Magenta Wool=赤紫色の羊毛 +Pink Wool=桃色の羊毛 diff --git a/mods/minetest_game/xpanes/locale/xpanes.ja.tr b/mods/minetest_game/xpanes/locale/xpanes.ja.tr new file mode 100644 index 0000000..06e0bed --- /dev/null +++ b/mods/minetest_game/xpanes/locale/xpanes.ja.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=板ガラス +Obsidian Glass Pane=黒曜石の板ガラス +Steel Bars=鉄棒の柵 +Steel Bar Door=鉄棒のドア +Steel Bar Trapdoor=鉄棒のトラップドア diff --git a/mods/petz/.gitignore b/mods/petz/.gitignore index aed8939..00c964e 100644 --- a/mods/petz/.gitignore +++ b/mods/petz/.gitignore @@ -1,4 +1,5 @@ ## Generic ignorable patterns and files *.obj *.blend1 +*.dae user.conf \ No newline at end of file diff --git a/mods/petz/petz/api/api_breed.lua b/mods/petz/petz/api/api_breed.lua index 87806ef..ab6b947 100644 --- a/mods/petz/petz/api/api_breed.lua +++ b/mods/petz/petz/api/api_breed.lua @@ -1,7 +1,15 @@ local S = ... +petz.is_fertile = function(self) + if self.pregnant_count and (self.pregnant_count > 0) then + return true + else + return false + end +end + petz.breed = function(self, clicker, wielded_item, wielded_item_name) - if not(self.is_rut) and not(self.is_pregnant) then + if (petz.is_fertile) and not(self.is_rut) and not(self.is_pregnant) then wielded_item:take_item() clicker:set_wielded_item(wielded_item) self.is_rut = true @@ -9,10 +17,13 @@ petz.breed = function(self, clicker, wielded_item, wielded_item_name) petz.do_particles_effect(self.object, self.object:get_pos(), "heart") mokapi.make_sound("object", self.object, "petz_"..self.type.."_moaning", petz.settings.max_hear_distance) else + local player_name = clicker:get_player_name() if self.is_rut then - minetest.chat_send_player(clicker:get_player_name(), S("This animal is already rut.")) - else - minetest.chat_send_player(clicker:get_player_name(), S("This animal is already pregnant.")) + minetest.chat_send_player(player_name, S("This animal is already rut.")) + elseif not petz.is_fertile then + minetest.chat_send_player(player_name, S("This animal is infertile.")) + elseif self.is_pregnant then + minetest.chat_send_player(player_name, S("This animal is already pregnant.")) end end end @@ -43,8 +54,7 @@ petz.pony_breed = function(self, clicker, wielded_item, wielded_item_name) local petz_type = meta:get_string("petz_type") if not(self.is_pregnant) and self.pregnant_count > 0 and self.type == petz_type then self.is_pregnant = mobkit.remember(self, "is_pregnant", true) - local pregnant_count = self.pregnant_count - 1 - mobkit.remember(self, "pregnant_count", pregnant_count) + self.pregnant_count = mobkit.remember(self, "pregnant_count", self.pregnant_count - 1) local max_speed_forward = meta:get_int("max_speed_forward") local max_speed_reverse = meta:get_int("max_speed_reverse") local accel = meta:get_int("accel") @@ -61,8 +71,6 @@ end petz.childbirth = function(self) local pos = self.object:get_pos() - self.is_pregnant = mobkit.remember(self, "is_pregnant", false) - self.pregnant_time = mobkit.remember(self, "pregnant_time", 0.0) local baby_properties = {} baby_properties["baby_born"] = true if self.father_genes then @@ -87,23 +95,31 @@ petz.childbirth = function(self) end pos.y = pos.y + 1.01 -- birth a litte up local baby = minetest.add_entity(pos, baby_type, minetest.serialize(baby_properties)) - mokapi.make_sound("object", baby, "petz_pop_sound", petz.settings.max_hear_distance) - local baby_entity = baby:get_luaentity() - baby_entity.is_baby = true - mobkit.remember(baby_entity, "is_baby", baby_entity.is_baby) - if not(self.owner== nil) and not(self.owner== "") then - baby_entity.tamed = true - mobkit.remember(baby_entity, "tamed", baby_entity.tamed) - baby_entity.owner = self.owner - mobkit.remember(baby_entity, "owner", baby_entity.owner) + if baby then + self.is_pregnant = mobkit.remember(self, "is_pregnant", false) + self.pregnant_time = mobkit.remember(self, "pregnant_time", 0.0) + mokapi.make_sound("object", baby, "petz_pop_sound", petz.settings.max_hear_distance) + local baby_entity = baby:get_luaentity() + baby_entity.is_baby = mobkit.remember(baby_entity, "is_baby", true) + if not(self.owner== nil) and not(self.owner== "") then + baby_entity.tamed = true + mobkit.remember(baby_entity, "tamed", baby_entity.tamed) + baby_entity.owner = self.owner + mobkit.remember(baby_entity, "owner", baby_entity.owner) + end + return baby_entity + else + return nil end - return baby_entity end petz.pregnant_timer = function(self, dtime) self.pregnant_time = mobkit.remember(self, "pregnant_time", self.pregnant_time + dtime) if self.pregnant_time >= petz.settings.pregnancy_time then local baby_entity = petz.childbirth(self) + if not baby_entity then + return + end if self.is_mountable then --Set the genetics accordingly the father and the mother local speedup = (self.horseshoes or 0) * petz.settings.horseshoe_speedup diff --git a/mods/petz/petz/api/api_eggs.lua b/mods/petz/petz/api/api_eggs.lua index f763229..a6cc249 100644 --- a/mods/petz/petz/api/api_eggs.lua +++ b/mods/petz/petz/api/api_eggs.lua @@ -39,12 +39,17 @@ petz.lay_egg = function(self) end --Extract Egg from a Nest -petz.extract_egg_from_nest = function(pos, player, egg_type) +petz.extract_egg_from_nest = function(pos, player, itemstack, egg_type) local inv = player:get_inventory() if inv:room_for_item("main", egg_type) then - inv:add_item("main", egg_type) --add the egg to the player's inventory + if itemstack:get_name() == egg_type then + itemstack:add_item(egg_type) + else + inv:add_item("main", egg_type) --add the egg to the player's inventory + end minetest.set_node(pos, {name= "petz:ducky_nest"}) --Replace the node to a empty nest else minetest.chat_send_player(player:get_player_name(), "No room in your inventory for the egg.") end + return itemstack end diff --git a/mods/petz/petz/api/api_on_punch.lua b/mods/petz/petz/api/api_on_punch.lua index 5c1752e..611edc1 100644 --- a/mods/petz/petz/api/api_on_punch.lua +++ b/mods/petz/petz/api/api_on_punch.lua @@ -47,13 +47,22 @@ end function petz.on_punch(self, puncher, time_from_last_punch, tool_capabilities, dir) local pos = self.object:get_pos() --pos of the petz - if not mobkit.is_alive(self) then --is petz alive + if not(mobkit.is_alive(self)) then --is petz is died return end --Do not punch when you are mounted on it!!!--> if self.is_mountable and puncher == self.driver then return end + --Check the setting 'check_enable_damage' + if petz.settings.check_enable_damage and + not(minetest.setting_getbool("enable_damage")) then + return + end + --Check area protection + if petz.settings.no_damage_in_protected and minetest.is_protected(pos, puncher:get_player_name()) then + return + end --Check Dreamcatcher Protection local puncher_is_player = petz.puncher_is_player(puncher) if puncher_is_player then --player diff --git a/mods/petz/petz/api/api_on_rightclick.lua b/mods/petz/petz/api/api_on_rightclick.lua index 8d7b11f..5c7a548 100644 --- a/mods/petz/petz/api/api_on_rightclick.lua +++ b/mods/petz/petz/api/api_on_rightclick.lua @@ -91,7 +91,7 @@ petz.on_rightclick = function(self, clicker) minetest.chat_send_player(clicker:get_player_name(), S("This animal has already been milked.")) end elseif (self.is_mountable) and (wielded_item_name == "petz:glass_syringe" or wielded_item_name == "petz:glass_syringe_sperm") then - if not(self.is_baby) then + if not(self.is_baby) and is_owner then petz.pony_breed(self, clicker, wielded_item, wielded_item_name) end elseif self.bottled and (wielded_item_name == "vessels:glass_bottle") then diff --git a/mods/petz/petz/api/api_wool_milk.lua b/mods/petz/petz/api/api_wool_milk.lua index f7d8d43..4bcf9a1 100644 --- a/mods/petz/petz/api/api_wool_milk.lua +++ b/mods/petz/petz/api/api_wool_milk.lua @@ -59,10 +59,7 @@ end --- petz.milk_refill = function(self) - self.food_count = self.food_count + 1 - mobkit.remember(self, "food_count", self.food_count) if self.food_count >= 5 then -- if calf replaces 5x grass then it refill milk - self.food_count = mobkit.remember(self, "food_count", self.food_count) self.milked = mobkit.remember(self, "milked", false) end end @@ -71,6 +68,9 @@ petz.milk_milk = function(self, clicker) if self.is_male then minetest.chat_send_player(clicker:get_player_name(), S("Milk only female animals!")) return + elseif self.is_baby then + minetest.chat_send_player(clicker:get_player_name(), S("You cannot milk babies!")) + return end local inv = clicker:get_inventory() local wielded_item = clicker:get_wielded_item() diff --git a/mods/petz/petz/misc/nodes.lua b/mods/petz/petz/misc/nodes.lua index ddd71e5..e0ee974 100644 --- a/mods/petz/petz/misc/nodes.lua +++ b/mods/petz/petz/misc/nodes.lua @@ -181,7 +181,8 @@ minetest.register_node("petz:ducky_nest_egg", { end end, on_rightclick = function(pos, node, player, itemstack, pointed_thing) - petz.extract_egg_from_nest(pos, player, "petz:ducky_egg") --extract the egg + itemstack = petz.extract_egg_from_nest(pos, player, itemstack, "petz:ducky_egg") --extract the egg + return itemstack end, }) @@ -223,7 +224,8 @@ minetest.register_node("petz:chicken_nest_egg", { end end, on_rightclick = function(pos, node, player, itemstack, pointed_thing) - petz.extract_egg_from_nest(pos, player, "petz:chicken_egg") --extract the egg + itemstack = petz.extract_egg_from_nest(pos, player, itemstack, "petz:chicken_egg") --extract the egg + return itemstack end, }) diff --git a/mods/petz/petz/misc/wagon.lua b/mods/petz/petz/misc/wagon.lua index df9ebf3..5ecdf8a 100644 --- a/mods/petz/petz/misc/wagon.lua +++ b/mods/petz/petz/misc/wagon.lua @@ -46,6 +46,8 @@ minetest.register_craftitem("petz:wagon", { z = pt_above.z, } minetest.add_entity(pos2, "petz:wagon", nil) + itemstack:take_item() + return itemstack end, }) diff --git a/mods/petz/petz/mobkit/bh_breed.lua b/mods/petz/petz/mobkit/bh_breed.lua index d03b11c..3720168 100644 --- a/mods/petz/petz/mobkit/bh_breed.lua +++ b/mods/petz/petz/mobkit/bh_breed.lua @@ -16,12 +16,9 @@ function petz.bh_breed(self, pos) local copulation_distance = petz.settings[self.type.."_copulation_distance"] or 1 if vector.distance(pos, couple_pos) <= copulation_distance then --if close --Changue some vars - self.is_rut = false - mobkit.remember(self, "is_rut", self.is_rut) - couple.is_rut = false - mobkit.remember(couple, "is_rut", couple.is_rut) - couple.is_pregnant = true - mobkit.remember(couple, "is_pregnant", couple.is_pregnant) + self.is_rut = mobkit.remember(self, "is_rut", false) + couple.is_rut = mobkit.remember(couple, "is_rut", false) + couple.is_pregnant = mobkit.remember(couple, "is_pregnant", true) couple.father_genes = mobkit.remember(couple, "father_genes", self.genes) petz.do_particles_effect(couple.object, couple.object:get_pos(), "pregnant".."_"..couple.type) end diff --git a/mods/petz/petz/models/petz_flamingo_texture0.png b/mods/petz/petz/models/petz_flamingo_texture0.png new file mode 100644 index 0000000..d78e184 Binary files /dev/null and b/mods/petz/petz/models/petz_flamingo_texture0.png differ diff --git a/mods/petz/petz/petz.conf b/mods/petz/petz/petz.conf index 50101f3..bb43c1d 100644 --- a/mods/petz/petz/petz.conf +++ b/mods/petz/petz/petz.conf @@ -89,6 +89,8 @@ look_at_random = 10 pregnant_count = 5 pregnancy_time = 300 growth_time = 1200 +#Only owners can extract some seed from their ponies +seed_only_owners = true ##Bloody Mode blood = false @@ -179,6 +181,13 @@ lycanthropy = true lycanthropy_infection_chance_by_wolf = 200 lycanthropy_infection_chance_by_werewolf = 10 +##Damage Engine +#If this setting is 'true', checks the "enable_damage" setting of the game +#and if 'enable_damage=false', disables the damage for pets too. +check_enable_damage = false +#Petz are not damaged in protected areas +no_damage_in_protected = false + ##Enviromental Damage air_damage = 1 #Lava & Fire diff --git a/mods/petz/petz/petz/calf_mobkit.lua b/mods/petz/petz/petz/calf_mobkit.lua index 003e99a..66edc6b 100644 --- a/mods/petz/petz/petz/calf_mobkit.lua +++ b/mods/petz/petz/petz/calf_mobkit.lua @@ -9,7 +9,7 @@ local scale_model = 4.5 local scale_baby = 0.5 local visual_size = {x=petz.settings.visual_size.x*scale_model, y=petz.settings.visual_size.y*scale_model} local visual_size_baby = {x=petz.settings.visual_size.x*scale_model*scale_baby, y=petz.settings.visual_size.y*scale_model*scale_baby} -local skin_colors = {"black_white", "brown_white", "brown", "white_black", "white_brown"} +local skin_colors = {"black_white", "brown_white", "brown", "white_black", "white_brown", "wine"} local textures = {} for n = 1, #skin_colors do textures[n] = "petz_"..pet_name.."_"..skin_colors[n]..".png" diff --git a/mods/petz/petz/petz/foxy_mobkit.lua b/mods/petz/petz/petz/foxy_mobkit.lua index d526076..2a97c59 100644 --- a/mods/petz/petz/petz/foxy_mobkit.lua +++ b/mods/petz/petz/petz/foxy_mobkit.lua @@ -7,7 +7,7 @@ local pet_name = "foxy" local scale_model = 1.5 petz.foxy = {} local mesh = 'petz_foxy.b3d' -local textures = {"petz_foxy.png"} +local textures = {"petz_foxy.png", "petz_foxy_light_brown.png"} local p1 = {x= -0.1875, y = -0.5, z = -0.25} local p2 = {x= 0.1875, y = -0.0625, z = 0.375} local collisionbox = petz.get_collisionbox(p1, p2, scale_model, nil) diff --git a/mods/petz/petz/settings.lua b/mods/petz/petz/settings.lua index 202e97b..c9b754b 100644 --- a/mods/petz/petz/settings.lua +++ b/mods/petz/petz/settings.lua @@ -79,6 +79,17 @@ local settings_def = { split = true, default = "", }, + --Damage Engine + { + name = "check_enable_damage", + type = "boolean", + default = false, + }, + { + name = "no_damage_in_protected", + type = "boolean", + default = false, + }, --Enviromental Damage { name = "air_damage", @@ -245,6 +256,11 @@ local settings_def = { type = "number", default = 1200, }, + { + name = "seed_only_owners", + type = "boolean", + default = true, + }, --Punch Effect { name = "colorize_punch", diff --git a/mods/petz/petz/textures/petz_calf_black_white.png b/mods/petz/petz/textures/petz_calf_black_white.png index 0be4140..fa72301 100644 Binary files a/mods/petz/petz/textures/petz_calf_black_white.png and b/mods/petz/petz/textures/petz_calf_black_white.png differ diff --git a/mods/petz/petz/textures/petz_calf_brown.png b/mods/petz/petz/textures/petz_calf_brown.png index bacf610..c13b92d 100644 Binary files a/mods/petz/petz/textures/petz_calf_brown.png and b/mods/petz/petz/textures/petz_calf_brown.png differ diff --git a/mods/petz/petz/textures/petz_calf_brown_white.png b/mods/petz/petz/textures/petz_calf_brown_white.png index 5b19fe2..d577c62 100644 Binary files a/mods/petz/petz/textures/petz_calf_brown_white.png and b/mods/petz/petz/textures/petz_calf_brown_white.png differ diff --git a/mods/petz/petz/textures/petz_calf_white_brown.png b/mods/petz/petz/textures/petz_calf_white_brown.png index 72b3d29..74b5038 100644 Binary files a/mods/petz/petz/textures/petz_calf_white_brown.png and b/mods/petz/petz/textures/petz_calf_white_brown.png differ diff --git a/mods/petz/petz/textures/petz_calf_wine.png b/mods/petz/petz/textures/petz_calf_wine.png new file mode 100644 index 0000000..f5e4204 Binary files /dev/null and b/mods/petz/petz/textures/petz_calf_wine.png differ diff --git a/mods/petz/petz/textures/petz_foxy.png b/mods/petz/petz/textures/petz_foxy.png index 24acd51..a883583 100644 Binary files a/mods/petz/petz/textures/petz_foxy.png and b/mods/petz/petz/textures/petz_foxy.png differ diff --git a/mods/petz/petz/textures/petz_foxy_light_brown.png b/mods/petz/petz/textures/petz_foxy_light_brown.png new file mode 100644 index 0000000..780a866 Binary files /dev/null and b/mods/petz/petz/textures/petz_foxy_light_brown.png differ diff --git a/mods/rainf/init.lua b/mods/rainf/init.lua index de7e790..756706d 100644 --- a/mods/rainf/init.lua +++ b/mods/rainf/init.lua @@ -44,7 +44,7 @@ minetest.register_node("rainf:meadow", { tiles = {"rainf_meadow.png", "rainf_dirt.png", {name = "rainf_dirt.png^rainf_dirt_with_grass_side.png", tileable_vertical = false}}, - groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1}, + groups = {crumbly = 3, soil = 1}, sounds = default.node_sound_dirt_defaults({ footstep = {name = "default_grass_footstep", gain = 0.25}, }), @@ -55,7 +55,7 @@ minetest.register_node("rainf:blossom_meadow", { tiles = {"rainf_blossom_meadow.png", "rainf_dirt.png", {name = "rainf_dirt.png^rainf_dirt_with_grass_side.png", tileable_vertical = false}}, - groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1}, + groups = {crumbly = 3, soil = 1}, sounds = default.node_sound_dirt_defaults({ footstep = {name = "default_grass_footstep", gain = 0.25}, }), diff --git a/mods/redw/init.lua b/mods/redw/init.lua index 82a28b3..9a2ac6e 100644 --- a/mods/redw/init.lua +++ b/mods/redw/init.lua @@ -29,7 +29,7 @@ minetest.register_node("redw:dirt_with_grass", { tiles = {"redw_dirt_with_grass.png", "redw_dirt.png", {name = "redw_dirt.png^redw_dirt_with_grass_side.png", tileable_vertical = false}}, - groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1}, + groups = {crumbly = 3, soil = 1}, sounds = default.node_sound_dirt_defaults({ footstep = {name = "default_grass_footstep", gain = 0.25}, }), @@ -38,7 +38,7 @@ minetest.register_node("redw:dirt_with_grass", { minetest.register_node("redw:dirt", { description = S("Red Dirt"), tiles = {"redw_dirt.png"}, - groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1}, + groups = {crumbly = 3, soil = 1}, sounds = default.node_sound_dirt_defaults({ footstep = {name = "default_grass_footstep", gain = 0.25}, }), @@ -47,10 +47,8 @@ minetest.register_node("redw:dirt", { minetest.register_node("redw:sandstone", { description = S("Red Sandstone"), tiles = {"redw_sandstone.png"}, - groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_grass_footstep", gain = 0.25}, - }), + groups = {crumbly = 1, cracky = 3}, + sounds = default.node_sound_stone_defaults(), }) -- Ferns diff --git a/mods/swaz/init.lua b/mods/swaz/init.lua index 3d767e0..97716c0 100644 --- a/mods/swaz/init.lua +++ b/mods/swaz/init.lua @@ -47,7 +47,7 @@ minetest.register_node("swaz:silt_with_grass", { tiles = {"swaz_grass.png", "swaz_silt.png", {name = "swaz_silt.png^swaz_silt_with_grass_side.png", tileable_vertical = false}}, - groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1}, + groups = {crumbly = 3, soil = 1}, drop = "swaz:mud", sounds = default.node_sound_dirt_defaults({ footstep = {name = "default_grass_footstep", gain = 0.25},