WhatTheMike/Fox-V3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #38 from bobloy/cogboard-test-fixes

Browse Source 
Cogboard test fixes
This commit is contained in:
bobloy 2018-10-26 11:47:59 -04:00 committed by GitHub
commit 59d1c97cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
planttycoon/planttycoon.py
View File

@ -884,7 +884,7 @@ class PlantTycoon(Cog):
async def _gardener(self, user: discord.User) -> Gardener: async def _gardener(self, user: discord.User) -> Gardener:
# #
# This function returns an individual gardener namedtuple # This function returns a Gardener object for the user
# #
g = Gardener(user, self.config) g = Gardener(user, self.config)

19
recyclingplant/recyclingplant.py
View File

@ -1,12 +1,11 @@
import asyncio import asyncio
import json import json
import random import random
from redbot.core import bank
from redbot.core import commands
from redbot.core.data_manager import cog_data_path
from typing import Any from typing import Any
from redbot.core import bank, commands
from redbot.core.data_manager import bundled_data_path
Cog: Any = getattr(commands, "Cog", object) Cog: Any = getattr(commands, "Cog", object)
@ -15,15 +14,19 @@ class RecyclingPlant(Cog):
def __init__(self, bot): def __init__(self, bot):
self.bot = bot self.bot = bot
self.path = str(cog_data_path(self)).replace("\\", "/") self.junk = None
self.junk_path = self.path + "/bundled_data/junk.json"
with open(self.junk_path) as json_data: def load_junk(self):
junk_path = bundled_data_path(self) / "junk.json"
with junk_path.open() as json_data:
self.junk = json.load(json_data) self.junk = json.load(json_data)
@commands.command(aliases=["recycle"]) @commands.command(aliases=["recycle"])
async def recyclingplant(self, ctx: commands.Context): async def recyclingplant(self, ctx: commands.Context):
"""Apply for a job at the recycling plant!""" """Apply for a job at the recycling plant!"""
if self.junk is None:
self.load_junk()
x = 0 x = 0
reward = 0 reward = 0
await ctx.send( await ctx.send(
@ -84,6 +87,6 @@ class RecyclingPlant(Cog):
await bank.deposit_credits(ctx.author, reward) await bank.deposit_credits(ctx.author, reward)
await ctx.send( await ctx.send(
"{} been given **{} {}s** for your services.".format( "{} been given **{} {}s** for your services.".format(
ctx.author.display_name, reward, bank.get_currency_name(ctx.guild) ctx.author.display_name, reward, await bank.get_currency_name(ctx.guild)
) )
) )