diff --git a/royalpack/commands/fortune.py b/royalpack/commands/fortune.py index 22d294b9..b390d7b9 100644 --- a/royalpack/commands/fortune.py +++ b/royalpack/commands/fortune.py @@ -72,10 +72,6 @@ class FortuneCommand(rc.Command): r = random.Random(x=h) - if author is not None and len(author.steam) >= 0 and author.steam[0].trionfistatus is not None: - author.steam[0].trionfistatus.x = datetime.datetime.now() - await ru.asyncify(session.commit) - message = r.sample(self._fortunes, 1)[0] await data.reply(message) diff --git a/royalpack/commands/spell.py b/royalpack/commands/spell.py index a6e4230e..35e29c9a 100644 --- a/royalpack/commands/spell.py +++ b/royalpack/commands/spell.py @@ -28,15 +28,6 @@ class SpellCommand(rc.Command): rows.append(f"Multiattacco: [b]×{dmg.repeat}[/b]") rows.append("") - # Halloween 2020 - possible_dmg = (dmg.dice_number * dmg.dice_type + dmg.constant) * dmg.repeat - if possible_dmg >= 250: - async with data.session_acm() as session: - author = await data.find_author(session=session, required=False) - if author is not None and author.halloween2020 is not None: - author.halloween2020.i = datetime.datetime.now() - await ru.asyncify(session.commit) - if spell.healing_component: heal: rs.HealingComponent = spell.healing_component constant_str: str = f"{heal.constant:+d}" if heal.constant != 0 else "" diff --git a/royalpack/halloween2020/trionfilist.py b/royalpack/halloween2020/trionfilist.py index b44e05c9..6d01ea00 100644 --- a/royalpack/halloween2020/trionfilist.py +++ b/royalpack/halloween2020/trionfilist.py @@ -18,8 +18,9 @@ trionfilist: List[TrionfoInfo] = [ roman="I", name="Il Mago", puzzle="L'ULTIMO GIORNO", - objective="Scopri una magia che possa fare più di 250 danni.", - check=NullCheck(), + objective="Gioca almeno mezz'ora a [url=https://store.steampowered.com/app/42910]Magicka[/url] " + "o [url=https://store.steampowered.com/app/238370]Magicka 2[/url].", + check=CheckPlayedSteamGame(42910) or CheckPlayedSteamGame(238370), ), TrionfoInfo( variable="ii", @@ -209,7 +210,7 @@ trionfilist: List[TrionfoInfo] = [ roman="XXI", name="Il Mondo", puzzle="""44°35'45.0"N 11°02'58.9"E""", - objective="Attraverso i Trionfi, il segreto ti sarà lentamente rivelato...", + objective="Attraverso i Trionfi, il segreto sarà rivelato...", check=NullCheck(), ), ] \ No newline at end of file