Minidodo/igncore
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the coloring from <color>[text]<end> to <color>[test]</color>, which allows the discord module to reparse the messages more accurately

Browse Source
This commit is contained in:
Minidodo
2022-04-29 20:12:15 +02:00
parent fcea02e1c9
commit 3cade228fe
22 changed files with 177 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/standard/raid/chat_controller.py
+1 -1
View File
@@ -26,7 +26,7 @@ class ChatController:
@command(command="lft", params=[Any("message", is_optional=True)], access_level="member",
description="Show a highly visible message")
def lft_command(self, _, message):
lft = f"<a href='chatcmd:///lft <font color=#FFFF00>» {message or '<myname>'}<end>'>/lft {message or '<myname>'}</a>"
lft = f"<a href='chatcmd:///lft <font color=#FFFF00>» {message or '<myname>'}</font>'>/lft {message or '<myname>'}</a>"
return self.text.format_page("Use this command for going LFT", "<yellow>────────────────</yellow>\n"
f"<highlight>{lft}</highlight>\n"
f"<yellow>────────────────</yellow>")
modules/standard/raid/leader_controller.py
+20 -20
View File
@@ -44,9 +44,9 @@ class LeaderController:
description="Show the current raid leader")
def leader_show_command(self, _):
if self.leader:
return "The current raid leader is <highlight>{leader}<end>.".format(leader=self.leader.name)
return "The current raid leader is <highlight>{leader}</highlight>.".format(leader=self.leader.name)
else:
return "There is no current raid leader. Use <highlight><symbol>leader set<end> to become the raid leader."
return "There is no current raid leader. Use <highlight><symbol>leader set</highlight> to become the raid leader."
@command(command="leader", params=[Const("echo"), Options(["on", "off"])], access_level="leader",
description="Echo whatever the current leader types in channel, in a distinctive color", sub_command="mgn")
@@ -54,8 +54,8 @@ class LeaderController:
if self.leader:
if self.can_use_command(request.sender.char_id):
self.echo = switch_to == "on"
return f"Raidleader echo for <highlight>{self.leader.name}<end> has been turned " \
f"<highlight>{switch_to}<end>."
return f"Raidleader echo for <highlight>{self.leader.name}</highlight> has been turned " \
f"<highlight>{switch_to}</highlight>."
else:
return "Insufficient access level."
elif self.leader is None and switch_to == "on":
@@ -66,7 +66,7 @@ class LeaderController:
def leader_echo_status_command(self, _1, _2):
if self.leader:
on_off = "on" if self.echo else "off"
return f"<highlight>{self.leader.name}<end> is set as leader, leader echo is <highlight>{on_off}<end>"
return f"<highlight>{self.leader.name}</highlight> is set as leader, leader echo is <highlight>{on_off}</highlight>"
else:
return "No current leader set, echo is off."
@@ -87,7 +87,7 @@ class LeaderController:
description="Set another character as raid leader")
def leader_set_other_command(self, request, _, char):
if not char.char_id:
return "Could not find <highlight>{player}<end>.".format(player=char)
return "Could not find <highlight>{player}</highlight>.".format(player=char)
return self.set_raid_leader(request.sender, char)
@@ -154,18 +154,18 @@ class LeaderController:
self.echo = False
self.bot.send_private_message(old_leader.char_id,
f"You have been removed as raid leader "
f"by <highlight>{sender.name}<end>.")
return f"You have removed <highlight>{old_leader.name}<end> as raid leader."
f"by <highlight>{sender.name}</highlight>.")
return f"You have removed <highlight>{old_leader.name}</highlight> as raid leader."
else:
return f"You do not have a high enough access level to remove raid leader " \
f"from <highlight>{self.leader.name}<end>."
f"from <highlight>{self.leader.name}</highlight>."
elif sender.char_id == set_to.char_id:
if not self.leader:
self.leader = sender
self.echo = self.setting_service.get("leader_auto_echo").get_value()
reply = "You have been set as raid leader."
if self.echo:
reply += " Leader echo is <green>enabled<end>."
reply += " Leader echo is <green>enabled</green>."
return reply
elif self.leader.char_id == sender.char_id:
self.leader = None
@@ -175,29 +175,29 @@ class LeaderController:
old_leader = self.leader
self.leader = sender
self.echo = self.setting_service.get("leader_auto_echo").get_value()
reply = f"<highlight>{sender.name}<end> has taken raid leader from you."
reply = f"<highlight>{sender.name}</highlight> has taken raid leader from you."
if self.echo:
reply += " Leader echo is <green>enabled<end>."
reply += " Leader echo is <green>enabled</green>."
self.bot.send_private_message(old_leader.char_id, reply)
reply = f"You have taken raid leader from <highlight>{old_leader.name}<end>."
reply = f"You have taken raid leader from <highlight>{old_leader.name}</highlight>."
if self.echo:
reply += " Leader echo is <green>enabled<end>."
reply += " Leader echo is <green>enabled</green>."
return reply
else:
return f"You do not have a high enough access level to " \
f"take raid leader from <highlight>{self.leader.name}<end>."
f"take raid leader from <highlight>{self.leader.name}</green>."
else:
if self.can_use_command(sender.char_id):
self.leader = set_to
self.echo = self.setting_service.get("leader_auto_echo").get_value()
reply = f"<highlight>{sender.name}<end> has set you as raid leader."
reply = f"<highlight>{sender.name}</highlight> has set you as raid leader."
if self.echo:
reply += " Leader echo is <green>enabled<end>."
reply += " Leader echo is <green>enabled</green>."
self.bot.send_private_message(set_to.char_id, reply)
reply = f"<highlight>{set_to.name}<end> has been set as raid leader by {sender.name}."
reply = f"<highlight>{set_to.name}</highlight> has been set as raid leader by {sender.name}."
if self.echo:
reply += " Leader echo is <green>enabled<end>."
reply += " Leader echo is <green>enabled</green>."
return reply
else:
return f"You do not have a high enough access level to " \
f"take raid leader from <highlight>{self.leader.name}<end>."
f"take raid leader from <highlight>{self.leader.name}</highlight>."