update currency, homedecor, unified inventory

This commit is contained in:
Vanessa Dannenberg 2018-06-23 17:26:11 -04:00
parent cd92583834
commit 2a6246016b
22 changed files with 725 additions and 206 deletions

14
currency/LICENSE.txt Normal file
View File

@ -0,0 +1,14 @@
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. You just DO WHAT THE FUCK YOU WANT TO.

View File

@ -47,6 +47,18 @@ minetest.register_craft({
recipe = {"currency:minegeld_5"},
})
minetest.register_craft({
type = "shapeless",
output = "currency:minegeld_10 5",
recipe = {"currency:minegeld_50"},
})
minetest.register_craft({
type = "shapeless",
output = "currency:minegeld_50",
recipe = {"currency:minegeld_10", "currency:minegeld_10", "currency:minegeld_10", "currency:minegeld_10", "currency:minegeld_10"},
})
minetest.register_craft({
type = "shapeless",
output = "currency:minegeld_bundle",

View File

@ -23,6 +23,13 @@ minetest.register_craftitem("currency:minegeld_10", {
groups = {minegeld = 1}
})
minetest.register_craftitem("currency:minegeld_50", {
description = S("50 MineGeld Note"),
inventory_image = "minegeld_50.png",
stack_max = 30000,
groups = {minegeld = 1}
})
minetest.register_craftitem("currency:minegeld_bundle", {
description = S("Bundle of random Minegeld notes"),
inventory_image = "minegeld_bundle.png",

183
currency/locale/de.po Normal file
View File

@ -0,0 +1,183 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-24 22:01+0200\n"
"PO-Revision-Date: 2018-05-24 22:48+0200\n"
"Last-Translator: A.C.M. <undertakers_help@yahoo.com>\n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.7\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: barter.lua
msgid "Start"
msgstr "Start"
#: barter.lua
msgid "Confirm"
msgstr "Bestätigen"
#: barter.lua
msgid "Cancel"
msgstr "Abbruch"
#: barter.lua shop.lua
msgid "Exchange"
msgstr "Tausch"
#: barter.lua
msgid "Barter Table"
msgstr "Tausch Tisch"
#: craftitems.lua
msgid "1 MineGeld Note"
msgstr "1 Minegeld Banknote"
#: craftitems.lua
msgid "5 MineGeld Note"
msgstr "5 Minegeld Banknote"
#: craftitems.lua
msgid "10 MineGeld Note"
msgstr "10 Minegeld Banknote"
#: craftitems.lua
msgid "50 MineGeld Note"
msgstr "50 Minegeld Banknote"
#: craftitems.lua
msgid "Bundle of random Minegeld notes"
msgstr "Bündel von verschiedenen Minegeld Banknoten"
#: income.lua
msgid "basic income for @1"
msgstr "Grundeinkommen für @1"
#: income.lua
msgid "added basic income for @1 to inventory"
msgstr "Grundeinkommen für @1 ins Inventar gelegt"
#: init.lua
msgid "Currency mod loading..."
msgstr "Currency mod lädt..."
#: init.lua
msgid "Craft_items Loaded!"
msgstr "Craft_items geladen!"
#: init.lua
msgid "Shop Loaded!"
msgstr "Geschäft geladen!"
#: init.lua
msgid "Barter Loaded!"
msgstr "Tauschtisch geladen!"
#: init.lua
msgid "Safe Loaded!"
msgstr "Safe geladen!"
#: init.lua
msgid "Crafting Loaded!"
msgstr "Crafting geladen!"
#: init.lua
msgid "Creative mode in use, skipping basic income."
msgstr "Kreativmodus eingeschalten, überspringe Grundeinkommen."
#: init.lua
msgid "Income Loaded!"
msgstr "Income geladen!"
#: safe.lua
msgid "Safe"
msgstr "Safe"
#: safe.lua
msgid "Safe (owned by @1)"
msgstr "Safe (gehört @1)"
#: safe.lua
msgid "@1 tried to access a safe belonging to @2 at @3"
msgstr "@1 versuchte den Zugriff auf Safe von @2 bei @3"
#: safe.lua
msgid "@1 moves stuff in safe at @2"
msgstr "@1 verschiebt Gegenstände in den Safe bei @2"
#: safe.lua
msgid "@1 moves stuff to safe at @2"
msgstr "@1 verschiebt Gegenstände nach Safe bei @2"
#: safe.lua
msgid "@1 takes stuff from safe at @2"
msgstr "@1 nimmt Gegenstände aus Safe bei @2"
#: shop.lua
msgid "Customer gives (pay here!)"
msgstr "Kunde gibt (bezahl hier!)"
#: shop.lua
msgid "Customer gets:"
msgstr "Kunde bekommt:"
#: shop.lua
msgid "Owner wants:"
msgstr "Inhaber will:"
#: shop.lua
msgid "Owner gives:"
msgstr "Inhaber gibt:"
#: shop.lua
msgid "Customers gave:"
msgstr "Kunde gab:"
#: shop.lua
msgid "Your stock:"
msgstr "Dein Lager:"
#: shop.lua
msgid "You want:"
msgstr "Du willst:"
#: shop.lua
msgid "In exchange, you give:"
msgstr "Im Tausch, du gibst:"
#: shop.lua
msgid "Owner, Use (E)+Place (right mouse button) for customer interface"
msgstr "Inhaber, Benutze (E)+Platziere (rechte Maustaste) für Kunde ..."
#: shop.lua
msgid "Shop"
msgstr "Geschäft"
#: shop.lua
msgid "Exchange shop (owned by @1)"
msgstr "Tauschgeschäft (gehört @1)"
#: shop.lua
msgid "This is your own shop, you can't exchange to yourself!"
msgstr "Das ist dein eigenes Geschäft, du kannst nicht mit dir selbst tauschen!"
#: shop.lua
msgid "Exchanged!"
msgstr "Getauscht!"
#: shop.lua
msgid "Exchange can not be done, contact the shop owner."
msgstr "Tausch kann nicht abgeschlossen werden, benachrichtige den Geschäftsinhaber."
#: shop.lua
msgid "Exchange can not be done, check if you put all items!"
msgstr "Tausch kann nicht abgeschlossen werden, prüfe nochmal alles was du hinein gelegt hast!"

187
currency/locale/fr.po Normal file
View File

@ -0,0 +1,187 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-24 23:06+0200\n"
"PO-Revision-Date: 2018-05-12 14:55+0200\n"
"Last-Translator: Papou30\n"
"Language-Team: \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.7\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: barter.lua
msgid "Start"
msgstr "Début"
#: barter.lua
msgid "Confirm"
msgstr "Confirmer"
#: barter.lua
msgid "Cancel"
msgstr "Annuler"
#: barter.lua shop.lua
msgid "Exchange"
msgstr "Échange"
#: barter.lua
msgid "Barter Table"
msgstr "Table de troc"
#: craftitems.lua
msgid "1 MineGeld Note"
msgstr "1 MineGeld"
#: craftitems.lua
msgid "5 MineGeld Note"
msgstr "5 MineGeld"
#: craftitems.lua
msgid "10 MineGeld Note"
msgstr "10 MineGeld"
#: craftitems.lua
#, fuzzy
msgid "50 MineGeld Note"
msgstr "5 MineGeld"
#: craftitems.lua
msgid "Bundle of random Minegeld notes"
msgstr "Liasse de Minegeld aléatoire"
#: income.lua
msgid "basic income for @1"
msgstr "revenu de base pour @1"
#: income.lua
msgid "added basic income for @1 to inventory"
msgstr "revenu de base ajouté pour @1 à l'inventaire"
#: init.lua
msgid "Currency mod loading..."
msgstr "Chargement du mod Currency..."
#: init.lua
msgid "Craft_items Loaded!"
msgstr "Fabrication d'objets (Craft_items) chargé!"
#: init.lua
msgid "Shop Loaded!"
msgstr "Boutique (Shop) chargée!"
#: init.lua
msgid "Barter Loaded!"
msgstr "Troc (Barter) chargé!"
#: init.lua
msgid "Safe Loaded!"
msgstr "Coffre-fort (Safe) chargé!"
#: init.lua
msgid "Crafting Loaded!"
msgstr "Artisanat (Crafting) chargé!"
#: init.lua
msgid "Creative mode in use, skipping basic income."
msgstr "Mod créatif en cours d'utilisation, ignoré le revenu de base."
#: init.lua
msgid "Income Loaded!"
msgstr "Revenu de base (Income) chargé!"
#: safe.lua
msgid "Safe"
msgstr "Coffre-fort"
#: safe.lua
msgid "Safe (owned by @1)"
msgstr "Coffre-fort (appartenant à @1)"
#: safe.lua
msgid "@1 tried to access a safe belonging to @2 at @3"
msgstr "@1 a tenté d'accéder à un coffre-fort appartenant à @2 à @3"
#: safe.lua
msgid "@1 moves stuff in safe at @2"
msgstr "@1 déplace le matériel dans coffre-fort à @2"
#: safe.lua
msgid "@1 moves stuff to safe at @2"
msgstr "@1 déplace le matériel vers coffre-fort à @2"
#: safe.lua
msgid "@1 takes stuff from safe at @2"
msgstr "@1 prend le matériel dans le coffre-fort à @2"
#: shop.lua
msgid "Customer gives (pay here!)"
msgstr "Client donne (payer ici!)"
#: shop.lua
msgid "Customer gets:"
msgstr "Client obtient:"
#: shop.lua
msgid "Owner wants:"
msgstr "Le propriétaire veut:"
#: shop.lua
msgid "Owner gives:"
msgstr "Propriétaire donne:"
#: shop.lua
msgid "Customers gave:"
msgstr "Le client a donné:"
#: shop.lua
msgid "Your stock:"
msgstr "Votre stock:"
#: shop.lua
msgid "You want:"
msgstr "Vous voulez:"
#: shop.lua
msgid "In exchange, you give:"
msgstr "En échange, vous donnez:"
#: shop.lua
msgid "Owner, Use (E)+Place (right mouse button) for customer interface"
msgstr ""
"Propriétaire, utilisez (E) + place (bouton droit de la souris) pour "
"l'interface client"
#: shop.lua
msgid "Shop"
msgstr "Boutique"
#: shop.lua
msgid "Exchange shop (owned by @1)"
msgstr "Boutique d'échange (détenue par @1)"
#: shop.lua
msgid "This is your own shop, you can't exchange to yourself!"
msgstr "C'est ta propre boutique, tu ne peux pas échanger avec toi-même!"
#: shop.lua
msgid "Exchanged!"
msgstr "Échangé!"
#: shop.lua
msgid "Exchange can not be done, contact the shop owner."
msgstr "L'échange ne peut être fait, contactez le propriétaire du magasin."
#: shop.lua
msgid "Exchange can not be done, check if you put all items!"
msgstr ""
"L'echange ne peut pas etre fait, verifiez si vous mettez tous les articles!"

View File

@ -7,173 +7,180 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-20 13:58-0700\n"
"POT-Creation-Date: 2018-05-24 23:06+0200\n"
"PO-Revision-Date: 2017-10-17 02:03+0800\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: ms\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.4\n"
"Last-Translator: \n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ms\n"
#: barter.lua:14 barter.lua:22
#: barter.lua
msgid "Start"
msgstr "Mula"
#: barter.lua:16 barter.lua:24
#: barter.lua
msgid "Confirm"
msgstr "Sah"
#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27
#: barter.lua
msgid "Cancel"
msgstr "Batal"
#: barter.lua:18 barter.lua:26 shop.lua:20
#: barter.lua shop.lua
msgid "Exchange"
msgstr "Tukar"
#: barter.lua:97 barter.lua:118
#: barter.lua
msgid "Barter Table"
msgstr "Meja Barter"
#: craftitems.lua:6
#: craftitems.lua
msgid "1 MineGeld Note"
msgstr "Wang 1 MineGeld"
#: craftitems.lua:13
#: craftitems.lua
msgid "5 MineGeld Note"
msgstr "Wang 5 MineGeld"
#: craftitems.lua:20
#: craftitems.lua
msgid "10 MineGeld Note"
msgstr "Wang 10 MineGeld"
#: craftitems.lua:27
#: craftitems.lua
#, fuzzy
msgid "50 MineGeld Note"
msgstr "Wang 5 MineGeld"
#: craftitems.lua
msgid "Bundle of random Minegeld notes"
msgstr "Seberkas wang Minegeld rawak"
#: income.lua:18
#: income.lua
msgid "basic income for @1"
msgstr "pendapatan asas untuk @1"
#: income.lua:34
#: income.lua
msgid "added basic income for @1 to inventory"
msgstr "pendapatan asas untuk @1 ditambah masuk ke dalam inventori"
#: init.lua:6
#: init.lua
msgid "Currency mod loading..."
msgstr "Memuatkan mods Currency..."
#: init.lua:9
#: init.lua
msgid "Craft_items Loaded!"
msgstr "Item pertukangan dimuatkan!"
#: init.lua:11
#: init.lua
msgid "Shop Loaded!"
msgstr "Kedai dimuatkan!"
#: init.lua:13
#: init.lua
msgid "Barter Loaded!"
msgstr "Meja barter dimuatkan!"
#: init.lua:15
#: init.lua
msgid "Safe Loaded!"
msgstr "Peti besi dimuatkan!"
#: init.lua:17
#: init.lua
msgid "Crafting Loaded!"
msgstr "Pertukangan dimuatkan!"
#: init.lua:20
#: init.lua
msgid "Creative mode in use, skipping basic income."
msgstr "Dalam mod kreatif, pendapatan asas diabaikan."
#: init.lua:23
#: init.lua
msgid "Income Loaded!"
msgstr "Pendapatan dimuatkan!"
#: safe.lua:29
#: safe.lua
msgid "Safe"
msgstr "Peti besi"
#: safe.lua:44
#: safe.lua
msgid "Safe (owned by @1)"
msgstr "Peti besi (pemilik: @1)"
#: safe.lua:61 safe.lua:70 safe.lua:79
#: safe.lua
msgid "@1 tried to access a safe belonging to @2 at @3"
msgstr "@1 cuba untuk mengakses peti besi milik @2 di @3"
#: safe.lua:86
#: safe.lua
msgid "@1 moves stuff in safe at @2"
msgstr "@1 pindahkan barang dalam peti besi di @2"
#: safe.lua:89
#: safe.lua
msgid "@1 moves stuff to safe at @2"
msgstr "@1 masukkan barang dalam peti besi di @2"
#: safe.lua:92
#: safe.lua
msgid "@1 takes stuff from safe at @2"
msgstr "@1 keluarkan barang dari peti besi di @2"
#: shop.lua:11
#: shop.lua
msgid "Customer gives (pay here!)"
msgstr "Pelanggan beri (bayar sini!)"
#: shop.lua:13
#: shop.lua
msgid "Customer gets:"
msgstr "Pelanggan dapat:"
#: shop.lua:15
#: shop.lua
msgid "Owner wants:"
msgstr "Penjual inginkan:"
#: shop.lua:17
#: shop.lua
msgid "Owner gives:"
msgstr "Penjual berikan:"
#: shop.lua:26
#: shop.lua
msgid "Customers gave:"
msgstr "Pelanggan berikan:"
#: shop.lua:28
#: shop.lua
msgid "Your stock:"
msgstr "Stok anda:"
#: shop.lua:30
#: shop.lua
msgid "You want:"
msgstr "Anda mahukan:"
#: shop.lua:32
#: shop.lua
msgid "In exchange, you give:"
msgstr "Anda berikan:"
#: shop.lua:34
#: shop.lua
msgid "Owner, Use (E)+Place (right mouse button) for customer interface"
msgstr "Penjual, Gunakan (E) + Letak (butang tetikus kanan) untuk antaramuka pelanggan"
msgstr ""
"Penjual, Gunakan (E) + Letak (butang tetikus kanan) untuk antaramuka "
"pelanggan"
#: shop.lua:88
#: shop.lua
msgid "Shop"
msgstr "Kedai"
#: shop.lua:102
#: shop.lua
msgid "Exchange shop (owned by @1)"
msgstr "Kedai (pemilik: @1)"
#: shop.lua:151
#: shop.lua
msgid "This is your own shop, you can't exchange to yourself!"
msgstr "Ini kedai anda, anda tidak boleh menjual kepada diri sendiri!"
#: shop.lua:188
#: shop.lua
msgid "Exchanged!"
msgstr "Jual!"
#: shop.lua:191
#: shop.lua
msgid "Exchange can not be done, contact the shop owner."
msgstr "Tak boleh jual, hubungi penjual."
#: shop.lua:193
#: shop.lua
msgid "Exchange can not be done, check if you put all items!"
msgstr "Tak boleh jual, pastikan anda ada apa yang penjual mahukan!"

View File

@ -7,173 +7,181 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-20 13:58-0700\n"
"POT-Creation-Date: 2018-05-24 23:06+0200\n"
"PO-Revision-Date: 2017-08-11 19:03+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.3\n"
"Last-Translator: \n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: barter.lua:14 barter.lua:22
#: barter.lua
msgid "Start"
msgstr "Старт"
#: barter.lua:16 barter.lua:24
#: barter.lua
msgid "Confirm"
msgstr "Подтверждение"
#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27
#: barter.lua
msgid "Cancel"
msgstr "Отмена"
#: barter.lua:18 barter.lua:26 shop.lua:20
#: barter.lua shop.lua
msgid "Exchange"
msgstr "Обмен"
#: barter.lua:97 barter.lua:118
#: barter.lua
msgid "Barter Table"
msgstr "Таблица бартера"
#: craftitems.lua:6
#: craftitems.lua
msgid "1 MineGeld Note"
msgstr "Банкнота в 1 MineGeld"
#: craftitems.lua:13
#: craftitems.lua
msgid "5 MineGeld Note"
msgstr "Банкнота в 5 MineGeld"
#: craftitems.lua:20
#: craftitems.lua
msgid "10 MineGeld Note"
msgstr "Банкнота в 10 MineGeld"
#: craftitems.lua:27
#: craftitems.lua
#, fuzzy
msgid "50 MineGeld Note"
msgstr "Банкнота в 5 MineGeld"
#: craftitems.lua
msgid "Bundle of random Minegeld notes"
msgstr "Пачка случайных банкнот Minegeld"
#: income.lua:18
#: income.lua
msgid "basic income for @1"
msgstr "базовая прибыль для @1"
#: income.lua:34
#: income.lua
msgid "added basic income for @1 to inventory"
msgstr "базовая прибыль для @1 добавлена в инвентарь"
#: init.lua:6
#: init.lua
msgid "Currency mod loading..."
msgstr "Загружается мод Currency..."
#: init.lua:9
#: init.lua
msgid "Craft_items Loaded!"
msgstr "Предметы для сборки загружены!"
#: init.lua:11
#: init.lua
msgid "Shop Loaded!"
msgstr "Магазин загружен!"
#: init.lua:13
#: init.lua
msgid "Barter Loaded!"
msgstr "Бартер загружен!"
#: init.lua:15
#: init.lua
msgid "Safe Loaded!"
msgstr "Сейф загружен!"
#: init.lua:17
#: init.lua
msgid "Crafting Loaded!"
msgstr "Механизм сборки загружен!"
#: init.lua:20
#: init.lua
msgid "Creative mode in use, skipping basic income."
msgstr "Используется режим творчества, пропускаем базовую прибыль."
#: init.lua:23
#: init.lua
msgid "Income Loaded!"
msgstr "Прибыль загружена!"
#: safe.lua:29
#: safe.lua
msgid "Safe"
msgstr "Сейф"
#: safe.lua:44
#: safe.lua
msgid "Safe (owned by @1)"
msgstr "Сейф (принадлежит @1)"
#: safe.lua:61 safe.lua:70 safe.lua:79
#: safe.lua
msgid "@1 tried to access a safe belonging to @2 at @3"
msgstr "@1 попробовал открыть сейф, принадлежащий @2 в @3"
#: safe.lua:86
#: safe.lua
msgid "@1 moves stuff in safe at @2"
msgstr "@1 перемещает вещи в сейфе в @2"
#: safe.lua:89
#: safe.lua
msgid "@1 moves stuff to safe at @2"
msgstr "@1 кладёт вещи в сейф в @2"
#: safe.lua:92
#: safe.lua
msgid "@1 takes stuff from safe at @2"
msgstr "@1 забирает вещи из сейфа в @2"
#: shop.lua:11
#: shop.lua
msgid "Customer gives (pay here!)"
msgstr "Покупатель отдаёт (здесь оплата!)"
#: shop.lua:13
#: shop.lua
msgid "Customer gets:"
msgstr "Покупатель получает:"
#: shop.lua:15
#: shop.lua
msgid "Owner wants:"
msgstr "Владелец хочет:"
#: shop.lua:17
#: shop.lua
msgid "Owner gives:"
msgstr "Владелец отдаёт:"
#: shop.lua:26
#: shop.lua
msgid "Customers gave:"
msgstr "Покупатель отдал:"
#: shop.lua:28
#: shop.lua
msgid "Your stock:"
msgstr "Ваш запас:"
#: shop.lua:30
#: shop.lua
msgid "You want:"
msgstr "Вы хотите:"
#: shop.lua:32
#: shop.lua
msgid "In exchange, you give:"
msgstr "Взамен вы даёте:"
#: shop.lua:34
#: shop.lua
msgid "Owner, Use (E)+Place (right mouse button) for customer interface"
msgstr "Владелец, используйте (E)+Разместить (правая кнопка мыши) для открытия интерфейса покупателя"
msgstr ""
"Владелец, используйте (E)+Разместить (правая кнопка мыши) для открытия "
"интерфейса покупателя"
#: shop.lua:88
#: shop.lua
msgid "Shop"
msgstr "Магазин"
#: shop.lua:102
#: shop.lua
msgid "Exchange shop (owned by @1)"
msgstr "Пункт обмена (принадлежит @1)"
#: shop.lua:151
#: shop.lua
msgid "This is your own shop, you can't exchange to yourself!"
msgstr "Это ваш собственный магазин, вы не можете обмениваться с самим собой!"
#: shop.lua:188
#: shop.lua
msgid "Exchanged!"
msgstr "Обмен произведён!"
#: shop.lua:191
#: shop.lua
msgid "Exchange can not be done, contact the shop owner."
msgstr "Обмен невозможен, свяжитесь с владельцем магазина."
#: shop.lua:193
#: shop.lua
msgid "Exchange can not be done, check if you put all items!"
msgstr "Обмен невозможен, проверьте, что вы положили все предметы!"

View File

@ -8,170 +8,175 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-20 13:58-0700\n"
"POT-Creation-Date: 2018-05-24 23:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: barter.lua:14 barter.lua:22
#: barter.lua
msgid "Start"
msgstr ""
#: barter.lua:16 barter.lua:24
#: barter.lua
msgid "Confirm"
msgstr ""
#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27
#: barter.lua
msgid "Cancel"
msgstr ""
#: barter.lua:18 barter.lua:26 shop.lua:20
#: barter.lua shop.lua
msgid "Exchange"
msgstr ""
#: barter.lua:97 barter.lua:118
#: barter.lua
msgid "Barter Table"
msgstr ""
#: craftitems.lua:6
#: craftitems.lua
msgid "1 MineGeld Note"
msgstr ""
#: craftitems.lua:13
#: craftitems.lua
msgid "5 MineGeld Note"
msgstr ""
#: craftitems.lua:20
#: craftitems.lua
msgid "10 MineGeld Note"
msgstr ""
#: craftitems.lua:27
#: craftitems.lua
msgid "50 MineGeld Note"
msgstr ""
#: craftitems.lua
msgid "Bundle of random Minegeld notes"
msgstr ""
#: income.lua:18
#: income.lua
msgid "basic income for @1"
msgstr ""
#: income.lua:34
#: income.lua
msgid "added basic income for @1 to inventory"
msgstr ""
#: init.lua:6
#: init.lua
msgid "Currency mod loading..."
msgstr ""
#: init.lua:9
#: init.lua
msgid "Craft_items Loaded!"
msgstr ""
#: init.lua:11
#: init.lua
msgid "Shop Loaded!"
msgstr ""
#: init.lua:13
#: init.lua
msgid "Barter Loaded!"
msgstr ""
#: init.lua:15
#: init.lua
msgid "Safe Loaded!"
msgstr ""
#: init.lua:17
#: init.lua
msgid "Crafting Loaded!"
msgstr ""
#: init.lua:20
#: init.lua
msgid "Creative mode in use, skipping basic income."
msgstr ""
#: init.lua:23
#: init.lua
msgid "Income Loaded!"
msgstr ""
#: safe.lua:29
#: safe.lua
msgid "Safe"
msgstr ""
#: safe.lua:44
#: safe.lua
msgid "Safe (owned by @1)"
msgstr ""
#: safe.lua:61 safe.lua:70 safe.lua:79
#: safe.lua
msgid "@1 tried to access a safe belonging to @2 at @3"
msgstr ""
#: safe.lua:86
#: safe.lua
msgid "@1 moves stuff in safe at @2"
msgstr ""
#: safe.lua:89
#: safe.lua
msgid "@1 moves stuff to safe at @2"
msgstr ""
#: safe.lua:92
#: safe.lua
msgid "@1 takes stuff from safe at @2"
msgstr ""
#: shop.lua:11
#: shop.lua
msgid "Customer gives (pay here!)"
msgstr ""
#: shop.lua:13
#: shop.lua
msgid "Customer gets:"
msgstr ""
#: shop.lua:15
#: shop.lua
msgid "Owner wants:"
msgstr ""
#: shop.lua:17
#: shop.lua
msgid "Owner gives:"
msgstr ""
#: shop.lua:26
#: shop.lua
msgid "Customers gave:"
msgstr ""
#: shop.lua:28
#: shop.lua
msgid "Your stock:"
msgstr ""
#: shop.lua:30
#: shop.lua
msgid "You want:"
msgstr ""
#: shop.lua:32
#: shop.lua
msgid "In exchange, you give:"
msgstr ""
#: shop.lua:34
#: shop.lua
msgid "Owner, Use (E)+Place (right mouse button) for customer interface"
msgstr ""
#: shop.lua:88
#: shop.lua
msgid "Shop"
msgstr ""
#: shop.lua:102
#: shop.lua
msgid "Exchange shop (owned by @1)"
msgstr ""
#: shop.lua:151
#: shop.lua
msgid "This is your own shop, you can't exchange to yourself!"
msgstr ""
#: shop.lua:188
#: shop.lua
msgid "Exchanged!"
msgstr ""
#: shop.lua:191
#: shop.lua
msgid "Exchange can not be done, contact the shop owner."
msgstr ""
#: shop.lua:193
#: shop.lua
msgid "Exchange can not be done, check if you put all items!"
msgstr ""

Binary file not shown.

After

Width:  |  Height:  |  Size: 1014 B

View File

@ -16,8 +16,8 @@ local function start_smoke(pos, node, clicker, chimney)
end, s_handle)
end
minetest.delete_particlespawner(id)
this_spawner_meta:set_int("smoky", nil)
this_spawner_meta:set_int("sound", nil)
this_spawner_meta:set_int("smoky", 0)
this_spawner_meta:set_int("sound", 0)
return
end
@ -34,7 +34,7 @@ local function start_smoke(pos, node, clicker, chimney)
})
if chimney == 1 then
this_spawner_meta:set_int("smoky", id)
this_spawner_meta:set_int("sound", nil)
this_spawner_meta:set_int("sound", 0)
else
s_handle = minetest.sound_play("fire_small", {
pos = pos,
@ -62,8 +62,8 @@ local function stop_smoke(pos)
end, s_handle)
end
this_spawner_meta:set_int("smoky", nil)
this_spawner_meta:set_int("sound", nil)
this_spawner_meta:set_int("smoky", 0)
this_spawner_meta:set_int("sound", 0)
end
minetest.register_node("fake_fire:ice_fire", {

View File

@ -25,7 +25,6 @@ minetest.register_entity("homedecor:mesh_desk_fan", {
})
local add_mesh_desk_fan_entity = function(pos)
print("in add_mesh_desk_fan_entity()")
local param2 = minetest.get_node(pos).param2
local entity = minetest.add_entity(pos, "homedecor:mesh_desk_fan")
if param2 == 0 then

View File

@ -2950,23 +2950,29 @@ minetest.register_craft({
},
})
minetest.register_craft({
type = "shapeless",
output = "homedecor:coin 5",
recipe = {"moreblocks:micro_goldblock_1", "default:sword_stone"}
})
if minetest.settings:get_bool("homedecor.disable_coin_crafting") == false then
minetest.register_craft({
type = "shapeless",
output = "homedecor:coin 5",
recipe = {"moreblocks:micro_goldblock_1", "default:sword_stone"}
})
minetest.register_craft({
type = "shapeless",
output = "homedecor:coin 15",
recipe = {"default:gold_ingot", "default:sword_steel"}
})
minetest.register_craft({
type = "shapeless",
output = "homedecor:coin 15",
recipe = {"default:gold_ingot", "default:sword_steel"}
})
minetest.register_craft({
type = "shapeless",
output = "homedecor:coin 50",
recipe = {"default:goldblock", "default:sword_mese"}
})
minetest.register_craft({
type = "shapeless",
output = "homedecor:coin 50",
recipe = {"default:goldblock", "default:sword_mese"}
})
else
if minetest.settings:get("log_mods") then
minetest.log("[HomeDecor] " .. S("coin crafting is disabled!"))
end
end
minetest.register_craft({
output = "homedecor:lattice_wood 8",

View File

@ -235,8 +235,6 @@ minetest.register_lbm({
local param2 = paletteidx + new_fdir
local newname = "homedecor:armchair"
print(name, dump(a), dump(b), dump(color).."("..dump(paletteidx)..")", dump(param2))
if node.name == "homedecor:chair" then
newname = "homedecor:kitchen_chair_wood"
elseif string.find(node.name, "homedecor:chair_") then

View File

@ -130,6 +130,24 @@ minetest.register_craft({
},
})
minetest.register_craft({
output = "homedecor:table_lamp_off",
recipe = {
{ "wool:white", "default:torch", "wool:white"},
{ "", "group:stick", ""},
{ "", "moreblocks:slab_wood", "" },
},
})
minetest.register_craft({
output = "homedecor:table_lamp_off",
recipe = {
{ "cottages:wool", "default:torch", "cottages:wool"},
{ "", "group:stick", ""},
{ "", "moreblocks:slab_wood", "" },
},
})
minetest.register_craft({
output = "homedecor:standing_lamp_off",
recipe = {

View File

@ -2,7 +2,6 @@
-- with changes needed for homedecor's beds.
local pi = math.pi
local player_in_bed = 0
local is_sp = minetest.is_singleplayer()
local enable_respawn = minetest.settings:get_bool("enable_bed_respawn")
if enable_respawn == nil then
@ -49,6 +48,14 @@ local function check_in_beds(players)
return #players > 0
end
local function get_player_in_bed()
local player_in_bed = 0
for k,v in pairs(beds.player) do
player_in_bed = player_in_bed + 1
end
return player_in_bed
end
local function lay_down(player, pos, bed_pos, state, skip)
local name = player:get_player_name()
local hud_flags = player:hud_get_flags()
@ -62,7 +69,6 @@ local function lay_down(player, pos, bed_pos, state, skip)
local p = beds.pos[name] or nil
if beds.player[name] ~= nil then
beds.player[name] = nil
player_in_bed = player_in_bed - 1
end
-- skip here to prevent sending player specific changes (used for leaving players)
if skip then
@ -84,8 +90,6 @@ local function lay_down(player, pos, bed_pos, state, skip)
else
beds.player[name] = 1
beds.pos[name] = pos
player_in_bed = player_in_bed + 1
-- physics, eye_offset, etc
player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
local yaw, fdir = get_look_yaw(bed_pos)
@ -109,6 +113,7 @@ end
local function update_formspecs(finished)
local ges = #minetest.get_connected_players()
local player_in_bed = get_player_in_bed()
local form_n
local is_majority = (ges / 2) < player_in_bed

View File

@ -30,8 +30,8 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname)
end, s_handle)
end
minetest.delete_particlespawner(id)
this_spawner_meta:set_int("active", nil)
this_spawner_meta:set_int("sound", nil)
this_spawner_meta:set_int("active", 0)
this_spawner_meta:set_int("sound", 0)
return
end
@ -109,6 +109,6 @@ function homedecor.stop_particle_spawner(pos)
end, s_handle)
end
this_spawner_meta:set_int("active", nil)
this_spawner_meta:set_int("sound", nil)
this_spawner_meta:set_int("active", 0)
this_spawner_meta:set_int("sound", 0)
end

View File

@ -119,4 +119,6 @@ dofile(modpath.."/wardrobe.lua")
dofile(modpath.."/crafts.lua")
print("[HomeDecor] " .. S("Loaded!"))
if minetest.settings:get_bool("log_mod") then
minetest.log("action", "[HomeDecor] " .. S("Loaded!"))
end

View File

@ -2,7 +2,7 @@
# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Automatically generated, 2017.
#
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
@ -472,6 +472,10 @@ msgstr "Messingbarren"
msgid "Small Flower Pot"
msgstr "Kleiner Blumentopf"
#: ../homedecor/crafts.lua
msgid "coin crafting is disabled!"
msgstr "Fertigung der Münzen ist ausgeschaltet!"
#: ../homedecor/doors_and_gates.lua
msgid "Mahogany Closet Door (@1 opening)"
msgstr "Mahagoniwandschranktür (@1öffnend)"

View File

@ -2,7 +2,7 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
@ -476,6 +476,10 @@ msgstr "Слиток латуни"
msgid "Small Flower Pot"
msgstr "Маленький цветочный горшок"
#: ../homedecor/crafts.lua
msgid "coin crafting is disabled!"
msgstr "Крафт монет отключен!"
#: ../homedecor/doors_and_gates.lua
msgid "Mahogany Closet Door (@1 opening)"
msgstr "Дверь стенного шкафа из красного дерева (открывается @1)"

View File

@ -471,6 +471,10 @@ msgstr ""
msgid "Small Flower Pot"
msgstr ""
#: ../homedecor/crafts.lua
msgid "coin crafting is disabled!"
msgstr ""
#: ../homedecor/doors_and_gates.lua
msgid "Mahogany Closet Door (@1 opening)"
msgstr ""

View File

@ -64,7 +64,6 @@ lrfurn.old_static_armchairs = {}
for _, color in ipairs(lrfurn.colors) do
table.insert(lrfurn.old_static_armchairs, "lrfurn:armchair_"..color)
print("lrfurn:armchair_"..color)
end
minetest.register_lbm({

View File

@ -31,11 +31,18 @@ unified_inventory.register_button("bags", {
hide_lite=true
})
local function get_player_bag_stack(player, i)
return minetest.get_inventory({
type = "detached",
name = player:get_player_name() .. "_bags"
}):get_stack("bag" .. i, 1)
end
for i = 1, 4 do
local bi = i
unified_inventory.register_page("bag"..bi, {
get_formspec = function(player)
local stack = player:get_inventory():get_stack("bag"..bi, 1)
local stack = get_player_bag_stack(player, bi)
local image = stack:get_definition().inventory_image
local formspec = ("image[7,0;1,1;"..image.."]"
.."label[0,0;"..F("Bag @1", bi).."]"
@ -58,7 +65,7 @@ for i = 1, 4 do
end
local inv = player:get_inventory()
for i = 1, 4 do
local def = inv:get_stack("bag"..i, 1):get_definition()
local def = get_player_bag_stack(player, i):get_definition()
local button
if def.groups.bagslots then
local list_name = "bag"..i.."contents"
@ -89,7 +96,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
for i = 1, 4 do
if fields["bag"..i] then
local stack = player:get_inventory():get_stack("bag"..i, 1)
local stack = get_player_bag_stack(player, i)
if not stack:get_definition().groups.bagslots then
return
end
@ -99,67 +106,117 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
end)
local function save_bags_metadata(player, bags_inv)
local is_empty = true
local bags = {}
for i = 1, 4 do
local bag = "bag"..i
if not bags_inv:is_empty(bag) then
-- Stack limit is 1, otherwise use stack:to_string()
bags[i] = bags_inv:get_stack(bag, 1):get_name()
is_empty = false
end
end
if is_empty then
player:set_attribute("unified_inventory:bags", nil)
else
player:set_attribute("unified_inventory:bags",
minetest.serialize(bags))
end
end
local function load_bags_metadata(player, bags_inv)
local player_inv = player:get_inventory()
local bags_meta = player:get_attribute("unified_inventory:bags")
local bags = bags_meta and minetest.deserialize(bags_meta) or {}
local dirty_meta = false
if not bags_meta then
-- Backwards compatiblity
for i = 1, 4 do
local bag = "bag"..i
if not player_inv:is_empty(bag) then
-- Stack limit is 1, otherwise use stack:to_string()
bags[i] = player_inv:get_stack(bag, 1):get_name()
dirty_meta = true
end
end
end
-- Fill detached slots
for i = 1, 4 do
local bag = "bag"..i
bags_inv:set_size(bag, 1)
bags_inv:set_stack(bag, 1, bags[i] or "")
end
if dirty_meta then
-- Requires detached inventory to be set up
save_bags_metadata(player, bags_inv)
end
-- Clean up deprecated garbage after saving
for i = 1, 4 do
local bag = "bag"..i
player_inv:set_size(bag, 0)
end
end
minetest.register_on_joinplayer(function(player)
local player_inv = player:get_inventory()
local player_name = player:get_player_name()
local bags_inv = minetest.create_detached_inventory(player_name.."_bags",{
on_put = function(inv, listname, index, stack, player)
player:get_inventory():set_stack(listname, index, stack)
player:get_inventory():set_size(listname.."contents",
stack:get_definition().groups.bagslots)
end,
on_take = function(inv, listname, index, stack, player)
player:get_inventory():set_stack(listname, index, nil)
save_bags_metadata(player, inv)
end,
allow_put = function(inv, listname, index, stack, player)
local new_slots = stack:get_definition().groups.bagslots
if new_slots then
local player_inv = player:get_inventory()
local old_slots = player_inv:get_size(listname.."contents")
if not new_slots then
return 0
end
local player_inv = player:get_inventory()
local old_slots = player_inv:get_size(listname.."contents")
if new_slots >= old_slots then
return 1
else
-- using a smaller bag, make sure it fits
local old_list = player_inv:get_list(listname.."contents")
local new_list = {}
local slots_used = 0
local use_new_list = false
if new_slots >= old_slots then
return 1
end
for i, v in ipairs(old_list) do
if v and not v:is_empty() then
slots_used = slots_used + 1
use_new_list = i > new_slots
new_list[slots_used] = v
end
end
if new_slots >= slots_used then
if use_new_list then
player_inv:set_list(listname.."contents", new_list)
end
return 1
end
-- using a smaller bag, make sure it fits
local old_list = player_inv:get_list(listname.."contents")
local new_list = {}
local slots_used = 0
local use_new_list = false
for i, v in ipairs(old_list) do
if v and not v:is_empty() then
slots_used = slots_used + 1
use_new_list = i > new_slots
new_list[slots_used] = v
end
end
return 0
if new_slots >= slots_used then
if use_new_list then
player_inv:set_list(listname.."contents", new_list)
end
return 1
end
end,
allow_take = function(inv, listname, index, stack, player)
if player:get_inventory():is_empty(listname.."contents") then
return stack:get_count()
else
return 0
end
return 0
end,
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
on_take = function(inv, listname, index, stack, player)
player:get_inventory():set_size(listname.."contents", 0)
save_bags_metadata(player, inv)
end,
allow_move = function()
return 0
end,
}, player_name)
for i=1,4 do
local bag = "bag"..i
player_inv:set_size(bag, 1)
bags_inv:set_size(bag, 1)
bags_inv:set_stack(bag, 1, player_inv:get_stack(bag, 1))
end
load_bags_metadata(player, bags_inv)
end)
-- register bag tools