Fixed:
-> !wants -> !orgs info -> special cmd's -> !assist -> "afk" for players without active account -> !loot add <item_ref> <count> => nolonger breaks !account Changes: -> grouped !tara, !gaunt, .. into !wb -> Display the most recent news entry on logon (default: enabled) -> improved grouping of !items -> Added the option to authentificate WS connections (Datanet module). This is used in special cases, where the Websocket Server requires the clien tto authentificate itself. (Server sends "#auth", client responds with the auth string) -> Add main name to relaying (priv <-> org) [default: disabled] -> Added logon/logoff messages back -> restricted default access to "dangerous" commands to moderator -> Added optional logging (Private Channel, Org Channel, Tells, ... disabled by default) Rewrite of the Tower Module. -> More verbosity, if enabled in config. by default, GAS and Hot timer only. -> !hot displays currently hot (and in penalty) sites, and these which go hot in < 60 minutes -> !attacks filterable by PF and Site -> display current contract QL's grouped by org: !contracts (requires managed cache)
This commit is contained in:
@@ -8,9 +8,9 @@ from core.command_alias_service import CommandAliasService
|
||||
from core.command_param_types import Const, Int, Any
|
||||
from core.db import DB
|
||||
from core.decorators import instance, command, timerevent
|
||||
from core.igncore import IgnCore
|
||||
from core.setting_service import SettingService
|
||||
from core.text import Text
|
||||
from core.igncore import IgnCore
|
||||
from modules.core.accounting.services.account_service import AccountService
|
||||
from modules.raidbot.raid.raidbot_controller import Raider
|
||||
from modules.standard.items.items_controller import ItemsController
|
||||
@@ -336,9 +336,16 @@ class LootController:
|
||||
loot += item
|
||||
self.add_item_to_loot(item)
|
||||
else:
|
||||
loot += item
|
||||
self.add_item_to_loot(item, item_count=item_count)
|
||||
out = re.match(r"(([^<]+)?<a href=[\"\']itemref://(\d+)/(\d+)/(\d+)[\"\']>([^<]+)</a>([^<]+)?)", item)
|
||||
if out:
|
||||
# print(out.groups())
|
||||
loot += item
|
||||
item = self.text.make_item(int(out[3]), int(out[4]), int(out[5]), out[6])
|
||||
self.add_item_to_loot((out[2] or "") + item + (out[7] or ""), item_count=item_count)
|
||||
|
||||
else:
|
||||
loot += item
|
||||
self.add_item_to_loot(item, item_count=item_count)
|
||||
self.bot.send_private_channel_message(f"<highlight>{loot}<end> was added to loot list.")
|
||||
|
||||
@timerevent(budatime="1h",
|
||||
|
||||
Reference in New Issue
Block a user