Merge pull request #53 from cohstats/166

Patch 166
cohstats · May 3, 2024 · f80bf3b · f80bf3b
2 parents d8eacd2 + 322e4bf
commit f80bf3b
Show file tree

Hide file tree

Showing 6 changed files with 19,461 additions and 19,483 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/data/abilities.json b/data/abilities.json
@@ -523027,7 +523027,7 @@
                         "recharge_time": 45.0,
                         "refundable": "True",
                         "require_no_shot_block": "False",
-                        "shared_timer": "shared_ability_1",
+                        "shared_timer": "",
                         "shared_timer_player_wide": "False",
                         "squad_caster": "one_entity",
                         "target": "tp_position",
@@ -523307,7 +523307,8 @@
                         "statetree_node_prereq_entity_target_filter": "",
                         "statetree_node_prereq_entity_target_default_command_filter": "",
                         "can_restart_on_same_target_while_active": "True",
-                        "show_movement_node_pathing_preview": "True"
+                        "show_movement_node_pathing_preview": "True",
+                        "active_range_bonus": 0.0
                     },
                     "pbgid": 2059902.0,
                     "parent_pbg": {

diff --git a/data/locstring.json b/data/locstring.json
@@ -7932,8 +7932,8 @@
     "11246976": "Dark Brown Sto\u00dftruppen",
     "11246977": "Dark Brown Flak 30 Team",
     "11246978": "Dark Brown Machine Gun Team",
-    "11246979": "Charcoal Kettenkrad",
-    "11246980": "Charcoal Wirbelwind",
+    "11246979": "Dark Brown Kettenkrad",
+    "11246980": "Dark Brown Wirbelwind",
     "11246981": "Winter Tundra Grenadier",
     "11246982": "Winter Tundra J\u00e4ger",
     "11246983": "Winter Tundra Panzergrenadier",
@@ -8118,7 +8118,7 @@
     "11248576": "German Mechanized Company",
     "11248579": "German Panzer Company",
     "11248609": "Update your look with a dark brown version of the default outfit.",
-    "11248610": "Update your look with a Charcoal version of the default skin.",
+    "11248610": "Update your look with a dark brown version of the default skin.",
     "11248649": "[Dev Kill Infantry]",
     "11248650": "[Dev Kill Vehicle]",
     "11248651": "[Dev Produce Infantry]",
@@ -8943,9 +8943,9 @@
     "11253793": "Basalt Grey Walking Stuka",
     "11253794": "Basalt Grey StuG III D",
     "11253803": "Dark Brown Nebelwerfer",
-    "11253804": "Charcoal Scout Car",
-    "11253805": "Charcoal Brummb\u00e4r",
-    "11253808": "Charcoal StuG III",
+    "11253804": "Dark Brown 221 Scout Car",
+    "11253805": "Dark Brown Brummb\u00e4r",
+    "11253808": "Dark Brown StuG III",
     "11253854": "Update your look with a mud brown version of the default outfit.",
     "11253855": "Update your look with a mud brown version of the default skin.",
     "11253856": "Mud Brown Foot Guards",

diff --git a/data/weapon.json b/data/weapon.json
@@ -383681,8 +383681,7 @@
                             "on_penetrated_state_trees": [],
                             "on_deflected_state_trees": [],
                             "post_damage_state_trees": [],
-                            "damage_target_requirement": "",
-                            "enable_damage_modifiers": "True"
+                            "damage_target_requirement": ""
                         },
                         "deflection": {
                             "deflection_damage_multiplier": 0.5,
@@ -383697,7 +383696,7 @@
                         "fx_always_visible": "True",
                         "fx_building_hit_delay": 0.0,
                         "fx_delay_in_building": 0.0,
-                        "fx_munition_name": "\\artillery\\artillery_medium_armour_piercing",
+                        "fx_munition_name": "\\artillery\\artillery_small",
                         "fx_tracer_name": "",
                         "fx_tracer_speed": 0.0,
                         "fx_use_building_panel_normal": "True",

diff --git a/scripts/xml-to-json/main.py b/scripts/xml-to-json/main.py
@@ -86,16 +86,19 @@ def main():
         ('weekly_challenges_store_release', 'challenges\\challenge\\')
     ]
 
+    futures = []
+
     # Create a ThreadPoolExecutor
     with concurrent.futures.ProcessPoolExecutor() as executor:
         # Use list comprehension to start the tasks and collect the Future objects
         futures = [executor.submit(export_by_type, type, prefix, script_root_dir, xml_data_dir, CONST_EXPORT_DIR) for
                    type, prefix in types_and_prefixes]
 
-        # Wait for all tasks to complete
-        for future in concurrent.futures.as_completed(futures):
-            print(f"Task completed: {future.result()}")
 
+    # Wait for all tasks to complete
+    for future in concurrent.futures.as_completed(futures):
+        print(f"Task completed: {future.result()}")
+
     print('Parsing done. View this folder for results: \n"' + get_path_as_string(
         script_root_dir) + f'\{CONST_EXPORT_DIR}"')
     print(f"Execution time: {round(time.time() - start_time, 1)} seconds")