From 5df83e0d46d2644e8eed271deb84b5cd52680260 Mon Sep 17 00:00:00 2001 From: Doloment Date: Wed, 25 Dec 2024 00:57:16 +0700 Subject: [PATCH 1/2] New Year textures for chests. Closes #1827 (#1879) Co-authored-by: alek13 --- ...ault_chest_front.png => default_chest_front.png} | Bin ...lt_chest_inside.png => default_chest_inside.png} | Bin ...efault_chest_lock.png => default_chest_lock.png} | Bin ...efault_chest_side.png => default_chest_side.png} | Bin ...-default_chest_top.png => default_chest_top.png} | Bin .../{_NY-shop_chest_top.png => shop_chest_top.png} | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename mods/lord/_overwrites/MTG/default/textures/{_NY-default_chest_front.png => default_chest_front.png} (100%) rename mods/lord/_overwrites/MTG/default/textures/{_NY-default_chest_inside.png => default_chest_inside.png} (100%) rename mods/lord/_overwrites/MTG/default/textures/{_NY-default_chest_lock.png => default_chest_lock.png} (100%) rename mods/lord/_overwrites/MTG/default/textures/{_NY-default_chest_side.png => default_chest_side.png} (100%) rename mods/lord/_overwrites/MTG/default/textures/{_NY-default_chest_top.png => default_chest_top.png} (100%) rename mods/lord/_overwrites/lord/lord_money/textures/{_NY-shop_chest_top.png => shop_chest_top.png} (100%) diff --git a/mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_front.png b/mods/lord/_overwrites/MTG/default/textures/default_chest_front.png similarity index 100% rename from mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_front.png rename to mods/lord/_overwrites/MTG/default/textures/default_chest_front.png diff --git a/mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_inside.png b/mods/lord/_overwrites/MTG/default/textures/default_chest_inside.png similarity index 100% rename from mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_inside.png rename to mods/lord/_overwrites/MTG/default/textures/default_chest_inside.png diff --git a/mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_lock.png b/mods/lord/_overwrites/MTG/default/textures/default_chest_lock.png similarity index 100% rename from mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_lock.png rename to mods/lord/_overwrites/MTG/default/textures/default_chest_lock.png diff --git a/mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_side.png b/mods/lord/_overwrites/MTG/default/textures/default_chest_side.png similarity index 100% rename from mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_side.png rename to mods/lord/_overwrites/MTG/default/textures/default_chest_side.png diff --git a/mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_top.png b/mods/lord/_overwrites/MTG/default/textures/default_chest_top.png similarity index 100% rename from mods/lord/_overwrites/MTG/default/textures/_NY-default_chest_top.png rename to mods/lord/_overwrites/MTG/default/textures/default_chest_top.png diff --git a/mods/lord/_overwrites/lord/lord_money/textures/_NY-shop_chest_top.png b/mods/lord/_overwrites/lord/lord_money/textures/shop_chest_top.png similarity index 100% rename from mods/lord/_overwrites/lord/lord_money/textures/_NY-shop_chest_top.png rename to mods/lord/_overwrites/lord/lord_money/textures/shop_chest_top.png From 0e28550188ed0ca41f7358f33c239774583cf8bc Mon Sep 17 00:00:00 2001 From: Doloment Date: Wed, 25 Dec 2024 01:39:35 +0700 Subject: [PATCH 2/2] Add event command (#1880) --- minetest.conf.prod | 1 + mods/lord/World/lord_spawn/init.lua | 1 + mods/lord/World/lord_spawn/locale/lord_spawn.en.tr | 1 + mods/lord/World/lord_spawn/locale/lord_spawn.ru.tr | 1 + 4 files changed, 4 insertions(+) diff --git a/minetest.conf.prod b/minetest.conf.prod index 97c108579..73dab4fe6 100644 --- a/minetest.conf.prod +++ b/minetest.conf.prod @@ -288,6 +288,7 @@ lp_api.system_name = lord common_spawn_pos = 735, 33, -818 #hall_of_life_pos = 735, 33, -818 hall_of_center_pos = 735, 33, -818 +hall_of_event_pos = 9519, 40, 11815 hall_of_death_pos = 11773, 54, -10282 #hall_of_bree_pos = -7201, 3, 7629 # спауны для рас ( GH: #330 ) diff --git a/mods/lord/World/lord_spawn/init.lua b/mods/lord/World/lord_spawn/init.lua index 898914dba..66c9b68e6 100644 --- a/mods/lord/World/lord_spawn/init.lua +++ b/mods/lord/World/lord_spawn/init.lua @@ -123,6 +123,7 @@ end spawn.register_hall("center", "Dol Guldur") spawn.register_hall("death", "Death") +spawn.register_hall("event", "Event") -- revert after Jan 13, 2025 --spawn.register_hall("life", "Life") minetest.register_chatcommand("life", { description = S("Teleport to the Hall of Life"), diff --git a/mods/lord/World/lord_spawn/locale/lord_spawn.en.tr b/mods/lord/World/lord_spawn/locale/lord_spawn.en.tr index 0c3ae8282..61724b409 100644 --- a/mods/lord/World/lord_spawn/locale/lord_spawn.en.tr +++ b/mods/lord/World/lord_spawn/locale/lord_spawn.en.tr @@ -21,5 +21,6 @@ Teleporting to elf Spawn...=Teleporting to Elf Spawn... Teleporting to the Hall of Life...=Teleporting to the Hall of Life... Teleporting to the Hall of Death...=Teleporting to the Hall of Death... Teleporting to the Hall of Dol Guldur...=Teleporting to the Dol Guldur... +Teleporting to the Hall of Event...=Teleporting to the event area (Maakh-Shaluur)... Teleport failed=Teleport failed Command reserved. For teleporting to Old Central Spawn use command `/center`=Command reserved. For teleporting to Old Central Spawn use command `/center` diff --git a/mods/lord/World/lord_spawn/locale/lord_spawn.ru.tr b/mods/lord/World/lord_spawn/locale/lord_spawn.ru.tr index 6d26d876a..99a4c1ffa 100644 --- a/mods/lord/World/lord_spawn/locale/lord_spawn.ru.tr +++ b/mods/lord/World/lord_spawn/locale/lord_spawn.ru.tr @@ -21,5 +21,6 @@ Teleporting to elf Spawn...=Производится перемещение на Teleporting to the Hall of Life...=Производится перемещение в Зал Жизни... Teleporting to the Hall of Death...=Производится перемещение в Зал Смерти... Teleporting to the Hall of Dol Guldur...=Производится перемещение в Дол Гулдур... +Teleporting to the Hall of Event...=Производится перемещение на территорию события (Маакх-Шаалур)... Teleport failed=Не удалось переместиться Command reserved. For teleporting to Old Central Spawn use command `/center`=Команда зарезервирована. Для телепортации в Старый центральный Спаун используйте команду `/center`