Skip to content

Commit 23fe7cc

Browse files
committed
add 14.4.0 files
1 parent bae63de commit 23fe7cc

File tree

185 files changed

+11151
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+11151
-14
lines changed

generated/abilities.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

generated/achievements.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

generated/buildings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"4288117680": "RayTower", "4289166256": "RayTower", "4292311984": "RayTower", "4293360560": "RayTower", "4286020528": "RayTower", "4288641968": "AirBase", "4290739120": "AirBase", "4289690544": "AirBase", "4291787696": "AirBase", "4293884848": "AirBase", "4292836272": "AirBase", "4277435312": "Complex", "4292803504": "CoastalArtillery", "4269046704": "Complex", "4279532464": "Complex", "4290214832": "RayTower", "4291263408": "RayTower", "4282350512": "AirBase", "4270095280": "Complex", "4288281520": "Military", "4285135792": "Military", "4281990064": "Military", "4287593392": "AirBase", "4268358576": "Military", "4080303024": "Complex", "4082400176": "Complex", "4081351600": "Complex", "4286544816": "AirBase", "4271831984": "CoastalArtillery", "4292869040": "AntiAircraft", "4293917616": "AntiAircraft", "4190993328": "Fake", "4267539376": "Fake", "4290018224": "Complex", "4287921072": "Complex", "4286872496": "Complex", "4293163952": "Complex", "4291066800": "Complex", "4285823920": "Complex", "4284775344": "Complex", "4274650032": "Military", "4269407152": "Military", "4272192432": "Complex", "4293491632": "SpaceStation", "4267998128": "Complex", "4283923376": "RayTower", "4284447664": "AirBase", "4288969648": "Complex", "4292705200": "Fake", "4287069104": "RayTower", "4273601456": "Military", "4283399088": "AirBase", "4284971952": "RayTower", "4284087216": "Military", "4283038640": "Military", "4278844336": "Military", "4276747184": "Military", "4287560624": "CoastalArtillery", "4270455728": "Military", "4271143856": "Complex", "4280941488": "Military", "4277795760": "Military", "4271504304": "Military", "4276386736": "Complex", "4278483888": "Complex", "4280581040": "Complex", "4281629616": "Complex", "4282678192": "Complex", "4283726768": "Complex", "4274289584": "Complex", "4275338160": "Complex", "4273241008": "Complex", "4270783408": "CoastalArtillery", "4289330096": "Military", "4286184368": "Military", "4272552880": "Military", "4062837680": "Military", "4275698608": "Military", "4287232944": "Military", "4293327792": "SensorTower", "4291230640": "SensorTower", "4292279216": "SensorTower", "4290182064": "SensorTower", "4285496240": "AirBase", "4288609200": "CoastalArtillery", "3247274928": "Fake", "4293852080": "CoastalArtillery", "4289657776": "CoastalArtillery", "4293721008": "Generator", "4279892912": "Military"}
1+
{"4288117680": "RayTower", "4289166256": "RayTower", "4292311984": "RayTower", "4293360560": "RayTower", "4286020528": "RayTower", "4288641968": "AirBase", "4290739120": "AirBase", "4289690544": "AirBase", "4291787696": "AirBase", "4293884848": "AirBase", "4292836272": "AirBase", "4277435312": "Complex", "4292803504": "CoastalArtillery", "4269046704": "Complex", "4279532464": "Complex", "4290214832": "RayTower", "4291263408": "RayTower", "4282350512": "AirBase", "4270095280": "Complex", "4288281520": "Military", "4285135792": "Military", "4281990064": "Military", "4287593392": "AirBase", "4268358576": "Military", "4080303024": "Complex", "4082400176": "Complex", "4081351600": "Complex", "4286544816": "AirBase", "4271831984": "CoastalArtillery", "4292869040": "AntiAircraft", "4293917616": "AntiAircraft", "4190993328": "Fake", "4267539376": "Fake", "4290018224": "Complex", "4287921072": "Complex", "4286872496": "Complex", "4293163952": "Complex", "4291066800": "Complex", "4285823920": "Complex", "4284775344": "Complex", "4274650032": "Military", "4269407152": "Military", "4272192432": "Complex", "4293491632": "SpaceStation", "4283923376": "RayTower", "4284447664": "AirBase", "4288969648": "Complex", "4292705200": "Fake", "4287069104": "RayTower", "4273601456": "Military", "4283399088": "AirBase", "4284971952": "RayTower", "4284087216": "Military", "4283038640": "Military", "4278844336": "Military", "4276747184": "Military", "4287560624": "CoastalArtillery", "4270455728": "Military", "4271143856": "Complex", "4280941488": "Military", "4277795760": "Military", "4276386736": "Complex", "4278483888": "Complex", "4280581040": "Complex", "4281629616": "Complex", "4282678192": "Complex", "4283726768": "Complex", "4274289584": "Complex", "4275338160": "Complex", "4273241008": "Complex", "4270783408": "CoastalArtillery", "4289330096": "Military", "4286184368": "Military", "4272552880": "Military", "4062837680": "Military", "4275698608": "Military", "4287232944": "Military", "4293327792": "SensorTower", "4291230640": "SensorTower", "4292279216": "SensorTower", "4290182064": "SensorTower", "4285496240": "AirBase", "4288609200": "CoastalArtillery", "3247274928": "Fake", "4293852080": "CoastalArtillery", "4289657776": "CoastalArtillery", "4293721008": "Generator", "4271504304": "Military", "4279892912": "Military", "4267998128": "Complex"}

