From 936eafa6840f525228caf33693d6428130d78921 Mon Sep 17 00:00:00 2001 From: Hipperooni <60094069+Hipperooni@users.noreply.github.com> Date: Fri, 3 Nov 2023 04:40:16 +1100 Subject: [PATCH] Hipperooni branch (#690) * many changes Added /message Added roleAudits for donor colours in onboarding Added typing status to /say * Team Mindset Roles BETA It works, but is kinda slow sometimes, probably some inefficient looping * Update tents to use new voice category Tents are now in their own category * I forgot 2 roles I am silly * Important Fixes Make AFK channel immune to deletion Make TTS role count as donor for donor colours * Add "Busy" role to TTS mindsets * Update futon ID Silly bot keeps deleting it * Change how deleting tents works Changed from checking explicit IDs to not delete to simply checking if a voice channel includes a tent emoji or not * Add bot typing status to announcements * Fix TTS access to donor colours * Make typing status 3 seconds * Small fixes / updates Add 'busy' role to TTS mindsets Make tripbot typing 3 seconds instead of 1.5 Add typing to announcements Change how tent deletion works Update IDs in env * Merge and lint * Update tents permission overwrites * belly button linting * Bug in knex * Add /voice radio First pass, needs work and add function of changing the tent name to signify the bot is being borrowed * Add /voice bitrate Allows editing of bitrate * Lint that shit * One more lint * Finish up * Possible /voice radio fix No way to test in dev. Incorporated what was originally a separate function (checking if there is already a radio bot in the channel before moving a new one in), into the same part of the code that checks if the radio is available and pulls it in * Make "user" entry for /timezone and /birthday required to speed up command entry * Trivia, small fixes Re-enabled Trivia Stopped Verified role from being removed during tripsit session (stops welcome messages) Added code for /voice add (disabled) Removed /voice radio (just way too buggy) Small edit to welcome message * Undo required * Linting * Fixing actions * New donator system Becoming a patron sub now also gives the "Premium Member" role. This new role is what activates all the donator benefits. Supporter role now only acts as a cosmetic with as a hoisted role with gem icon. Premium Member is permanent for Patreon or Kofi donations. Booster is unchanged and all donator perks for boosters is removed once they stop boosting. * Update env.config.ts * Add kofi link * Ignore donor roles in tripsit mode To prevent duplicate donation announcement messages * Update d.donate and a few minor things * Add premium role add * Add 4 new backgrounds, remove multipliers --------- Co-authored-by: Moonbear <1836049+LunaUrsa@users.noreply.github.com> --- src/discord/commands/guild/d.rpg.ts | 182 ++++++++++------------------ src/discord/utils/imageGet.ts | 3 - 2 files changed, 64 insertions(+), 121 deletions(-) diff --git a/src/discord/commands/guild/d.rpg.ts b/src/discord/commands/guild/d.rpg.ts index 0dfed57d8..a68518275 100644 --- a/src/discord/commands/guild/d.rpg.ts +++ b/src/discord/commands/guild/d.rpg.ts @@ -59,112 +59,86 @@ const timesUp = 'Time\'s up!'; const items = { general: { - testkit: { - label: 'TestKit', - value: 'testkit', - description: '10% more tokens from all sources!', - quantity: 1, - weight: 0, - cost: 2000, - equipped: true, - consumable: false, - effect: 'tokenMultiplier', - effect_value: '0.1', - emoji: 'itemBonus', - }, - scale: { - label: 'Scale', - value: 'scale', - description: '10% more tokens from all sources!', - quantity: 1, - weight: 0, - cost: 3000, - equipped: true, - consumable: false, - effect: 'tokenMultiplier', - effect_value: '0.1', - emoji: 'itemBonus', - }, - }, - backgrounds: { - // Geolines: { - // label: 'Geolines', - // value: 'Geolines', - // description: 'Geolines', + // testkit: { + // label: 'TestKit', + // value: 'testkit', + // description: '10% more tokens from all sources!', // quantity: 1, // weight: 0, - // cost: 1000, - // equipped: false, + // cost: 2000, + // equipped: true, // consumable: false, - // effect: 'background', - // effect_value: 'Geolines', - // emoji: '🖼', + // effect: 'tokenMultiplier', + // effect_value: '0.1', + // emoji: 'itemBonus', // }, - // Waves: { - // label: 'Waves', - // value: 'Waves', - // description: 'Waves', + // scale: { + // label: 'Scale', + // value: 'scale', + // description: '10% more tokens from all sources!', // quantity: 1, // weight: 0, - // cost: 1000, - // equipped: false, + // cost: 3000, + // equipped: true, // consumable: false, - // effect: 'background', - // effect_value: 'Waves', - // emoji: '🖼', + // effect: 'tokenMultiplier', + // effect_value: '0.1', + // emoji: 'itemBonus', // }, - // LiquidMaze: { - // label: 'LiquidMaze', - // value: 'LiquidMaze', - // description: 'LiquidMaze', - // quantity: 1, - // weight: 0, - // cost: 1000, - // equipped: false, - // consumable: false, - // effect: 'background', - // effect_value: 'LiquidMaze', - // emoji: '🖼', - // }, - // Flow: { - // label: 'Flow', - // value: 'Flow', - // description: 'Flow', - // quantity: 1, - // weight: 0, - // cost: 1000, - // equipped: false, - // consumable: false, - // effect: 'background', - // effect_value: 'Flow', - // emoji: '🖼', - // }, - DiamondChevron: { - label: 'DiamondChevron', - value: 'DiamondChevron', - description: 'Background', + }, + backgrounds: { + Geolines: { + label: 'Geolines', + value: 'Geolines', + description: 'Geolines', quantity: 1, weight: 0, cost: 1000, equipped: false, consumable: false, effect: 'background', - effect_value: 'DiamondChevron', + effect_value: 'Geolines', + emoji: 'itemBackground', + }, + Waves: { + label: 'Waves', + value: 'Waves', + description: 'Waves', + quantity: 1, + weight: 0, + cost: 1000, + equipped: false, + consumable: false, + effect: 'background', + effect_value: 'Waves', + emoji: 'itemBackground', + }, + LiquidMaze: { + label: 'LiquidMaze', + value: 'LiquidMaze', + description: 'LiquidMaze', + quantity: 1, + weight: 0, + cost: 1000, + equipped: false, + consumable: false, + effect: 'background', + effect_value: 'LiquidMaze', + emoji: 'itemBackground', + }, + Flow: { + label: 'Flow', + value: 'Flow', + description: 'Flow', + quantity: 1, + weight: 0, + cost: 1000, + equipped: false, + consumable: false, + effect: 'background', + effect_value: 'Flow', emoji: 'itemBackground', }, - // Chevron: { - // label: 'Chevron', - // value: 'Chevron', - // description: 'Background', - // quantity: 1, - // weight: 0, - // cost: 1000, - // equipped: false, - // consumable: false, - // effect: 'background', - // effect_value: 'Chevron', - // emoji: 'itemBackground', - // }, Concentric: { label: 'Concentric', value: 'Concentric', @@ -217,19 +191,6 @@ const items = { effect_value: 'SquareTwist', emoji: 'itemBackground', }, - // SquareSpiral: { - // label: 'SquareSpiral', - // value: 'SquareSpiral', - // description: 'Background', - // quantity: 1, - // weight: 0, - // cost: 1000, - // equipped: false, - // consumable: false, - // effect: 'background', - // effect_value: 'SquareSpiral', - // emoji: 'itemBackground', - // }, Noise: { label: 'Noise', value: 'Noise', @@ -425,19 +386,6 @@ const items = { effect_value: 'Connected', emoji: 'itemBackground', }, - // Binary: { - // label: 'Binary', - // value: 'Binary', - // description: 'Background', - // quantity: 1, - // weight: 0, - // cost: 1000, - // equipped: false, - // consumable: false, - // effect: 'background', - // effect_value: 'Binary', - // emoji: 'itemBackground', - // }, }, } as { [key: string]: { @@ -1096,7 +1044,6 @@ export async function rpgMarket( .setDescription(stripIndents` You are in the local market, you can buy some items to help you on your journey. - ${emojiGet('itemBonus')} ***Multipliers*** can be used to increase the amount of tokens you earn. ${emojiGet('itemBackground')} ***Backgrounds*** can be used to personalize your /profile and /levels. ***More items coming soon! Check back later.*** @@ -1205,7 +1152,6 @@ export async function rpgMarketChange( .setDescription(stripIndents` You are in the local market, you can buy some items to help you on your journey. - ${emojiGet('itemBonus')} ***Multipliers*** can be used to increase the amount of tokens you earn. ${emojiGet('itemBackground')} ***Backgrounds*** can be used to personalize your /profile and /levels. ***More items coming soon! Check back later.*** diff --git a/src/discord/utils/imageGet.ts b/src/discord/utils/imageGet.ts index f28c0bf49..1d2e9f69b 100644 --- a/src/discord/utils/imageGet.ts +++ b/src/discord/utils/imageGet.ts @@ -53,12 +53,10 @@ const imageDef = { LiquidMaze: { path: `${assetsDirectory}/img/backgrounds/LiquidMaze.png`, url: 'https://drive.google.com/uc?export=view&id=1-RdKRSH1rrugei5VLHHjUdXceBhDPnPn' }, Flow: { path: `${assetsDirectory}/img/backgrounds/Flow.png`, url: 'https://drive.google.com/uc?export=view&id=1-ZkGk_lw2zEX1xVxXzwhjum7UOJBwDGb' }, DiamondChevron: { path: `${assetsDirectory}/img/backgrounds/DiamondChevron.png`, url: 'https://drive.google.com/uc?export=view&id=1-b2xFDrzpL6tVMvmY5pz-SO-czPnCMsO' }, - Chevron: { path: `${assetsDirectory}/img/backgrounds/Chevron.png`, url: 'https://drive.google.com/uc?export=view&id=1-c3XYW0A6lvYo9MFAi_cHSF6v2csInVU' }, Concentric: { path: `${assetsDirectory}/img/backgrounds/Concentric.png`, url: 'https://drive.google.com/uc?export=view&id=1-fe72RxbCLR24QOwomtsZcetTnsP1zNx' }, CubeTunnels: { path: `${assetsDirectory}/img/backgrounds/CubeTunnels.png`, url: 'https://drive.google.com/uc?export=view&id=1-fvG30yPMAK87d0JeKEND8CMB80xhP4_' }, Leaves: { path: `${assetsDirectory}/img/backgrounds/Leaves.png`, url: 'https://drive.google.com/uc?export=view&id=1-rQG0lQOfI30DOSZAOQGBoYi7FXxgqbg' }, SquareTwist: { path: `${assetsDirectory}/img/backgrounds/SquareTwist.png`, url: 'https://drive.google.com/uc?export=view&id=103ok01PPBQlpfeqQO30D8waE1db30nBY' }, - SquareSpiral: { path: `${assetsDirectory}/img/backgrounds/SquareSpiral.png`, url: 'https://drive.google.com/uc?export=view&id=106GkajsYXQyG_VARHT_cdv-olUmPToni' }, Noise: { path: `${assetsDirectory}/img/backgrounds/Noise.png`, url: 'https://drive.google.com/uc?export=view&id=10Glmw04_aNLo0h-YsZcgmg5PUU_hQ5Yt' }, Squiggles: { path: `${assetsDirectory}/img/backgrounds/Squiggles.png`, url: 'https://drive.google.com/uc?export=view&id=10J5CZyaBq9zBO4GDsIg2wayw3aIPlkZC' }, TriangleOverlap: { path: `${assetsDirectory}/img/backgrounds/TriangleOverlap.png`, url: 'https://drive.google.com/uc?export=view&id=10LoWmB0HhGxzRlguftb0vwiqfM06BaVF' }, @@ -74,7 +72,6 @@ const imageDef = { AbstractTriangles: { path: `${assetsDirectory}/img/backgrounds/AbstractTriangles.png`, url: 'https://drive.google.com/uc?export=view&id=116zugUVQJqTVEhSZTO8iXiiLUznrOjjc' }, Memphis: { path: `${assetsDirectory}/img/backgrounds/Memphis.png`, url: 'https://drive.google.com/uc?export=view&id=117XLPb59h6V9op7GG7A6FFSvh07Any7-' }, Connected: { path: `${assetsDirectory}/img/backgrounds/Connected.png`, url: 'https://drive.google.com/uc?export=view&id=11AVKT7xrjI2ZgIpxz7j0zstBkD6XOD4m' }, - Binary: { path: `${assetsDirectory}/img/backgrounds/Binary.png`, url: 'https://drive.google.com/uc?export=view&id=11Ocm9oq5jCqnWleZEZyk9yPsdSpQl6oK' }, mushroomInfoA: { path: `${assetsDirectory}/img/mushroomInfoA.png`, url: 'https://i.gyazo.com/233df47085a0ac5493d8378111512b3d.png' }, mushroomInfoB: { path: `${assetsDirectory}/img/mushroomInfoB.png`, url: 'https://i.gyazo.com/2aae45e843da99867b82e9b1ad07d22b.png' }, } as {