From b929c93c1deb6f3259d237f790e4b19931df03ae Mon Sep 17 00:00:00 2001 From: Wurmatron Date: Mon, 17 Mar 2025 21:18:04 -0400 Subject: [PATCH] Updated Board Command, Removed Outdated battery command --- .../hardware/battery.hardware.md | 17 -------- cogs/assistancehardware.py | 39 +++++++++++++++---- 2 files changed, 31 insertions(+), 25 deletions(-) delete mode 100644 cogs/assistance-cmds/hardware/battery.hardware.md diff --git a/cogs/assistance-cmds/hardware/battery.hardware.md b/cogs/assistance-cmds/hardware/battery.hardware.md deleted file mode 100644 index 210c6a3d7..000000000 --- a/cogs/assistance-cmds/hardware/battery.hardware.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Battery replacements -help-desc: Notes on battery replacements -thumbnail-url: https://nintendohomebrew.com/assets/img/hardware/swollen-battery.png -aliases: batt,spicypillow ---- - -Has the battery life of your handheld drastically decreased\*? Or is your battery looking puffed up and swollen? It might be time to replace your battery. In the latter case of swelling, you MUST replace your battery and safely dispose of your old battery as soon as you can, as swollen batteries can pose a safety hazard and potentially explode. - -Replacement batteries for Nintendo's handheld systems can be purchased from iFixit (https://ifixit.com) \*\*. These systems include the DS Lite, DSi, DS 2DS, 3DS, Switch (OLED), and variations. Do NOT purchase 3rd party replacement batteries from retailers such as Amazon, eBay, and AliExpress. These batteries almost always advertise fake capacities, have quality control issues, and break down after a few months. - -When using a new DS/2DS/3DS battery, be sure to calibrate it first. As noted by iFixit: -"For optimal performance, calibrate your newly installed battery: Charge it to 100% and keep charging it for at least 2 more hours. Then use your device until it shuts off due to low battery. Finally, charge it uninterrupted to 100%". For calibrating Switch batteries, read more here: https://discord.com/channels/196618637950451712/467801334373023744/1256118057177186434. - -\* A list of approximated battery durations can be found [here for the 3DS family systems](https://en-americas-support.nintendo.com/app/answers/detail/a_id/385/~/how-long-will-the-battery-remain-charged), and [here for the switch](https://www.nintendo.com/en-gb/Support/Nintendo-Switch/How-Long-Does-the-Battery-Charge-Last-1630015.html). - -\*\* Unfortunately, some quality control issues have been reported with a few iFixit batteries, as a few batteries have broken down after a few months of use. Potentially cheaper, and more reliable batteries from another source are currently being tested by Wurmatron. However, as of now, iFixit is still the recommended option for replacement batteries. If you notice any issues with your iFixit battery, claim your 1-year warranty from iFixit and let us in #hardware know for logging purposes. \ No newline at end of file diff --git a/cogs/assistancehardware.py b/cogs/assistancehardware.py index 02e898c50..e68d1b9f9 100644 --- a/cogs/assistancehardware.py +++ b/cogs/assistancehardware.py @@ -162,17 +162,31 @@ "ctr": "3ds", "spr": "3dsxl", "ktr": "new3ds", + "red": "new3dsxl", "jan": "new2dsxl", } boards = { "dslite": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-dsl.png", "dsixl": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-dsixl.png", - "o3ds": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-o3ds.jpg", - "o3dsxl": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-o3dsxl.png", - "n3ds": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-n3ds.png", - "n3dsxl": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-n3dsxl.png", - "n2dsxl": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-n2dsxl.png", + "3ds": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-o3ds.jpg", + "3dsxl": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-o3dsxl.png", + "2ds": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-o2ds.png", + "new3ds": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-n3ds.png", + "new3dsxl": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-n3dsxl.png", + "new2dsxl": "https://hacksguidewiki.sfo3.digitaloceanspaces.com/hardwarewiki/Board-n2dsxl.png", +} + +# Used for board command title +title = { + "dslite": "DS Lite", + "dsixl": "DSI XL", + "3ds": "3DS (2011)", + "3dsxl": "3DS XL (2011)", + "2ds": "2DS", + "new3ds": "\"New\" 3DS (2015)", + "new3dsxl": "\"New\" 3DS XL (2015)", + "new2dsxl": "\"New\" 2DS XL" } @@ -218,15 +232,24 @@ async def board(self, ctx: KurisuContext, console: str = ""): if console in boards.keys(): embed.set_image(url=boards[console]) - elif console in alias.keys() and alias[console] in boards.keys(): - embed.set_image(url=boards[alias[console]]) + elif console in alias.keys(): + # Verify alias has a board (shared with all other commands) + if alias[console] in boards.keys(): + embed.set_image(url=boards[alias[console]]) + else: + embed.description = f'{ctx.author.mention}, Board options are `' + ', '.join(boards) + "`" + embed.color = discord.Color.red() + await ctx.send(embed=embed, delete_after=10) else: embed.description = f'{ctx.author.mention}, Board options are `' + ', '.join(boards) + "`" embed.color = discord.Color.red() await ctx.send(embed=embed, delete_after=10) return - embed.title = f"Board Diagram: {console.capitalize()}" + if console in alias.keys(): + embed.title = f"System: {title[alias[console]]}" + else: + embed.title = f"System: {title[console]}" await ctx.send(embed=embed)