Correct status bar info + update version for release

DetroitApps · Dec 3, 2019 · dc4b191 · dc4b191
1 parent ad9135c
commit dc4b191
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/Scenarios/ConnectPlayersOnServer.ahk b/Scenarios/ConnectPlayersOnServer.ahk
@@ -55,9 +55,10 @@ Main:
 
         window.isConnected := True
 
-        API.GuiUpdateProgressBar(i, API.GetNbWindows())
+        API.GuiUpdateProgressBar(A_Index, API.GetNbWindows())
         i++
         SleepHandler(0)
     }
 
+    API.GuiUpdateProgressBar(100)
 return
diff --git a/Scenarios/OpenDofusInstances.ahk b/Scenarios/OpenDofusInstances.ahk
@@ -6,7 +6,6 @@ Main:
     API.GuiUpdateProgressBar(0, 3)
     API.GuiUpdateProgressText("Opening Dofus instances...")
 
-    ;API.ClearWindowList()
     nbAccounts := API.GetNbAccounts()
 
     i := 1
@@ -37,7 +36,7 @@ Main:
         this_window.WaitOpen()
         this_window.SetTitle()
 
-        API.AddWindowToListView(i)
+        API.AddWindowToListView(this_window.id)
         API.GuiUpdateProgressBar(A_Index, API.GetNbActiveAccounts())
 
         i++

diff --git a/Scenarios/Out/MergedScenarios.ahk b/Scenarios/Out/MergedScenarios.ahk
@@ -91,11 +91,12 @@ ConnectPlayersOnServer:
 
         window.isConnected := True
 
-        API.GuiUpdateProgressBar(i, API.GetNbWindows())
+        API.GuiUpdateProgressBar(A_Index, API.GetNbWindows())
         i++
         SleepHandler(0)
     }
 
+    API.GuiUpdateProgressBar(100)
 return
 
 ;Scenario merged from: Scenarios\CycleWindows.ahk
@@ -254,7 +255,6 @@ OpenDofusInstances:
     API.GuiUpdateProgressBar(0, 3)
     API.GuiUpdateProgressText("Opening Dofus instances...")
 
-    ;API.ClearWindowList()
     nbAccounts := API.GetNbAccounts()
 
     i := 1
@@ -285,7 +285,7 @@ OpenDofusInstances:
         this_window.WaitOpen()
         this_window.SetTitle()
 
-        API.AddWindowToListView(i)
+        API.AddWindowToListView(this_window.id)
         API.GuiUpdateProgressBar(A_Index, API.GetNbActiveAccounts())
 
         i++

diff --git a/Tools/Release Maker/Makefile b/Tools/Release Maker/Makefile
@@ -1,4 +1,3 @@
-Tools\Scenario Merger.ahk
 app.ahk
 resources
 settings_default.ini

diff --git a/Tools/Release Maker/build.ini b/Tools/Release Maker/build.ini
@@ -1,2 +1,2 @@
 [Build]
-Id=24
+Id=29
diff --git a/src/labels/labels.ahk b/src/labels/labels.ahk
@@ -63,7 +63,7 @@ LoadProfile:
             IniRead, serverSlot, %profileIniPath%, Accounts, ServerSlot%A_Index%
             IniRead, nickname, %profileIniPath%, Accounts, Nickname%A_Index%
             IniRead, characterClass, %profileIniPath%, Accounts, Class%A_Index%
-            IniRead, initiative, %profileIniPath%, Accounts, Initiative%A_Index%
+            IniRead, initiative, %profileIniPath%, Accounts, Initiative%A_Index%, 0
             IniRead, isActive, %profileIniPath%, Accounts, IsActive%A_Index%
             If (username = "ERROR" || password = "ERROR")
                 break

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.0.5-beta
+1.1
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
     [Build]
-    Id=24
+    Id=29