mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-06 11:18:54 -05:00
Settable slot cooldown (#165)
This commit is contained in:
parent
df120884af
commit
1a3dd95f2c
@ -29,6 +29,7 @@ class Economy:
|
|||||||
self.bank = fileIO("data/economy/bank.json", "load")
|
self.bank = fileIO("data/economy/bank.json", "load")
|
||||||
self.settings = fileIO("data/economy/settings.json", "load")
|
self.settings = fileIO("data/economy/settings.json", "load")
|
||||||
self.payday_register = {}
|
self.payday_register = {}
|
||||||
|
self.slot_register = {}
|
||||||
|
|
||||||
@commands.group(name="bank", pass_context=True)
|
@commands.group(name="bank", pass_context=True)
|
||||||
async def _bank(self, ctx):
|
async def _bank(self, ctx):
|
||||||
@ -158,7 +159,15 @@ class Economy:
|
|||||||
author = ctx.message.author
|
author = ctx.message.author
|
||||||
if self.enough_money(author.id, bid):
|
if self.enough_money(author.id, bid):
|
||||||
if bid >= self.settings["SLOT_MIN"] and bid <= self.settings["SLOT_MAX"]:
|
if bid >= self.settings["SLOT_MIN"] and bid <= self.settings["SLOT_MAX"]:
|
||||||
await self.slot_machine(ctx.message, bid)
|
if author.id in self.slot_register:
|
||||||
|
if abs(self.slot_register[author.id] - int(time.perf_counter())) >= self.settings["SLOT_TIME"]:
|
||||||
|
self.slot_register[author.id] = int(time.perf_counter())
|
||||||
|
await self.slot_machine(ctx.message, bid)
|
||||||
|
else:
|
||||||
|
await self.bot.say("Slot machine is still cooling off! Wait {} seconds between each pull".format(self.settings["SLOT_TIME"]))
|
||||||
|
else:
|
||||||
|
self.slot_register[author.id] = int(time.perf_counter())
|
||||||
|
await self.slot_machine(ctx.message, bid)
|
||||||
else:
|
else:
|
||||||
await self.bot.say("{0} Bid must be between {1} and {2}.".format(author.mention, self.settings["SLOT_MIN"], self.settings["SLOT_MAX"]))
|
await self.bot.say("{0} Bid must be between {1} and {2}.".format(author.mention, self.settings["SLOT_MIN"], self.settings["SLOT_MAX"]))
|
||||||
else:
|
else:
|
||||||
@ -232,6 +241,13 @@ class Economy:
|
|||||||
self.settings["SLOT_MAX"] = bid
|
self.settings["SLOT_MAX"] = bid
|
||||||
await self.bot.say("Maximum bid is now " + str(bid) + " credits.")
|
await self.bot.say("Maximum bid is now " + str(bid) + " credits.")
|
||||||
fileIO("data/economy/settings.json", "save", self.settings)
|
fileIO("data/economy/settings.json", "save", self.settings)
|
||||||
|
|
||||||
|
@economyset.command()
|
||||||
|
async def slottime(self, seconds : int):
|
||||||
|
"""Seconds between each slots use"""
|
||||||
|
self.settings["SLOT_TIME"] = seconds
|
||||||
|
await self.bot.say("Cooldown is now " + str(seconds) + " seconds.")
|
||||||
|
fileIO("data/economy/settings.json", "save", self.settings)
|
||||||
|
|
||||||
@economyset.command()
|
@economyset.command()
|
||||||
async def paydaytime(self, seconds : int):
|
async def paydaytime(self, seconds : int):
|
||||||
@ -319,12 +335,20 @@ def check_folders():
|
|||||||
os.makedirs("data/economy")
|
os.makedirs("data/economy")
|
||||||
|
|
||||||
def check_files():
|
def check_files():
|
||||||
settings = {"PAYDAY_TIME" : 300, "PAYDAY_CREDITS" : 120, "SLOT_MIN" : 5, "SLOT_MAX" : 100}
|
settings = {"PAYDAY_TIME" : 300, "PAYDAY_CREDITS" : 120, "SLOT_MIN" : 5, "SLOT_MAX" : 100, "SLOT_TIME" : 0}
|
||||||
|
|
||||||
f = "data/economy/settings.json"
|
f = "data/economy/settings.json"
|
||||||
if not fileIO(f, "check"):
|
if not fileIO(f, "check"):
|
||||||
print("Creating default economy's settings.json...")
|
print("Creating default economy's settings.json...")
|
||||||
fileIO(f, "save", settings)
|
fileIO(f, "save", settings)
|
||||||
|
else: #consistency check
|
||||||
|
current = fileIO(f, "load")
|
||||||
|
if current.keys() != settings.keys():
|
||||||
|
for key in settings.keys():
|
||||||
|
if key not in current.keys():
|
||||||
|
current[key] = settings[key]
|
||||||
|
print("Adding " + str(key) + " field to economy settings.json")
|
||||||
|
fileIO(f, "save", current)
|
||||||
|
|
||||||
f = "data/economy/bank.json"
|
f = "data/economy/bank.json"
|
||||||
if not fileIO(f, "check"):
|
if not fileIO(f, "check"):
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user