From 447fa917f8eb53b472fa7a4de0658a50eda448a1 Mon Sep 17 00:00:00 2001 From: fyredragon69 <51103172+fyredragon69@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:22:04 -0400 Subject: [PATCH 1/9] Update memes.py and change vcextract.3ds.md to use wiki tutorial --- cogs/assistance-cmds/tutorial/vcextract.3ds.md | 9 ++++----- cogs/memes.py | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cogs/assistance-cmds/tutorial/vcextract.3ds.md b/cogs/assistance-cmds/tutorial/vcextract.3ds.md index 708d6b1b6..2f396a25c 100644 --- a/cogs/assistance-cmds/tutorial/vcextract.3ds.md +++ b/cogs/assistance-cmds/tutorial/vcextract.3ds.md @@ -1,9 +1,8 @@ --- -title: 3DS VC Extraction Tutorial -url: https://glazedbelmont.github.io/vcextract/ -author.name: GlaZed_Belmont -thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/jade.png -help-desc: Links to Virtual Console Extraction tutorials +title: 3DS VC ROM Extraction Tutorials +url: https://wiki.hacks.guide/wiki/3DS:Virtual_Console/Extraction +author.name: Wiki Contributors +help-desc: Links to Virtual Console ROM Extraction tutorials cooldown-per: 0 cooldown-rate: 0 --- diff --git a/cogs/memes.py b/cogs/memes.py index e8645b29a..5e053ed91 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -93,6 +93,7 @@ async def init_memes(self): self.isforme3 = discord.utils.get(self.bot.guild.emojis, name="isforme3") or "⁉" self.flushed5 = discord.utils.get(self.bot.guild.emojis, name="flushed5") or "⁉" self.flushedbold = discord.utils.get(self.bot.guild.emojis, name="flushedbold") or "⁉" + self.joyclap = discord.utils.get(self.bot.guild.emojis, name="joyclap") or "⁉" async def _meme(self, ctx: KurisuContext, msg, directed: bool = False, image_link: Optional[str] = None, allowed_mentions: Optional[discord.AllowedMentions] = None): @@ -637,14 +638,15 @@ async def motd(self, ctx: KurisuContext): "has junko had a name change today?", "got milk?", "got pilk?", "it has been 0 days since eip broke me", "ETA WEN PLS", "The beatings will continue until morale improves.", - "Zǎoshang hǎo zhōngguó xiànzài wǒ yǒu BING CHILLING"] + "Zǎoshang hǎo zhōngguó xiànzài wǒ yǒu BING CHILLING", "HELP QUIJA?", "glazy if you were cum"] await ctx.send(random.choice(motd_list)) @commands.command(hidden=True) async def doom(self, ctx: KurisuContext): """got demons?""" doom_list = ["RIP AND TEAR", "I *could* run Doom, but I choose not to.", "The Ion Catapult is designed to use only approved UAC ammunition.", - "...we will send unto them... only you.", "May your thirst for retribution never quench, may the blood on your sword never dry, and may we never need you again."] + "...we will send unto them... only you.", "May your thirst for retribution never quench, may the blood on your sword never dry, and may we never need you again.", + "That is a weapon, NOT a teleporter.", "You can't just shoot a hole into the surface of **Mars**...", "They are rage, brutal, without mercy. But you. You will be worse. Rip and tear, until it is done."] await ctx.send(random.choice(doom_list)) @commands.command(hidden=True) @@ -727,7 +729,7 @@ async def eustace3(self, ctx: KurisuContext): await self._meme(ctx, "", image_link="https://album.eiphax.tech/uploads/big/cf85135091814a6136aaf5acd395d860.jpeg") - @commands.command(hidden=True) + @commands.command(hidden=True) async def booba(self, ctx: KurisuContext): """:booba:""" await self._meme(ctx, "", From b146a6f6a325f6a1ceb21e1e41ee703eec682131 Mon Sep 17 00:00:00 2001 From: fyredragon <51103172+fyredragon69@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:31:06 -0400 Subject: [PATCH 2/9] apparently indents are important oops --- cogs/memes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/memes.py b/cogs/memes.py index 5e053ed91..54131f61f 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -729,7 +729,7 @@ async def eustace3(self, ctx: KurisuContext): await self._meme(ctx, "", image_link="https://album.eiphax.tech/uploads/big/cf85135091814a6136aaf5acd395d860.jpeg") - @commands.command(hidden=True) + @commands.command(hidden=True) async def booba(self, ctx: KurisuContext): """:booba:""" await self._meme(ctx, "", From 1ddd602f884c19335c24d8368f45e9050ea997bc Mon Sep 17 00:00:00 2001 From: fyredragon <51103172+fyredragon69@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:33:29 -0400 Subject: [PATCH 3/9] i was ONE character off sorry --- cogs/memes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/memes.py b/cogs/memes.py index 54131f61f..798d9912f 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -729,7 +729,7 @@ async def eustace3(self, ctx: KurisuContext): await self._meme(ctx, "", image_link="https://album.eiphax.tech/uploads/big/cf85135091814a6136aaf5acd395d860.jpeg") - @commands.command(hidden=True) + @commands.command(hidden=True) async def booba(self, ctx: KurisuContext): """:booba:""" await self._meme(ctx, "", From 5a7b46a73abde2549e0e7da456f9a28197bb7bcd Mon Sep 17 00:00:00 2001 From: fyredragon69 <51103172+fyredragon69@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:30:09 -0500 Subject: [PATCH 4/9] change wiki guides/tutorial authors to Wiki Contributors, add wii dump command, add more zoomer speak to fr, and various word changes --- cogs/assistance-cmds/cartinstall.3ds.md | 2 +- cogs/assistance-cmds/cios.wii.md | 4 ++-- cogs/assistance-cmds/dump.3ds.md | 2 +- cogs/assistance-cmds/dump.wii.md | 9 +++++++++ cogs/assistance-cmds/gytb.3ds.md | 11 ++++------- cogs/assistance-cmds/newver.3ds.md | 3 +-- cogs/assistance-cmds/tutorial/ftp.3ds.md | 2 +- cogs/assistance-cmds/tutorial/ftp.switch.md | 6 +++--- cogs/assistance-cmds/tutorial/vcextract.3ds.md | 1 + cogs/memes.py | 6 ++++-- 10 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 cogs/assistance-cmds/dump.wii.md diff --git a/cogs/assistance-cmds/cartinstall.3ds.md b/cogs/assistance-cmds/cartinstall.3ds.md index bc519c57c..e0b2342ab 100644 --- a/cogs/assistance-cmds/cartinstall.3ds.md +++ b/cogs/assistance-cmds/cartinstall.3ds.md @@ -1,7 +1,7 @@ --- title: 3DS Cart Install Guide url: https://wiki.hacks.guide/wiki/3DS:Dump_titles_and_game_cartridges#Installing_a_Game_Cartridge_Directly_to_the_System -author.name: NH Discord Server +author.name: Wiki Contributors thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/bigh.png help-desc: How to install 3DS cartridges to the SD card --- diff --git a/cogs/assistance-cmds/cios.wii.md b/cogs/assistance-cmds/cios.wii.md index 849263092..6a0ce6762 100644 --- a/cogs/assistance-cmds/cios.wii.md +++ b/cogs/assistance-cmds/cios.wii.md @@ -1,7 +1,7 @@ --- title: cIOS Guide -url: https://wii.guide/cios.html -author.name: RiiConnect24 +url: https://wii.hacks.guide/cios +author.name: NH & Friends thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/wii.png help-desc: cIOS installation guide --- diff --git a/cogs/assistance-cmds/dump.3ds.md b/cogs/assistance-cmds/dump.3ds.md index bd45ebb2d..0f464e661 100644 --- a/cogs/assistance-cmds/dump.3ds.md +++ b/cogs/assistance-cmds/dump.3ds.md @@ -1,7 +1,7 @@ --- title: GodMode9 dump/build Guide url: https://wiki.hacks.guide/wiki/3DS:Dump_titles_and_game_cartridges -author.name: NH Discord Server +author.name: Wiki Contributors thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/bigh.png help-desc: How to dump games and data for CFW consoles --- diff --git a/cogs/assistance-cmds/dump.wii.md b/cogs/assistance-cmds/dump.wii.md new file mode 100644 index 000000000..c3cb9b37e --- /dev/null +++ b/cogs/assistance-cmds/dump.wii.md @@ -0,0 +1,9 @@ +--- +title: Wii/Gamecube dump guide +url: https://wii.hacks.guide/dump-games +author.name: NH & Friends +thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/wii.png +help-desc: Wii/Gamecube disc dumping guide +--- + +How to dump Wii or Gamecube games with CleanRip \ No newline at end of file diff --git a/cogs/assistance-cmds/gytb.3ds.md b/cogs/assistance-cmds/gytb.3ds.md index 85a2d2c9d..3d4398e33 100644 --- a/cogs/assistance-cmds/gytb.3ds.md +++ b/cogs/assistance-cmds/gytb.3ds.md @@ -1,12 +1,9 @@ --- title: How to install custom badges +url: https://wiki.hacks.guide/wiki/3DS:GYTB +author.name: Wiki Contributors +thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/bigh.png help-desc: Guide and troubleshooting for custom badges on the 3DS --- -1. On the root of your SD card, make a folder called `/badges/`, and inside it put your custom badges, as `.png` files, with a size of 64x64, or a multiple of this, in which case the badge will get split up -2. Download and install [GYTB](https://github.com/MechanicalDragon0687/GYTB/releases) (the .cia file) -3. Run the app, and all badges will be installed - -## Troubleshooting: -- Is there any file with dimensions that can't be divided by 64 in the badges folder? (check for and delete preview.png) -- Do you have over 1000 badges? +GYTB Installation and usage guide \ No newline at end of file diff --git a/cogs/assistance-cmds/newver.3ds.md b/cogs/assistance-cmds/newver.3ds.md index df490e5d0..4ea838db9 100644 --- a/cogs/assistance-cmds/newver.3ds.md +++ b/cogs/assistance-cmds/newver.3ds.md @@ -10,5 +10,4 @@ Is your Luma version up to date? If your Luma version is 10.2.1 or above, **upda If it is 10.2 or below, please type `.update` in <#261581918653513729> and follow the information there. If you DO NOT currently have CFW installed (stock console): -The methods available on 11.17.0 depend on your console model and region. Check here to see if any methods are available to you: https://troubleshoot.uwuu.ca/seventeen -*Last edited: May 28th, 2023* +It is safe to update to 11.17.0-50, but it is recommended to stay on lower versions for easier custom firmware installation. diff --git a/cogs/assistance-cmds/tutorial/ftp.3ds.md b/cogs/assistance-cmds/tutorial/ftp.3ds.md index 37a64154e..5bb31c9b8 100644 --- a/cogs/assistance-cmds/tutorial/ftp.3ds.md +++ b/cogs/assistance-cmds/tutorial/ftp.3ds.md @@ -1,7 +1,7 @@ --- title: 3DS FTP Guide url: https://wiki.hacks.guide/wiki/3DS:FTP -author.name: Nintendo Homebrew +author.name: Wiki Contributors thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/bigh.png help-desc: FTPD/WinSCP ftp guide aliases: ftpd diff --git a/cogs/assistance-cmds/tutorial/ftp.switch.md b/cogs/assistance-cmds/tutorial/ftp.switch.md index 8ab818fb3..6c42d74ce 100644 --- a/cogs/assistance-cmds/tutorial/ftp.switch.md +++ b/cogs/assistance-cmds/tutorial/ftp.switch.md @@ -1,8 +1,8 @@ --- title: Switch FTP Guide -url: https://nx.eiphax.tech/ftp.html -author.name: Krieg -thumbnail-url: https://nintendohomebrew.com/assets/img/krieg.png +url: https://wiki.hacks.guide/wiki/Switch:FTP +author.name: Wiki Contributors +thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/bigh.png help-desc: FTPD/WinSCP ftp guide aliases: ftpd cooldown-per: 0 diff --git a/cogs/assistance-cmds/tutorial/vcextract.3ds.md b/cogs/assistance-cmds/tutorial/vcextract.3ds.md index 2f396a25c..62c06b5d7 100644 --- a/cogs/assistance-cmds/tutorial/vcextract.3ds.md +++ b/cogs/assistance-cmds/tutorial/vcextract.3ds.md @@ -2,6 +2,7 @@ title: 3DS VC ROM Extraction Tutorials url: https://wiki.hacks.guide/wiki/3DS:Virtual_Console/Extraction author.name: Wiki Contributors +thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/bigh.png help-desc: Links to Virtual Console ROM Extraction tutorials cooldown-per: 0 cooldown-rate: 0 diff --git a/cogs/memes.py b/cogs/memes.py index 5e7eb53ab..57743acdb 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -680,7 +680,7 @@ async def flushed(self, ctx: KurisuContext, sample: commands.Range[int, 1, 10] = await ctx.send(' '.join(map(str, random.choices(flushed_list, k=sample)))) @commands.command(hidden=True, aliases=["ong", "ongod", "nocap", "ngl", "tbh"]) - async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 15] = 1): + async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 20] = 1): """fr ngl tbh""" zoomer_list = ["💯", "👌", "🔥", "🙏", "get that bag", "fr", @@ -704,7 +704,9 @@ async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 15] = 1): "iykyk", "jit", "highkey lowkey", "rizz", "W", "L", "rizzler", "glow up tbh", "sigma chad", - "gyat", "it's giving", "IT'S GIVING FR"] + "gyat", "it's giving", "IT'S GIVING FR", + "gyatt", "fanum tax", "skibidi toilet", "skibidi", + "sheesh", "sigma grindset", "only in ohio"] await ctx.send(' '.join(random.choices(zoomer_list, k=sample))) @commands.command(hidden=True, aliases=["freeshop", "3hs"]) From fcc253d4a70eefa731a8129b25cda058894be1f4 Mon Sep 17 00:00:00 2001 From: fyredragon69 <51103172+fyredragon69@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:33:57 -0500 Subject: [PATCH 5/9] everything from before and changing cios guide to wii.hacks.guide, switching gytb guide to wiki page, changing switch ftp guide to wiki page, change newver to say 11.17 is safe (for now) --- cogs/memes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/memes.py b/cogs/memes.py index 57743acdb..72946a9a3 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -680,7 +680,7 @@ async def flushed(self, ctx: KurisuContext, sample: commands.Range[int, 1, 10] = await ctx.send(' '.join(map(str, random.choices(flushed_list, k=sample)))) @commands.command(hidden=True, aliases=["ong", "ongod", "nocap", "ngl", "tbh"]) - async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 20] = 1): + async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 15] = 1): """fr ngl tbh""" zoomer_list = ["💯", "👌", "🔥", "🙏", "get that bag", "fr", From d851c82f673c37e82eb1ec5d288d135fce205e28 Mon Sep 17 00:00:00 2001 From: fyredragon69 <51103172+fyredragon69@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:43:09 -0500 Subject: [PATCH 6/9] forgot to change syscheck, oops --- cogs/assistance-cmds/syscheck.wii.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cogs/assistance-cmds/syscheck.wii.md b/cogs/assistance-cmds/syscheck.wii.md index e5095a6cc..c76fd5e0b 100644 --- a/cogs/assistance-cmds/syscheck.wii.md +++ b/cogs/assistance-cmds/syscheck.wii.md @@ -1,10 +1,9 @@ --- title: SysCheck -url: https://wii.guide/syscheck.html +url: https://wii.hacks.guide/syscheck.html thumbnail-url: https://nintendohomebrew.com/assets/img/nhmemes/wii.png -author.name: RiiConnect24 -author.url: https://wii.guide/syscheck.html -help-desc: Wii System checking tool for debugging console issues +author.name: NH & Friends +help-desc Wii System Checking tool for debugging console issues --- -Wii System Check tool +Wii System Check tool \ No newline at end of file From b01be1c3ed9a9e6187287a6e89698ce3788af0b5 Mon Sep 17 00:00:00 2001 From: fyredragon69 <51103172+fyredragon69@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:47:57 -0500 Subject: [PATCH 7/9] im not very smart --- cogs/memes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cogs/memes.py b/cogs/memes.py index 72946a9a3..cb45e82fe 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -703,8 +703,7 @@ async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 15] = 1): "no cap", "tea", "spill the tea", "iykyk", "jit", "highkey lowkey", "rizz", "W", "L", - "rizzler", "glow up tbh", "sigma chad", - "gyat", "it's giving", "IT'S GIVING FR", + "rizzler", "glow up tbh", "sigma chad", "gyat", "it's giving", "IT'S GIVING FR", "gyatt", "fanum tax", "skibidi toilet", "skibidi", "sheesh", "sigma grindset", "only in ohio"] await ctx.send(' '.join(random.choices(zoomer_list, k=sample))) From 47c6c9ed0b36e371ed4aaabd596e11d6fd093512 Mon Sep 17 00:00:00 2001 From: fyredragon69 <51103172+fyredragon69@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:49:46 -0500 Subject: [PATCH 8/9] im not very smart part 2 --- cogs/memes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cogs/memes.py b/cogs/memes.py index cb45e82fe..1c4d3b700 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -704,8 +704,7 @@ async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 15] = 1): "iykyk", "jit", "highkey lowkey", "rizz", "W", "L", "rizzler", "glow up tbh", "sigma chad", "gyat", "it's giving", "IT'S GIVING FR", - "gyatt", "fanum tax", "skibidi toilet", "skibidi", - "sheesh", "sigma grindset", "only in ohio"] + "gyatt", "fanum tax", "skibidi toilet", "skibidi", "sheesh", "sigma grindset", "only in ohio"] await ctx.send(' '.join(random.choices(zoomer_list, k=sample))) @commands.command(hidden=True, aliases=["freeshop", "3hs"]) From 8c77203902d09c6e946c243c5380be5aaefad330 Mon Sep 17 00:00:00 2001 From: eip <36315290+eip618@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:54:03 +1100 Subject: [PATCH 9/9] Update memes.py --- cogs/memes.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cogs/memes.py b/cogs/memes.py index 1c4d3b700..79e94f365 100644 --- a/cogs/memes.py +++ b/cogs/memes.py @@ -703,8 +703,11 @@ async def fr(self, ctx: KurisuContext, sample: commands.Range[int, 1, 15] = 1): "no cap", "tea", "spill the tea", "iykyk", "jit", "highkey lowkey", "rizz", "W", "L", - "rizzler", "glow up tbh", "sigma chad", "gyat", "it's giving", "IT'S GIVING FR", - "gyatt", "fanum tax", "skibidi toilet", "skibidi", "sheesh", "sigma grindset", "only in ohio"] + "rizzler", "glow up tbh", "sigma chad", + "gyat", "it's giving", "IT'S GIVING FR", + "gyatt", "fanum tax", "skibidi toilet", + "skibidi", "sheesh", "sigma grindset", + "only in ohio"] await ctx.send(' '.join(random.choices(zoomer_list, k=sample))) @commands.command(hidden=True, aliases=["freeshop", "3hs"])