final cleanup, plus adding notes

Author: gitket

README

@@ -14,4 +14,7 @@ Build instructions for simcraft can be found at: https://github.com/simulationcr
 To register for a Blizzard API key, go here: https://dev.battle.net/
 To register a Discord app, go here: https://dev.battle.net/
 
-Further instructions for setting up will be on the wiki (soon)
+Further instructions for setting up will be on the wiki (soon)
+
+Note to those who use this code:
+When updating simcraft version, update the version of simcraft under the !nerd command in discordbot.py so it is up to date

discordbot.py

@@ -106,7 +106,8 @@ def get_role(character, server, region):
  for i in range(0,7):
  try:
  x = armory_json['talents'][0]['talents'][i]['spec']['role']
- return x
+ if(x):
+ return x
  except:
  print('No role (getrole 1) identifier in tier %s.' % i)
  print('Can\'t find role (getRole check1), going second')
@@ -132,7 +133,8 @@ def get_spec(character, server, region):
  for i in range(0,7):
  try:
  x = armory_json['talents'][0]['talents'][i]['spec']['name']
- return x
+ if(x):
+ return x
  except:
  print('No spec (getspec 1) identifier in tier %s.' % i)
  print('Can\'t find spec (getSpec check1), going second')
@@ -166,87 +168,36 @@ async def on_ready():
 @client.event
 async def on_message(message):
  author = message.author
