added translations, sort recipe list
tenplus1
parent
c6b226e481
commit
33b17076e8
|
|
@ -30,7 +30,7 @@ re-arranged code, tweaked lucky blocks, updated translations
|
|||
- 1.9 - Added wine:add_drink() function to create drink glasses and bottles
|
||||
- 1.95 - Tweaked code to accept 2 item recipes, fixed mineclone2 rum recipe and ui recipes
|
||||
- 1.98 - New formspec textures and Kefir drink by Sirrobzeroone
|
||||
- 1.99 - Barrel now has 4 slots for recipe items (and drinking glasses) and a water slot to fill up barrel with water buckets ready for fermenting, fix mineclone2 compatibility
|
||||
- 1.99 - Barrel now has 4 slots for recipe items (and drinking glasses) and a water slot to fill up barrel with water buckets ready for fermenting, fix mineclone2 compatibility, added translations
|
||||
|
||||
Lucky Blocks: 22
|
||||
|
||||
|
|
|
|||
18
drinks.lua
18
drinks.lua
|
|
@ -56,6 +56,15 @@ wine:add_item({
|
|||
{"wine:blue_agave", "wine:glass_tequila"}
|
||||
})
|
||||
|
||||
-- default game
|
||||
if minetest.get_modpath("default") then
|
||||
|
||||
wine:add_item({
|
||||
{"default:apple", "wine:glass_cider"},
|
||||
{"default:papyrus", "wine:glass_rum"}
|
||||
})
|
||||
end
|
||||
|
||||
-- xdecor
|
||||
if minetest.get_modpath("xdecor") then
|
||||
|
||||
|
|
@ -112,15 +121,6 @@ if minetest.get_modpath("farming") then
|
|||
end
|
||||
end
|
||||
|
||||
-- default game
|
||||
if minetest.get_modpath("default") then
|
||||
|
||||
wine:add_item({
|
||||
{"default:apple", "wine:glass_cider"},
|
||||
{"default:papyrus", "wine:glass_rum"}
|
||||
})
|
||||
end
|
||||
|
||||
-- mineclone2
|
||||
if minetest.get_modpath("mcl_core") then
|
||||
|
||||
|
|
|
|||
48
init.lua
48
init.lua
|
|
@ -5,6 +5,7 @@ local def = minetest.get_modpath("default")
|
|||
local snd_d = def and default.node_sound_defaults()
|
||||
local snd_g = def and default.node_sound_glass_defaults()
|
||||
local glass_item = def and "default:glass"
|
||||
local txt
|
||||
|
||||
|
||||
-- check for MineClone2
|
||||
|
|
@ -383,7 +384,7 @@ minetest.register_node("wine:wine_barrel", {
|
|||
|
||||
meta:set_int("water", water)
|
||||
meta:set_string("formspec",
|
||||
winebarrel_formspec(status, "Water Added", water))
|
||||
winebarrel_formspec(status, S("Water Added"), water))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -462,10 +463,12 @@ minetest.register_node("wine:wine_barrel", {
|
|||
-- check water level
|
||||
if water < 5 then
|
||||
|
||||
meta:set_string("infotext", S("Fermenting Barrel (Water Level Low)"))
|
||||
txt = S("Fermenting Barrel") .. " " .. S("(Water Level Low)")
|
||||
|
||||
meta:set_string("infotext", txt)
|
||||
meta:set_float("status", 0)
|
||||
meta:set_string("formspec", winebarrel_formspec(0,
|
||||
S("Water Level Low"), water))
|
||||
S("(Water Level Low)"), water))
|
||||
|
||||
return false
|
||||
end
|
||||
|
|
@ -511,10 +514,12 @@ minetest.register_node("wine:wine_barrel", {
|
|||
-- if we have a wrong recipe change status
|
||||
if not has_items then
|
||||
|
||||
meta:set_string("infotext", S("Fermenting Barrel") .. " (No Valid Recipe)")
|
||||
txt = S("Fermenting Barrel") .. " " .. S("(No Valid Recipe)")
|
||||
|
||||
meta:set_string("infotext", txt)
|
||||
meta:set_float("status", 0)
|
||||
meta:set_string("formspec",
|
||||
winebarrel_formspec(0, S("No Valid Recipe"), water))
|
||||
winebarrel_formspec(0, S("(No Valid Recipe)"), water))
|
||||
|
||||
return false
|
||||
end
|
||||
|
|
@ -522,9 +527,11 @@ minetest.register_node("wine:wine_barrel", {
|
|||
-- is there room for additional fermentation?
|
||||
if not inv:room_for_item("dst", recipe[2]) then
|
||||
|
||||
meta:set_string("infotext", S("Fermenting Barrel (Output Full)"))
|
||||
txt = S("Fermenting Barrel") .. " " .. S("(Output Full)")
|
||||
|
||||
meta:set_string("infotext", txt)
|
||||
meta:set_string("formspec",
|
||||
winebarrel_formspec(0, S("Output Full"), water))
|
||||
winebarrel_formspec(0, S("(Output Full)"), water))
|
||||
|
||||
return false
|
||||
end
|
||||
|
|
@ -534,13 +541,16 @@ minetest.register_node("wine:wine_barrel", {
|
|||
-- fermenting (change status)
|
||||
if status < 100 then
|
||||
|
||||
meta:set_string("infotext", S("Fermenting Barrel (@1% Done)", status))
|
||||
txt = S("Fermenting Barrel") .. " " .. S("(@1% Done)", status)
|
||||
|
||||
meta:set_string("infotext", txt)
|
||||
meta:set_float("status", status + 5)
|
||||
|
||||
local desc = minetest.registered_items[recipe[2]].description or ""
|
||||
|
||||
meta:set_string("formspec", winebarrel_formspec(status,
|
||||
S("Brewing: @1 (@2% Done)", desc, status), water))
|
||||
txt = S("Brewing: @1", desc) .. " " .. S("(@1% Done)", status)
|
||||
|
||||
meta:set_string("formspec", winebarrel_formspec(status, txt, water))
|
||||
|
||||
else -- when we hit 100% remove items needed and add beverage
|
||||
|
||||
|
|
@ -635,4 +645,22 @@ if not minetest.registered_items["vessels:drinking_glass"] then
|
|||
end
|
||||
|
||||
|
||||
-- sort ferment table to fix recipe overlap (large to small)
|
||||
minetest.after(0.2, function()
|
||||
|
||||
local tmp = {}
|
||||
|
||||
for l = 4, 1, -1 do
|
||||
for n = 1, #ferment do
|
||||
|
||||
if #ferment[n][1] == l then
|
||||
table.insert(tmp, ferment[n])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
ferment = tmp
|
||||
end)
|
||||
|
||||
|
||||
print ("[MOD] Wine loaded")
|
||||
|
|
|
|||
|
|
@ -25,10 +25,25 @@ Glass of Honey-Mead=
|
|||
Bottle of Honey-Mead=
|
||||
Glass of Mint Julep=
|
||||
Bottle of Mint Julep=
|
||||
Glass of Sparkling Agave Juice=
|
||||
Bottle of Sparkling Agave Juice=
|
||||
Glass of Sparkling Apple Juice=
|
||||
Bottle of Sparkling Apple Juice=
|
||||
Glass of Sparkling Carrot Juice=
|
||||
Bottle of Sparkling Carrot Juice=
|
||||
Glass of Sparkling Blackberry Juice=
|
||||
Bottle of Sparkling Blackberry Juice=
|
||||
Glass of Kefir=
|
||||
Bottle of Kefir=
|
||||
Blue Agave=
|
||||
Agave Syrup=
|
||||
Fermenting Barrel=
|
||||
Fermenting Barrel (FULL)=
|
||||
Fermenting Barrel (@1% Done)=
|
||||
Brewing: @1=
|
||||
Water @1% Full=
|
||||
Water Added=
|
||||
(@1% Done)=
|
||||
(Water Level Low)=
|
||||
(No Valid Recipe)=
|
||||
(Output Full)=
|
||||
Empty Drinking Glass=
|
||||
[MOD] Wine loaded=
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# textdomain: wine
|
||||
# author: Xanthin
|
||||
# author: TheDarkTiger
|
||||
# last update: 2020/October/27
|
||||
# last update: 2022/August/20
|
||||
|
||||
Glass of Wine=Glas Wein
|
||||
Bottle of Wine=Flasche Wein
|
||||
|
|
@ -26,9 +26,25 @@ Glass of Honey-Mead=Honigwein
|
|||
Bottle of Honey-Mead=Flasche Honigwein
|
||||
Glass of Mint Julep=Minze Julep
|
||||
Bottle of Mint Julep=Flasch Minze Julep
|
||||
Glass of Sparkling Agave Juice=Minze prickelnder Agavensaft
|
||||
Bottle of Sparkling Agave Juice=Flasch Minze prickelnder Agavensaft
|
||||
Glass of Sparkling Apple Juice=Minze prickelnder Apfelsaft
|
||||
Bottle of Sparkling Apple Juice=Flasch Minze prickelnder Apfelsaft
|
||||
Glass of Sparkling Carrot Juice=Minze prickelnder Karottensaft
|
||||
Bottle of Sparkling Carrot Juice=Flasch Minze prickelnder Karottensaft
|
||||
Glass of Sparkling Blackberry Juice=Minze sprudelnder Brombeersaft
|
||||
Bottle of Sparkling Blackberry Juice=Flasch Minze sprudelnder Brombeersaft
|
||||
Glass of Kefir=Minze Kefir
|
||||
Bottle of Kefir=Flasch Minze Kefir
|
||||
Blue Agave=Agave
|
||||
Agave Syrup=Agavendicksaft
|
||||
Fermenting Barrel=Gärfass
|
||||
Fermenting Barrel (FULL)=Gärfass (VOLL)
|
||||
Fermenting Barrel (@1% Done)=Gärfass (@1% erledigt)
|
||||
Brewing: @1=(Brauen: @1)
|
||||
Water @1% Full=Wasser @1%
|
||||
Water Added=Wasser Hinzugefügt
|
||||
(@1% Done)=(@1 erledigt)
|
||||
(Water Level Low)=(Wasserstand Niedrig)
|
||||
(No Valid Recipe)=(kein gültiges Rezept)
|
||||
(Output Full)=(Ausgabe voll)
|
||||
Empty Drinking Glass=Leeres Trinkglas
|
||||
[MOD] Wine loaded=[MOD] Wine geladen
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# author: Unknown
|
||||
# author: TenPlus1
|
||||
# author: TheDarkTiger
|
||||
# last update: 2020/October/27
|
||||
# last update: 2022/August/20
|
||||
|
||||
Glass of Wine=Copa de vino
|
||||
Bottle of Wine=Botella de vino
|
||||
|
|
@ -27,9 +27,25 @@ Glass of Honey-Mead=Bebida de Miel
|
|||
Bottle of Honey-Mead=Botella de Bebida de Miel
|
||||
Glass of Mint Julep=Julepe de menta
|
||||
Bottle of Mint Julep=Botella de Julepe de menta
|
||||
Glass of Sparkling Agave Juice=Vaso de jugo de agave espumoso
|
||||
Bottle of Sparkling Agave Juice=Botella de jugo de agave espumoso
|
||||
Glass of Sparkling Apple Juice=Vaso de jugo de manzana espumoso
|
||||
Bottle of Sparkling Apple Juice=Botella de jugo de manzana espumoso
|
||||
Glass of Sparkling Carrot Juice=Vaso de jugo de zanahoria espumoso
|
||||
Bottle of Sparkling Carrot Juice=Botella de jugo de zanahoria espumoso
|
||||
Glass of Sparkling Blackberry Juice=Vaso de jugo de mora espumoso
|
||||
Bottle of Sparkling Blackberry Juice=Botella de jugo de mora espumoso
|
||||
Glass of Kefir=vaso de kéfir
|
||||
Bottle of Kefir=Botella de kéfir
|
||||
Blue Agave=Agave Tequilana
|
||||
Agave Syrup=jarabe de agave
|
||||
Fermenting Barrel=Barril de fermentación
|
||||
Fermenting Barrel (FULL)=Barril de fermentación (Lleno)
|
||||
Fermenting Barrel (@1% Done)=Barril de fermentación (@1% completado)
|
||||
Brewing: @1= Fabricación de cerveza: @1
|
||||
Water @1% Full=Agua @1% Llena
|
||||
Water Added=Agua añadida
|
||||
(@1% Done)=(@1% completado)
|
||||
(Water Level Low)=(Nivel de agua bajo)
|
||||
(No Valid Recipe)=(Sin receta válida)
|
||||
(Output Full)=(Salida completa)
|
||||
Empty Drinking Glass=Vaso para beber vacío
|
||||
[MOD] Wine loaded=[MOD] Wine cargado
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Traduction Française du mod Wine par TenPlus1
|
||||
# textdomain: wine
|
||||
# author: TheDarkTiger
|
||||
# last update: 2020/October/27
|
||||
# last update: 2022/August/20
|
||||
|
||||
Glass of Wine=Verre de Vin
|
||||
Bottle of Wine=Bouteille de Vin
|
||||
|
|
@ -25,9 +25,25 @@ Glass of Honey-Mead=Hydromel
|
|||
Bottle of Honey-Mead=Bouteille d'Hydromel
|
||||
Glass of Mint Julep=Mint Julep
|
||||
Bottle of Mint Julep=Bouteille de Mint Julep
|
||||
Glass of Sparkling Agave Juice=Verre de jus d'agave pétillant
|
||||
Bottle of Sparkling Agave Juice=Bouteille de jus d'agave pétillant
|
||||
Glass of Sparkling Apple Juice=Verre de jus de pomme pétillant
|
||||
Bottle of Sparkling Apple Juice=Bouteille de jus de pomme pétillant
|
||||
Glass of Sparkling Carrot Juice=Verre de jus de carotte pétillant
|
||||
Bottle of Sparkling Carrot Juice=Bouteille de jus de carotte pétillant
|
||||
Glass of Sparkling Blackberry Juice=Verre de jus de mûre pétillant
|
||||
Bottle of Sparkling Blackberry Juice=Bouteille de jus de mûre pétillant
|
||||
Glass of Kefir=Verre de kéfir
|
||||
Bottle of Kefir=Bouteille de kéfir
|
||||
Blue Agave=Agave Bleue
|
||||
Agave Syrup=Sirop d'Agave
|
||||
Fermenting Barrel=Baril de fermentation
|
||||
Fermenting Barrel (FULL)=Baril de fermentation (PLEIN)
|
||||
Fermenting Barrel (@1% Done)=Baril de fermentation (En cours @1%)
|
||||
Brewing: @1=Sortie pleine: @1
|
||||
Water @1% Full=l'eau @1 rempli
|
||||
Water Added=eau ajoutée
|
||||
(@1% Done)=(En cours @1%)
|
||||
(Water Level Low)=(niveau d'eau bas)
|
||||
(No Valid Recipe)=(pas de recette valide)
|
||||
(Output Full)=(Sortie pleine)
|
||||
Empty Drinking Glass=Verre vide
|
||||
[MOD] Wine loaded=[MOD] Wine chargé
|
||||
|
|
|
|||
Loading…
Reference in New Issue