Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
@pncakespoon1
pncakespoon1 committed Mar 26, 2023
1 parent 0817895 commit 80266b3
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 36 deletions.
2 changes: 1 addition & 1 deletion ResetTracker/graphs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ def graph11(cls, generalData):
def graph12(cls, generalData):
try:
values = [Logistics.formatValue(generalData['total resets']),
Logistics.formatValue(generalData['total time'] + generalData['total Walltime'], isTime=True),
Logistics.formatValue(generalData['total time'] + generalData['total Walltime'], isTime=True, includeHours=True),
Logistics.formatValue(generalData['percent played'], isPercent=True),
Logistics.formatValue(generalData['rpe'])]
headers = ['Resets', 'Playtime', '% played', 'rpe']
Expand Down
86 changes: 70 additions & 16 deletions ResetTracker/gui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

if True:
databaseLink = "https://docs.google.com/spreadsheets/d/1ky0mgYjsDE14xccw6JjmsKPrEIDHpt4TFnD2vr4Qmcc"
headerLabels = ['Date and Time', 'Iron Source', 'Enter Type', 'Gold Source', 'Spawn Biome', 'RTA', 'Wood', 'Iron Pickaxe', 'Nether', 'Bastion', 'Fortress', 'Nether Exit', 'Stronghold', 'End', 'Retimed IGT', 'IGT', 'Gold Dropped', 'Blaze Rods', 'Blazes', 'Flint', 'Gravel', 'Deaths', 'Traded', 'Endermen', 'Eyes Thrown', 'Iron', 'Wall Resets Since Prev', 'Played Since Prev', 'RTA Since Prev', 'Break RTA Since Prev', 'Wall Time Since Prev', 'Session Marker', 'RTA Distribution']
headerLabels = ['Date and Time', 'Iron Source', 'Enter Type', 'Gold Source', 'Spawn Biome', 'RTA', 'Wood', 'Iron Pickaxe', 'Nether', 'Bastion', 'Fortress', 'Nether Exit', 'Stronghold', 'End', 'Retimed IGT', 'IGT', 'Gold Dropped', 'Blaze Rods', 'Blazes', 'Diamond Pick', 'Pearls Thrown', 'Deaths', 'Obsidian Placed', 'Diamond Sword', 'Blocks Mined', 'Iron', 'Wall Resets Since Prev', 'Played Since Prev', 'RTA Since Prev', 'Break RTA Since Prev', 'Wall Time Since Prev', 'Session Marker', 'RTA Distribution']
sqldict = {'int': 'INTEGER', 'str': 'TEXT'}
lastRun = None
useSQL = False
Expand Down Expand Up @@ -62,14 +62,54 @@
("minecraft:dropped", "minecraft:gold_ingot"),
("minecraft:picked_up", "minecraft:blaze_rod"),
("minecraft:killed", "minecraft:blaze"),
("minecraft:picked_up", "minecraft:flint"),
("minecraft:mined", "minecraft:gravel"),
("minecraft:crafted", "minecraft:diamond_pickaxe"),
("minecraft:used", "minecraft:ender_pearl"),
("minecraft:custom", "minecraft:deaths"),
("minecraft:custom", "minecraft:traded_with_villager"),
("minecraft:killed", "minecraft:enderman"),
("minecraft:picked_up", "minecraft:ender_eye")
("minecraft:used", "minecraft:obsidian"),
("minecraft:crafted", "minecraft:diamond_sword")
]

