From 68ae029161f616ab6cecaa78b41b815b38e3e967 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 12 May 2020 10:19:30 +0100 Subject: [PATCH] added honey-mead bottle, updated translations, tweaked and tidied code, added lucky blocks --- README.md | 4 +- init.lua | 603 ++++-------------- license.txt | 19 +- locale/de.txt | 3 +- locale/es.txt | 3 +- locale/fr.txt | 3 +- locale/template.txt | 1 + textures/wine_mead_bottle.png | Bin 0 -> 301 bytes .../{wine_sake.png => wine_sake_glass.png} | Bin ...ine_tequila.png => wine_tequila_glass.png} | Bin .../{wine_bottle.png => wine_wine_bottle.png} | Bin .../{wine_glass.png => wine_wine_glass.png} | Bin 12 files changed, 146 insertions(+), 490 deletions(-) create mode 100644 textures/wine_mead_bottle.png rename textures/{wine_sake.png => wine_sake_glass.png} (100%) rename textures/{wine_tequila.png => wine_tequila_glass.png} (100%) rename textures/{wine_bottle.png => wine_wine_bottle.png} (100%) rename textures/{wine_glass.png => wine_wine_glass.png} (100%) diff --git a/README.md b/README.md index 3d2d2d3..f6e4687 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,10 @@ Change log: - 1.3 - Translations updated and French added thanks to TheDarkTiger - 1.4 - Added bottle of beer and bottle of wheat beer (thanks Darkstalker for textures) - 1.5 - Added bottle of sake (texture by Darkstalker), code tidy & tweaks, resized bottles and glasses, added some new lucky blocks, support for Thirst mod +- 1.6 - Added bottle of Mead and Cider (textures by Darkstalker), re-arranged +code, tweaked lucky blocks, updated translations -Lucky Blocks: 16 +Lucky Blocks: 14 Wine Mod API diff --git a/init.lua b/init.lua index 2ee922a..631308f 100644 --- a/init.lua +++ b/init.lua @@ -1,26 +1,28 @@ +wine = {} local def = minetest.get_modpath("default") -wine = { - snd_d = def and default.node_sound_defaults(), - snd_g = def and default.node_sound_glass_defaults(), - snd_l = def and default.node_sound_leaves_defaults(), - sand = "default:desert_sand" -} +local snd_d = def and default.node_sound_defaults() +local snd_g = def and default.node_sound_glass_defaults() +local snd_l = def and default.node_sound_leaves_defaults() +local sand = "default:desert_sand" -- check for MineClone2 local mcl = minetest.get_modpath("mcl_core") if mcl then - wine.snd_d = mcl_sounds.node_sound_glass_defaults() - wine.snd_g = mcl_sounds.node_sound_defaults() - wine.snd_l = mcl_sounds.node_sound_leaves_defaults() - wine.sand = "mcl_core:sand" + snd_d = mcl_sounds.node_sound_glass_defaults() + snd_g = mcl_sounds.node_sound_defaults() + snd_l = mcl_sounds.node_sound_leaves_defaults() + sand = "mcl_core:sand" end -- check for Unified Inventory local is_uninv = minetest.global_exists("unified_inventory") or false +-- is thirsty mod active +local thirsty_mod = minetest.get_modpath("thirsty") + -- Intllib local S if minetest.get_modpath("intllib") then @@ -87,6 +89,7 @@ if is_uninv then end +-- add item to ferment list and resulting beverage function wine:add_item(list) for n = 1, #list do @@ -105,477 +108,113 @@ function wine:add_item(list) end --- selection boxes -local gla_sel = {type = "fixed", fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}} -local bot_sel = {type = "fixed", fixed = {-0.15, -0.5, -0.15, 0.15, 0.25, 0.15}} +-- list of beverages (name, desc, has bottle, hunger, thirst) +local beverages = { + {"wine", "Wine", true, 2, 5}, + {"beer", "Beer", true, 2, 8}, + {"rum", "Rum", true, 2, 5}, + {"tequila", "Tequila", true, 2, 3}, + {"wheat_beer", "Wheat Beer", true, 2, 8}, + {"sake", "Sake", true, 2, 3}, + {"bourbon", "Bourbon", true, 2, 3}, + {"vodka", "Vodka", true, 2, 3}, + {"cider", "Cider", true, 2, 6}, + {"mead", "Honey-Mead", true, 4, 5} +} --- is thirsty mod active -local thirsty_mod = minetest.get_modpath("thirsty") +-- create glasses and bottles +for n = 1, #beverages do + local name = beverages[n][1] + local desc = beverages[n][2] + local has_bottle = beverages[n][2] + local hunger = beverages[n][3] + local thirst = beverages[n][3] --- glass of wine -minetest.register_node("wine:glass_wine", { - description = S("Glass of Wine"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_glass.png"}, - inventory_image = "wine_glass.png", - wield_image = "wine_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_wine = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 5) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - --- bottle of wine -minetest.register_node("wine:bottle_wine", { - description = S("Bottle of Wine"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_bottle.png"}, - inventory_image = "wine_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of rum -minetest.register_node("wine:glass_rum", { - description = S("Rum"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_rum_glass.png"}, - inventory_image = "wine_rum_glass.png", - wield_image = "wine_rum_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_rum = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 5) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - - --- bottle of rum -minetest.register_node("wine:bottle_rum", { - description = S("Bottle of Rum"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_rum_bottle.png"}, - inventory_image = "wine_rum_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of weizen, or wheat beer --- The image is a lighter version of the one from RiverKpocc @ deviantart.com -minetest.register_node("wine:glass_wheat_beer", { - description = S("Wheat Beer"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_wheat_beer_glass.png"}, - inventory_image = "wine_wheat_beer_glass.png", - wield_image = "wine_wheat_beer_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_beer = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 8) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - --- bottle of wheat beer -minetest.register_node("wine:bottle_wheat_beer", { - description = S("Bottle of Wheat Beer"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_wheat_beer_bottle.png"}, - inventory_image = "wine_wheat_beer_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of beer (thanks to RiverKpocc @ deviantart.com for image) -minetest.register_node("wine:glass_beer", { - description = S("Beer"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_beer_glass.png"}, - inventory_image = "wine_beer_glass.png", - wield_image = "wine_beer_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_beer = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 8) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - --- bottle of beer -minetest.register_node("wine:bottle_beer", { - description = S("Bottle of Beer"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_beer_bottle.png"}, - inventory_image = "wine_beer_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of honey mead -minetest.register_node("wine:glass_mead", { - description = S("Honey-Mead"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_mead_glass.png"}, - inventory_image = "wine_mead_glass.png", - wield_image = "wine_mead_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_mead = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(4), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 5) - end - return minetest.do_item_eat(4, nil, itemstack, user, pointed_thing) - end - end -}) - - --- glass of apple cider -minetest.register_node("wine:glass_cider", { - description = S("Apple Cider"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_cider_glass.png"}, - inventory_image = "wine_cider_glass.png", - wield_image = "wine_cider_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_cider = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 6) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - --- bottle of cider -minetest.register_node("wine:bottle_cider", { - description = S("Bottle of Cider"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_cider_bottle.png"}, - inventory_image = "wine_cider_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of tequila -minetest.register_node("wine:glass_tequila", { - description = S("Tequila"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_tequila.png"}, - inventory_image = "wine_tequila.png", - wield_image = "wine_tequila.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_tequila = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 3) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - - --- bottle of tequila -minetest.register_node("wine:bottle_tequila", { - description = S("Bottle of Tequila"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_tequila_bottle.png"}, - inventory_image = "wine_tequila_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of sake -minetest.register_node("wine:glass_sake", { - description = S("Sake"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_sake.png"}, - inventory_image = "wine_sake.png", - wield_image = "wine_sake.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_sake = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 3) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - --- bottle of sake -minetest.register_node("wine:bottle_sake", { - description = S("Bottle of Sake"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_sake_bottle.png"}, - inventory_image = "wine_sake_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of bourbon -minetest.register_node("wine:glass_bourbon", { - description = S("Glass of Bourbon"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_bourbon_glass.png"}, - inventory_image = "wine_bourbon_glass.png", - wield_image = "wine_bourbon_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_wine = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 3) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - --- bottle of bourbon -minetest.register_node("wine:bottle_bourbon", { - description = S("Bottle of Bourbon"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_bourbon_bottle.png"}, - inventory_image = "wine_bourbon_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- glass of vodka -minetest.register_node("wine:glass_vodka", { - description = S("Glass of Vodka"), - drawtype = "plantlike", - visual_scale = 0.5, - tiles = {"wine_vodka_glass.png"}, - inventory_image = "wine_vodka_glass.png", - wield_image = "wine_vodka_glass.png", - paramtype = "light", - is_ground_content = false, - sunlight_propagates = true, - walkable = false, - selection_box = gla_sel, - groups = { - food_wine = 1, vessel = 1, dig_immediate = 3, attached_node = 1, - alcohol = 1 - }, - sounds = wine.snd_g, --- on_use = minetest.item_eat(2), - on_use = function(itemstack, user, pointed_thing) - if user then - if thirsty_mod then - thirsty.drink(user, 3) - end - return minetest.do_item_eat(2, nil, itemstack, user, pointed_thing) - end - end -}) - --- bottle of vodka -minetest.register_node("wine:bottle_vodka", { - description = S("Bottle of Vodka"), - drawtype = "plantlike", - visual_scale = 0.7, - tiles = {"wine_vodka_bottle.png"}, - inventory_image = "wine_vodka_bottle.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - selection_box = bot_sel, - groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, - sounds = wine.snd_d, -}) - - --- bottle recipes -local bottles = {"wine", "beer", "rum", "tequila", "wheat_beer", "sake", - "bourbon", "vodka", "cider"} - -for n = 1, #bottles do - - local glass = "wine:glass_" .. bottles[n] - local bottle = "wine:bottle_" .. bottles[n] - - minetest.register_craft({ - output = bottle, - recipe = { - {glass, glass, glass}, - {glass, glass, glass}, - {glass, glass, glass}, + -- glass + minetest.register_node("wine:glass_" .. name, { + description = S("Glass of " .. desc), + drawtype = "plantlike", + visual_scale = 0.5, + tiles = {"wine_" .. name .. "_glass.png"}, + inventory_image = "wine_" .. name .. "_glass.png", + wield_image = "wine_" .. name .. "_glass.png", + paramtype = "light", + is_ground_content = false, + sunlight_propagates = true, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.15, -0.5, -0.15, 0.15, 0, 0.15} }, + groups = { + vessel = 1, dig_immediate = 3, + attached_node = 1, alcohol = 1 + }, + sounds = snd_g, + on_use = function(itemstack, user, pointed_thing) + + if user then + + if thirsty_mod then + thirsty.drink(user, 5) + end + + return minetest.do_item_eat(2, nil, + itemstack, user, pointed_thing) + end + end }) - minetest.register_craft({ - type = "shapeless", - output = glass .. " 9", - recipe = {bottle}, - }) + -- bottle + if has_bottle then + + minetest.register_node("wine:bottle_" .. name, { + description = S("Bottle of " .. desc), + drawtype = "plantlike", + visual_scale = 0.7, + tiles = {"wine_" .. name .. "_bottle.png"}, + inventory_image = "wine_" .. name .. "_bottle.png", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.15, -0.5, -0.15, 0.15, 0.25, 0.15} + }, + groups = {dig_immediate = 3, attached_node = 1, vessel = 1}, + sounds = snd_d, + }) + + local glass = "wine:glass_" .. name + + minetest.register_craft({ + output = "wine:bottle_" .. name, + recipe = { + {glass, glass, glass}, + {glass, glass, glass}, + {glass, glass, glass}, + }, + }) + + minetest.register_craft({ + type = "shapeless", + output = glass .. " 9", + recipe = {"wine:bottle_" .. name}, + }) + end end + +-- override to add food group to wine glass +minetest.override_item("wine:glass_wine", { + groups = { + food_wine = 1, vessel = 1, dig_immediate = 3, + attached_node = 1, alcohol = 1 + } +}) + + -- blue agave minetest.register_node("wine:blue_agave", { description = S("Blue Agave"), @@ -593,7 +232,7 @@ minetest.register_node("wine:blue_agave", { fixed = {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2} }, groups = {snappy = 3, attached_node = 1, plant = 1}, - sounds = wine.snd_l, + sounds = snd_l, on_construct = function(pos) @@ -624,7 +263,7 @@ minetest.register_node("wine:blue_agave", { n = minetest.find_nodes_in_area_under_air( {x = pos.x + 1, y = pos.y - 1, z = pos.z + 1}, {x = pos.x - 1, y = pos.y - 2, z = pos.z - 1}, - {wine.sand}) + {sand}) -- place blue agave if n and #n > 0 then @@ -648,21 +287,21 @@ minetest.register_craft( { minetest.register_decoration({ deco_type = "simple", - place_on = {wine.sand}, + place_on = {sand}, sidelen = 16, fill_ratio = 0.001, biomes = {"desert"}, decoration = {"wine:blue_agave"}, y_min = 15, y_max = 50, - spawn_by = wine.sand, + spawn_by = sand, num_spawn_by = 6, }) if minetest.get_modpath("bonemeal") then bonemeal:add_deco({ - {wine.sand, {}, {"default:dry_shrub", "wine:blue_agave", "", ""} } + {sand, {}, {"default:dry_shrub", "wine:blue_agave", "", ""} } }) end @@ -799,8 +438,8 @@ minetest.register_node("wine:wine_barrel", { -- the default stack, from which objects will be taken input_inventory = "dst", connect_sides = { - left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1} - } end end)(), + left = 1, right = 1, back = 1, + front = 1, bottom = 1, top = 1} } end end)(), on_timer = function(pos) @@ -909,12 +548,14 @@ minetest.register_lbm({ if minetest.get_modpath("lucky_block") then lucky_block:add_blocks({ + {"fal", {"default:water_source"}, 1, true, 4}, {"dro", {"wine:glass_wine"}, 5}, {"dro", {"wine:glass_beer"}, 5}, {"dro", {"wine:glass_wheat_beer"}, 5}, {"dro", {"wine:glass_mead"}, 5}, {"dro", {"wine:glass_cider"}, 5}, {"dro", {"wine:glass_rum"}, 5}, + {"dro", {"wine:glass_sake"}, 5}, {"dro", {"wine:glass_tequila"}, 5}, {"dro", {"wine:glass_bourbon"}, 5}, {"dro", {"wine:glass_vodka"}, 5}, @@ -924,10 +565,12 @@ if minetest.get_modpath("lucky_block") then {name = "wine:bottle_wine", max = 1}, {name = "wine:bottle_tequila", max = 1}, {name = "wine:bottle_rum", max = 1}, + {name = "wine:bottle_cider", max = 1}, {name = "wine:bottle_bourbon", max = 1}, {name = "wine:bottle_vodka", max = 1}, {name = "wine:wine_barrel", max = 1}, {name = "wine:bottle_sake", max = 1}, + {name = "wine:bottle_mead", max = 1}, {name = "wine:bottle_beer", max = 1}, {name = "wine:bottle_wheat_beer", max = 1}, {name = "wine:blue_agave", max = 4}}}, diff --git a/license.txt b/license.txt index 17973e5..8ba9643 100644 --- a/license.txt +++ b/license.txt @@ -20,12 +20,19 @@ 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. +Textures by TenPlus1 unless listed below (CC-By-3.0) -wine_bourbon_bottle.png has royalty free license - (Mikhail Miroscnichenko @ dreamstime.com) +Mikhail Miroscnichenko @ dreamstime.com (royalty free license) + wine_bourbon_bottle.png + +RiverKpocc @ deviantart.com + wine_beer_glass.png + wine_wheat_beer_glass.png Textures by Darkstalker (cc-by-3.0 license) -wine_beer_bottle.png -wine_wheat_beer_bottle.png -wine_sake_bottle.png -wine_cider.bottle.png + wine_beer_bottle.png + wine_wheat_beer_bottle.png + wine_sake_bottle.png + wine_cider.bottle.png + wine_mead_bottle.png + diff --git a/locale/de.txt b/locale/de.txt index 8786800..361e095 100644 --- a/locale/de.txt +++ b/locale/de.txt @@ -2,7 +2,7 @@ # textdomain: wine # author: Xanthin # author: TheDarkTiger -# last update: 2020/May/11 +# last update: 2020/May/12 Glass of Wine=Glas Wein Bottle of Wine=Flasche Wein @@ -13,6 +13,7 @@ Bottle of Wheat Beer=Flasche Weizenbier Beer=Bier Bottle of Beer=Flasche Bier Honey-Mead=Honigwein +Bottle of Honey-Mead=Flasche Honigwein Apple Cider=Apfelwein Bottle of Cider=Flasche Apfelwein Tequila=Tequila diff --git a/locale/es.txt b/locale/es.txt index 2975105..3d327ac 100644 --- a/locale/es.txt +++ b/locale/es.txt @@ -3,7 +3,7 @@ # author: Unknown # author: TenPlus1 # author: TheDarkTiger -# last update: 2020/May/11 +# last update: 2020/May/12 Glass of Wine=Copa de vino Bottle of Wine=Botella de vino @@ -14,6 +14,7 @@ Bottle of Wheat Beer=Botella de Cerveza de Trigo Beer=Cerveza Bottle of Beer=Botella de Cerveza Honey-Mead=Bebida de Miel +Bottle of Honey-Mead=Botella de Bebida de Miel Apple Cider=Sidra de Manzana Bottle of Cider=Botella de Sidra de Manzana Tequila=Tequíla diff --git a/locale/fr.txt b/locale/fr.txt index 22d5322..44f1e94 100644 --- a/locale/fr.txt +++ b/locale/fr.txt @@ -1,7 +1,7 @@ # Traduction Française du mod Wine par TenPlus1 # textdomain: wine # author: TheDarkTiger -# last update: 2020/May/08 +# last update: 2020/May/12 Glass of Wine=Verre de Vin Bottle of Wine=Bouteille de Vin @@ -12,6 +12,7 @@ Bottle of Wheat Beer=Bouteille de Bière de Blé Beer=Bière Bottle of Beer=Bouteille de Bière Honey-Mead=Hydromel +Bottle of Honey-Mead=Bouteille de Hydromel Apple Cider=Cidre Brut Bottle of Cider=Bouteille de Cidre Tequila=Tequila diff --git a/locale/template.txt b/locale/template.txt index f0500a1..e7f1033 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -12,6 +12,7 @@ Bottle of Wheat Beer= Beer= Bottle of Beer= Honey-Mead= +Bottle of Honey-Mead= Apple Cider= Bottle of Cider= Tequila= diff --git a/textures/wine_mead_bottle.png b/textures/wine_mead_bottle.png new file mode 100644 index 0000000000000000000000000000000000000000..0d81b5b0791f839e13a2e230617de2e95e472b29 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^rXbA13?zk5>~jWEiUB?$u0WcBkwH>gLQX+WLsQ+& z)gnKZzd27}`&6l&TN++R2hkkNZTO$E1ULRdb&#DyXu;# zbu+WfFCW literal 0 HcmV?d00001 diff --git a/textures/wine_sake.png b/textures/wine_sake_glass.png similarity index 100% rename from textures/wine_sake.png rename to textures/wine_sake_glass.png diff --git a/textures/wine_tequila.png b/textures/wine_tequila_glass.png similarity index 100% rename from textures/wine_tequila.png rename to textures/wine_tequila_glass.png diff --git a/textures/wine_bottle.png b/textures/wine_wine_bottle.png similarity index 100% rename from textures/wine_bottle.png rename to textures/wine_wine_bottle.png diff --git a/textures/wine_glass.png b/textures/wine_wine_glass.png similarity index 100% rename from textures/wine_glass.png rename to textures/wine_wine_glass.png