Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Mar 12, 2024
2 parents 71ee9a3 + 8f4b63b commit c76e58d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [2023.12.p4](https://github.com/lord-server/lord/releases/tag/2023.12.p4)
- Death Hall: add orc spawn & hall positions config.
- add clan "Ganza"

## [2023.12.p3](https://github.com/lord-server/lord/releases/tag/2023.12.p3)
- Restore chest textures after New Year.

Expand Down
6 changes: 3 additions & 3 deletions minetest.conf.prod
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ lp_api.router.cmd = true
# добавлено при реализации `/death`
common_spawn_pos = 735, 33, -818
hall_of_life_pos = 735, 33, -818
#hall_of_death_pos =
hall_of_death_pos = 11773, 54, -10282
# спауны для рас ( GH: #330 )
#dynamic_spawn = true
dynamic_spawn = true
#elf_spawn_pos =
#orc_spawn_pos =
orc_spawn_pos = 11773, 54, -10282

# ------- lord/player -------
# арены, на которых отображается здоровье:
Expand Down
10 changes: 5 additions & 5 deletions mods/lord/Player/clans/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ local clans_storage = {
title = "Masons",
players = { "Petus_mason", "Swed_mason", "Dormi_mason", "JikiSo_mason", "Alek_mason", "Zhekil_mason" },
},
--havit = {
-- name = "havit",
-- title = "Havit-Nakyar",
-- players = { "Doloment", "Sdoh", "Aiex" }
--},
vassals = {
name = "vassals",
title = "Vassals",
players = { "Pilsner_vassal", "PePe_vassal", "JVD_vassal", "Semi_vassal" },
},
ganza = {
name = "ganza",
title = "Ganza",
players = { "Qundark", "Kema" },
},
}
--- @type table<string,boolean> local cache for clan is online
local clan_is_online_cache = {}
Expand Down

0 comments on commit c76e58d

Please sign in to comment.