1

fix: wot.py - temporary fix

This commit is contained in:
VitaliyS
2015-02-17 10:03:06 +02:00
parent 8966910ce9
commit ab140aac85
3 changed files with 82 additions and 73 deletions

View File

@@ -1375,7 +1375,7 @@ none отсутствует
2 class 2 степень 2 class 2 степень
1 class 1 степень 1 class 1 степень
master мастер master мастер
\n%s: %s/%s (%s%%), avg.damage: %s, xp (avg/max): %s/%s, WN8: %s (%s), mastery: %s \n%s: %s/%s (%s%%), ср.урон: %s, опыт (ср/макс): %s/%s, WN8: %s (%s), классность: %s \n%s: %s/%s (%s%%), avg.damage: %s, xp (avg/max): %s/%s,%s mastery: %s \n%s: %s/%s (%s%%), ср.урон: %s, опыт (ср/макс): %s/%s,%s классность: %s
not founded tank танк не найден not founded tank танк не найден
Impossible to get tanks' statistics Невозможно получить статистику танков Impossible to get tanks' statistics Невозможно получить статистику танков
\nUp to %s%% win left: %s battles \nДо %s%% побед осталось: %s битв \nUp to %s%% win left: %s battles \nДо %s%% побед осталось: %s битв

View File

@@ -1375,7 +1375,7 @@ none відсутня
2 class 2 степінь 2 class 2 степінь
1 class 1 степінь 1 class 1 степінь
master майстер master майстер
\n%s: %s/%s (%s%%), avg.damage: %s, xp (avg/max): %s/%s, WN8: %s (%s), mastery: %s \n%s: %s/%s (%s%%), сер.ушкодж.: %s, досвід (сер/макс): %s/%s, WN8: %s (%s), класність: %s \n%s: %s/%s (%s%%), avg.damage: %s, xp (avg/max): %s/%s,%s mastery: %s \n%s: %s/%s (%s%%), сер.ушкодж.: %s, досвід (сер/макс): %s/%s,%s класність: %s
not founded tank танк не знайдено not founded tank танк не знайдено
Impossible to get tanks' statistics Неможливо отримати статистику танків Impossible to get tanks' statistics Неможливо отримати статистику танків
\nUp to %s%% win left: %s battles \nДо %s%% перемог залишилося: %s битв \nUp to %s%% win left: %s battles \nДо %s%% перемог залишилося: %s битв

View File

@@ -37,10 +37,13 @@ def get_tanks_data():
return res return res
def getExtValue(): def getExtValue():
try:
data = load_page('http://www.wnefficiency.net/exp/expected_tank_values_latest.json') data = load_page('http://www.wnefficiency.net/exp/expected_tank_values_latest.json')
v = json.loads(data) v = json.loads(data)
extv = dict([[d['IDNum'], {'expFrag':d['expFrag'],'expDamage':d['expDamage'],'expSpot':d['expSpot'],'expDef':d['expDef'],'expWinRate':d['expWinRate']}] for d in v['data']]) extv = dict([[d['IDNum'], {'expFrag':d['expFrag'],'expDamage':d['expDamage'],'expSpot':d['expSpot'],'expDef':d['expDef'],'expWinRate':d['expWinRate']}] for d in v['data']])
return extv return extv
except:
return
try: try:
tanks_data = get_tanks_data() tanks_data = get_tanks_data()
@@ -106,6 +109,8 @@ def wot(type, jid, nick, text):
tank_dmg = int(round(t['all']['damage_dealt'] / float(tank_battle), 0)) tank_dmg = int(round(t['all']['damage_dealt'] / float(tank_battle), 0))
tank_name = tanks_data[str(t['tank_id'])]['name_i18n'] tank_name = tanks_data[str(t['tank_id'])]['name_i18n']
tank_wins = round(100.0*tank_win/tank_battle, 2) tank_wins = round(100.0*tank_win/tank_battle, 2)
if extv:
#wn8 #wn8
expDmg = tank_battle * extv[t['tank_id']]['expDamage'] expDmg = tank_battle * extv[t['tank_id']]['expDamage']
expSpot = tank_battle * extv[t['tank_id']]['expSpot'] expSpot = tank_battle * extv[t['tank_id']]['expSpot']
@@ -131,8 +136,11 @@ def wot(type, jid, nick, text):
twn8_xvm = 100 twn8_xvm = 100
else: else:
twn8_xvm = max(min(twn8*(twn8*(twn8*(twn8*(twn8*(9.553e-20*twn8 - 1.644e-16) - 4.26e-12) + 1.97e-8) - 3.192e-5) + 5.6265e-2) - 0.157, 100), 0) twn8_xvm = max(min(twn8*(twn8*(twn8*(twn8*(twn8*(9.553e-20*twn8 - 1.644e-16) - 4.26e-12) + 1.97e-8) - 3.192e-5) + 5.6265e-2) - 0.157, 100), 0)
WN8_TXT = ' WN8: %s (%s),' % (int(round(twn8)), round(twn8_xvm, 1))
else:
WN8_TXT = ''
msg += L('\n%s: %s/%s (%s%%), avg.damage: %s, xp (avg/max): %s/%s, WN8: %s (%s), mastery: %s','%s/%s'%(jid,nick)) % (tank_name, tank_win, tank_battle, tank_wins, tank_dmg, tank_avgxp, tank_maxxp, int(round(twn8)), round(twn8_xvm, 1), mom) msg += L('\n%s: %s/%s (%s%%), avg.damage: %s, xp (avg/max): %s/%s,%s mastery: %s','%s/%s'%(jid,nick)) % (tank_name, tank_win, tank_battle, tank_wins, tank_dmg, tank_avgxp, tank_maxxp, WN8_TXT, mom)
else: else:
msg += '\n%s (%s/%s)' % (tanks_data[str(t['tank_id'])]['name_i18n'], tank_win, tank_battle) msg += '\n%s (%s/%s)' % (tanks_data[str(t['tank_id'])]['name_i18n'], tank_win, tank_battle)
@@ -222,6 +230,7 @@ def wot(type, jid, nick, text):
elif wn6 >= 1925: elif wn6 >= 1925:
msg += L(' - unicum','%s/%s'%(jid,nick)) msg += L(' - unicum','%s/%s'%(jid,nick))
if extv:
expDmg = 0 expDmg = 0
expSpot = 0 expSpot = 0
expFrag = 0 expFrag = 0