diff --git a/LoLMasteryManager/Admin.vb b/LoLMasteryManager/Admin.vb index ac48cdd..9ccb60d 100644 --- a/LoLMasteryManager/Admin.vb +++ b/LoLMasteryManager/Admin.vb @@ -9,9 +9,9 @@ Public Class Admin Dim oMasteryCoordinatesFile As New MasteryCoordinatesFile - Dim sMenuScreenshotPath As String = "D:\Google Drive\LoL Mastery Manager\Client - Menu.png" - Dim sChampionSelectScreenshotPath As String = "D:\Google Drive\LoL Mastery Manager\Client - Champion Select.png" - Dim sMasteryIconDirectory As String = "D:\Google Drive\LoL Mastery Manager\Masteries" + Dim sMenuScreenshotPath As String = "D:\LoL Mastery Manager\Client - Menu.png" + Dim sChampionSelectScreenshotPath As String = "D:\LoL Mastery Manager\Client - Champion Select.png" + Dim sMasteryIconDirectory As String = "D:\LoL Mastery Manager\Masteries" Dim oLocator As New MasteryLocator Dim oMasteryCoordinateFile As New MasteryCoordinatesFile @@ -73,7 +73,7 @@ Public Class Admin Try - Dim sMasteryCoordinatesPath As String = Path.Combine("D:\Google Drive\LoL Mastery Manager", "Coordinates.json") + Dim sMasteryCoordinatesPath As String = Path.Combine("D:\LoL Mastery Manager", "Coordinates.json") Dim sMasteryCoordinatesJson As String = JsonConvert.SerializeObject(masteryCoordinateListFile) Using oStreamWriter As New StreamWriter(sMasteryCoordinatesPath) diff --git a/LoLMasteryManager/App.config b/LoLMasteryManager/App.config index 2ae8254..1729194 100644 --- a/LoLMasteryManager/App.config +++ b/LoLMasteryManager/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/LoLMasteryManager/ClientControls/ClientControls.vb b/LoLMasteryManager/ClientControls/ClientControls.vb index 3455e3f..7db5aaf 100644 --- a/LoLMasteryManager/ClientControls/ClientControls.vb +++ b/LoLMasteryManager/ClientControls/ClientControls.vb @@ -11,8 +11,8 @@ Public Structure Medium - Public Const Width As Integer = 1280 - Public Const Height As Integer = 800 + Public Const Width As Integer = 1152 + Public Const Height As Integer = 720 End Structure diff --git a/LoLMasteryManager/ClientControls/ClientMasteryPageNameInputField.vb b/LoLMasteryManager/ClientControls/ClientMasteryPageNameInputField.vb index f675aec..f56122c 100644 --- a/LoLMasteryManager/ClientControls/ClientMasteryPageNameInputField.vb +++ b/LoLMasteryManager/ClientControls/ClientMasteryPageNameInputField.vb @@ -5,28 +5,22 @@ Public Const Width As Integer = 165 Public Const Height As Integer = 20 - Public Structure ChampionSelect + Public Structure ChampionSelect_Old - Public Structure Small - Public Const X As Double = ClientSize.Small.Width / 112 - Public Const Y As Double = ClientSize.Small.Height / 165 + Public Const X As Double = ClientSize.Medium.Width / 128 + Public Const Y As Double = ClientSize.Medium.Height / 190 - End Structure - Public Structure Medium - Public Const X As Double = ClientSize.Medium.Width / 132 - Public Const Y As Double = ClientSize.Medium.Height / 172 + End Structure + Public Structure ChampionSelect - End Structure - Public Structure Large + Public Const X As Double = ClientSize.Medium.Width / 115 + Public Const Y As Double = ClientSize.Medium.Height / 103 - Public Const X As Double = ClientSize.Large.Width / 70 - Public Const Y As Double = ClientSize.Medium.Height / 150 - End Structure End Structure diff --git a/LoLMasteryManager/ClientControls/ClientReturnPointsButton.vb b/LoLMasteryManager/ClientControls/ClientReturnPointsButton.vb index ac87962..4515316 100644 --- a/LoLMasteryManager/ClientControls/ClientReturnPointsButton.vb +++ b/LoLMasteryManager/ClientControls/ClientReturnPointsButton.vb @@ -5,31 +5,20 @@ Public Const Width As Integer = 175 Public Const Height As Integer = 25 - Public Structure ChampionSelect - - Public Structure Small - - Public Const X As Double = ClientSize.Small.Width / 120 - Public Const Y As Double = ClientSize.Small.Height / 285 - - End Structure + Public Structure ChampionSelect_Old - Public Structure Medium + Public Const X As Double = ClientSize.Medium.Width / 139 + Public Const Y As Double = ClientSize.Medium.Height / 325 - Public Const X As Double = ClientSize.Medium.Width / 145 - Public Const Y As Double = ClientSize.Medium.Height / 325 - End Structure - - Public Structure Large + End Structure + Public Structure ChampionSelect - Public Const X As Double = ClientSize.Large.Width / 85 - Public Const Y As Double = ClientSize.Large.Height / 320 + Public Const X As Double = ClientSize.Medium.Width / 126 + Public Const Y As Double = ClientSize.Medium.Height / 245 - End Structure End Structure - Public Structure Menu Public Const X As Double = ClientSize.Small.Width / 105 diff --git a/LoLMasteryManager/ClientControls/ClientSaveMasteriesButton.vb b/LoLMasteryManager/ClientControls/ClientSaveMasteriesButton.vb index b1a7b82..89b9909 100644 --- a/LoLMasteryManager/ClientControls/ClientSaveMasteriesButton.vb +++ b/LoLMasteryManager/ClientControls/ClientSaveMasteriesButton.vb @@ -5,28 +5,16 @@ Public Const Width As Integer = 175 Public Const Height As Integer = 25 - Public Structure ChampionSelect - - Public Structure Small - - Public Const X As Double = ClientSize.Small.Width / 120 - Public Const Y As Double = ClientSize.Small.Height / 265 - - End Structure - - Public Structure Medium + Public Structure ChampionSelect_Old - Public Const X As Double = ClientSize.Medium.Width / 145 - Public Const Y As Double = ClientSize.Medium.Height / 295 + Public Const X As Double = ClientSize.Medium.Width / 145 + Public Const Y As Double = ClientSize.Medium.Height / 300 - End Structure - - Public Structure Large - - Public Const X As Double = ClientSize.Large.Width / 85 - Public Const Y As Double = ClientSize.Large.Height / 285 + End Structure + Public Structure ChampionSelect - End Structure + Public Const X As Double = ClientSize.Medium.Width / 126 + Public Const Y As Double = ClientSize.Medium.Height / 217 End Structure diff --git a/LoLMasteryManager/LoLMasteryManager.vbproj b/LoLMasteryManager/LoLMasteryManager.vbproj index c0249fe..cfe5c7b 100644 --- a/LoLMasteryManager/LoLMasteryManager.vbproj +++ b/LoLMasteryManager/LoLMasteryManager.vbproj @@ -11,8 +11,10 @@ LoLMasteryManager 512 WindowsForms - v4.5.2 + v4.5 true + + AnyCPU @@ -25,6 +27,7 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 + false AnyCPU @@ -55,6 +58,7 @@ app.manifest + false diff --git a/LoLMasteryManager/Main.Designer.vb b/LoLMasteryManager/Main.Designer.vb index 9f7bd2c..95f7110 100644 --- a/LoLMasteryManager/Main.Designer.vb +++ b/LoLMasteryManager/Main.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class Main Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class Main 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Main)) Me.cboChampion = New System.Windows.Forms.ComboBox() @@ -30,15 +30,20 @@ Partial Class Main Me.lblRole = New System.Windows.Forms.Label() Me.lblStats = New System.Windows.Forms.Label() Me.btnAssignMasteries = New System.Windows.Forms.Button() - Me.chkInChampionSelect = New System.Windows.Forms.CheckBox() Me.lblVersion = New System.Windows.Forms.LinkLabel() Me.lblClientVersion = New System.Windows.Forms.LinkLabel() + Me.CbClienName = New System.Windows.Forms.ComboBox() + Me.CbMenuOrSelect = New System.Windows.Forms.ComboBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'cboChampion ' Me.cboChampion.FormattingEnabled = True - Me.cboChampion.Location = New System.Drawing.Point(69, 12) + Me.cboChampion.Location = New System.Drawing.Point(90, 12) Me.cboChampion.Name = "cboChampion" Me.cboChampion.Size = New System.Drawing.Size(261, 21) Me.cboChampion.TabIndex = 0 @@ -46,7 +51,7 @@ Partial Class Main 'lblChampion ' Me.lblChampion.AutoSize = True - Me.lblChampion.Location = New System.Drawing.Point(9, 15) + Me.lblChampion.Location = New System.Drawing.Point(30, 15) Me.lblChampion.Name = "lblChampion" Me.lblChampion.Size = New System.Drawing.Size(54, 13) Me.lblChampion.TabIndex = 1 @@ -55,7 +60,7 @@ Partial Class Main 'cboRole ' Me.cboRole.FormattingEnabled = True - Me.cboRole.Location = New System.Drawing.Point(69, 39) + Me.cboRole.Location = New System.Drawing.Point(90, 39) Me.cboRole.Name = "cboRole" Me.cboRole.Size = New System.Drawing.Size(261, 21) Me.cboRole.TabIndex = 2 @@ -63,7 +68,7 @@ Partial Class Main 'cboStats ' Me.cboStats.FormattingEnabled = True - Me.cboStats.Location = New System.Drawing.Point(69, 66) + Me.cboStats.Location = New System.Drawing.Point(90, 66) Me.cboStats.Name = "cboStats" Me.cboStats.Size = New System.Drawing.Size(261, 21) Me.cboStats.TabIndex = 3 @@ -71,7 +76,7 @@ Partial Class Main 'lblRole ' Me.lblRole.AutoSize = True - Me.lblRole.Location = New System.Drawing.Point(34, 42) + Me.lblRole.Location = New System.Drawing.Point(55, 42) Me.lblRole.Name = "lblRole" Me.lblRole.Size = New System.Drawing.Size(29, 13) Me.lblRole.TabIndex = 4 @@ -80,7 +85,7 @@ Partial Class Main 'lblStats ' Me.lblStats.AutoSize = True - Me.lblStats.Location = New System.Drawing.Point(32, 69) + Me.lblStats.Location = New System.Drawing.Point(53, 69) Me.lblStats.Name = "lblStats" Me.lblStats.Size = New System.Drawing.Size(31, 13) Me.lblStats.TabIndex = 5 @@ -88,31 +93,19 @@ Partial Class Main ' 'btnAssignMasteries ' - Me.btnAssignMasteries.Location = New System.Drawing.Point(202, 105) + Me.btnAssignMasteries.Location = New System.Drawing.Point(219, 150) Me.btnAssignMasteries.Name = "btnAssignMasteries" Me.btnAssignMasteries.Size = New System.Drawing.Size(128, 23) Me.btnAssignMasteries.TabIndex = 6 Me.btnAssignMasteries.Text = "Assign Masteries" Me.btnAssignMasteries.UseVisualStyleBackColor = True ' - 'chkInChampionSelect - ' - Me.chkInChampionSelect.AutoSize = True - Me.chkInChampionSelect.Checked = True - Me.chkInChampionSelect.CheckState = System.Windows.Forms.CheckState.Checked - Me.chkInChampionSelect.Location = New System.Drawing.Point(12, 111) - Me.chkInChampionSelect.Name = "chkInChampionSelect" - Me.chkInChampionSelect.Size = New System.Drawing.Size(118, 17) - Me.chkInChampionSelect.TabIndex = 8 - Me.chkInChampionSelect.Text = "In Champion Select" - Me.chkInChampionSelect.UseVisualStyleBackColor = True - ' 'lblVersion ' Me.lblVersion.ActiveLinkColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(120, Byte), Integer), CType(CType(192, Byte), Integer)) Me.lblVersion.AutoSize = True Me.lblVersion.LinkColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(120, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.lblVersion.Location = New System.Drawing.Point(9, 136) + Me.lblVersion.Location = New System.Drawing.Point(26, 181) Me.lblVersion.Name = "lblVersion" Me.lblVersion.Size = New System.Drawing.Size(31, 13) Me.lblVersion.TabIndex = 9 @@ -125,7 +118,7 @@ Partial Class Main Me.lblClientVersion.ActiveLinkColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(120, Byte), Integer), CType(CType(192, Byte), Integer)) Me.lblClientVersion.AutoSize = True Me.lblClientVersion.LinkColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(120, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.lblClientVersion.Location = New System.Drawing.Point(271, 136) + Me.lblClientVersion.Location = New System.Drawing.Point(288, 181) Me.lblClientVersion.Name = "lblClientVersion" Me.lblClientVersion.Size = New System.Drawing.Size(59, 13) Me.lblClientVersion.TabIndex = 10 @@ -133,17 +126,78 @@ Partial Class Main Me.lblClientVersion.Text = "Patch 1.11" Me.lblClientVersion.VisitedLinkColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(120, Byte), Integer), CType(CType(192, Byte), Integer)) ' + 'CbClienName + ' + Me.CbClienName.Enabled = False + Me.CbClienName.FormattingEnabled = True + Me.CbClienName.Items.AddRange(New Object() {"PVP.net Client", "Protect by Son Nguyen (www.sonnguyen.xyz)"}) + Me.CbClienName.Location = New System.Drawing.Point(90, 93) + Me.CbClienName.Name = "CbClienName" + Me.CbClienName.Size = New System.Drawing.Size(261, 21) + Me.CbClienName.TabIndex = 3 + Me.CbClienName.Text = "PVP.net Client" + ' + 'CbMenuOrSelect + ' + Me.CbMenuOrSelect.FormattingEnabled = True + Me.CbMenuOrSelect.Items.AddRange(New Object() {"Mastery in Menu", "Mastery in Champion Select Old", "Mastery in Champion Select New (ver 6)"}) + Me.CbMenuOrSelect.Location = New System.Drawing.Point(90, 120) + Me.CbMenuOrSelect.Name = "CbMenuOrSelect" + Me.CbMenuOrSelect.Size = New System.Drawing.Size(261, 21) + Me.CbMenuOrSelect.TabIndex = 3 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(20, 101) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(64, 13) + Me.Label1.TabIndex = 5 + Me.Label1.Text = "Client Name" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(5, 125) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(79, 13) + Me.Label2.TabIndex = 5 + Me.Label2.Text = "Menu or Select" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(20, 160) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(42, 13) + Me.Label3.TabIndex = 5 + Me.Label3.Text = "Version" + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(109, 150) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(104, 23) + Me.Button1.TabIndex = 11 + Me.Button1.Text = "Change Size LOL" + Me.Button1.UseVisualStyleBackColor = True + ' 'Main ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(342, 158) + Me.ClientSize = New System.Drawing.Size(373, 206) + Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.lblClientVersion) Me.Controls.Add(Me.lblVersion) - Me.Controls.Add(Me.chkInChampionSelect) Me.Controls.Add(Me.btnAssignMasteries) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.lblStats) Me.Controls.Add(Me.lblRole) + Me.Controls.Add(Me.CbMenuOrSelect) + Me.Controls.Add(Me.CbClienName) Me.Controls.Add(Me.cboStats) Me.Controls.Add(Me.cboRole) Me.Controls.Add(Me.lblChampion) @@ -151,7 +205,7 @@ Partial Class Main Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "Main" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "LoL Mastery Manager" + Me.Text = "LoL Mastery Manager edit by Hoang0109" Me.ResumeLayout(False) Me.PerformLayout() @@ -164,7 +218,12 @@ Partial Class Main Friend WithEvents lblRole As Label Friend WithEvents lblStats As Label Friend WithEvents btnAssignMasteries As Button - Friend WithEvents chkInChampionSelect As CheckBox Friend WithEvents lblVersion As LinkLabel Friend WithEvents lblClientVersion As LinkLabel + Friend WithEvents CbClienName As ComboBox + Friend WithEvents CbMenuOrSelect As ComboBox + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Button1 As Button End Class diff --git a/LoLMasteryManager/Main.vb b/LoLMasteryManager/Main.vb index 00e3f9a..21855e1 100644 --- a/LoLMasteryManager/Main.vb +++ b/LoLMasteryManager/Main.vb @@ -1,4 +1,6 @@ Imports System.Timers +Imports System.Diagnostics +Imports System.Runtime.InteropServices Public Class Main @@ -11,6 +13,7 @@ Public Class Main Private _MasteryManager As New MasteryManager Private Sub Main_Load(sender As Object, e As EventArgs) Handles MyBase.Load + CbClienName.SelectedIndex = 0 Try @@ -28,7 +31,8 @@ Public Class Main _Timer = New Timer(1000) - _Timer.Enabled = True + _Timer.Enabled = False + #End If @@ -105,9 +109,27 @@ Public Class Main lblClientVersion.Links.Add(oChampionGGLink) End Sub + + Friend Shared Sub MoveWindow(hwnd As IntPtr, X As Integer, Y As Integer, nWidth As Integer, nHeight As Integer, bRepaint As Boolean) + End Sub + Friend Shared Function GetWindowRect(hWnd As IntPtr, ByRef rect As RECT) As Boolean + End Function + Private Sub ChangeSizeWindow() + Dim processes As Process() = Process.GetProcesses() + If processes.Length > 0 Then + For i As Integer = 0 To processes.Length - 1 + If processes(i).MainWindowTitle = CbClienName.Text Then - Private Sub btnAssignMasteries_Click(sender As Object, e As EventArgs) Handles btnAssignMasteries.Click + Console.Write("tim thay cua so") + + MoveWindow(processes(i).MainWindowHandle, 0, 0, 1152, 720, False) + End If + Next + End If + + End Sub + Private Sub btnAssignMasteries_Click(sender As Object, e As EventArgs) Handles btnAssignMasteries.Click Try Dim sChampionKey As String = CType(cboChampion.SelectedItem, Champion).Key @@ -140,27 +162,7 @@ Public Class Main End Sub - Private Sub chkInChampionSelect_CheckedChanged(sender As Object, e As EventArgs) Handles chkInChampionSelect.CheckedChanged - Try - - If chkInChampionSelect.Checked Then - - _MasteryManager.SetMode(Modes.ChampionSelect) - - Else - - _MasteryManager.SetMode(Modes.Menu) - - End If - - Catch ex As Exception - - MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error) - - End Try - - End Sub Private Sub lblVersion_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblVersion.LinkClicked @@ -196,12 +198,49 @@ Public Class Main Dim oLeagueWindow As IntPtr = HwndInterface.GetHwndFromTitle(My.Resources.LeagueClientWindowTitle) + Dim oLeagueSize = HwndInterface.GetHwndSize(oLeagueWindow) Dim oLeaguePosition = HwndInterface.GetHwndPos(oLeagueWindow) - Debug.WriteLine(String.Format("Client: {{ {0}, {1} }}", oLeaguePosition, oLeagueSize)) - Debug.WriteLine(New Point(Cursor.Position.X - oLeaguePosition.X, Cursor.Position.Y - oLeaguePosition.Y)) + Debug.WriteLine(My.Resources.LeagueClientWindowTitle) + + + End Sub + + Private Sub cboStats_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboStats.SelectedIndexChanged + + End Sub + + Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CbClienName.SelectedIndexChanged + My.Resources.LeagueClientWindowTitle = CbClienName.Text + + Debug.WriteLine(My.Resources.LeagueClientWindowTitle) + End Sub + + Private Sub CbMenuOrSelect_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CbMenuOrSelect.SelectedIndexChanged + Try + If CbMenuOrSelect.SelectedIndex = 0 Then + _MasteryManager.SetMode(Modes.Menu) + End If + If CbMenuOrSelect.SelectedIndex = 1 Then + _MasteryManager.SetMode(Modes.ChampionSelect_Old) + End If + If CbMenuOrSelect.SelectedIndex = 2 Then + _MasteryManager.SetMode(Modes.ChampionSelect) + End If + Catch ex As Exception + + MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error) + + End Try + End Sub + + Private Sub Label3_Click(sender As Object, e As EventArgs) Handles Label3.Click + + End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + ChangeSizeWindow() End Sub #End If diff --git a/LoLMasteryManager/MasteryAssigner.vb b/LoLMasteryManager/MasteryAssigner.vb index 7439856..e32da9d 100644 --- a/LoLMasteryManager/MasteryAssigner.vb +++ b/LoLMasteryManager/MasteryAssigner.vb @@ -82,11 +82,11 @@ Public Class MasteryAssigner Mouse.Move(oPosition) - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Mouse.LeftClick() - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Catch ex As Exception @@ -110,11 +110,11 @@ Public Class MasteryAssigner Mouse.Move(oPosition) - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Mouse.LeftClick() - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Catch ex As Exception @@ -138,11 +138,11 @@ Public Class MasteryAssigner Mouse.Move(oPosition) - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Mouse.LeftClick() - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Catch ex As Exception @@ -200,7 +200,7 @@ Public Class MasteryAssigner Mouse.Move(oMasteryPosition) ' Sleep the thread to ensure the mouse has time to move - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) ' If the mastery has all of the points for that row If mastery.Ranks = 5 Then @@ -209,7 +209,7 @@ Public Class MasteryAssigner Mouse.LeftClick() ' Sleep the thread to ensure the click has time to complete - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Else ' Points shared between both masteries on the row @@ -220,7 +220,7 @@ Public Class MasteryAssigner Mouse.LeftClick() ' Sleep the thread to ensure the click has time to complete - Threading.Thread.Sleep(100) + Threading.Thread.Sleep(150) Next iRank ' Loop through the mastery ranks @@ -262,6 +262,10 @@ Public Class MasteryAssigner oMasteryPosition = _MasteryCoordinatesListFile.MasteryCoordinatesChampionSelect(sID) + Case Modes.ChampionSelect_Old + + oMasteryPosition = _MasteryCoordinatesListFile.MasteryCoordinatesChampionSelect_Old(sID) + End Select Dim oPosition As New Point @@ -309,29 +313,20 @@ Public Class MasteryAssigner If _Mode = Modes.ChampionSelect Then - Select Case oLeagueClientWindowSize.Width - - Case < ClientSize.Medium.Width - - oMasteryPageNameInputFieldOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientMasteryPageNameInputField.ChampionSelect.Small.X)) - oMasteryPageNameInputFieldOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientMasteryPageNameInputField.ChampionSelect.Small.Y)) - - Case >= ClientSize.Medium.Width, < ClientSize.Large.Width - - oMasteryPageNameInputFieldOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientMasteryPageNameInputField.ChampionSelect.Medium.X)) - oMasteryPageNameInputFieldOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientMasteryPageNameInputField.ChampionSelect.Medium.Y)) - - Case >= ClientSize.Large.Width + oMasteryPageNameInputFieldOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientMasteryPageNameInputField.ChampionSelect.X)) + oMasteryPageNameInputFieldOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientMasteryPageNameInputField.ChampionSelect.Y)) + End If - oMasteryPageNameInputFieldOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientMasteryPageNameInputField.ChampionSelect.Large.X)) - oMasteryPageNameInputFieldOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientMasteryPageNameInputField.ChampionSelect.Large.Y)) + If _Mode = Modes.Menu Then - End Select + oMasteryPageNameInputFieldOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientMasteryPageNameInputField.Menu.X)) + oMasteryPageNameInputFieldOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientMasteryPageNameInputField.Menu.Y)) - Else + End If + If _Mode = Modes.ChampionSelect_Old Then - oMasteryPageNameInputFieldOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientMasteryPageNameInputField.Menu.X)) - oMasteryPageNameInputFieldOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientMasteryPageNameInputField.Menu.Y)) + oMasteryPageNameInputFieldOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientMasteryPageNameInputField.ChampionSelect_Old.X)) + oMasteryPageNameInputFieldOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientMasteryPageNameInputField.ChampionSelect_Old.Y)) End If @@ -354,33 +349,28 @@ Public Class MasteryAssigner If _Mode = Modes.ChampionSelect Then - Select Case oLeagueClientWindowSize.Width - - Case < ClientSize.Medium.Width - oSaveMasteriesButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientSaveMasteriesButton.ChampionSelect.Small.X)) - oSaveMasteriesButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientSaveMasteriesButton.ChampionSelect.Small.Y)) + oSaveMasteriesButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientSaveMasteriesButton.ChampionSelect.X)) + oSaveMasteriesButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientSaveMasteriesButton.ChampionSelect.Y)) - Case >= ClientSize.Medium.Width, < ClientSize.Large.Width + End If + If _Mode = Modes.ChampionSelect_Old Then - oSaveMasteriesButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientSaveMasteriesButton.ChampionSelect.Medium.X)) - oSaveMasteriesButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientSaveMasteriesButton.ChampionSelect.Medium.Y)) - Case >= ClientSize.Large.Width + oSaveMasteriesButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientSaveMasteriesButton.ChampionSelect_Old.X)) + oSaveMasteriesButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientSaveMasteriesButton.ChampionSelect_Old.Y)) - oSaveMasteriesButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientSaveMasteriesButton.ChampionSelect.Large.X)) - oSaveMasteriesButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientSaveMasteriesButton.ChampionSelect.Large.Y)) + End If - End Select - Else + If _Mode = Modes.Menu Then - oSaveMasteriesButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientSaveMasteriesButton.Menu.X)) - oSaveMasteriesButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientSaveMasteriesButton.Menu.Y)) + oSaveMasteriesButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientSaveMasteriesButton.Menu.X)) + oSaveMasteriesButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientSaveMasteriesButton.Menu.Y)) - End If + End If - Return oSaveMasteriesButtonOffsets + Return oSaveMasteriesButtonOffsets Catch ex As Exception @@ -397,32 +387,25 @@ Public Class MasteryAssigner Dim oLeagueClientWindowSize As Size = GetLeagueClientWindowSize() Dim oReturnPointsButtonOffsets As New Point - If _Mode = Modes.ChampionSelect Then - - Select Case oLeagueClientWindowSize.Width - - Case < ClientSize.Medium.Width - - oReturnPointsButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientReturnPointsButton.ChampionSelect.Small.X)) - oReturnPointsButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientReturnPointsButton.ChampionSelect.Small.Y)) - - Case >= ClientSize.Medium.Width, < ClientSize.Large.Width - - oReturnPointsButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientReturnPointsButton.ChampionSelect.Medium.X)) - oReturnPointsButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientReturnPointsButton.ChampionSelect.Medium.Y)) + If _Mode = Modes.ChampionSelect_Old Then - Case >= ClientSize.Large.Width - oReturnPointsButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientReturnPointsButton.ChampionSelect.Large.X)) - oReturnPointsButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientReturnPointsButton.ChampionSelect.Large.Y)) + oReturnPointsButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientReturnPointsButton.ChampionSelect_Old.X)) + oReturnPointsButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientReturnPointsButton.ChampionSelect_Old.Y)) - End Select + End If - Else + If _Mode = Modes.Menu Then oReturnPointsButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientReturnPointsButton.Menu.X)) oReturnPointsButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientReturnPointsButton.Menu.Y)) + End If + If _Mode = Modes.ChampionSelect Then + + oReturnPointsButtonOffsets.X = CInt(Math.Floor(oLeagueClientWindowSize.Width / ClientReturnPointsButton.ChampionSelect.X)) + oReturnPointsButtonOffsets.Y = CInt(Math.Floor(oLeagueClientWindowSize.Height / ClientReturnPointsButton.ChampionSelect.Y)) + End If Return oReturnPointsButtonOffsets diff --git a/LoLMasteryManager/MasteryManager.vb b/LoLMasteryManager/MasteryManager.vb index 78e7191..0f1d65a 100644 --- a/LoLMasteryManager/MasteryManager.vb +++ b/LoLMasteryManager/MasteryManager.vb @@ -4,6 +4,7 @@ Imports Newtonsoft.Json Public Enum Modes + ChampionSelect_Old ChampionSelect Menu @@ -101,7 +102,7 @@ Public Class MasteryManager While _LoadingWindow Is Nothing OrElse Not _LoadingWindow.IsHandleCreated - Thread.Sleep(100) + Thread.Sleep(150) End While diff --git a/LoLMasteryManager/Models/MasteryCoordinates.vb b/LoLMasteryManager/Models/MasteryCoordinates.vb index 5f25b20..8ace5a5 100644 --- a/LoLMasteryManager/Models/MasteryCoordinates.vb +++ b/LoLMasteryManager/Models/MasteryCoordinates.vb @@ -14,6 +14,9 @@ Partial Public Module Models Public MasteryCoordinatesChampionSelect As New Dictionary(Of String, Point) + + Public MasteryCoordinatesChampionSelect_Old As New Dictionary(Of String, Point) + End Class End Module diff --git a/LoLMasteryManager/My Project/Resources.Designer.vb b/LoLMasteryManager/My Project/Resources.Designer.vb index ac7f818..d9c908e 100644 --- a/LoLMasteryManager/My Project/Resources.Designer.vb +++ b/LoLMasteryManager/My Project/Resources.Designer.vb @@ -86,11 +86,19 @@ Namespace My.Resources Return ResourceManager.GetString("GitHubLatestReleaseUrl", resourceCulture) End Get End Property - + Private mdescription As String + Public Property LeagueClientWindowTitle() As String + Set(ByVal Value As String) + mdescription = Value + End Set + Get + LeagueClientWindowTitle = mdescription + End Get + End Property ''' ''' Looks up a localized string similar to PVP.net Client. ''' - Friend ReadOnly Property LeagueClientWindowTitle() As String + Friend ReadOnly Property LeagueClientWindowTitle1() As String Get Return ResourceManager.GetString("LeagueClientWindowTitle", resourceCulture) End Get diff --git a/LoLMasteryManager/My Project/Settings.Designer.vb b/LoLMasteryManager/My Project/Settings.Designer.vb index 0a56512..6b6219c 100644 --- a/LoLMasteryManager/My Project/Settings.Designer.vb +++ b/LoLMasteryManager/My Project/Settings.Designer.vb @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + #Region "My.Settings Auto-Save Functionality" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + _ Friend Module MySettingsProperty - - _ + + _ Friend ReadOnly Property Settings() As Global.LoLMasteryManager.My.MySettings Get Return Global.LoLMasteryManager.My.MySettings.Default