From 8d5ae1b15a7658dd986ed648b8660d266e8563a1 Mon Sep 17 00:00:00 2001 From: Strs2 Date: Sun, 26 Apr 2026 23:23:55 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E7=94=A8=E3=81=AE?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=83=99=E3=83=BC=E3=82=B9=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/database.py b/database.py index ddea59e..5b23823 100644 --- a/database.py +++ b/database.py @@ -1,5 +1,5 @@ from discord.ext import commands -from sqlalchemy import Column, Integer, String, Boolean, create_engine +from sqlalchemy import Column, Integer, String, Boolean, create_engine, func from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker @@ -142,6 +142,25 @@ class Oregacha(Base2): session2 = Session2() +DATABASE_URL3 = 'sqlite:///polls.db' # データベースの種類と名前をここで指定できます +engine3 = create_engine(DATABASE_URL3) # データベースエンジンを作成 +Base3 = declarative_base() # データベースの親クラスを作成 + + +class Polls(Base3): + __tablename__ = 'polls' + no = Column(Integer, primary_key=True) + pollid = Column(Integer) + userid = Column(Integer) + username = Column(String) + chosen = Column(Integer) + + +Base3.metadata.create_all(engine3) +Session3 = sessionmaker(bind=engine3) +session3 = Session3() + + class Sqltest1(commands.Cog): def __init__(self, bot: commands.Bot): self.bot = bot From 7bc19a01c708b2dbc6da8efa359f416150dc0fad Mon Sep 17 00:00:00 2001 From: Strs2 Date: Sun, 26 Apr 2026 23:24:40 +0900 Subject: [PATCH 2/6] =?UTF-8?q?cpoll.py=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cogs/cpoll.py | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 cogs/cpoll.py diff --git a/cogs/cpoll.py b/cogs/cpoll.py new file mode 100644 index 0000000..0e0efa2 --- /dev/null +++ b/cogs/cpoll.py @@ -0,0 +1,286 @@ +import discord +from discord import ButtonStyle, Interaction, app_commands +from discord.ext import commands +from discord.ui import Button, View, button, Modal + +from config.config import config +from database import User, session, Oregacha, session2, Polls, session3, func + +from datetime import datetime + +import random, string + +async def win(user_ids, amount, interaction: Interaction, odd): + for i in user_ids: + userdb = session.query(User).filter_by(userid=i[0]).first() + userdb.exp += int(amount * odd) + touser = interaction.guild.get_member(i[0]) + if amount > 0: + await touser.send(f"おめでとう！　あなたは **{int(amount * odd)} XP** 獲得した。") + else: + await touser.send(f"おめでとう！　あなたは **{int(amount * odd)} XP** 獲得した。\n…… **0 XP** でも勝ちは勝ちだ。") + if userdb.exp >= 10000: + userdb.level += 1 + userdb.exp -= 10000 + session.commit() + mee6_channel = await interaction.guild.fetch_channel(config.channels.level_data) + await mee6_channel.send(f"mcmdlevel,{userdb.userid},{userdb.username},{userdb.level}") + else: + session.commit() + +class ShowButton(Button): + def __init__(self, pollid, choices: str, title: str, started: int): + super().__init__(label="開票・削除", style=ButtonStyle.danger) + self.cid = pollid + self.choices = choices.split(",") + self.title = title + self.started = started + + async def callback(self, interaction: discord.Interaction): + if interaction.user.id != self.started: + await interaction.response.send_message(f"**自分の投票のみ開票・削除ができます！**", ephemeral=True) + return + polls = dict(session3.query(Polls.chosen, func.count()).filter_by(pollid=self.cid).group_by(Polls.chosen).all()) + total = (session3.query(func.count()).filter(Polls.pollid==self.cid).scalar()) + if not polls: + await interaction.message.delete() + else: + result_embed = discord.Embed( + title=f"投票終了！　結果は……", color=0x113AFF + ) + result_embed.add_field( + name=f"{self.title}", value="", inline=False + ) + + for n, i in enumerate(self.choices): + if n in polls: + bar = int(40 * polls[n] / total) + result_embed.add_field( + name=f"{i}: {polls[n]}票", value="="*bar, inline=False + ) + else: + result_embed.add_field( + name=f"{i}: 0票", value="x", inline=False + ) + + result_embed.set_footer(text=f"計{total}票") + + await interaction.channel.send(embed=result_embed) + await interaction.message.delete() + +class ShowBetButton(Button): + def __init__(self, pollid, choices: str, title: str, rule, nn, amount, odds, started: int): + super().__init__(label="開票・削除", style=ButtonStyle.danger) + self.cid = pollid + self.choices = choices.split(",") + self.title = title + self.rule = rule + self.nn = nn + self.amount = amount + self.odds = odds + self.started = started + + async def callback(self, interaction: discord.Interaction): + if interaction.user.id != self.started: + await interaction.response.send_message(f"**自分の投票のみ開票・削除ができます！**", ephemeral=True) + return + polls = dict(session3.query(Polls.chosen, func.count()).filter_by(pollid=self.cid).group_by(Polls.chosen).all()) + total = (session3.query(func.count()).filter(Polls.pollid==self.cid).scalar()) + if not polls: + await interaction.message.delete() + else: + result_embed = discord.Embed( + title=f"投票終了！　結果は……", color=0x113AFF + ) + result_embed.add_field( + name=f"{self.title}", value="", inline=False + ) + + if self.rule == 3: self.nn = random.randint(1, len(self.choices)) + + for n, i in enumerate(self.choices): + if n in polls: + bar = int(40 * polls[n] / total) + result_embed.add_field( + name=f"{i}（{self.odds[n]}倍）: {polls[n]}票", value="="*bar, inline=False + ) + if self.rule == 1 and polls[n] == 1: + user_ids = (session3.query(Polls.userid).filter(Polls.pollid == self.cid, Polls.chosen == n).all()) + await win(user_ids, self.amount, interaction, self.odds[n]) + elif self.rule == 2 and n == (self.nn-1): + user_ids = (session3.query(Polls.userid).filter(Polls.pollid == self.cid, Polls.chosen == n).all()) + await win(user_ids, self.amount, interaction, self.odds[n]) + elif self.rule == 3 and n == (self.nn-1): + user_ids = (session3.query(Polls.userid).filter(Polls.pollid == self.cid, Polls.chosen == n).all()) + await win(user_ids, self.amount, interaction, self.odds[n]) + elif self.rule == 4 and polls[n] == 2: + user_ids = (session3.query(Polls.userid).filter(Polls.pollid == self.cid, Polls.chosen == n).all()) + await win(user_ids, self.amount, interaction, self.odds[n]) + elif self.rule == 5 and (polls[n]/total*100 <= self.nn): + user_ids = (session3.query(Polls.userid).filter(Polls.pollid == self.cid, Polls.chosen == n).all()) + await win(user_ids, self.amount, interaction, self.odds[n]) + elif self.rule == 6 and (n == 0 or polls[n]/total*100 > 50): + user_ids = (session3.query(Polls.userid).filter(Polls.pollid == self.cid, Polls.chosen == n).all()) + await win(user_ids, self.amount, interaction, self.odds[n]) + + else: + result_embed.add_field( + name=f"{i}（{self.odds[n]}倍）: 0票", value="x", inline=False + ) + + if self.rule == 1: + result_embed.set_author(name=f"一票だけの選択肢を選んだ人の勝ち！") + elif self.rule == 2 or self.rule == 3: + result_embed.set_author(name=f"{self.choices[self.nn-1]} を選んだ人の勝ち！") + elif self.rule == 4: + result_embed.set_author(name=f"二票だけの選択肢を選んだ人の勝ち！") + elif self.rule == 5: + result_embed.set_author(name=f"割合が {self.nn} % 以下の選択肢を選んだ人の勝ち！") + result_embed.set_footer(text=f"計{total}票・勝者には DM が届きます（{['','一票のみの選択肢が勝ち','特定の選択肢が勝ち','ランダムな選択肢が勝ち','二票のみの選択肢が勝ち',f'割合が {self.nn} % 以下の選択肢が勝ち','一つ目は絶対に勝ち／二つ目が過半数を占めたら全員勝ち'][self.rule]}）") + + await interaction.channel.send(embed=result_embed) + await interaction.message.delete() + +class ChoiceButton(Button): + def __init__(self, text, pollid, num, choices: str): + super().__init__(label=text, style=ButtonStyle.secondary) + self.num = num + self.cid = pollid + self.choices = choices.split(",") + + async def callback(self, interaction: discord.Interaction): + polled = session3.query(Polls).filter_by(pollid=self.cid, userid=interaction.user.id).first() + if not polled: + session3.add(Polls(pollid=self.cid, userid=interaction.user.id, username=interaction.user.name, chosen=self.num)) + session3.commit() + print(f"{interaction.user.name} -> {self.num}") + await interaction.response.send_message(f"**{self.label}** に投票しました！", ephemeral=True) + elif polled: + await interaction.response.send_message(f"あなたはすでに **{self.choices[polled.chosen]}** に投票しています！", ephemeral=True) + +class ChoiceBetButton(Button): + def __init__(self, text, pollid, num, choices: str, amount, odd): + super().__init__(label=f"{text} （{odd}倍）", style=ButtonStyle.secondary) + self.num = num + self.cid = pollid + self.amount = amount + self.choices = choices.split(",") + self.odd = odd + + async def callback(self, interaction: discord.Interaction): + polled = session3.query(Polls).filter_by(pollid=self.cid, userid=interaction.user.id).first() + if not polled: + userdb = session.query(User).filter_by(userid=interaction.user.id).first() + userdb.exp -= self.amount + userdb.allremoveexp += self.amount + if userdb.exp < 0: + userdb.level -= 1 + userdb.exp += 10000 + session.commit() + session3.add(Polls(pollid=self.cid, userid=interaction.user.id, username=interaction.user.name, chosen=self.num)) + session3.commit() + print(f"{interaction.user.name} -> {self.num}") + if self.amount > 0: + await interaction.response.send_message(f"**{self.label}** に投票しました！\n確かに **{self.amount} XP** いただきました。", ephemeral=True) + else: + await interaction.response.send_message(f"**{self.label}** に投票しました！\n確かに **{self.amount} XP** を……。\n……ないものはいただけませんね。フリーです！", ephemeral=True) + elif polled: + await interaction.response.send_message(f"あなたはすでに **{self.choices[polled.chosen]}** に投票しています！", ephemeral=True) + +class ChoiceButtons(View): + def __init__(self, choices = "x", title = "x", sid = -1): + super().__init__(timeout=None) + if len(choices.split(",")) <= 15: + date = datetime.today().strftime("%Y%m%d") + rand = "".join(random.choices(string.ascii_uppercase + string.digits, k=8)) + for n, i in enumerate(choices.split(",")): + self.add_item(ChoiceButton(i, f"{date}_{rand}", n, choices)) + self.add_item(ShowButton(f"{date}_{rand}", choices, title, sid)) + +class ChoiceBetButtons(View): + def __init__(self, choices = "x", title = "x", amount = 100, rule = 1, nn = None, odds = None, sid = -1): + super().__init__(timeout=None) + if len(choices.split(",")) <= 15: + date = datetime.today().strftime("%Y%m%d") + rand = "".join(random.choices(string.ascii_uppercase + string.digits, k=8)) + for n, i in enumerate(choices.split(",")): + self.add_item(ChoiceBetButton(i, f"{date}_{rand}", n, choices, amount, odds[n])) + self.add_item(ShowBetButton(f"{date}_{rand}", choices, title, rule, nn, amount, odds, sid)) + +class CPoll(commands.Cog): + def __init__(self, bot: commands.Bot): + self.bot = bot + + @app_commands.command(name="cpoll", description="投票を行います") + @app_commands.describe(title="タイトル", choice="選択肢／選択肢は , ← カンマで区切ってね！／15個まで") + async def cpoll(self, interaction: Interaction, title: str, choice: str): + poler_embed = discord.Embed( + title=f"投票：{title}", color=0x3AFF11 + ) + poler_embed.set_footer(text="投票者: 表示されません\n開票: 任意のタイミング") + + await interaction.response.send_message("投票を開始しました", ephemeral=True) + await interaction.channel.send(embed=poler_embed, view=ChoiceButtons(choice, title)) + + @app_commands.command(name="cpollbet", description="XPを賭けて投票を行います（行うのにもXPは必要です）。ルールなども設定できます") + @app_commands.describe(title="タイトル", choice="選択肢／選択肢は , ← カンマで区切ってね！／2個から15個まで", amount="賭ける量（ 0 ～ 1500 ）", rule="1: 一票のみの選択肢を選んだら勝利, 2: 特定の選択肢が勝利, 3: ランダムな選択肢が勝利, 4: 二票のみの選択肢を選んだら勝利, 5: 割合の小さい選択肢を選んだら勝利, 6: 1つ目は絶対に勝ち／2つ目は過半数なら勝ち", n="2, 5 を設定した場合は設定してください（2は番目／5は割合）。それ以外は0にしてください", odds="選択肢ごとのオッズです（通常2倍、最大2.5倍）。 , ← カンマで区切ってね！") + async def cpollbet(self, interaction: Interaction, title: str, choice: str, amount: int, rule: int, n: int, odds: str = None): + poler_embed = discord.Embed( + title=f"投票：{title}", color=0x3AFF11 + ) + if odds == None: + odds = ["2.0"] * len(choice.split(",")) + if odds is not list: odds = odds.split(",") + poler_embed.set_footer(text=f"投票者: 表示されません\n開票: 任意のタイミング\n投票時に {amount} XP 徴収されます。\n{['','一票のみの選択肢を選んだら勝ち！','特定の選択肢を選んだら勝ち！', 'ランダムな選択肢が勝ち！', '二票のみの選択肢を選んだら勝ち！', f'割合が {n} % 以下の選択肢を選んだら勝ち！', '一つ目は絶対に勝ち。でも二つ目が過半数を占めたら全員勝ち！'][rule]}\n選択肢ごとのオッズ: {'倍, '.join(odds)}倍") + + odds = [float(_) for _ in odds] + + if len(choice.split(",")) < 2 or 16 <= len(choice.split(",")): + await interaction.response.send_message("**引数が正しくないです！**\n選択肢は2個から15個までです。", ephemeral=True) + return + elif rule == 6 and len(choice.split(",")) != 2: + await interaction.response.send_message("**引数が正しくないです！**\nrule に「6」を指定した場合、選択肢は2個のみです。", ephemeral=True) + return + elif len(odds) != len(choice.split(",")): + await interaction.response.send_message("**引数が正しくないです！**\n選択肢の数とオッズの指定数が合っていません。", ephemeral=True) + return + elif rule <= 0 or 7 <= rule: + await interaction.response.send_message("**引数が正しくないです！**\nrule は「1」「2」「3」「4」「5」「6」のみです。", ephemeral=True) + return + elif rule == 2 and (n <= 0 or len(choice.split(",")) < n): + await interaction.response.send_message("**引数が正しくないです！**\nrule に「2」を指定した場合、 n に1以上の数を指定してください！", ephemeral=True) + return + elif rule == 5 and (n <= 0 or int(100/len(choice.split(","))) < n): + await interaction.response.send_message("**引数が正しくないです！**\nrule に「5」を指定した場合、 n は1以上かつ選択肢の数に基づくチャンスレベル以下でなければなりません（2択なら50以下、3択なら33以下、……）。", ephemeral=True) + return + elif amount > 1500: + await interaction.response.send_message("**賭けすぎです！**\n最大 1500 XP となっております。ご利用は計画的に……。", ephemeral=True) + return + elif amount < 0: + await interaction.response.send_message("**引数が正しくないです！**\n賭ける量は 0 ～ 1500 を指定してください。", ephemeral=True) + return + + for odd in odds: + if odd > 2.5: + await interaction.response.send_message("**オッズが高いです！**\n最大2.5倍です。", ephemeral=True) + return + elif odd < 0: + await interaction.response.send_message("**引数が正しくないです！**\nオッズは 0 ～ 2.5 を指定してください。", ephemeral=True) + return + + userdb = session.query(User).filter_by(userid=interaction.user.id).first() + userdb.exp -= amount * 2 + userdb.allremoveexp += amount * 2 + if userdb.exp < 0: + userdb.level -= 1 + userdb.exp += 10000 + session.commit() + + if amount > 0: + await interaction.response.send_message(f"投票を開始しました！\n確かに **{amount * 2} XP** いただきました。", ephemeral=True) + else: + await interaction.response.send_message(f"投票を開始しました！\n確かに **{amount * 2} XP** を……。\n……ないものはいただけませんね。フリーでお楽しみください！", ephemeral=True) + await interaction.channel.send(embed=poler_embed, view=ChoiceBetButtons(choice, title, amount, rule, n, odds, interaction.user.id)) + +async def setup(bot: commands.Bot): + await bot.add_cog(CPoll(bot)) \ No newline at end of file From d0589f4784ed72a1ae5edcdbf3da7c89ab4a7c09 Mon Sep 17 00:00:00 2001 From: Strs2 Date: Sun, 26 Apr 2026 23:59:48 +0900 Subject: [PATCH 3/6] Update cpoll.py --- cogs/cpoll.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cogs/cpoll.py b/cogs/cpoll.py index 0e0efa2..e3f1eb6 100644 --- a/cogs/cpoll.py +++ b/cogs/cpoll.py @@ -213,17 +213,23 @@ def __init__(self, bot: commands.Bot): @app_commands.command(name="cpoll", description="投票を行います") @app_commands.describe(title="タイトル", choice="選択肢／選択肢は , ← カンマで区切ってね！／15個まで") +# @app_commands.Cooldown(1, 60 * 60) async def cpoll(self, interaction: Interaction, title: str, choice: str): poler_embed = discord.Embed( title=f"投票：{title}", color=0x3AFF11 ) poler_embed.set_footer(text="投票者: 表示されません\n開票: 任意のタイミング") + + if 16 <= len(choice.split(",")): + await interaction.response.send_message("**引数が正しくないです！**\n選択肢は15個までです。", ephemeral=True) + return await interaction.response.send_message("投票を開始しました", ephemeral=True) await interaction.channel.send(embed=poler_embed, view=ChoiceButtons(choice, title)) @app_commands.command(name="cpollbet", description="XPを賭けて投票を行います（行うのにもXPは必要です）。ルールなども設定できます") @app_commands.describe(title="タイトル", choice="選択肢／選択肢は , ← カンマで区切ってね！／2個から15個まで", amount="賭ける量（ 0 ～ 1500 ）", rule="1: 一票のみの選択肢を選んだら勝利, 2: 特定の選択肢が勝利, 3: ランダムな選択肢が勝利, 4: 二票のみの選択肢を選んだら勝利, 5: 割合の小さい選択肢を選んだら勝利, 6: 1つ目は絶対に勝ち／2つ目は過半数なら勝ち", n="2, 5 を設定した場合は設定してください（2は番目／5は割合）。それ以外は0にしてください", odds="選択肢ごとのオッズです（通常2倍、最大2.5倍）。 , ← カンマで区切ってね！") +# @app_commands.Cooldown(1, 60 * 60) async def cpollbet(self, interaction: Interaction, title: str, choice: str, amount: int, rule: int, n: int, odds: str = None): poler_embed = discord.Embed( title=f"投票：{title}", color=0x3AFF11 @@ -283,4 +289,4 @@ async def cpollbet(self, interaction: Interaction, title: str, choice: str, amou await interaction.channel.send(embed=poler_embed, view=ChoiceBetButtons(choice, title, amount, rule, n, odds, interaction.user.id)) async def setup(bot: commands.Bot): - await bot.add_cog(CPoll(bot)) \ No newline at end of file + await bot.add_cog(CPoll(bot)) From 83e17c701d9db00ee458fab68a285cb10b3223e0 Mon Sep 17 00:00:00 2001 From: Strs2 Date: Mon, 27 Apr 2026 21:53:30 +0900 Subject: [PATCH 4/6] Update cpoll.py --- cogs/cpoll.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/cpoll.py b/cogs/cpoll.py index e3f1eb6..d113109 100644 --- a/cogs/cpoll.py +++ b/cogs/cpoll.py @@ -225,7 +225,7 @@ async def cpoll(self, interaction: Interaction, title: str, choice: str): return await interaction.response.send_message("投票を開始しました", ephemeral=True) - await interaction.channel.send(embed=poler_embed, view=ChoiceButtons(choice, title)) + await interaction.channel.send(embed=poler_embed, view=ChoiceButtons(choice, title, interaction.user.id)) @app_commands.command(name="cpollbet", description="XPを賭けて投票を行います（行うのにもXPは必要です）。ルールなども設定できます") @app_commands.describe(title="タイトル", choice="選択肢／選択肢は , ← カンマで区切ってね！／2個から15個まで", amount="賭ける量（ 0 ～ 1500 ）", rule="1: 一票のみの選択肢を選んだら勝利, 2: 特定の選択肢が勝利, 3: ランダムな選択肢が勝利, 4: 二票のみの選択肢を選んだら勝利, 5: 割合の小さい選択肢を選んだら勝利, 6: 1つ目は絶対に勝ち／2つ目は過半数なら勝ち", n="2, 5 を設定した場合は設定してください（2は番目／5は割合）。それ以外は0にしてください", odds="選択肢ごとのオッズです（通常2倍、最大2.5倍）。 , ← カンマで区切ってね！") @@ -236,7 +236,7 @@ async def cpollbet(self, interaction: Interaction, title: str, choice: str, amou ) if odds == None: odds = ["2.0"] * len(choice.split(",")) - if odds is not list: odds = odds.split(",") + if type(odds) == str: odds = odds.split(",") poler_embed.set_footer(text=f"投票者: 表示されません\n開票: 任意のタイミング\n投票時に {amount} XP 徴収されます。\n{['','一票のみの選択肢を選んだら勝ち！','特定の選択肢を選んだら勝ち！', 'ランダムな選択肢が勝ち！', '二票のみの選択肢を選んだら勝ち！', f'割合が {n} % 以下の選択肢を選んだら勝ち！', '一つ目は絶対に勝ち。でも二つ目が過半数を占めたら全員勝ち！'][rule]}\n選択肢ごとのオッズ: {'倍, '.join(odds)}倍") odds = [float(_) for _ in odds] From 8522a66f106cce963c1590869ec27993659a2dac Mon Sep 17 00:00:00 2001 From: Strs2 Date: Mon, 27 Apr 2026 22:01:16 +0900 Subject: [PATCH 5/6] Update cpoll.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit テスト用のを消し忘れてた！ --- cogs/cpoll.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/cpoll.py b/cogs/cpoll.py index d113109..8cbc0c0 100644 --- a/cogs/cpoll.py +++ b/cogs/cpoll.py @@ -153,7 +153,7 @@ async def callback(self, interaction: discord.Interaction): if not polled: session3.add(Polls(pollid=self.cid, userid=interaction.user.id, username=interaction.user.name, chosen=self.num)) session3.commit() - print(f"{interaction.user.name} -> {self.num}") +# print(f"{interaction.user.name} -> {self.num}") await interaction.response.send_message(f"**{self.label}** に投票しました！", ephemeral=True) elif polled: await interaction.response.send_message(f"あなたはすでに **{self.choices[polled.chosen]}** に投票しています！", ephemeral=True) @@ -179,7 +179,7 @@ async def callback(self, interaction: discord.Interaction): session.commit() session3.add(Polls(pollid=self.cid, userid=interaction.user.id, username=interaction.user.name, chosen=self.num)) session3.commit() - print(f"{interaction.user.name} -> {self.num}") +# print(f"{interaction.user.name} -> {self.num}") if self.amount > 0: await interaction.response.send_message(f"**{self.label}** に投票しました！\n確かに **{self.amount} XP** いただきました。", ephemeral=True) else: From 0f35bb86a61f70ac95fa429691b725be41431c49 Mon Sep 17 00:00:00 2001 From: Strs2 Date: Wed, 29 Apr 2026 20:12:14 +0900 Subject: [PATCH 6/6] Update ckill.py --- cogs/ckill.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cogs/ckill.py b/cogs/ckill.py index 8e325cb..2ccf81e 100644 --- a/cogs/ckill.py +++ b/cogs/ckill.py @@ -32,6 +32,11 @@ def generate_death_log(self, victim: Optional[str], player: str) -> str: else: victim, player = player, victim + chosen = random.choice(death_logs) + + if chosen == "ゲームの仕様": + return "%1$s は[ゲームの仕様]に殺された".replace("%1$s", escape(player)) + # キルログ生成 return random.choice(death_logs) \ .replace("%1$s", escape(player)) \