Prepare for release 1.1

aspadm · Jan 6, 2019 · 94684d9 · 94684d9
1 parent 4368a94
commit 94684d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/Converters/GUI.py b/Converters/GUI.py
@@ -86,7 +86,7 @@ def setupUi(self, Form):
 
     def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "EIrepack v1.0"))
+        Form.setWindowTitle(_translate("Form", "EIrepack v1.1"))
         self.label.setText(_translate("Form", "Папка с игрой (содержит game.exe):"))
         self.src_folder_choser.setText(_translate("Form", "Обзор..."))
         self.in_place.setText(_translate("Form", "Распаковка \"На месте\" (использовать с осторожностью!)"))

diff --git a/Converters/GUI.ui b/Converters/GUI.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>EIrepack v1.0</string>
+   <string>EIrepack v1.1</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">

diff --git a/Converters/unpack.py b/Converters/unpack.py
@@ -15,7 +15,7 @@
 import time
 
 funcs = []
-not_copy = ["asi", "dll", "exe", "sav"]
+not_copy = ["asi", "dll", "exe", "sav", "mp", "bmp"]
 simple_copy = ["mp3", "rtf", "dat", "grp", "bik", "ini", "txt", "wav",
                "mat", "scr"]
 archives = ["mq", "mpr", "res", "bon", "mod", "anm"]
@@ -513,31 +513,32 @@ def add_progress(self, value=1):
             self.progress_call.emit(self.progress)
 
 def start_unpack():
-    max_progress = 50033
+    max_progress = 53983
     w.start.setEnabled(False)
     argarr = [w.src_folder.text()]
 
     if not w.in_place.isChecked():
         argarr.append(w.dst_folder.text())
         if not w.need_copy.isChecked():
             argarr.append("--skip_copy")
-            max_progress -= 287
+            max_progress -= 276
     else:
         argarr.append(w.src_folder.text())
         argarr.append("--skip_copy")
-        max_progress -= 287
+        max_progress -= 276
 
     if not w.need_extracting.isChecked():
         argarr.append("--skip_extract")
-        max_progress -= 2009
+        max_progress -= 2036
     if not w.need_converting.isChecked():
         argarr.append("--skip_convert")
-        max_progress -= 47737
+        max_progress -= 51671
     if w.need_verbose.isChecked():
         argarr.append("--verbose")
     if w.need_text_merging.isChecked():
         argarr.append("--text_joint")
-        max_progress += 3561
+    else:
+        max_progress -= 3561
 
     w.progress.setMaximum(max_progress)
     unpack_thread.args = parser.parse_args(argarr)
@@ -568,7 +569,7 @@ def complete():
                                 "Все операции выполнены!")
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="EIrepack v1.0 \
+    parser = argparse.ArgumentParser(description="EIrepack v1.1 \
 (Evil Islands resources unpacker and converter)",
                                      add_help=True)
     parser.add_argument("src_dir", type=str,