blocks = ['minecraft:gravel',
'minecraft:dirt',
'minecraft:sand',
'minecraft:soul_sand',
'minecraft:soul_soil',
'minecraft:stone',
'minecraft:andesite',
'minecraft:diorite',
'minecraft:granite',
'minecraft:gold_block',
'minecraft:basalt',
'minecraft:netherack',
'minecraft:nether_bricks',
'minecraft:blackstone',
'minecraft:blackstone_wall',
'minecraft:blackstone_slab',
'minecraft:blackstone_stairs',
'minecraft:gilded_blackstone',
'minecraft:blackstone',
'minecraft:polished_blackstone_bricks',
'minecraft:chiseled_polished_blackstone',
'minecraft:polished_blackstone_brick_wall',
'minecraft:polished_blackstone_brick_slab',
'minecraft:polished_blackstone_brick_stairs',
'minecraft:cracked_polished_blackstone_bricks',
'minecraft:crafting_table',
'minecraft:oak_log',
'minecraft:birch_log',
'minecraft:spruce_log',
'minecraft:jungle_log',
'minecraft:acacia_log',
'minecraft:dark_oak_log',
'minecraft:warped_stem',
'minecraft:crimson_stem',
'minecraft:oak_leaves',
'minecraft:birch_leaves',
'minecraft:spruce_leaves',
'minecraft:jungle_leaves',
'minecraft:acacia_leaves',
'minecraft:dark_oak_leaves'
]
"""
global variables
"""
Expand Down Expand Up @@ -437,7 +477,7 @@ def authenticate(cls):

@classmethod
def setup(cls):
wks1.update_row(index=1, values=['Date and Time', 'Iron Source', 'Enter Type', 'Gold Source', 'Spawn Biome', 'RTA', 'Wood', 'Iron Pickaxe', 'Nether', 'Bastion', 'Fortress', 'Nether Exit', 'Stronghold', 'End', 'Retimed IGT', 'IGT', 'Gold Dropped', 'Blaze Rods', 'Blazes', 'Flint', 'Gravel', 'Deaths', 'Traded', 'Endermen', 'Eyes Thrown', 'Iron', 'Wall Resets Since Prev', 'Played Since Prev', 'RTA Since Prev', 'Break RTA Since Prev', 'Wall Time Since Prev', 'Session Marker', 'RTA Distribution'], col_offset=0)
wks1.update_row(index=1, values=headerLabels, col_offset=0)

@classmethod
def sheets(cls):
Expand Down Expand Up @@ -503,6 +543,8 @@ def __init__(self):
self.isFirstRun = currentSessionMarker + '$' + config['version']

def ensure_run(self):
if settings['tracking']['detect RSG'] == 0:
return True, ""
if self.path is None:
return False, "Path error"
if self.data is None:
Expand Down Expand Up @@ -612,13 +654,14 @@ def on_created(self, evt):
)

# Generate other stuff
enter_type, gold_source, spawn_biome, iron_source = Tracking.getMiscData(stats, adv)
enter_type, gold_source, spawn_biome, iron_source, blocks_mined = Tracking.getMiscData(stats, adv)
print(blocks_mined)

iron_time = adv["minecraft:story/smelt_iron"]["igt"] if "minecraft:story/smelt_iron" in adv else None

