From f0f182560f4de2f471844ba6059c47e9d8c2e1e6 Mon Sep 17 00:00:00 2001 From: BFlow Date: Fri, 10 Apr 2020 17:02:34 +0200 Subject: [PATCH] Kamoulox 2.0 correction --- kabot/kabot/kabot.py | 38 +++++++++---------- kabot/kabot/{Resource => ressources}/.gitkeep | 0 .../{Resource => ressources}/base_kml.xml | 0 3 files changed, 19 insertions(+), 19 deletions(-) rename kabot/kabot/{Resource => ressources}/.gitkeep (100%) rename kabot/kabot/{Resource => ressources}/base_kml.xml (100%) diff --git a/kabot/kabot/kabot.py b/kabot/kabot/kabot.py index 6995b90..4ecad4a 100644 --- a/kabot/kabot/kabot.py +++ b/kabot/kabot/kabot.py @@ -195,24 +195,24 @@ class Mybot(commands.Cog): @commands.command(help="Je menotte une cornemuse et je fume Eddy Malou") async def kamoulox(self, ctx): - sans_verbe = get_word('nom').text + " " + get_word('complement').get('m') + " et " + get_word('nom').text + " " + get_word('complement').get('m') + "." - nom1 = get_word('nom') - nom2 = get_word('nom') - un1 = "un" - un2 = "un" - if nom1.get('gender') == 'F': - un1 = "une" - if nom2.get('gender') == 'F': - un2 = "une" - phrase1 = get_word('verbe').text + " " + un1 + " " + nom1.text + " " + random.choice([get_word('complement').get('m'), ""]) - phrase2 = get_word('verbe').text + " " + un2 + " " + nom2.text + " " + random.choice([get_word('complement').get('m'), ""]) - avec_verbe = phrase1 + " et " + phrase2 + "." - piece = random.choice(['pile', 'face']) - if piece == "pile": - sans_verbe - elif piece == "face": - avec_verbe - await ctx.send(piece) + sans_verbe = get_word('nom').text + " " + get_word('complement').get('m') + " et " + get_word('nom').text + " " + get_word('complement').get('m') + "." + nom1 = get_word('nom') + nom2 = get_word('nom') + un1 = "un" + un2 = "un" + if nom1.get('gender') == 'F': + un1 = "une" + if nom2.get('gender') == 'F': + un2 = "une" + phrase1 = get_word('verbe').text + " " + un1 + " " + nom1.text + " " + random.choice([get_word('complement').get('m'), ""]) + phrase2 = get_word('verbe').text + " " + un2 + " " + nom2.text + " " + random.choice([get_word('complement').get('m'), ""]) + avec_verbe = phrase1 + " et " + phrase2 + "." + piece = random.choice(['pile', 'face']) + if piece == "pile": + sans_verbe + elif piece == "face": + avec_verbe + await ctx.send(piece) @tasks.loop(seconds=1.5) async def play_next(self): @@ -230,7 +230,7 @@ class Mybot(commands.Cog): def get_word(word_type): content = [] - with open("base_kml.xml", "r") as file: + with open("/home/mika/kabot/kabot/kabot/ressources/base_kml.xml", "r") as file: content = file.readlines() content = "".join(content) bs_content = bs(content, 'lxml') diff --git a/kabot/kabot/Resource/.gitkeep b/kabot/kabot/ressources/.gitkeep similarity index 100% rename from kabot/kabot/Resource/.gitkeep rename to kabot/kabot/ressources/.gitkeep diff --git a/kabot/kabot/Resource/base_kml.xml b/kabot/kabot/ressources/base_kml.xml similarity index 100% rename from kabot/kabot/Resource/base_kml.xml rename to kabot/kabot/ressources/base_kml.xml