Skip to content

Commit

Permalink
Update XVM 8.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kipphan committed Oct 15, 2019
1 parent 3d79e11 commit aedffda
Show file tree
Hide file tree
Showing 106 changed files with 521 additions and 368 deletions.
4 changes: 4 additions & 0 deletions source/8.1.1_31
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
8.1.1
31
14cb4688e67948b6dea37008cce45f8d23b86585
master
3 changes: 0 additions & 3 deletions source/9372

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions source/res_mods/configs/xvm/default/@xvm.xc
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@

// Supported version of the game.
// Поддерживаемая версия игры.
"gameVersion": "1.6.0.7",
"gameVersion": "1.6.1.0",

// The minimum required version of the XVM mod.
// Минимально необходимая версия мода XVM.
"modMinVersion": "8.0.5",
"modMinVersion": "8.1.0",

// Config last modified.
// Дата последней модификации конфига.
"date": "17.09.2019"
"date": "08.10.2019"
},

// Parameters for login screen.
Expand Down
7 changes: 2 additions & 5 deletions source/res_mods/configs/xvm/default/battle.xc
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
// false - disable tank icon mirroring (good for alternative icons).
// false - отключить зеркалирования иконок танков (полезно для альтернативных иконок).
"mirroredVehicleIcons": true,
// false - disable pop-up panel at the bottom after death (includes a dog tag and description).
// false - отключить всплывающую внизу панель после смерти (включает в себя личный жетон и описание).
// false - disable pop-up panel at the bottom after death.
// false - отключить всплывающую внизу панель после смерти.
"showPostmortemTips": true,
// false - disable pop-up panel with a dog tag.
// false - отключить всплывающую внизу панель с личным жетоном.
"showPostmortemDogtag": true,
// false - disable highlighting of own vehicle icon and squad.
// false - отключить подсветку иконки своего танка и взвода.
"highlightVehicleIcon": true,
Expand Down
3 changes: 0 additions & 3 deletions source/res_mods/configs/xvm/default/hangar.xc
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
// false - отключить отображение счетчика проведенных боев на кнопке.
"showBattleCount": true
},
// false - disable display of the dog tag widget.
// false - отключить отображение виджета личного жетона.
"showDogtagWidget": true,
// true - enable locker for gold.
// true - включить замок для золота.
"enableGoldLocker": false,
Expand Down
10 changes: 6 additions & 4 deletions source/res_mods/configs/xvm/default/vehicleNames.xc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
{
"vehicleNames": {
// Last update: 17.09.2019
// Last update: 08.10.2019
"china-Ch01_Type59": {"name": null, "short": null},
"china-Ch01_Type59_Gold": {"name": null, "short": null},
"china-Ch02_Type62": {"name": null, "short": null},
Expand Down Expand Up @@ -154,7 +154,6 @@
"france-F89_Canon_dassaut_de_105": {"name": null, "short": null},
"france-F97_ELC_EVEN_90": {"name": null, "short": null},
"germany-Env_Artillery": {"name": null, "short": null},
"germany-G00_VK1602_race": {"name": null, "short": null},
"germany-G02_Hummel": {"name": null, "short": null},
"germany-G03_PzV_Panther": {"name": null, "short": null},
"germany-G03_PzV_Panther_IGR": {"name": null, "short": null},
Expand Down Expand Up @@ -218,6 +217,7 @@
"germany-G141_VK7501K": {"name": null, "short": null},
"germany-G142_M48RPz": {"name": null, "short": null},
"germany-G143_E75_TS": {"name": null, "short": null},
"germany-G144_Kpz_50t": {"name": null, "short": null},
"germany-G15_VK3601H": {"name": null, "short": null},
"germany-G16_PzVIB_Tiger_II": {"name": null, "short": null},
"germany-G16_PzVIB_Tiger_II_F": {"name": null, "short": null},
Expand Down Expand Up @@ -367,6 +367,7 @@
"poland-Pl13_53TP_Markowskiego": {"name": null, "short": null},
"poland-Pl14_4TP": {"name": null, "short": null},
"poland-Pl15_60TP_Lewandowskiego": {"name": null, "short": null},
"poland-Pl16_T34_85_Rudy": {"name": null, "short": null},
"sweden-S01_Strv_74_A2": {"name": null, "short": null},
"sweden-S02_Strv_M42": {"name": null, "short": null},
"sweden-S03_Strv_M38": {"name": null, "short": null},
Expand Down Expand Up @@ -487,7 +488,7 @@
"uk-GB96_Excalibur": {"name": null, "short": null},
"uk-GB97_Chimera": {"name": null, "short": null},
"uk-GB98_T95_FV4201_Chieftain": {"name": null, "short": null},
"usa-A00_M24_Chaffee_race": {"name": null, "short": null},
"uk-GB99_Turtle_Mk1": {"name": null, "short": null},
"usa-A01_T1_Cunningham": {"name": null, "short": null},
"usa-A01_T1_Cunningham_bot": {"name": null, "short": null},
"usa-A02_M2_lt": {"name": null, "short": null},
Expand Down Expand Up @@ -605,7 +606,6 @@
"usa-A97_M41_Bulldog": {"name": null, "short": null},
"usa-A99_T92_LT": {"name": null, "short": null},
"ussr-Observer": {"name": null, "short": null},
"ussr-R00_T-50_race": {"name": null, "short": null},
"ussr-R01_IS": {"name": null, "short": null},
"ussr-R02_SU-85": {"name": null, "short": null},
"ussr-R03_BT-7": {"name": null, "short": null},
Expand Down Expand Up @@ -687,6 +687,8 @@
"ussr-R15_S-51": {"name": null, "short": null},
"ussr-R160_T_50_2": {"name": null, "short": null},
"ussr-R161_T_116": {"name": null, "short": null},
"ussr-R165_Object_703_II": {"name": null, "short": null},
"ussr-R165_Object_703_II_2": {"name": null, "short": null},
"ussr-R16_SU-18": {"name": null, "short": null},
"ussr-R17_SU-100": {"name": null, "short": null},
"ussr-R18_SU-152": {"name": null, "short": null},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def BattleRibbonsPanel__onRibbonAdded(self, ribbon):
ribbonTypes[ribbonType] += 1
updateLabels.update()
elif ribbonType == 'spotted':
ribbonTypes[ribbonType] += ribbon.getCount()
ribbonTypes[ribbonType] += ribbon.getTargetsAmount()
updateLabels.update()
elif ribbonType in ['damage', 'ram', 'burn']:
numberDamagesDealt += 1
Expand Down
1 change: 1 addition & 0 deletions source/res_mods/configs/xvm/sirmax/sirmax-hangar.xc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"hangar": {
"enableGoldLocker": true,
"enableFreeXpLocker": true,
"enableCrystalLocker": true,
"hidePricesInTechTree": true,
"masteryMarkInTechTree": true,
"allowExchangeXPInTechTree": false,
Expand Down
6 changes: 3 additions & 3 deletions source/res_mods/configs/xvm/sirmax/sirmax.xc
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,9 @@
"vehicleMarkerEnemyAtlas": "../../../../res/atlases/vehicleMarkerAtlasEnemy"
},
"vehicleNames": {
"ussr-T-34": { "name": "т-34.", "short": "т-34" },
"usa-T34_hvy": { "name": "т34.", "short": "т34" },
"ussr-KV-1s": { "name": "квас", "short": "квс" }
"usa-A13_T34_hvy": { "name": "т34.", "short": "т34" },
"ussr-R04_T-34": { "name": "т-34.", "short": "т-34" },
"ussr-R13_KV-1s": { "name": "квас", "short": "квс" }
},
"texts": {
//"vtype": { "LT": "ЛТ" },
Expand Down
38 changes: 35 additions & 3 deletions source/res_mods/mods/shared_resources/xvm/doc/ChangeLog-en.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,36 @@
XVM-8.0.7:
XVM-8.1.1:
[GENERAL]
* World of Tanks 1.6.1.1

[XFW]
* Refactored XFW Loader. More info: https://gitlab.com/xvm/xvm/wikis
* Changes in `.wotmod` names:
* `com.modxvm.xfw.loader` was added
* `com.modxvm.xfw` was removed

[MACROS]
* added macros in hangar:
{{v.multiNation}} - 'multi' for vehicle on which it is possible to change the nation, empty for normal vehicle

[KNOWN ISSUES]
* XVM is not compatible with the 64-bit version of the client

XVM-8.1.0:
[GENERAL]
* World of Tanks 1.6.1.0

[BATTLE]
* removed option:
"battle"/"showPostmortemDogtag"

[HANGAR]
* removed option:
"hangar"/"showDogtagWidget"

[KNOWN ISSUES]
* XVM is not compatible with the 64-bit version of the client

XVM-8.0.7:
[GENERAL]
* Fix platoons for Grand Race

Expand Down Expand Up @@ -239,11 +271,11 @@ XVM-7.8.5:
"hangar"/"masteryMarkInTechTree" - show mastery mark in tech tree
Will be reprocessed in future releases.

XVM-7.8.4
XVM-7.8.4:
[GENERAL]
* World of Tanks 1.4.0.2

XVM-7.8.3
XVM-7.8.3:
[GENERAL]
* World of Tanks 1.4.0.1 micropatch 2019.03.06

Expand Down
34 changes: 33 additions & 1 deletion source/res_mods/mods/shared_resources/xvm/doc/ChangeLog-ru.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,36 @@
XVM-8.0.7:
XVM-8.1.1:
[ОБЩЕЕ]
* World of Tanks 1.6.1.1

[XFW]
* Переработан XFW Loader. Больше информации: https://gitlab.com/xvm/xvm/wikis
* Изменения в именах .wotmod:
* добавлен `com.modxvm.xfw.loader`
* удалён `com.modxvm.xfw`

[МАКРОСЫ]
* добавлен макрос в ангаре:
{{v.multiNation}} - 'multi' для техники на которой возможно сменить нацию, пусто - для обычной

[ИЗВЕСТНЫЕ ПРОБЛЕМЫ]
* XVM не совместим с 64 разрядной версией клиента

XVM-8.1.0:
[ОБЩЕЕ]
* World of Tanks 1.6.1.0

[БОЙ]
* удалена опция:
"battle"/"showPostmortemDogtag"

[АНГАР]
* удалена опция:
"hangar"/"showDogtagWidget"

[ИЗВЕСТНЫЕ ПРОБЛЕМЫ]
* XVM не совместим с 64 разрядной версией клиента

XVM-8.0.7:
[Общее]
* Исправлена работа взводов для режима гонок

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Legend:
│ {{v.special}} │ X │ X │ value 'special' for award and event (excluding premium vehicles with increased income on credits) vehicle, empty for normal vehicle
│ {{v.elite}} │ X │ │ value 'elite' for elite, empty for normal vehicle
│ {{v.rent}} │ X │ X │ value 'rent' for rented, empty for normal vehicle
│ {{v.multiNation}} │ X │ X │ value 'multi' for vehicle on which it is possible to change the nation, empty for normal vehicle
│ {{v.maxHP}} │ X │ X │ maximum vehicle health points
│ {{v.hitsRatio}} │ X │ X │ percent of hits
│ {{v.c_hitsRatio}} │ X │ X │ dynamic color for this macro
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
│ {{v.special}} │ X │ X │ возвращает 'special' для наградной и акционной (без учета премиум техники с повышенной доходностью по кредитам) техники, пусто - для обычной
│ {{v.elite}} │ X │ │ возвращает 'elite' для элитной техники, пусто - для обычной
│ {{v.rent}} │ X │ X │ возвращает 'rent' для арендной техники, пусто - для обычной
│ {{v.multiNation}} │ X │ X │ возвращает 'multi' для техники на которой возможно сменить нацию, пусто - для обычной
│ {{v.maxHP}} │ X │ X │ макс. запас прочности техники
│ {{v.hitsRatio}} │ X │ X │ процент попаданий
│ {{v.c_hitsRatio}} │ X │ X │ динамический цвет для этого макроса
Expand Down
13 changes: 6 additions & 7 deletions source/res_mods/mods/shared_resources/xvm/doc/py_macros_ru.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
│ │ │ │ иначе нормализует значение относительно общего суммарного HP противников
│ │ ---//--- │ {{py:xvm.totalDamagesSquad(norm)}} │ если norm не задан, то возвращает общий нанесенный урон взводом, иначе нормализует значение относи-
│ │ │ │ тельно общего суммарного HP противников
│ │ ---//--- │ {{py:xvm.detection}} │ количество обнаруженных противников (см. сноску 1)
│ │ ---//--- │ {{py:xvm.frags}} │ количество фрагов (см. сноску 1)
│ │ ---//--- │ {{py:xvm.assistTrack}} │ урон нанесенный технике, обездвиженной игроком (сбитая гусеница) (см. сноску 1)
│ │ ---//--- │ {{py:xvm.assistSpot}} │ урон нанесенный по засвету игрока (см. сноску 1)
│ │ ---//--- │ {{py:xvm.crits}} │ количество нанесенных критических попаданий (см. сноску 1)
│ │ ---//--- │ {{py:xvm.detection}} │ количество обнаруженных противников
│ │ ---//--- │ {{py:xvm.frags}} │ количество фрагов
│ │ ---//--- │ {{py:xvm.assistTrack}} │ урон нанесенный технике, обездвиженной игроком (сбитая гусеница)
│ │ ---//--- │ {{py:xvm.assistSpot}} │ урон нанесенный по засвету игрока
│ │ ---//--- │ {{py:xvm.crits}} │ количество нанесенных критических попаданий
│ │ ---//--- │ {{py:xvm.numberHitsBlocked}} │ количество заблокированных попаданий
│ │ ---//--- │ {{py:xvm.numberHitsDealt}} │ количество выстрелов с уроном
│ │ ---//--- │ {{py:xvm.dmg}} │ последний нанесенный урон
Expand All @@ -94,7 +94,7 @@
│ │ ---//--- │ {{py:xvm.dmgAlly}} │ возвращает 'dmgAlly', если был нанесен хотя бы один раз урон союзнику, иначе - пусто
│ │ ---//--- │ {{py:xvm.numberAssistSpot}} │ количество попаданий по технике по вашему засвету
│ │ ---//--- │ {{py:xvm.numberAssistTrack}} │ количество попаданий по технике со сбитой вами гусеницой
│ │ ---//--- │ {{py:xvm.numberAssistStun}} │ количество попаданий по оглушенной вами технике
│ │ ---//--- │ {{py:xvm.numberAssistStun}} │ количество попаданий по оглушенной вами технике
│ │ ---//--- │ {{py:xvm.numberAssistAndStuns}} │ сумма {{py:xvm.numberAssistSpot}}, {{py:xvm.numberAssistTrack}} и {{py:xvm.numberStuns}}
│ │ ---//--- │ {{py:xvm.totalAssistAndStuns}} │ сумма {{py:xvm.totalAssist}} и {{py:xvm.totalStun}}
│ │ ---//--- │ {{py:xvm.dmgKindColor}} │ цвет по виду последнего нанесенного урона (задается в colors.xc/"dmg_kind")
Expand Down Expand Up @@ -165,4 +165,3 @@
├─────────────────────────────┼───────────────────────────────┼────────────────────────────────────────────┼───────────────────────────────────────────────────────────────────────────────────────────────────
│ xvm.py (xvm2sup.py) │ │ {{py:xvm.xvm2sup(x)}} │ переводит число x из шкалы XVM в процент превосходства (SUP%)
└─────────────────────────────┴───────────────────────────────┴────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────────────────────────────────
1 - Для работы макросов {{py:xvm.detection}}, {{py:xvm.frags}}, {{py:xvm.assistTrack}}, {{py:xvm.assistSpot}}, {{py:xvm.crits}} в игре должны быть включены "События в бою".
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file was created automatically from build script
__xvm_version__ = '8.0.7'
__wot_version__ = '1.6.0.8'
__revision__ = '9372'
__branch__ = 'wot-1.6.0'
__node__ = '6d155a1849c150fe70384361841ce7b4fa6baf3f'
__xvm_version__ = '8.1.1'
__wot_version__ = '1.6.1.1'
__revision__ = '31'
__branch__ = 'master'
__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
__development__ = 'True'
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "XVM Autologin",
"description": "XVM Autologin module",

"version": "8.0.7.9372",
"version": "8.1.1.31",
"dependencies": ["com.modxvm.xvm"],

"url": "https://modxvm.com/",
"url_update": "https://modxvm.com/",

"wot_version_min": "1.6.0.8",
"wot_version_min": "1.6.1.1",
"wot_version_exactmatch": false,

"features": ["python"]
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file was created automatically from build script
__xvm_version__ = '8.0.7'
__wot_version__ = '1.6.0.8'
__revision__ = '9372'
__branch__ = 'wot-1.6.0'
__node__ = '6d155a1849c150fe70384361841ce7b4fa6baf3f'
__xvm_version__ = '8.1.1'
__wot_version__ = '1.6.1.1'
__revision__ = '31'
__branch__ = 'master'
__node__ = '14cb4688e67948b6dea37008cce45f8d23b86585'
__development__ = 'True'
7 changes: 0 additions & 7 deletions source/res_mods/mods/xfw_packages/xvm_battle/python/battle.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,6 @@ def canDisplayHelpHint(base, self, typeDescriptor):
return False
base(self, typeDescriptor)

@overrideMethod(SharedPage, '_definePostmortemPanel')
def _definePostmortemPanel(base, self):
if not config.get('battle/showPostmortemDogtag'):
self.as_useEventPostmortemPanelS(False)
return
base(self)


#####################################################################
# Battle
Expand Down
Loading

0 comments on commit aedffda

Please sign in to comment.