# Push to csv
d = Logistics.ms_to_string(int(self.data["date"]), returnTime=True)
data = ([str(d), iron_source, enter_type, gold_source, spawn_biome] + self.this_run +
data = ([str(d), iron_source, enter_type, gold_source, spawn_biome] + self.this_run + [blocks_mined] +
[Logistics.ms_to_string(iron_time), str(self.wall_resets), str(self.splitless_count),
Logistics.ms_to_string(self.rta_spent), Logistics.ms_to_string(self.break_time), Logistics.ms_to_string(self.wall_time), self.isFirstRun, self.rtaString])
self.isFirstRun = ''
Expand Down Expand Up @@ -770,7 +813,17 @@ def getMiscData(cls, stats, adv):
iron_source = "Half Shipwreck"
else:
iron_source = "Buried Treasure"
return enter_type, gold_source, spawn_biome, iron_source

blocks_mined_list = ['0'] * len(blocks)

if "minecraft:mined" in stats:
for i in range(len(blocks)):
if blocks[i] in stats["minecraft:mined"]:
blocks_mined_list[i] = str(stats["minecraft:mined"][blocks[i]])

blocks_mined = '$'.join(blocks_mined_list)

return enter_type, gold_source, spawn_biome, iron_source, blocks_mined

@classmethod
def trackOldRecords(cls):
Expand Down Expand Up @@ -846,15 +899,15 @@ def __init__(self, *args, **kwargs):
# gui
class SettingsPage(Page):
explanationText = 'This is the page where you adjust your settings. Your settings are saved in the data folder. Remember to press save to save and apply the adjustments!'
varStrings = [['sheet link', 'records path', 'break threshold', 'use sheets', 'delete-old-records', 'autoupdate stats'],
varStrings = [['sheet link', 'records path', 'break threshold', 'use sheets', 'delete-old-records', 'autoupdate stats', 'detect RSG'],
['vault directory', 'twitch username', 'latest x sessions', 'comparison threshold', 'use local timezone', 'upload anonymity', 'use KDE'],
['instance count', 'target time', 'rd', 'ed'],
['Buried Treasure w/ tnt', 'Buried Treasure', 'Full Shipwreck', 'Half Shipwreck', 'Village']]
varTypes = [['entry', 'entry', 'entry', 'check', 'check', 'check'],
varTypes = [['entry', 'entry', 'entry', 'check', 'check', 'check', 'check'],
['entry', 'entry', 'entry', 'entry', 'check', 'check', 'check'],
['entry', 'entry', 'entry', 'entry'],
['check', 'check', 'check', 'check', 'check']]
varTooltips = [['', 'path to your records file, by default C:/Users/<user>/speedrunigt/records', 'after not having any resets while on wall for this many seconds, the tracker pauses until you reset again', 'if checked, data will be stored both locally and virtually via google sheets', '', 'if checked, the program will update and analyze your stats every time it launches'],
varTooltips = [['', 'path to your records file, by default C:/Users/<user>/speedrunigt/records', 'after not having any resets while on wall for this many seconds, the tracker pauses until you reset again', 'if checked, data will be stored both locally and virtually via google sheets', '', 'if checked, the program will update and analyze your stats every time it launches', 'Only track random seed runs. Disable for other categories.'],
['currently not used', 'currently not used', 'when selecting a session, you can also select latest x sessions, which would depend on the integer for this setting', 'when generating feedback, the program compares you to players with in this number of seconds of your target time', 'if checked, the program will calculate session starts/ends in your timezone instead of utc', 'if checked, your twitch username will not be shown on the global sheet', 'if checked, histograms will display as kdeplots'],
['', 'in seconds', '', 'numerical value from 0.5 to 5.0'],
['', '', '', '', '']]
Expand Down Expand Up @@ -1312,6 +1365,7 @@ class MainView(tk.Frame):
currentSessionMarkerLock = threading.Lock()
pages = None
trackingLabel = None
drop = None

def authenticateSheets(self):
if settings['tracking']['use sheets'] == 1:
Expand Down Expand Up @@ -1421,11 +1475,11 @@ def __init__(self, *args, **kwargs):
for session in sessions['sessions']:
sessionStrings.append(session['string'])
selectedSession.set(sessionStrings[0])
drop = OptionMenu(buttonframeMain, selectedSession, *sessionStrings)
drop.configure(background=guiColors['button'], foreground=guiColors['text'])
self.drop = OptionMenu(buttonframeMain, selectedSession, *sessionStrings)
self.drop.configure(background=guiColors['button'], foreground=guiColors['text'])
self.trackingLabel = Label(buttonframeMain, text='Tracking: False', background=guiColors['false_light'], foreground=guiColors['black'], font=("Arial Bold", 10), pady=3, padx=10, )
self.trackingLabel.pack(side="right", expand=True)
drop.pack(side="right")
self.drop.pack(side="right")
buttonframe1.pack(side="left", fill="x", expand=False)
buttonframeMain.pack(side="top")
container.pack(side="top", fill="both", expand=True)
Expand Down
9 changes: 7 additions & 2 deletions ResetTracker/stats.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
from speedrun_models import SplitDistribution
from utils import *

headerLabels = ['Date and Time', 'Iron Source', 'Enter Type', 'Gold Source', 'Spawn Biome', 'RTA', 'Wood', 'Iron Pickaxe', 'Nether', 'Bastion', 'Fortress', 'Nether Exit', 'Stronghold', 'End', 'Retimed IGT', 'IGT', 'Gold Dropped', 'Blaze Rods', 'Blazes', 'Flint', 'Gravel', 'Deaths', 'Traded', 'Endermen', 'Eyes Thrown', 'Iron', 'Wall Resets Since Prev', 'Played Since Prev', 'RTA Since Prev', 'Break RTA Since Prev', 'Wall Time Since Prev', 'Session Marker', 'RTA Distribution']
headerLabels = ['Date and Time', 'Iron Source', 'Enter Type', 'Gold Source', 'Spawn Biome', 'RTA', 'Wood',
'Iron Pickaxe', 'Nether', 'Bastion', 'Fortress', 'Nether Exit', 'Stronghold', 'End', 'Retimed IGT',
'IGT', 'Gold Dropped', 'Blaze Rods', 'Blazes', 'Diamond Pick', 'Pearls Thrown', 'Deaths',
'Obsidian Placed', 'Diamond Sword', 'Blocks Mined', 'Iron', 'Wall Resets Since Prev',
'Played Since Prev', 'RTA Since Prev', 'Break RTA Since Prev', 'Wall Time Since Prev', 'Session Marker',
'RTA Distribution']


class StatsDB:
Expand Down Expand Up @@ -428,7 +433,7 @@ def saveSessionData(cls, settings):
def appendStats(cls, settings, last):
global sessions
new_last = Stats.get_last_time()
if last is None or new_last != last:
if True or last is None or new_last != last:
sessionList = Stats.get_sessions(settings)
if len(sessionList) == 0:
return None
Expand Down
23 changes: 11 additions & 12 deletions ResetTracker/update.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import requests
import json
import time
import stat
import tkinter as tk
import threading

Expand All @@ -18,45 +17,45 @@ def unzip(path):
def download():
response1 = requests.get("https://api.github.com/repos/pncakespoon1/ResetTracker/releases/latest")
releaseTag = response1.json()["name"]
URL = "https://github.com/pncakespoon1/ResetTracker/releases/download/" + releaseTag + "/ResetTracker2.0.zip"
response2 = wget.download(URL, "temp/update/ResetTracker2.0.zip")
URL = "https://github.com/pncakespoon1/ResetTracker/releases/download/" + releaseTag + "/ResetTracker2.zip"
response2 = wget.download(URL, "temp/update/ResetTracker2.zip")


def update():
download()
unzip('temp/update/ResetTracker2.0.zip')
unzip('temp/update/ResetTracker2.zip')

oldSettingsFile = open('data/settings.json')
oldSettings = json.load(oldSettingsFile)
newSettingsFile = open('temp/update/ResetTracker2.0/data/settings.json')
newSettingsFile = open('temp/update/ResetTracker2/data/settings.json')
newSettings = json.load(newSettingsFile)
for key1 in oldSettings.keys():
for key2 in oldSettings[key1].keys():
newSettings[key1][key2] = oldSettings[key1][key2]
oldSettingsFile.close()
newSettingsFile.close()
json.dump(newSettings, open('temp/update/ResetTracker2.0/data/settings.json', 'w'))
json.dump(newSettings, open('temp/update/ResetTracker2/data/settings.json', 'w'))

oldConfigFile = open('data/config.json')
oldConfig = json.load(oldConfigFile)
newConfigFile = open('temp/update/ResetTracker2.0/data/config.json')
newConfigFile = open('temp/update/ResetTracker2/data/config.json')
newConfig = json.load(newConfigFile)
for key in oldConfig.keys():
if key != 'version':
newConfig[key] = oldConfig[key]
oldConfigFile.close()
newConfigFile.close()
json.dump(newConfig, open('temp/update/ResetTracker2.0/data/config.json', 'w'))
json.dump(newConfig, open('temp/update/ResetTracker2/data/config.json', 'w'))

shutil.rmtree('data')
os.remove('gui.exe')

relativeDir = os.path.abspath('temp')
relativeDir = relativeDir[:len(relativeDir) - 5]
shutil.move('temp/update/ResetTracker2.0/data', relativeDir)
shutil.move('temp/update/ResetTracker2.0/gui.exe', relativeDir)
os.remove('temp/update/ResetTracker2.0.zip')
shutil.rmtree('temp/update/ResetTracker2.0')
shutil.move('temp/update/ResetTracker2/data', relativeDir)
shutil.move('temp/update/ResetTracker2/ResetTracker2.exe', relativeDir)
os.remove('temp/update/ResetTracker2.zip')
shutil.rmtree('temp/update/ResetTracker2')
root.destroy()


Expand Down
18 changes: 13 additions & 5 deletions ResetTracker/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ def ms_to_string(cls, ms, returnTime=False):
return ''

ms = int(ms)

td = timedelta(milliseconds=ms)
if not timedelta(hours=0) < td < timedelta(hours=12):
td = timedelta(days=1) - td
t = datetime(1970, 1, 1) + timedelta(milliseconds=ms)
if returnTime:
return t
Expand Down Expand Up @@ -120,21 +122,24 @@ def stringToTimedelta(cls, TDString):
return timedelta(hours=int(links[0]), minutes=int(links[1]), seconds=int(links[2]))

@classmethod
def formatValue(cls, value, isTime=False, isPercent=False):
def formatValue(cls, value, isTime=False, isPercent=False, includeHours=False):
if value is None:
return ""
if type(value) == str:
return value
if type(value) == int:
if isTime:
valueDatetime = datetime(year=1970, month=1, day=1) + timedelta(seconds=value % 3600)
return str(math.trunc(value/3600)) + valueDatetime.strftime('%M:%S')
return str(math.trunc(value/3600)) + ':' + valueDatetime.strftime('%M:%S')
else:
return str(value)
if type(value) == float:
if isTime:
valueDatetime = datetime(year=1970, month=1, day=1) + timedelta(seconds=value % 3600)
return str(math.trunc(value/3600)) + valueDatetime.strftime('%M:%S')
if includeHours:
return str(math.trunc(value / 3600)) + ':' + valueDatetime.strftime('%M:%S') + '.' + str(round(int(10 * (value % 1)), 0))
else:
return valueDatetime.strftime('%M:%S') + '.' + str(round(int(10 * (value % 1)), 0))
else:
if isPercent:
return str(round(value * 100, 1)) + '%'
Expand All @@ -143,7 +148,10 @@ def formatValue(cls, value, isTime=False, isPercent=False):
if type(value) == timedelta:
if isTime:
valueDatetime = datetime(year=1970, month=1, day=1) + value
return valueDatetime.strftime("%M:%S.") + str(round(int(10 * ((value / timedelta(seconds=1)) % 1)), 0))
if includeHours:
return str(math.trunc((value / timedelta(seconds=1)) / 3600)) + ':' + valueDatetime.strftime("%M:%S") + '.' + str(round(int(10 * ((value / timedelta(seconds=1)) % 1)), 0))
else:
return valueDatetime.strftime("%M:%S") + '.' + str(round(int(10 * ((value / timedelta(seconds=1)) % 1)), 0))
else:
return value/timedelta(seconds=1)

Expand Down

0 comments on commit 80266b3

Please sign in to comment.