Update XVM 8.1.2 - custom

kipphan · Oct 22, 2019 · 03410f4 · 03410f4
1 parent 6107188
commit 03410f4
Show file tree

Hide file tree

Showing 72 changed files with 162 additions and 160 deletions.
diff --git a/source/8.1.1_31 b/source/8.1.1_31
diff --git a/source/8.1.2_23 b/source/8.1.2_23
@@ -0,0 +1,4 @@
+8.1.2
+23
+bdfd9605c8051c3592016e3e60ff96e7e51bd9c6
+master
diff --git a/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.1.31.wotmod b/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.1.31.wotmod
diff --git a/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.2.23.wotmod b/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.2.23.wotmod
diff --git a/...om.modxvm.xfw.crashreport_8.1.1.31.wotmod → ...om.modxvm.xfw.crashreport_8.1.2.23.wotmod b/...om.modxvm.xfw.crashreport_8.1.1.31.wotmod → ...om.modxvm.xfw.crashreport_8.1.2.23.wotmod
diff --git a/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.filewatcher_8.1.2.23.wotmod b/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.filewatcher_8.1.2.23.wotmod
diff --git a/....xfw/com.modxvm.xfw.fonts_8.1.1.31.wotmod → ....xfw/com.modxvm.xfw.fonts_8.1.2.23.wotmod b/....xfw/com.modxvm.xfw.fonts_8.1.1.31.wotmod → ....xfw/com.modxvm.xfw.fonts_8.1.2.23.wotmod
diff --git a/.../com.modxvm.xfw.libraries_8.1.1.31.wotmod → .../com.modxvm.xfw.libraries_8.1.2.23.wotmod b/.../com.modxvm.xfw.libraries_8.1.1.31.wotmod → .../com.modxvm.xfw.libraries_8.1.2.23.wotmod
diff --git a/...xfw/com.modxvm.xfw.loader_8.1.1.31.wotmod → ...xfw/com.modxvm.xfw.loader_8.1.2.23.wotmod b/...xfw/com.modxvm.xfw.loader_8.1.1.31.wotmod → ...xfw/com.modxvm.xfw.loader_8.1.2.23.wotmod
diff --git a/....xfw/com.modxvm.xfw.mutex_8.1.1.31.wotmod → ....xfw/com.modxvm.xfw.mutex_8.1.2.23.wotmod b/....xfw/com.modxvm.xfw.mutex_8.1.1.31.wotmod → ....xfw/com.modxvm.xfw.mutex_8.1.2.23.wotmod
diff --git a/...vm.xfw/com.modxvm.xfw.native_1.4.9.wotmod → ...vm.xfw/com.modxvm.xfw.native_1.5.2.wotmod b/...vm.xfw/com.modxvm.xfw.native_1.4.9.wotmod → ...vm.xfw/com.modxvm.xfw.native_1.5.2.wotmod
diff --git a/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.ping_8.1.1.31.wotmod b/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.ping_8.1.1.31.wotmod
diff --git a/...om.modxvm.xfw.filewatcher_8.1.1.31.wotmod → ...m.xfw/com.modxvm.xfw.ping_8.1.2.23.wotmod b/...om.modxvm.xfw.filewatcher_8.1.1.31.wotmod → ...m.xfw/com.modxvm.xfw.ping_8.1.2.23.wotmod
diff --git a/...modxvm.xfw.wotfix.crashes_8.1.1.31.wotmod → ...modxvm.xfw.wotfix.crashes_8.1.2.23.wotmod b/...modxvm.xfw.wotfix.crashes_8.1.1.31.wotmod → ...modxvm.xfw.wotfix.crashes_8.1.2.23.wotmod
diff --git a/...m.modxvm.xfw.wotfix.hidpi_8.1.1.31.wotmod → ...m.modxvm.xfw.wotfix.hidpi_8.1.2.23.wotmod b/...m.modxvm.xfw.wotfix.hidpi_8.1.1.31.wotmod → ...m.modxvm.xfw.wotfix.hidpi_8.1.2.23.wotmod
diff --git a/....xfw/com.modxvm.xfw.wwise_8.1.1.31.wotmod → ....xfw/com.modxvm.xfw.wwise_8.1.2.23.wotmod b/....xfw/com.modxvm.xfw.wwise_8.1.1.31.wotmod → ....xfw/com.modxvm.xfw.wwise_8.1.2.23.wotmod
diff --git a/source/res_mods/configs/xvm/default/@xvm.xc b/source/res_mods/configs/xvm/default/@xvm.xc
@@ -58,15 +58,15 @@
 
     // Supported version of the game.
     // Поддерживаемая версия игры.
-    "gameVersion": "1.6.1.0",
+    "gameVersion": "1.6.1.1",
 
     // The minimum required version of the XVM mod.
     // Минимально необходимая версия мода XVM.
-    "modMinVersion": "8.1.0",
+    "modMinVersion": "8.1.2",
 
     // Config last modified.
     // Дата последней модификации конфига.
-    "date": "08.10.2019"
+    "date": "14.10.2019"
   },
 
   // Parameters for login screen.

diff --git a/source/res_mods/configs/xvm/default/alpha.xc b/source/res_mods/configs/xvm/default/alpha.xc
@@ -74,12 +74,12 @@
     // Если вы хотите использовать свои собственные границы прозрачности вместо стандартных,
     // раскомментируйте блок и замените "rating_name" на одно из следующих значений: "eff", "wn8", "wtr", "wgr".
     // "rating_name": [
