diff --git a/game/engines/default/data/keybinds/chat.lua b/game/engines/default/data/keybinds/chat.lua index 013d84e1e0be2dab535dcef5b07490858a4b40c9..ede9b56997d3700ed123a941f535bdd25d9c030c 100644 --- a/game/engines/default/data/keybinds/chat.lua +++ b/game/engines/default/data/keybinds/chat.lua @@ -30,3 +30,10 @@ defineAction{ group = "user chat", name = "Display chat log", } + +defineAction{ + default = { "sym:32:false:true:false:false" }, + type = "USERCHAT_SWITCH_CHANNEL", + group = "user chat", + name = "Cycle chat channels", +} diff --git a/game/engines/default/engine/UserChat.lua b/game/engines/default/engine/UserChat.lua index 9f8491d191c27e1e4232b21de32e938f1786a2d6..4f56dad1e3e1c194e4dadc55308a19d051221ae3 100644 --- a/game/engines/default/engine/UserChat.lua +++ b/game/engines/default/engine/UserChat.lua @@ -45,6 +45,16 @@ function _M:setupOnGame() USERCHAT_TALK = function() self:talkBox() end, + USERCHAT_SWITCH_CHANNEL = function() + if not self.display_chans then return end + for i = 1, #self.display_chans do + if self.display_chans[i].name == self.cur_channel then + self:selectChannel(self.display_chans[util.boundWrap(i + 1, 1, #self.display_chans)].name) + if game.logChat then game.logChat("Talking in channel: %s", self.cur_channel) end + break + end + end + end, } local ok, UC = pcall(require, "mod.class.UserChatExtension") diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_human_great_gladiator.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_human_great_gladiator.png new file mode 100644 index 0000000000000000000000000000000000000000..cd962fe2fffea0c87b897c0797c435f0fb33e7a2 Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_human_great_gladiator.png differ diff --git a/game/modules/tome/data/zones/arena/npcs.lua b/game/modules/tome/data/zones/arena/npcs.lua index f7f9647c41a0912ecce76cdf57fb467877ae5a44..73c052a6fc20b5d46f958bb9b38e8eb5836cefa3 100644 --- a/game/modules/tome/data/zones/arena/npcs.lua +++ b/game/modules/tome/data/zones/arena/npcs.lua @@ -911,6 +911,7 @@ newEntity{ name = "great gladiator", base = "BASE_NPC_ARENA1", type = "humanoid", subtype = "human", color=colors.VERY_DARK_RED, + resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_human_great_gladiator.png", display_h=2, display_y=-1}}}, life_rating = 12,