- if message.content.startswith('!sim '):
- character = charstrip(message.content, '!sim ').strip()
- server = serverstrip(message.content).replace("'", "").strip()
- region = regionfind(message.content).strip()
- escapeAuthor = author.mention.replace(">", "\>").replace("<", "\<") 
- print('Looking at %s - %s - %s' % (character, server, region))
- if char_exists(character, server, region):
- print("Toon exists, moving on")
- isDPS = is_dps(character, server, region)
- spec = get_spec(character, server, region)
- role = get_role(character, server, region)
- print('Looking at %s - %s - %s who exists and is a %s' % (character, server, region, spec ))
- if (isDPS or spec == 'Shadow'):
- if(spec == 'Shadow' or True):
- await client.send_message(message.channel, 'Pulling simming stats for %s - %s - %s. Be aware concurrent simulations will slow me down. Be gentle... I\'m delicate :^)' % (character, server, region))
- await client.send_message(message.channel, 'Temple Bot takes about 3-5 min to run a sim (longer if multiple sims are going at the same time). I will ping you when I\'m done')
- await client.send_message(message.channel, 'Current spec: %s. Armory info last updated %s' % (spec, armory_date(character, server, region))) 
- await client.send_message(message.channel, '%s: Starting sim. This will take several minutes.' % author.mention) 
- subprocess.Popen('python3 sim.py %s %s %s %s %s' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
- else:
- await client.send_message(message.channel, '%s: Sorry, I am a mean temple bot. I only have eyes for Shadow Priests.' % author.mention)
- else:
- if (role == 'TANK'):
- await client.send_message(message.channel, '%s: Sorry, sims for pawn do not work well for Tanks. This is a limitation of SimulationCraft. Have you thought about being Shadow? I like Shadow' % author.mention)
- elif (role == 'HEALING'):
- await client.send_message(message.channel, '%s: Sorry, sims do not work for healers. This is a limitation of SimulationCraft. Have you thought about being Shadow?' % author.mention)
- else:
- await client.send_message(message.channel, '%s: Error getting info for character %s-%s-%s. Role not found. Make sure your format is \'!sim charactername-servername-region\'.' % (author.mention, character, server, region))
- else:
- await client.send_message(message.channel, '%s: Character %s-%s-%s not found. Make sure your format is \'!sim charactername-servername-region\'.' % (author.mention, character, server, region)) 
  if message.content.startswith('!help'):
  await client.send_message(message.channel, 'To simulate: \'!sim charactername-servername-region\'. Only US/EU supported. Sims take a few minutes depending on load. You will get a message when it is completed.') 
  await client.send_message(message.channel, 'Character data is pulled from the Armory, so it may not always be up to date. Please leave in spaces for realm name')
  if message.content.startswith('!nerd'):
  await client.send_message(message.channel, 'I do very basic 10k sims for a Patchwerk fight, using the talents and gear you last logged out in. Custom sims are not available. If a completely custom sim is of interest to you, go sim yourself!')
  await client.send_message(message.channel, 'Temple Bot runs SimulationCraft 715-01 for World of Warcraft 7.1.5 Live (wow build 23360, git build c8f3bd3). Temple Bot runs a modified Simbot 0.9.')
  await client.send_message(message.channel, 'Temple Bot runs on a 3 year old computer. Temple Bot is slow. Temple Bot thought it was in retirement. Temple Bot was wrong.')
- if message.content.startswith('!dps '):
- character = charstrip(message.content, '!dps ').strip()
- server = serverstrip(message.content).replace("'", "").strip()
- region = regionfind(message.content).strip()
- escapeAuthor = author.mention.replace(">", "\>").replace("<", "\<") 
- print('Looking at %s - %s - %s' % (character, server, region))
- if char_exists(character, server, region):
- print("Toon exists, moving on")
- isDPS = is_dps(character, server, region)
- spec = get_spec(character, server, region)
- role = get_role(character, server, region)
- print('Looking at %s - %s - %s who exists and is a %s' % (character, server, region, spec ))
- if (isDPS or spec == 'Shadow'):
- if(spec == 'Shadow' or trues):
- await client.send_message(message.channel, 'Pulling dps stats for %s - %s - %s. Be aware concurrent simulations will slow me down. Be gentle... I\'m delicate :^)' % (character, server, region))
- await client.send_message(message.channel, 'Temple Bot takes about 3-5 min to run a sim (longer if multiple sims are going at the same time). I will ping you when I\'m done')
- await client.send_message(message.channel, 'Current spec: %s. Armory info last updated %s' % (spec, armory_date(character, server, region))) 
- await client.send_message(message.channel, '%s: Starting sim. This will take several minutes.' % author.mention) 
- subprocess.Popen('python3 dps.py %s %s %s %s %s' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
- else:
- await client.send_message(message.channel, '%s: Sorry, I am a mean temple bot. I only have eyes for Shadow Priests.' % author.mention)
- else:
- if (role == 'TANK'):
- await client.send_message(message.channel, '%s: Sorry, sims for pawn do not work well for Tanks. This is a limitation of SimulationCraft. Have you thought about being Shadow? I like Shadow' % author.mention)
- elif (role == 'HEALING'):
- await client.send_message(message.channel, '%s: Sorry, sims do not work for healers. This is a limitation of SimulationCraft. Have you thought about being Shadow?' % author.mention)
- else:
- await client.send_message(message.channel, '%s: Error getting info for character %s-%s-%s. Role not found. Make sure your format is \'!sim charactername-servername-region\'.' % (author.mention, character, server, region))
- else:
- await client.send_message(message.channel, '%s: Character %s-%s-%s not found. Make sure your format is \'!sim charactername-servername-region\'.' % (author.mention, character, server, region)) 
- if message.content.startswith('!2sim ') or message.content.startswith('!3sim ') or message.content.startswith('!sim3 '):
+ if message.content.startswith('!2sim ') or message.content.startswith('!3sim ') or message.content.startswith('!sim3 ') or message.content.startswith('!sim ') or message.content.startswith('!dps '):
  run2 = False
  run3 = False
  runAll3 = False
+ runStandalone = False
+ runDPS = False
 
  if(message.content.startswith('!2sim ')):
  character = charstrip(message.content, '!2sim ').strip()
  run2 = True
  elif(message.content.startswith('!3sim ')):
  character = charstrip(message.content, '!3sim ').strip()
  run3 = True
- else:
+ elif(message.content.startswith('!sim3 ')):
  character = charstrip(message.content, '!sim3 ').strip()
  runAll3 = True
+ elif(message.content.startswith('!sim ')):
+ character = charstrip(message.content, '!sim ').strip()
+ runStandalone = True
+ elif(message.content.startswith('!dps ')):
+ character = charstrip(message.content, '!dps ').strip()
+ runDPS = True
+
  server = serverstrip(message.content).replace("'", "").strip()
  region = regionfind(message.content).strip()
  escapeAuthor = author.mention.replace(">", "\>").replace("<", "\<") 
@@ -261,16 +212,32 @@ async def on_message(message):
  if (isDPS or spec == 'Shadow'):
  if(spec == 'Shadow' or True):
  await client.send_message(message.channel, 'Temple Bot takes about 3-5 min to run a sim (longer if multiple sims are going at the same time). I will ping you when I\'m done')
- await client.send_message(message.channel, 'Current spec: %s. Armory info last updated %s' % (spec, armory_date(character, server, region))) 
+ await client.send_message(message.channel, 'Current spec for %s-%s-%s: %s. Armory info last updated %s' % (character, server, region, spec, armory_date(character, server, region))) 
  if(run2):
- await client.send_message(message.channel, '%s: Starting 1 sim for 2 targets. This will take several minutes.' % author.mention) 
- subprocess.Popen('python3 sim2.py %s %s %s %s %s yes' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
+ print('Starting a 2 target standalone')
+ await client.send_message(message.channel, 'Starting 1 sim for 2 targets for %s - %s - %s. This will take several minutes.' % (character, server, region))
+ subprocess.Popen('python3 sim.py %s %s %s %s %s 2 yes' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
  elif(run3):
- await client.send_message(message.channel, '%s: Starting 1 sim for 3 targets. This will take several minutes.' % author.mention) 
- subprocess.Popen('python3 sim3.py %s %s %s %s %s yes' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
+ print('Starting a 3 target standalone')
+ await client.send_message(message.channel, 'Starting 1 sim for 3 targets for %s - %s - %s. This will take several minutes.' % (character, server, region))
+ subprocess.Popen('python3 sim.py %s %s %s %s %s 3 yes' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
+ elif(runAll3):
+ print('Starting the 1,2,3 sim run')
+ await client.send_message(message.channel, 'Starting 3 sims for 1, 2 and 3 targets for %s - %s - %s. These will run one after the other and will take several minutes.' % (character, server, region)) 
+ subprocess.Popen('python3 sim.py %s %s %s %s %s 1 no' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
+ elif(runStandalone):
+ print('Starting a 1 target standalone')
+ await client.send_message(message.channel, 'Starting sim. This will take several minutes for %s - %s - %s.' % (character, server, region))
+ subprocess.Popen('python3 sim.py %s %s %s %s %s 1 yes' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
+ elif(runDPS):
+ print('Starting DPS only')
+ await client.send_message(message.channel, 'Starting sim. This will take several minutes for %s - %s - %s.' % (character, server, region)) 
+ subprocess.Popen('python3 dps.py %s %s %s %s %s' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
  else:
- await client.send_message(message.channel, '%s: Starting 3 sims for 1, 2 and 3 targets. These will run one after the other and will take several minutes.' % author.mention) 
- subprocess.Popen('python3 sim1.py %s %s %s %s %s' % (character, server, message.channel.id, escapeAuthor, region), shell=True)
+ #Failsafe is single sim
+ print('I shouldn\'t be here, but gonna run a single target sim')
+ await client.send_message(message.channel, 'Starting sim. This will take several minutes for %s - %s - %s.' % (character, server, region))
+ subprocess.Popen('python3 sim.py %s %s %s %s %s 1 yes' % (character, server, message.channel. id, escapeAuthor, region), shell=True)
  else:
  await client.send_message(message.channel, '%s: Sorry, I am a mean temple bot. I only have eyes for Shadow Priests.' % author.mention)
  else:

sim.py

@@ -18,14 +18,25 @@
 channel = str(sys.argv[3])
 author = str(sys.argv[4])
 region = str(sys.argv[5])
+numberTargets = str(sys.argv[6])
+escapeAuthor = str(sys.argv[4]).replace(">", "\>").replace("<", "\<")
+standAlone = str(sys.argv[7])
 
-def pawnstrip(character, server, region):
+def pawnstrip(character, server, region, numberTargets, standAlone):
  try:
- with open('%s%s-%s-%s.html' % (simcraft_path, character, server, region), encoding='utf8') as infile:
+ with open('%s%s-%s-%s-%s.html' % (simcraft_path, character, server, region, numberTargets), encoding='utf8') as infile:
  soup = BeautifulSoup(infile, "html.parser")
- return soup.find(text=re.compile(' Pawn: v1: '))
+ if(numberTargets == '1' ):
+ return soup.find(text=re.compile(' Pawn: v1: '))
+ elif(numberTargets == '2' ):
+ return soup.find(text=re.compile(' Pawn: v1: ')).replace(character, character + " 2 Target")
+ elif(numberTargets == '3' ):
+ return soup.find(text=re.compile(' Pawn: v1: ')).replace(character, character + " 3 Target")
+ else:
+ print("Something's not quite right. Default pawn print")
+ return soup.find(text=re.compile(' Pawn: v1: '))
  except:
- print('Bad sim, cannot find %s%s-%s-%s.html' % (simcraft_path, character, server, region))
+ print('Bad sim, cannot find %s%s-%s-%s-%s.html' % (simcraft_path, character, server, region, numberTargets))
  return 'Error simming character, simcraft crashed during sim. Please try again'
 
 
@@ -37,11 +48,19 @@ def mod_date(filename):
 async def on_ready():
  for x in config_json['servers']:
  client.accept_invite(x)
- await client.send_message(client.get_channel(channel), '%s: Stat weight simulation on %s completed. This is for a 1 target fight' % (author, character))
+ await client.send_message(client.get_channel(channel), '%s: Stat weight simulation on %s completed. This is for a %a target fight' % (author, character, numberTargets))
  await client.send_message(client.get_channel(channel), '%s: Remember, this is for %s\'s current talents! Other talent combos will likely be a different pawn string.' % (author, character))
- await client.send_message(client.get_channel(channel), '%s: %s' % (author, pawnstrip(character, server, region)))
+ await client.send_message(client.get_channel(channel), '%s: %s' % (author, pawnstrip(character, server, region, numberTargets, standAlone)))
+ if(numberTargets == '1' and standAlone == "no"):
+ await client.send_message(client.get_channel(channel), 'Starting 2 target sim') 
+ subprocess.Popen('python3 sim.py %s %s %s %s %s 2 no' % (character, server, channel, escapeAuthor, region), shell=True)
+ elif(numberTargets == '2' and standAlone == "no"):
+ await client.send_message(client.get_channel(channel), 'Starting 3 target sim') 
+ subprocess.Popen('python3 sim.py %s %s %s %s %s 3 no' % (character, server, channel, escapeAuthor, region), shell=True)
+ elif(numberTargets == '3' and standAlone == "no"):
+ await client.send_message(client.get_channel(channel), 'Does a 2 or 3 target look majorly off? Rerun a 2 target using !2sim character-server-region. Rerun a 3 with !3sim character-server-region') 
  await client.logout()
 print('Starting sim:')
-print('%s./simc armory=%s,%s,%s calculate_scale_factors=1 scale_only=intellect,crit_rating,haste_rating,mastery_rating,versatility_rating iterations=10000 html=%s-%s-%s.html output=%s-%s.txt' % (simcraft_path, region, server, character, character, server, region, character, region))
-subprocess.call('%s./simc armory=%s,%s,%s calculate_scale_factors=1 scale_only=intellect,crit_rating,haste_rating,mastery_rating,versatility_rating iterations=10000 html=%s-%s-%s.html output=%s-%s.txt' % (simcraft_path, region, server, character, character, server, region, character, region), cwd=simcraft_path, shell=True)
+print('%s./simc armory=%s,%s,%s calculate_scale_factors=1 scale_only=intellect,crit_rating,haste_rating,mastery_rating,versatility_rating iterations=10000 desired_targets=%s html=%s-%s-%s-%s.html output=%s-%s-%s.txt' % (simcraft_path, region, server, character, numberTargets, character, server, region, numberTargets, character, region, numberTargets))
+subprocess.call('%s./simc armory=%s,%s,%s calculate_scale_factors=1 scale_only=intellect,crit_rating,haste_rating,mastery_rating,versatility_rating iterations=10000 desired_targets=%s html=%s-%s-%s-%s.html output=%s-%s-%s.txt' % (simcraft_path, region, server, character, numberTargets, character, server, region, numberTargets, character, region, numberTargets), cwd=simcraft_path, shell=True)
 client.run(token)