generated/exteriors.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

generated/planes.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

generated/projectiles.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

generated/ships.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

generated/units.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

renderer_data/generators/abilities.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import functools
12
import json
23
import os
34

@@ -6,9 +7,9 @@
67

78
REQUIRED = {
89
"workTime",
9-
"regenerationHPSpeed",
10-
"distShip",
11-
"artilleryDistCoeff",
10+
"logic.regenerationHPSpeed",
11+
"logic.distShip",
12+
"logic.artilleryDistCoeff",
1213
}
1314
# ConsumablesConstants.ConsumableIDsMap
1415
ability_type_to_id = {'tacticalTrigger2': 46, 'callFighters': 21, 'smokePlane': 52, 'goDeep': 33,
@@ -26,6 +27,13 @@
2627
'subsWaveGunBoost': 24, 'tacticalTrigger6': 50, 'depthCharges': 26}
2728

2829

30+
# https://gist.github.com/wonderbeyond/d293e7a2af1de4873f2d757edd580288
31+
def rgetattr(obj, attr, *args):
32+
def _getattr(obj, attr):
33+
return getattr(obj, attr, *args)
34+
return functools.reduce(_getattr, [obj] + attr.split('.'))
35+
36+
2937
def create_abilities_data():
3038
LOGGER.info("Creating abilities data...")
3139
list_ships = get_data("Ship")
@@ -71,9 +79,12 @@ def create_abilities_data():
7179
id_to_index[ability_type_to_id[sa.consumableType]] = name
7280
params_id_to_subtype[ability["id"]] = sub_name
7381
params_id_to_index[ability["id"]] = ability["index"]
74-
at[f"{name}.{sub_name}"] = {
75-
k: v for k, v in sa.__dict__.items() if k in REQUIRED
76-
}
82+
at[f"{name}.{sub_name}"] = {}
83+
for key in REQUIRED:
84+
try:
85+
at.setdefault(f"{name}.{sub_name}", {})[key[key.rfind(".") + 1:]] = rgetattr(sa, key)
86+
except AttributeError:
87+
pass
7788

7889
_abils["clan"] = clan_battles
7990

replays/144.wowsreplay

3.41 MB
Binary file not shown.

0 commit comments

Comments
 (0)