diff --git a/.vs/MythicPlusCalc/v16/.suo b/.vs/MythicPlusCalc/v16/.suo index bf219f4..920afa4 100644 Binary files a/.vs/MythicPlusCalc/v16/.suo and b/.vs/MythicPlusCalc/v16/.suo differ diff --git a/MythicPlusCalc/Form1.Designer.cs b/MythicPlusCalc/Form1.Designer.cs index f654c0d..820ae72 100644 --- a/MythicPlusCalc/Form1.Designer.cs +++ b/MythicPlusCalc/Form1.Designer.cs @@ -107,8 +107,8 @@ private void InitializeComponent() this.panel1.Controls.Add(this.Exit); resources.ApplyResources(this.panel1, "panel1"); this.panel1.Name = "panel1"; - this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.mouse_Down); - this.panel1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.mouse_Move); + this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Mouse_Down); + this.panel1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.Mouse_Move); // // pictureBox13 // @@ -433,7 +433,7 @@ private void InitializeComponent() this.setScore.ForeColor = System.Drawing.Color.White; this.setScore.Name = "setScore"; this.setScore.UseVisualStyleBackColor = false; - this.setScore.Click += new System.EventHandler(this.setScore_Click); + this.setScore.Click += new System.EventHandler(this.SetScore_Click); // // Form1 // diff --git a/MythicPlusCalc/Form1.cs b/MythicPlusCalc/Form1.cs index e11bfe0..4d05ede 100644 --- a/MythicPlusCalc/Form1.cs +++ b/MythicPlusCalc/Form1.cs @@ -1,12 +1,6 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; -using System.Linq; using System.Net; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using Newtonsoft.Json; @@ -15,20 +9,24 @@ namespace MythicPlusCalc public partial class Form1 : Form { public Point mouseLocation; + public double score = 0; public Form1() { InitializeComponent(); + //Anwendungseinstellungen Laden nameInput.Text = Properties.Settings.Default.Name; realmInput.Text = Properties.Settings.Default.Realm; } - private void mouse_Down(object sender, MouseEventArgs e) + private void Mouse_Down(object sender, MouseEventArgs e) { + //Sobald man klickt die Maus Position nehmen mouseLocation = new Point(-e.X, -e.Y); } - private void mouse_Move(object sender, MouseEventArgs e) + private void Mouse_Move(object sender, MouseEventArgs e) { + //Falls die Linke Maustaste gedrückt wird das Fenster zur Position der Maus bewegen if(e.Button == MouseButtons.Left) { Point mousePose = Control.MousePosition; @@ -39,13 +37,28 @@ private void mouse_Move(object sender, MouseEventArgs e) private void Exit_Click(object sender, EventArgs e) { + //Anwendung Schließen Application.Exit(); } - private void calcButton_Click(object sender, EventArgs e) + //Überprüfen welche Zahl größer ist um den Score richtig zu berechnen + private void CompareDungeon(int T, int F) { - double score = 0; + if (T >= F) + { + score += Calc_Score(T); + score += (Calc_Score(F) / 3); + } + else + { + score += Calc_Score(F); + score += (Calc_Score(T) / 3); + } + } + private void calcButton_Click(object sender, EventArgs e) + { + //Versuchen alle Textboxen in int's umzuwandeln und damit den Score zu berechnen try { int HoATS = int.Parse(HoAT.Text); @@ -78,115 +91,16 @@ private void calcButton_Click(object sender, EventArgs e) int STRTSTS = int.Parse(STRTST.Text); int STRTSFS = int.Parse(STRTSF.Text); - if (HoATS >= HoAFS) - { - score = score + calc_Score(HoATS); - score = score + (calc_Score(HoAFS) / 3); - } - else - { - score = score + calc_Score(HoAFS); - score = score + (calc_Score(HoATS) / 3); - } - - if (SDTS >= SDFS) - { - score = score + calc_Score(SDTS); - score = score + (calc_Score(SDFS) / 3); - } - else - { - score = score + calc_Score(SDFS); - score = score + (calc_Score(SDTS) / 3); - } - - if (DoSTS >= DoSFS) - { - score = score + calc_Score(DoSTS); - score = score + (calc_Score(DoSFS) / 3); - } - else - { - score = score + calc_Score(DoSFS); - score = score + (calc_Score(DoSTS) / 3); - } - - if (MoTSTS >= MoTSFS) - { - score = score + calc_Score(MoTSTS); - score = score + (calc_Score(MoTSFS) / 3); - } - else - { - score = score + calc_Score(MoTSFS); - score = score + (calc_Score(MoTSTS) / 3); - } - - if (NWTS >= NWFS) - { - score = score + calc_Score(NWTS); - score = score + (calc_Score(NWFS) / 3); - } - else - { - score = score + calc_Score(NWFS); - score = score + (calc_Score(NWTS) / 3); - } - - if (SoATS >= SoAFS) - { - score = score + calc_Score(SoATS); - score = score + (calc_Score(SoAFS) / 3); - } - else - { - score = score + calc_Score(SoAFS); - score = score + (calc_Score(SoATS) / 3); - } - - if (ToPTS >= ToPFS) - { - score = score + calc_Score(ToPTS); - score = score + (calc_Score(ToPFS) / 3); - } - else - { - score = score + calc_Score(ToPFS); - score = score + (calc_Score(ToPTS) / 3); - } - - if (PFTS >= PFFS) - { - score = score + calc_Score(PFTS); - score = score + (calc_Score(PFFS) / 3); - } - else - { - score = score + calc_Score(PFFS); - score = score + (calc_Score(PFTS) / 3); - } - - if (GMBTTS >= GMBTFS) - { - score = score + calc_Score(GMBTTS); - score = score + (calc_Score(GMBTFS) / 3); - } - else - { - score = score + calc_Score(GMBTFS); - score = score + (calc_Score(GMBTTS) / 3); - } - - if (STRTSTS >= STRTSFS) - { - score = score + calc_Score(STRTSTS); - score = score + (calc_Score(STRTSFS) / 3); - } - else - { - score = score + calc_Score(STRTSFS); - score = score + (calc_Score(STRTSTS) / 3); - } + CompareDungeon(HoATS, HoAFS); + CompareDungeon(SDTS, SDFS); + CompareDungeon(DoSTS, DoSFS); + CompareDungeon(MoTSTS, MoTSFS); + CompareDungeon(NWTS, NWFS); + CompareDungeon(SoATS, SoAFS); + CompareDungeon(ToPTS, ToPFS); + CompareDungeon(PFTS, PFFS); + CompareDungeon(GMBTTS, GMBTFS); + CompareDungeon(STRTSTS, STRTSFS); scoreLabel.Text = score.ToString("F2"); scoreLabel.Visible = true; } @@ -195,89 +109,91 @@ private void calcButton_Click(object sender, EventArgs e) MessageBox.Show("Bitte alle Felder ausfüllen!"); } - if (score >= 150) - { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#2ECC71"); - } - if (score >= 300) + //Textfarbe je nach höhe des Scores festlegen + if (score >= 3000) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#30BF8B"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#E67E22"); } - if (score >= 450) + else if (score >= 2850) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#31B2A5"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#DD7A35"); } - if (score >= 600) + else if (score >= 2700) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#32AAB5"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#D37547"); } - if (score >= 750) + else if (score >= 2550) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#33A1C9"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#CA7159"); } - if (score >= 900) + else if(score >= 2400) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#3498DB"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#C16C6B"); } - if (score >= 1050) + else if (score >= 2250) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#4190D6"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#B1648B"); } - if (score >= 1200) + else if (score >= 2100) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#5087D1"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#A55EA2"); } - if (score >= 1350) + else if (score >= 1950) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#5C80CD"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#9B59B6"); } - if (score >= 1500) + else if (score >= 1800) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#6879C9"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#8865BD"); } - if (score >= 1650) + else if (score >= 1650) { scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#7770C4"); } - if (score >= 1800) + else if (score >= 1500) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#8865BD"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#6879C9"); } - if (score >= 1950) + else if (score >= 1350) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#9B59B6"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#5C80CD"); } - if (score >= 2100) + else if (score >= 1200) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#A55EA2"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#5087D1"); } - if (score >= 2250) + else if (score >= 1050) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#B1648B"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#4190D6"); } - if (score >= 2400) + else if (score >= 900) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#C16C6B"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#3498DB"); } - if (score >= 2550) + else if (score >= 750) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#CA7159"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#33A1C9"); } - if (score >= 2700) + else if (score >= 600) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#D37547"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#32AAB5"); } - if (score >= 2850) + else if (score >= 450) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#DD7A35"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#31B2A5"); } - if (score >= 3000) + else if (score >= 300) { - scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#E67E22"); + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#30BF8B"); } + else if (score >= 150) + { + scoreLabel.ForeColor = System.Drawing.ColorTranslator.FromHtml("#2ECC71"); + } } - public void setLevels(String dungeon, String level, String affix) + //Textboxen mit Werten füllen + public void SetLevels(String dungeon, String level, String affix) { if (affix == "Tyrannical") { @@ -353,7 +269,8 @@ public void setLevels(String dungeon, String level, String affix) } } - public dynamic jsonRequest(String playerName, String realmName, String requestField) + //Json Datei aus der API abrufen + public dynamic JsonRequest(String playerName, String realmName, String requestField) { try { @@ -368,7 +285,8 @@ public dynamic jsonRequest(String playerName, String realmName, String requestFi return null; } - private double calc_Score(int Level) + //Werte je nach Level berechnen + private double Calc_Score(int Level) { double score = Level * 7.5; if(Level >= 10) @@ -385,6 +303,7 @@ private double calc_Score(int Level) return score; } + //Überprüfung dass nur Zahlen in der Textbox benutzt werden private void STRTST_KeyPress(object sender, KeyPressEventArgs e) { if (!char.IsControl(e.KeyChar) && !char.IsDigit(e.KeyChar)) @@ -394,12 +313,13 @@ private void STRTST_KeyPress(object sender, KeyPressEventArgs e) } } - private void setScore_Click(object sender, EventArgs e) + //Textboxen mit API Werten füllen + private void SetScore_Click(object sender, EventArgs e) { Properties.Settings.Default.Name = nameInput.Text; Properties.Settings.Default.Realm = realmInput.Text; Properties.Settings.Default.Save(); - var bestRuns = jsonRequest(nameInput.Text, realmInput.Text, "mythic_plus_best_runs"); + var bestRuns = JsonRequest(nameInput.Text, realmInput.Text, "mythic_plus_best_runs"); if (bestRuns != null) { foreach (var item in bestRuns["mythic_plus_best_runs"]) @@ -409,7 +329,7 @@ private void setScore_Click(object sender, EventArgs e) String affixName = affix["name"]; String dungeon = item["short_name"]; String level = item["mythic_level"]; - setLevels(dungeon, level, affixName); + SetLevels(dungeon, level, affixName); } } } @@ -417,7 +337,7 @@ private void setScore_Click(object sender, EventArgs e) { return; } - var alternateRuns = jsonRequest(nameInput.Text, realmInput.Text, "mythic_plus_alternate_runs"); + var alternateRuns = JsonRequest(nameInput.Text, realmInput.Text, "mythic_plus_alternate_runs"); if(alternateRuns != null) { foreach (var item in alternateRuns["mythic_plus_alternate_runs"]) @@ -427,7 +347,7 @@ private void setScore_Click(object sender, EventArgs e) String affixName = affix["name"]; String dungeon = item["short_name"]; String level = item["mythic_level"]; - setLevels(dungeon, level, affixName); + SetLevels(dungeon, level, affixName); } } } diff --git a/MythicPlusCalc/MythicPlusCalc.csproj b/MythicPlusCalc/MythicPlusCalc.csproj index f61a755..56e92ca 100644 --- a/MythicPlusCalc/MythicPlusCalc.csproj +++ b/MythicPlusCalc/MythicPlusCalc.csproj @@ -13,7 +13,7 @@ true true false - C:\Users\lars2\Desktop\m+ calc\2.0\ + C:\Users\lars2\Desktop\m+ calc\1.0.2\ true Disk false @@ -23,7 +23,7 @@ false false true - 1 + 3 1.0.0.%2a false true diff --git a/MythicPlusCalc/MythicPlusCalc.csproj.user b/MythicPlusCalc/MythicPlusCalc.csproj.user index 1f07894..94279a0 100644 --- a/MythicPlusCalc/MythicPlusCalc.csproj.user +++ b/MythicPlusCalc/MythicPlusCalc.csproj.user @@ -1,7 +1,7 @@  - C:\Users\lars2\Desktop\m+ calc\2.0\|C:\Users\lars2\Desktop\|publish\ + C:\Users\lars2\Desktop\m+ calc\1.0.2\|C:\Users\lars2\Desktop\m+ calc\2.0\|C:\Users\lars2\Desktop\|publish\ diff --git a/MythicPlusCalc/bin/Debug/MythicPlusCalc.application b/MythicPlusCalc/bin/Debug/MythicPlusCalc.application index b2932f7..7bafc9d 100644 --- a/MythicPlusCalc/bin/Debug/MythicPlusCalc.application +++ b/MythicPlusCalc/bin/Debug/MythicPlusCalc.application @@ -1,6 +1,6 @@  - + @@ -8,13 +8,13 @@ - + - BOnm6ZCPh4kctZtUU1RAeq0l+VwpGJKD120EuV/GsCo= + Heg/ici0aMrSoBwiU1dzQhWqBuICAaZEQmxtL68649E= diff --git a/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe b/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe index 7092ba7..70fee77 100644 Binary files a/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe and b/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe differ diff --git a/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe.manifest b/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe.manifest index cf97231..cf6dada 100644 --- a/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe.manifest +++ b/MythicPlusCalc/bin/Debug/MythicPlusCalc.exe.manifest @@ -1,6 +1,6 @@  - + @@ -50,7 +50,7 @@ - l2+PEPiIwf/4d9AyGfB6Ab2cOoPMbtQshUj6h7dxgFg= + gzK7ERGL9JhJLaHVFhSFGBqYDIUAMxkK4UXW+iMy2VQ= diff --git a/MythicPlusCalc/bin/Debug/MythicPlusCalc.pdb b/MythicPlusCalc/bin/Debug/MythicPlusCalc.pdb index 6ae7ff8..40e3519 100644 Binary files a/MythicPlusCalc/bin/Debug/MythicPlusCalc.pdb and b/MythicPlusCalc/bin/Debug/MythicPlusCalc.pdb differ diff --git a/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.config.deploy b/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.config.deploy similarity index 100% rename from MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.config.deploy rename to MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.config.deploy diff --git a/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.deploy b/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.deploy similarity index 99% rename from MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.deploy rename to MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.deploy index b2b4a74..95b5b4f 100644 Binary files a/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.deploy and b/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.deploy differ diff --git a/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.manifest b/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.manifest similarity index 88% rename from MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.manifest rename to MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.manifest index d24af3f..a90660f 100644 --- a/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/MythicPlusCalc.exe.manifest +++ b/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/MythicPlusCalc.exe.manifest @@ -1,6 +1,6 @@  - + @@ -50,7 +50,7 @@ - l2+PEPiIwf/4d9AyGfB6Ab2cOoPMbtQshUj6h7dxgFg= + gzK7ERGL9JhJLaHVFhSFGBqYDIUAMxkK4UXW+iMy2VQ= @@ -84,4 +84,4 @@ EKlvT9mQxJ0UI4FfJtdH0CTt835Y51zwy5ADxxXYw4E= -SBFdn0r1WsFiZFyOJvFgmKZDg5L2RUdMICcFPZsTwD8=cn/OvGNiF9+Fi0vDzvW8I8rWlmbOkr3kWoWkomDlxlihlmTNmNcAwx3N9YB9iPFm0O/9J+QFD934lV1IXZoquATxRlCoyxkI8AOPyWw+Ge2SbV77KsISnz15Sy127N28zuxTopl/PEYPOmEAbWwjr29am/xOzLYd6AuK+F8eYAI=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABCN=DESKTOP-BQB588K\lars2h9tN+z+EM5kRy0X8EjrwA0+Kk2jwwDlZUsI5a+TyAOU=jHxc/XCdf7Fyx4by0S1dsFcv2Y1y8prDW7fk9iVcPDXsmOyiarMuoduvMILDZxlKU5fqNnMF2rMVVeFGYjLb6Tagv6qpXvcVPL0TEgFMczwJbMuDTvh7gaW5srGV3Kp0Qbpnj3QsupqiY/E08PwLOAALetzHRar8wrAt5+fh4xI=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABMIIB7TCCAVagAwIBAgIQUMM8X4O/RoJF0qOliwmr8jANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwHhcNMjIwMzIxMTU1NDIzWhcNMjMwMzIxMjE1NDIzWjA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSGrte9tgP7uAurLMXGh8Xo+l331g8z1RGanAfKLZqmIUUHieLRBQ3CZkTRnIRJKHAyhXj9DPrzpZP/kYwVTeO0gl6zU4uubHxPxBm65eMaG/pKpxmd8ngs41Yu3AocbsznaXNnRUz22CSDeiAchqfFIGmIyezPjCmjNIud2didAgMBAAEwDQYJKoZIhvcNAQELBQADgYEASMnjBsmQT3I6uAisJytY0VZZ9KZHHfabsgkZnyyfvaHYaUViufD+wHIZCak1y+vA+bMg/VCujtk2xTmcv5viSywQF4YF0yioFOEDoWcET3PUrHKC8fO+wASb855/WY1Q6PFb1w1UA/MJs4NALR90d7nH1FrWIPDYjPSF30hC3Y4= \ No newline at end of file +oz62frXvqRSOuxRWTx9ZHDbXhbPiGX0gE/b8Py3SEJk=PmtFhr7ZdptfyQ496MTc61Zk3pZIDvJGT586n01UQU5YR7QfSlIZgOveX5sScbEzfzT5SkVr/ihcQWuJzyvmuIlrgv75tbJ0fD41H9dUC7VjRN9XuJF8yFGTo34vmreVXMIrW1973SS1u4DeOK351C3fDSPjKs9qj2YC0euZS7Y=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABCN=DESKTOP-BQB588K\lars2eOi/PEe7v85A8Ue/9YyGjqFREckM9pETsNyGB9zd1Bk=kUJ4TfuFcryJjzApWZqYlrntORolT2nic3WlrCV5GPnncYYk4hUORQigSlhWiwild/VnRw2ZQcPtQcOk0vo32rQdOluQkcB20PcaAds4JlRQ05CQDeQSo1Pqn2mSkx1dhzmX5bm7dfpD3gtkXaHpsh3HsGmblAzgYzxDLGma8V8=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABMIIB7TCCAVagAwIBAgIQUMM8X4O/RoJF0qOliwmr8jANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwHhcNMjIwMzIxMTU1NDIzWhcNMjMwMzIxMjE1NDIzWjA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSGrte9tgP7uAurLMXGh8Xo+l331g8z1RGanAfKLZqmIUUHieLRBQ3CZkTRnIRJKHAyhXj9DPrzpZP/kYwVTeO0gl6zU4uubHxPxBm65eMaG/pKpxmd8ngs41Yu3AocbsznaXNnRUz22CSDeiAchqfFIGmIyezPjCmjNIud2didAgMBAAEwDQYJKoZIhvcNAQELBQADgYEASMnjBsmQT3I6uAisJytY0VZZ9KZHHfabsgkZnyyfvaHYaUViufD+wHIZCak1y+vA+bMg/VCujtk2xTmcv5viSywQF4YF0yioFOEDoWcET3PUrHKC8fO+wASb855/WY1Q6PFb1w1UA/MJs4NALR90d7nH1FrWIPDYjPSF30hC3Y4= \ No newline at end of file diff --git a/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/Newtonsoft.Json.dll.deploy b/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/Newtonsoft.Json.dll.deploy similarity index 100% rename from MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/Newtonsoft.Json.dll.deploy rename to MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/Newtonsoft.Json.dll.deploy diff --git a/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/inv_relics_hourglass_02.ico.deploy b/MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/inv_relics_hourglass_02.ico.deploy similarity index 100% rename from MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_1/inv_relics_hourglass_02.ico.deploy rename to MythicPlusCalc/bin/Debug/app.publish/Application Files/MythicPlusCalc_1_0_0_2/inv_relics_hourglass_02.ico.deploy diff --git a/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.application b/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.application index 2cf8cdc..cd07d5c 100644 --- a/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.application +++ b/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.application @@ -1,21 +1,21 @@  - + - - + + - 6OHf/03PlHtAMyPEnzMa96kQWczfffYDuNa5QVFKf5Y= + jmr7sIhforCdv0Tm61ojCwvrehRd9CIp0SVT0KCjjPE= -oIhfK0caS2QCMpq6jFHusiU4qF9XbkGrrGJQVpSfJ58=n9h1SdYMVxYh4ou+Ub0TPj2n0Vj84Sf4zFRi0BDLrRze5mlwGV4r8vTxaI3MRyN35pHVAz+0MsiYbuTgph7neNjeuTUb6udGchx+5FBsE0nd7lFtzHGV2x5iK16bP4JJBIRO8Id94xmd0Ul5l6CYoDXZlZaSFQgI9lQWzRosq4w=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABCN=DESKTOP-BQB588K\lars2lvhkYUHrSo+H9siYAiU5slAT4unefcAr4Z/5Qdvi4As=LfpxNsl8tzTDPElfwsSLCYYoJM0hczQYzu+XqSH35n0w+rxaCWEYHXyYJY9oFdKE6TR24OLJsCq70WzltodknTt5YKDIEON/ikrxLJS0DSz4AxQTRsdFup9PcYbZirCJeCMmMEcKDAAR/oReuVJLd1j+xn5hcQpaiDKrqsYrXsA=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABMIIB7TCCAVagAwIBAgIQUMM8X4O/RoJF0qOliwmr8jANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwHhcNMjIwMzIxMTU1NDIzWhcNMjMwMzIxMjE1NDIzWjA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSGrte9tgP7uAurLMXGh8Xo+l331g8z1RGanAfKLZqmIUUHieLRBQ3CZkTRnIRJKHAyhXj9DPrzpZP/kYwVTeO0gl6zU4uubHxPxBm65eMaG/pKpxmd8ngs41Yu3AocbsznaXNnRUz22CSDeiAchqfFIGmIyezPjCmjNIud2didAgMBAAEwDQYJKoZIhvcNAQELBQADgYEASMnjBsmQT3I6uAisJytY0VZZ9KZHHfabsgkZnyyfvaHYaUViufD+wHIZCak1y+vA+bMg/VCujtk2xTmcv5viSywQF4YF0yioFOEDoWcET3PUrHKC8fO+wASb855/WY1Q6PFb1w1UA/MJs4NALR90d7nH1FrWIPDYjPSF30hC3Y4= \ No newline at end of file +QcsRgPPhDt03T8eyoaGEGb+zyLXk5TCCIJq6Pqh/FWc=umHkUhH+BQl8HOD6B7202X0fDKohybwN/HPi5UIKoI4yxHF5O8olHhHOgVEEvvYzD7IFAxHDS/jl61w5w9yJ1f2d9f1EkINqT7opNzGIeYKUsrZPv5Dh1RCc4AwsJ6zqU9zlRSRzEW4x2HMTwNmF+F7HRuu/6ZTCIjXEvmZGm9g=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABCN=DESKTOP-BQB588K\lars2LXLF2oZskEArs+gFz1+E04KOVnv7merD4ejJL1eGel0=jeh0jPRgSn0wQQuK+c//pJfGCWthV5vl1J/q447QqrEQQj/snKjnYgGUUMTguXmJVIZ+dZC93gaSq4rpsBraPfB6N37ZPQ7cvQ3kZ4RQssXcHPSO1fwcGzYGOhLx9+vae1emmSpYI5FaHjPKA5r2CGP5V6D725WLm2bQYfTo3qM=xIau1722A/u4C6ssxcaHxej6XffWDzPVEZqcB8otmqYhRQeJ4tEFDcJmRNGchEkocDKFeP0M+vOlk/+RjBVN47SCXrNTi65sfE/EGbrl4xob+kqnGZ3yeCzjVi7cChxuzOdpc2dFTPbYJIN6IByGp8UgaYjJ7M+MKaM0i53Z2J0=AQABMIIB7TCCAVagAwIBAgIQUMM8X4O/RoJF0qOliwmr8jANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwHhcNMjIwMzIxMTU1NDIzWhcNMjMwMzIxMjE1NDIzWjA1MTMwMQYDVQQDHioARABFAFMASwBUAE8AUAAtAEIAUQBCADUAOAA4AEsAXABsAGEAcgBzADIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSGrte9tgP7uAurLMXGh8Xo+l331g8z1RGanAfKLZqmIUUHieLRBQ3CZkTRnIRJKHAyhXj9DPrzpZP/kYwVTeO0gl6zU4uubHxPxBm65eMaG/pKpxmd8ngs41Yu3AocbsznaXNnRUz22CSDeiAchqfFIGmIyezPjCmjNIud2didAgMBAAEwDQYJKoZIhvcNAQELBQADgYEASMnjBsmQT3I6uAisJytY0VZZ9KZHHfabsgkZnyyfvaHYaUViufD+wHIZCak1y+vA+bMg/VCujtk2xTmcv5viSywQF4YF0yioFOEDoWcET3PUrHKC8fO+wASb855/WY1Q6PFb1w1UA/MJs4NALR90d7nH1FrWIPDYjPSF30hC3Y4= \ No newline at end of file diff --git a/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.exe b/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.exe index b2b4a74..95b5b4f 100644 Binary files a/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.exe and b/MythicPlusCalc/bin/Debug/app.publish/MythicPlusCalc.exe differ diff --git a/MythicPlusCalc/obj/Debug/MythicPlusCalc.application b/MythicPlusCalc/obj/Debug/MythicPlusCalc.application index b2932f7..7bafc9d 100644 --- a/MythicPlusCalc/obj/Debug/MythicPlusCalc.application +++ b/MythicPlusCalc/obj/Debug/MythicPlusCalc.application @@ -1,6 +1,6 @@  - + @@ -8,13 +8,13 @@ - + - BOnm6ZCPh4kctZtUU1RAeq0l+VwpGJKD120EuV/GsCo= + Heg/ici0aMrSoBwiU1dzQhWqBuICAaZEQmxtL68649E= diff --git a/MythicPlusCalc/obj/Debug/MythicPlusCalc.csprojAssemblyReference.cache b/MythicPlusCalc/obj/Debug/MythicPlusCalc.csprojAssemblyReference.cache index c3325e4..840ddd8 100644 Binary files a/MythicPlusCalc/obj/Debug/MythicPlusCalc.csprojAssemblyReference.cache and b/MythicPlusCalc/obj/Debug/MythicPlusCalc.csprojAssemblyReference.cache differ diff --git a/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe b/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe index 7092ba7..70fee77 100644 Binary files a/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe and b/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe differ diff --git a/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe.manifest b/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe.manifest index cf97231..cf6dada 100644 --- a/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe.manifest +++ b/MythicPlusCalc/obj/Debug/MythicPlusCalc.exe.manifest @@ -1,6 +1,6 @@  - + @@ -50,7 +50,7 @@ - l2+PEPiIwf/4d9AyGfB6Ab2cOoPMbtQshUj6h7dxgFg= + gzK7ERGL9JhJLaHVFhSFGBqYDIUAMxkK4UXW+iMy2VQ= diff --git a/MythicPlusCalc/obj/Debug/MythicPlusCalc.pdb b/MythicPlusCalc/obj/Debug/MythicPlusCalc.pdb index 6ae7ff8..40e3519 100644 Binary files a/MythicPlusCalc/obj/Debug/MythicPlusCalc.pdb and b/MythicPlusCalc/obj/Debug/MythicPlusCalc.pdb differ