From 6d214d5ee30664db71b3dcb42f8dd90e08c0479d Mon Sep 17 00:00:00 2001 From: Bea Date: Thu, 15 Feb 2024 18:59:16 +0000 Subject: [PATCH 1/4] modified: ../../../conf.py modified: ../../../newGaia.py modified: ../../../settings/talkingChannels.dat modified: ../../../settings/talkingChannels.dir modified: ../../../talkingChanceData.csv modified: ../../../tarotFuncs.py --- conf.py | 14 +++++++------- newGaia.py | 4 ++-- settings/talkingChannels.dat | Bin 1095 -> 1790 bytes settings/talkingChannels.dir | 1 + talkingChanceData.csv | 2 +- tarotFuncs.py | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/conf.py b/conf.py index 665914f..ce0ec2d 100644 --- a/conf.py +++ b/conf.py @@ -1,13 +1,13 @@ ##conf.py import os path = os.path.dirname(__file__) -vaultPath = path + "\\vault\\" -meaningsPath = [path + "\\meanings\\tarotMeanings.tsv"] -imgPath = path + "\\images\\tarot\\" -deckPrefsPath = path + "\\settings\\deckPrefs" -talkingChannelsPath = path + "\\settings\\talkingChannels" -layoutsPath = path + "\\meanings\\layouts" -sigilImagesPath = path + "\\images\\" +vaultPath = path + "/vault/" +meaningsPath = [path + "/meanings/tarotMeanings.tsv"] +imgPath = path + "/images/tarot/" +deckPrefsPath = path + "/settings/deckPrefs" +talkingChannelsPath = path + "/settings/talkingChannels" +layoutsPath = path + "/meanings/layouts" +sigilImagesPath = path + "/images/" defaultDeck = "Biddy" diff --git a/newGaia.py b/newGaia.py index 831618c..80128b7 100644 --- a/newGaia.py +++ b/newGaia.py @@ -22,8 +22,8 @@ #### variables test_guild_id = 572854786513174529 -guilds=[test_guild_id]#727652231419002880, 775449492232208404, 572854786513174529, 923448242107207720, 1149038131673309324] -prefix="!g" +guilds=[]#727652231419002880, 775449492232208404, 572854786513174529, 923448242107207720, 1149038131673309324] +prefix="!t" intents = nextcord.Intents.default() intents.messages = True intents.reactions = True diff --git a/settings/talkingChannels.dat b/settings/talkingChannels.dat index a43c665ed1922aba6876c12f3322318e35fff126..602715ff995b2bea07fc2eb898165265dd42f5c3 100644 GIT binary patch delta 157 zcmXBJy$-=p6aZkY3TeVZVlInG&N=tz+%xk69^$IGNr^#XG<0yIc5fi!Av};>RDA3A z>V5j>Mbv#P+sShk-=lC#@t9oSt-nJ(t5U!9#eTQ(g|AQ55YcEO%me_e93s&ri?i{d zYz~A#46_vtPOQ=#@@(As6>5v(5J+2M5XThq>8J?;gHFgO&`J?G3F}D`m*xBmT_Pw@ delta 12 Tcmeyzdz@o}Gb8Ip7iJa!9-jlS diff --git a/settings/talkingChannels.dir b/settings/talkingChannels.dir index 991a8fa..5c93220 100644 --- a/settings/talkingChannels.dir +++ b/settings/talkingChannels.dir @@ -1,3 +1,4 @@ '572854786513174529', (0, 140) '775449492232208404', (512, 70) '1149038131673309324', (1024, 71) +'1090392935746502746', (1536, 254) diff --git a/talkingChanceData.csv b/talkingChanceData.csv index 06f3eae..5bfbbad 100644 --- a/talkingChanceData.csv +++ b/talkingChanceData.csv @@ -1 +1 @@ -16,27,9,17,13,20,10,16,14,10,12,19,6,14, \ No newline at end of file +16,27,9,17,13,20,10,16,14,10,12,19,6,14,5,19,25,5, \ No newline at end of file diff --git a/tarotFuncs.py b/tarotFuncs.py index 4be4ddc..b9b7d24 100644 --- a/tarotFuncs.py +++ b/tarotFuncs.py @@ -40,7 +40,7 @@ async def drawCard(mess, deck, art, prompt, ctx): async def dispCard(mess, card, art, ctx): print(f'displaying card: {card.name}') - cardIcon = imgPath + art + "\\" + card.icon + cardIcon = imgPath + art.lower() + "/" + card.icon msg = nextcord.Embed(title=card.name, description=(card.upright), color=mess.author.color) file = nextcord.File(cardIcon, filename="image.png") msg.set_image(url=f"attachment://image.png") @@ -87,4 +87,4 @@ async def getPrefs(deckPrefsPath, name): - \ No newline at end of file + From ab89b7c1f1795b08024932e45bf941d75fc1b3cc Mon Sep 17 00:00:00 2001 From: Bea Shakow Date: Thu, 15 Feb 2024 15:58:33 -0500 Subject: [PATCH 2/4] Fixed art choice --- newGaia.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/newGaia.py b/newGaia.py index 80128b7..2fbec4b 100644 --- a/newGaia.py +++ b/newGaia.py @@ -137,13 +137,15 @@ async def on_message(message): @bot.slash_command(description="Sets which deck you want Gaia to use for you!", guild_ids=guilds) async def choosedeck( ctx, - deck: str = SlashOption(name="deck", choices=deckChoices, required=True, default=defaultDeck), - art: str = SlashOption(name="deck", choices=artChoices, required=True, default=defaultDeck) + # deck: str = SlashOption(name="deck", choices=deckChoices, required=False, default=defaultDeck), + art: str = SlashOption(name="art", choices=artChoices, required=True, default=defaultArt) ): - messageAuthor = str(ctx.user) + deck="Biddy" + messageAuthor = str(ctx.user.name) print(f"##################\nSaving prefs for {messageAuthor} with deck {deck}") await savePrefs(deckPrefsPath, messageAuthor, deck, art) - await ctx.send(f'Saved your preferences with deck = {deck.name}') + await ctx.send(f'Saved your preferences with art: {art} and meanings: {deck}') + @bot.slash_command(description="Lets Gaia talk in this channel freely (has a small chance to respond to a message with a card)", guild_ids=guilds) async def gaiatalking( From f7b444c5a9d450a6715fa0b096a886a8dbefe98b Mon Sep 17 00:00:00 2001 From: Bea Date: Thu, 15 Feb 2024 21:23:14 +0000 Subject: [PATCH 3/4] modified: newGaia.py modified: settings/talkingChannels.dat modified: settings/talkingChannels.dir modified: talkingChanceData.csv images/tarot/Biddy/ --- newGaia.py | 4 ++-- settings/talkingChannels.dat | Bin 1790 -> 1846 bytes settings/talkingChannels.dir | 2 +- talkingChanceData.csv | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newGaia.py b/newGaia.py index 2fbec4b..269182f 100644 --- a/newGaia.py +++ b/newGaia.py @@ -134,8 +134,8 @@ async def on_message(message): # await drawCard(mess, deck, art, prompt, ctx) ## deck prefences -@bot.slash_command(description="Sets which deck you want Gaia to use for you!", guild_ids=guilds) -async def choosedeck( +@bot.slash_command(description="Sets which art you want Gaia to use for you!", guild_ids=guilds) +async def chooseart( ctx, # deck: str = SlashOption(name="deck", choices=deckChoices, required=False, default=defaultDeck), art: str = SlashOption(name="art", choices=artChoices, required=True, default=defaultArt) diff --git a/settings/talkingChannels.dat b/settings/talkingChannels.dat index 602715ff995b2bea07fc2eb898165265dd42f5c3..cc808cc9ea371efd6622814d098210926e420dd1 100644 GIT binary patch delta 51 zcmeyzyNz!HGaHjO<78GgUq;5s!E7r Date: Fri, 24 May 2024 21:25:52 +0000 Subject: [PATCH 4/4] Trying to merge server version --- newGaia.py | 8 ++++---- settings/deckPrefs.dat | Bin 51 -> 563 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newGaia.py b/newGaia.py index 269182f..42d2724 100644 --- a/newGaia.py +++ b/newGaia.py @@ -29,7 +29,7 @@ intents.reactions = True intents.message_content = True callAt = "<@1024094680968855663>" -talkChance = 100 ##higher is less probable +talkChance = 120#100 ##higher is less probable ##### filepaths @@ -120,12 +120,12 @@ async def on_message(message): print(f"talking! count is {current['count']}, was bigger than {chance}") with open("talkingChanceData.csv", "a") as myfile: myfile.write(f"{current['count']},") - current['count'] = 0 + current['count'] = -5 prefArt = random.choice(artChoices) prefDeck = decks['Biddy'] s.close() await drawCard(message, prefDeck, prefArt, message.content, ctx) - print(f"Chance: {str(chance)} Count: {str(current['count'])} \n") + # print(f"Chance: {str(chance)} Count: {str(current['count'])} \n") # # Drawing cards # @bot.command() @@ -167,7 +167,7 @@ async def gaiatalking( s[guildID][cID]['chance'] = talkChance s[guildID][cID]['count'] = 0 print(f"s[guildID][cID] = {s[guildID][cID]}") - await ctx.send(f"Gaia can talk in this channel: {talks}") + await ctx.send(f"Gaia can talk in this channel: {talks}\nGaia can talk everywhere: {everywhere}") diff --git a/settings/deckPrefs.dat b/settings/deckPrefs.dat index ccc8c682632edd1de38e749740559da73544ce2c..831200c2ffab0eee40afe3f1b74ea37927d4cc53 100644 GIT binary patch literal 563 zcmZo*nX1760ku;!dRS6Yle4GvusUU?q*PAnVNNV6nbN}@l$nxRq!6B%S&}-XR1d0r Nlo}2p&_H_p0{{`ZAsqk! delta 5 McmdnYVm!eZ00n>nt^fc4