-    //  { "value": 500,   "alpha": ${"def.colorRating.very_bad" } }, //    0 - 500   - very bad
-    //  { "value": 1000,  "alpha": ${"def.colorRating.bad"      } }, //  501 - 1000  - bad
-    //  { "value": 2000,  "alpha": ${"def.colorRating.normal"   } }, // 1001 - 2000  - normal
-    //  { "value": 3000,  "alpha": ${"def.colorRating.good"     } }, // 2001 - 3000  - good
-    //  { "value": 5000,  "alpha": ${"def.colorRating.very_good"} }, // 3001 - 5000  - very good
-    //  { "value": 99999, "alpha": ${"def.colorRating.unique"   } }  // 5001 - 99999 - unique
+    //  { "value": 500,   "alpha": ${"def.alphaRating.very_bad" } }, //    0 - 500   - very bad
+    //  { "value": 1000,  "alpha": ${"def.alphaRating.bad"      } }, //  501 - 1000  - bad
+    //  { "value": 2000,  "alpha": ${"def.alphaRating.normal"   } }, // 1001 - 2000  - normal
+    //  { "value": 3000,  "alpha": ${"def.alphaRating.good"     } }, // 2001 - 3000  - good
+    //  { "value": 5000,  "alpha": ${"def.alphaRating.very_good"} }, // 3001 - 5000  - very good
+    //  { "value": 99999, "alpha": ${"def.alphaRating.unique"   } }  // 5001 - 99999 - unique
     // ],
     // Dynamic transparency by win percent.
     // Динамическая прозрачность по проценту побед.

diff --git a/source/res_mods/mods/xfw_packages/xvm_autologin/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_autologin/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_autologin/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_autologin/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Autologin",
     "description": "XVM Autologin module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/as_battle/xvm_vehiclemarkers_ui.swf b/source/res_mods/mods/xfw_packages/xvm_battle/as_battle/xvm_vehiclemarkers_ui.swf
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_classic/xvm_battle_classic.swf b/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_classic/xvm_battle_classic.swf
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_epicbattle/xvm_battle_epicbattle.swf b/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_epicbattle/xvm_battle_epicbattle.swf
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_epicrandom/xvm_battle_epicrandom.swf b/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_epicrandom/xvm_battle_epicrandom.swf
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_ranked/xvm_battle_ranked.swf b/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_ranked/xvm_battle_ranked.swf
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_battle/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/python/minimap.py b/source/res_mods/mods/xfw_packages/xvm_battle/python/minimap.py
@@ -122,15 +122,17 @@ def _ArenaVehiclesPlugin__switchToVehicle(base, self, prevCtrlID):
                 if g_minimap.viewPointID:
                     self._invoke(g_minimap.viewPointID, 'xvm_setVehicleID', self._ctrlVehicleID)
 
-@registerEvent(PersonalEntriesPlugin, '_PersonalEntriesPlugin__updateViewPointEntry')
-def _PersonalEntriesPlugin__updateViewPointEntry(self, vehicleID=0):
-   g_minimap.viewPointID = self._getViewPointID()
+@overrideMethod(PersonalEntriesPlugin, '_PersonalEntriesPlugin__updateViewPointEntry')
+def _PersonalEntriesPlugin__updateViewPointEntry(base, self, vehicleID=0):
+    base(self, vehicleID)
+    g_minimap.viewPointID = self._getViewPointID()
 
 
 # Minimap dead switch
 
-@registerEvent(PostMortemControlMode, 'onMinimapClicked')
-def _PostMortemControlMode_onMinimapClicked(self, worldPos):
+@overrideMethod(PostMortemControlMode, 'onMinimapClicked')
+def _PostMortemControlMode_onMinimapClicked(base, self, worldPos):
+    base(self, worldPos)
     #log('_PostMortemControlMode_onMinimapClicked active=' + str(g_minimap.active))
     if g_minimap.active and g_minimap.opt_minimapDeadSwitch:
         try:

diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_battle/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Battle",
     "description": "XVM Battle module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_battleresults/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_battleresults/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_battleresults/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_battleresults/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Battle Results",
     "description": "XVM Battle Results module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_contacts/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_contacts/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_contacts/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_contacts/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Contacts",
     "description": "XVM Contacts",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_crew/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_crew/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_crew/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_crew/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Crew",
     "description": "XVM Crew Module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_equip/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_equip/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_equip/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_equip/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Equip",
     "description": "XVM Equip Module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_export/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_export/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_export/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_export/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Export",
     "description": "XVM Export Module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_hangar/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_hangar/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_hangar/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_hangar/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Hangar",
     "description": "XVM Hangar Module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_hotfix/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_hotfix/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_hotfix/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_hotfix/xfw_package.json
@@ -3,7 +3,7 @@
     "name": "XVM Hotfix",
     "description": "XVM Hotfix Module",
 
-    "version": "8.1.1.31",
+    "version": "8.1.2.23",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",

diff --git a/source/res_mods/mods/xfw_packages/xvm_integrity/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_integrity/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.1'
+__xvm_version__ = '8.1.2'
 __wot_version__ = '1.6.1.1'
-__revision__ = '31'
+__revision__ = '23'
 __branch__ = 'master'
-__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
-__development__ = 'True'
+__node__ = 'bdfd9605c8051c3592016e3e60ff96e7e51bd9c6'
+__development__ = 'False'