Emperor/arbitration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix+Feature addition

Browse Source 
- Changed source url.
- Added command to manually update solnodes without restarting the bot.
This commit is contained in:
Emperor 2020-08-14 07:22:09 -04:00
parent bac0b699a5
commit a337c3fde1
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arbitration.py
View File

@ -22,7 +22,7 @@ bot = commands.Bot(
mtypes = ['Defense', 'Defection','Disruption', 'Excavation', 'Interception', 'Salvage', 'Survival'] mtypes = ['Defense', 'Defection','Disruption', 'Excavation', 'Interception', 'Salvage', 'Survival']
factions = ['Corpus', 'Grineer', 'Infested', 'Orokin'] factions = ['Corpus', 'Grineer', 'Infested', 'Orokin']
solnodes = requests.get('https://raw.githubusercontent.com/empdarkness/warframe-data/master/solNodes.json').json() ## personal node export solnodes = requests.get('https://raw.githubusercontent.com/empdarkness/warframe-data/master/solNodes.json').json() ## personal node export
CurrentArbi = requests.get('https://10o.io/kuvalog.json').json()[0] ## semlar arbitration data CurrentArbi = requests.get('https://10o.io/arbitrations.json').json()[0] ## semlar arbitration data
OldArbi = CurrentArbi OldArbi = CurrentArbi
sched = AsyncIOScheduler() # needed cause discord.py uses async sched = AsyncIOScheduler() # needed cause discord.py uses async
sched.start() # starts scheduler for cron task sched.start() # starts scheduler for cron task
@ -37,6 +37,13 @@ async def on_ready():
await bot.change_presence(status=discord.Status.online, activity=discord.Activity(name='Starting up...', type=3)) await bot.change_presence(status=discord.Status.online, activity=discord.Activity(name='Starting up...', type=3))
sched.add_job(arby_post_task, trigger='cron', minute='*', second='20', id='Elite', replace_existing=True) # trigger every minute, works best cus cron sched.add_job(arby_post_task, trigger='cron', minute='*', second='20', id='Elite', replace_existing=True) # trigger every minute, works best cus cron
@bot.command(name="update")
@commands.is_owner()
async def update(ctx):
global solnodes
solnodes = requests.get('https://raw.githubusercontent.com/empdarkness/warframe-data/master/solNodes.json').json() ## personal node export
await ctx.send("Updated solnode list.")
@bot.command(name="reload") @bot.command(name="reload")
@commands.is_owner() @commands.is_owner()
async def reload(ctx, cog): async def reload(ctx, cog):
@ -79,13 +86,16 @@ async def unload(ctx, cog):
def request_arby(): ### get updated arbitration data def request_arby(): ### get updated arbitration data
global CurrentArbi global CurrentArbi
CurrentArbi = requests.get('https://10o.io/kuvalog.json').json()[0] CurrentArbi = requests.get('https://10o.io/arbitrations.json').json()[0]
try:
CurrentArbi['solnodedata']['type'] = solnodes[CurrentArbi['solnode']]['type'] CurrentArbi['solnodedata']['type'] = solnodes[CurrentArbi['solnode']]['type']
CurrentArbi['solnodedata']['enemy'] = solnodes[CurrentArbi['solnode']]['enemy'] CurrentArbi['solnodedata']['enemy'] = solnodes[CurrentArbi['solnode']]['enemy']
CurrentArbi['solnodedata']['node'] = solnodes[CurrentArbi['solnode']]['node'] CurrentArbi['solnodedata']['node'] = solnodes[CurrentArbi['solnode']]['node']
CurrentArbi['solnodedata']['planet'] = solnodes[CurrentArbi['solnode']]['planet'] CurrentArbi['solnodedata']['planet'] = solnodes[CurrentArbi['solnode']]['planet']
CurrentArbi['solnodedata']['dark_sector'] = solnodes[CurrentArbi['solnode']]['dark_sector'] CurrentArbi['solnodedata']['dark_sector'] = solnodes[CurrentArbi['solnode']]['dark_sector']
CurrentArbi['solnodedata']['tileset'] = solnodes[CurrentArbi['solnode']]['tileset'] CurrentArbi['solnodedata']['tileset'] = solnodes[CurrentArbi['solnode']]['tileset']
except KeyError:
print(CurrentArbi)
if 'bonus' in solnodes[CurrentArbi['solnode']]: if 'bonus' in solnodes[CurrentArbi['solnode']]:
CurrentArbi['solnodedata']['bonus'] = solnodes[CurrentArbi['solnode']]['bonus'] CurrentArbi['solnodedata']['bonus'] = solnodes[CurrentArbi['solnode']]['bonus']
return CurrentArbi return CurrentArbi