diff --git a/Extended Tech Tree/Data/Configs/TechTree/france_tree.yaml.dvpl b/Extended Tech Tree/Data/Configs/TechTree/france_tree.yaml.dvpl index c269e0e..217dc68 100644 Binary files a/Extended Tech Tree/Data/Configs/TechTree/france_tree.yaml.dvpl and b/Extended Tech Tree/Data/Configs/TechTree/france_tree.yaml.dvpl differ diff --git a/Extended Tech Tree/Data/Configs/TechTree/modules_shared.yaml.dvpl b/Extended Tech Tree/Data/Configs/TechTree/modules_shared.yaml.dvpl deleted file mode 100644 index fa02c37..0000000 Binary files a/Extended Tech Tree/Data/Configs/TechTree/modules_shared.yaml.dvpl and /dev/null differ diff --git a/Extended Tech Tree/Data/Configs/TechTree/other_tree.yaml.dvpl b/Extended Tech Tree/Data/Configs/TechTree/other_tree.yaml.dvpl deleted file mode 100644 index 8aed769..0000000 Binary files a/Extended Tech Tree/Data/Configs/TechTree/other_tree.yaml.dvpl and /dev/null differ diff --git a/Extended Tech Tree/Data/Configs/TechTree/prem_tanks.yaml.dvpl b/Extended Tech Tree/Data/Configs/TechTree/prem_tanks.yaml.dvpl deleted file mode 100644 index 325d12f..0000000 Binary files a/Extended Tech Tree/Data/Configs/TechTree/prem_tanks.yaml.dvpl and /dev/null differ diff --git a/Extended Tech Tree/Data/Configs/TechTree/tree_shared.yaml.dvpl b/Extended Tech Tree/Data/Configs/TechTree/tree_shared.yaml.dvpl deleted file mode 100644 index 83ecbdb..0000000 Binary files a/Extended Tech Tree/Data/Configs/TechTree/tree_shared.yaml.dvpl and /dev/null differ diff --git a/Extended Tech Tree/Data/Configs/TechTree/uk_tree.yaml.dvpl b/Extended Tech Tree/Data/Configs/TechTree/uk_tree.yaml.dvpl index c81523c..c54cbe7 100644 Binary files a/Extended Tech Tree/Data/Configs/TechTree/uk_tree.yaml.dvpl and b/Extended Tech Tree/Data/Configs/TechTree/uk_tree.yaml.dvpl differ diff --git a/Extended Tech Tree/Data/XML/item_defs/vehicles/china/list.xml.dvpl b/Extended Tech Tree/Data/XML/item_defs/vehicles/china/list.xml.dvpl index edfb8ca..945084b 100644 Binary files a/Extended Tech Tree/Data/XML/item_defs/vehicles/china/list.xml.dvpl and b/Extended Tech Tree/Data/XML/item_defs/vehicles/china/list.xml.dvpl differ diff --git a/Extended Tech Tree/Data/XML/item_defs/vehicles/france/list.xml.dvpl b/Extended Tech Tree/Data/XML/item_defs/vehicles/france/list.xml.dvpl index 6f9092e..18ad283 100644 Binary files a/Extended Tech Tree/Data/XML/item_defs/vehicles/france/list.xml.dvpl and b/Extended Tech Tree/Data/XML/item_defs/vehicles/france/list.xml.dvpl differ diff --git a/Extended Tech Tree/Data/XML/item_defs/vehicles/other/list.xml.dvpl b/Extended Tech Tree/Data/XML/item_defs/vehicles/other/list.xml.dvpl deleted file mode 100644 index 2bb53ea..0000000 Binary files a/Extended Tech Tree/Data/XML/item_defs/vehicles/other/list.xml.dvpl and /dev/null differ diff --git a/Extended Tech Tree/Data/XML/item_defs/vehicles/uk/list.xml.dvpl b/Extended Tech Tree/Data/XML/item_defs/vehicles/uk/list.xml.dvpl index 016ce59..b55274a 100644 Binary files a/Extended Tech Tree/Data/XML/item_defs/vehicles/uk/list.xml.dvpl and b/Extended Tech Tree/Data/XML/item_defs/vehicles/uk/list.xml.dvpl differ diff --git a/Extended Tech Tree/Data/XML/item_defs/vehicles/usa/list.xml.dvpl b/Extended Tech Tree/Data/XML/item_defs/vehicles/usa/list.xml.dvpl index 9e918af..ba77438 100644 Binary files a/Extended Tech Tree/Data/XML/item_defs/vehicles/usa/list.xml.dvpl and b/Extended Tech Tree/Data/XML/item_defs/vehicles/usa/list.xml.dvpl differ diff --git a/Non-DVPL/Data/Configs/TechTree/france_tree.yaml b/Non-DVPL/Data/Configs/TechTree/france_tree.yaml index c583012..e222889 100644 --- a/Non-DVPL/Data/Configs/TechTree/france_tree.yaml +++ b/Non-DVPL/Data/Configs/TechTree/france_tree.yaml @@ -35,6 +35,8 @@ tanks: ELC_AMX: position: [5, 8] # + ARL_44BP: + position: [6, 5] ARL_V39: position: [6, 6] ARL_44: @@ -77,6 +79,8 @@ tanks: F75_Char_de_25t: position: [9, 8] # + F82_AMX_M4_Mle1949_Ter: + position: [10, 4] F72_AMX_30: position: [10, 5] AMX_50Fosh_155: diff --git a/Non-DVPL/Data/Configs/TechTree/modules_shared.yaml b/Non-DVPL/Data/Configs/TechTree/modules_shared.yaml deleted file mode 100644 index 3cc0d33..0000000 --- a/Non-DVPL/Data/Configs/TechTree/modules_shared.yaml +++ /dev/null @@ -1,4 +0,0 @@ -grid_properties: - start: [30, 36] - step: [100, 104] - offset: [26, 40] \ No newline at end of file diff --git a/Non-DVPL/Data/Configs/TechTree/other_tree.yaml b/Non-DVPL/Data/Configs/TechTree/other_tree.yaml deleted file mode 100644 index e2cc47d..0000000 --- a/Non-DVPL/Data/Configs/TechTree/other_tree.yaml +++ /dev/null @@ -1,59 +0,0 @@ -premium_rows: 2 - -tanks: -# 1 уровень - iblitzmods - Oth10_WarDuck: - position: [1, 1] -# 2 уровень - iblitzmods -# 3 уровень - iblitzmods -# 4 уровень - iblitzmods -# 5 уровень - iblitzmods - Oth15_RustCrab: - position: [5, 1] - Oth17_BDT-5A: - position: [5, 2] - Oth24_StuH_42HW: - position: [5, 3] -# 6 уровень - iblitzmods - Strv_74A2: - position: [6, 1] - Oth18_BDT-5B: - position: [6, 2] -# 7 уровень - iblitzmods - Sega_Edelweiss: - position: [7, 1] - Sega_Nameless: - position: [7, 2] - Van_Helsing: - position: [7, 3] - WZ-135G_FT: - position: [7, 4] - AMX_dracula: - position: [7, 5] - Oth06_Sega_Lupus: - position: [7, 6] - Oth08_WH_Vindicator: - position: [7, 7] - Oth09_WH_Predator: - position: [7, 8] - Oth12_Sega_Hafen: - position: [7, 9] - Oth14_MdM_AshKnight: - position: [7, 10] - Oth16_KV_TG: - position: [7, 11] - Oth19_BDT-5C: - position: [7, 12] - Oth20_M4FL10: - position: [7, 13] - Oth22_Sega_Vulcan: - position: [7, 14] - Oth23_Werewolf: - position: [7, 15] -# 8 уровень - iblitzmods - Akawara: - position: [8, 1] -# 9 уровень - iblitzmods - Oth11_T-55A: - position: [9, 1] -# 10 уровень - iblitzmods \ No newline at end of file diff --git a/Non-DVPL/Data/Configs/TechTree/prem_tanks.yaml b/Non-DVPL/Data/Configs/TechTree/prem_tanks.yaml deleted file mode 100644 index 9dbdab0..0000000 --- a/Non-DVPL/Data/Configs/TechTree/prem_tanks.yaml +++ /dev/null @@ -1,74 +0,0 @@ -"germany:PzIV": ['germany:DickerMax'] -"germany:StuGIII": ['germany:DickerMax'] -"germany:VK1602": ['germany:DickerMax'] -"japan:Chi_Nu": ['germany:Panther_M10'] -"uk:GB08_Churchill_I": ['uk:GB63_TOG_II'] -"uk:GB20_Crusader": ['uk:GB63_TOG_II'] -"uk:GB73_AT2": ['uk:GB63_TOG_II'] -"usa:M10_Wolverine": ['uk:GB71_AT_15A'] -"usa:M4_Sherman": ['uk:GB63_TOG_II'] -"usa:T1_hvy": ['germany:Panther_M10'] -"usa:M24_Chaffee": ['germany:Panther_M10'] -"ussr:KV1": ['ussr:SU122_44'] -"ussr:SU-85": ['ussr:SU100Y'] -"ussr:T-34": ['usa:T23E3'] -"france:BDR_G1B": ['uk:GB63_TOG_II'] -"france:S_35CA": ['uk:GB63_TOG_II'] -"france:ELC_AMX": ['germany:Panther_M10'] -"germany:JagdPzIV": ['germany:Panther_M10'] -"germany:Nashorn": ['germany:Panther_M10'] -"germany:VK2801": ['germany:Panther_M10'] -"germany:VK3001P": ['germany:Panther_M10'] -"germany:VK3002DB_V1": ['germany:Panther_M10'] -"germany:VK3601H": ['germany:Lowe'] -"japan:Chi_To": ['germany:Panther_M10'] -"uk:GB09_Churchill_VII": ['uk:GB71_AT_15A'] -"uk:GB21_Cromwell": ['usa:T23E3'] -"uk:GB19_Sherman_Firefly": ['usa:T23E3'] -"uk:GB74_AT8": ['uk:GB71_AT_15A'] -"usa:M18_Hellcat": ['uk:GB71_AT_15A'] -"usa:M36_Slagger": ['uk:GB71_AT_15A'] -"usa:M4A3E8_Sherman": ['usa:T23E3'] -"usa:M6": ['usa:T34_hvy'] -"usa:A94_T37": ['usa:M6A2E1'] -"ussr:KV-1s": ['ussr:SU122_44'] -"ussr:KV2": ['ussr:SU122_44'] -"ussr:MT25": ['germany:Panther_M10'] -"ussr:SU-100": ['ussr:SU122_44'] -"ussr:T-34-85": ['ussr:SU122_44'] -"france:ARL_44": ['uk:GB71_AT_15A'] -"france:ARL_V39": ['uk:GB71_AT_15A'] -"france:AMX_12t": ['germany:Panther_M10'] -"germany:G113_SP_I_C": ['germany:Lowe'] -"germany:JagdPanther": ['germany:Lowe'] -"germany:PzV": ['germany:Lowe'] -"germany:PzVI": ['germany:Lowe'] -"germany:PzVI_Tiger_P": ['germany:Lowe'] -"germany:Sturer_Emil": ['germany:JagdTiger_SdKfz_185'] -"germany:VK3002DB": ['germany:Lowe'] -"japan:Chi_Ri": ['germany:Lowe'] -"uk:GB10_Black_Prince": ['usa:T34_hvy'] -"uk:GB22_Comet": ['usa:T26_E4_SuperPershing'] -"uk:GB75_AT7": ['usa:T34_hvy'] -"usa:T20": ['usa:T26_E4_SuperPershing'] -"usa:T25_2": ['usa:T34_hvy'] -"usa:T25_AT": ['usa:T26_E4_SuperPershing'] -"usa:T29": ['usa:T34_hvy'] -"usa:T71": ['usa:T26_E4_SuperPershing'] -"usa:M41_Bulldog": ['usa:M6A2E1'] -"ussr:IS": ['ussr:Object252'] -"ussr:KV-3": ['ussr:Object252'] -"ussr:R107_LTB": ['ussr:Object252'] -"ussr:SU100M1": ['ussr:Object252'] -"ussr:SU-152": ['ussr:Object252'] -"ussr:T-43": ['ussr:Object252'] -"france:AMX_M4_1945": ['usa:T34_hvy'] -"france:AMX_AC_Mle1946": ['germany:JagdTiger_SdKfz_185'] -"france:AMX_13_75": ['france:FCM_50t'] -"china:Ch21_T34": ['usa:T23E3'] -"china:Ch20_Type58": ['ussr:SU122_44'] -"china:Ch04_T34_1": ['usa:T26_E4_SuperPershing'] -"china:Ch10_IS2": ['usa:T34_hvy'] -"china:Ch34_WZ-131G_FT": ['ussr:SU122_44'] -"china:Ch35_T-34-2G_FT": ['usa:T26_E4_SuperPershing'] -"uk:GB41_Challenger": ['usa:T34_hvy'] diff --git a/Non-DVPL/Data/Configs/TechTree/tree_shared.yaml b/Non-DVPL/Data/Configs/TechTree/tree_shared.yaml deleted file mode 100644 index 82a86d2..0000000 --- a/Non-DVPL/Data/Configs/TechTree/tree_shared.yaml +++ /dev/null @@ -1,3 +0,0 @@ -grid_properties: - start: [15, 16] - step: [200, 90] \ No newline at end of file diff --git a/Non-DVPL/Data/Configs/TechTree/uk_tree.yaml b/Non-DVPL/Data/Configs/TechTree/uk_tree.yaml index 09e0cbf..e8363e8 100644 --- a/Non-DVPL/Data/Configs/TechTree/uk_tree.yaml +++ b/Non-DVPL/Data/Configs/TechTree/uk_tree.yaml @@ -3,9 +3,9 @@ premium_rows: 5 tanks: # GB01_Medium_Mark_I: - position: [1, 4] + position: [1, 3] GB_Mark_I: - position: [1, 5] + position: [1, 4] GB69_Cruiser_Mk_II: position: [1, 8] # @@ -48,9 +48,9 @@ tanks: position: [5, 5] GB73_AT2: position: [5, 6] - GB08_Churchill_I: - position: [5, 8] GB20_Crusader: + position: [5, 8] + GB08_Churchill_I: position: [5, 10] # GB35_Sentinel_AC_IV: diff --git a/Non-DVPL/Data/XML/item_defs/vehicles/china/list.xml b/Non-DVPL/Data/XML/item_defs/vehicles/china/list.xml index 3d7f32d..b872b2f 100644 --- a/Non-DVPL/Data/XML/item_defs/vehicles/china/list.xml +++ b/Non-DVPL/Data/XML/item_defs/vehicles/china/list.xml @@ -12,7 +12,7 @@ cavalry vampire_2 - development production supertest + development production 3 @@ -28,7 +28,7 @@ stormtrooper werewolf_2 - development production supertest + development production 4 diff --git a/Non-DVPL/Data/XML/item_defs/vehicles/france/list.xml b/Non-DVPL/Data/XML/item_defs/vehicles/france/list.xml index 8d72c9b..7dc9709 100644 --- a/Non-DVPL/Data/XML/item_defs/vehicles/france/list.xml +++ b/Non-DVPL/Data/XML/item_defs/vehicles/france/list.xml @@ -17,7 +17,7 @@ #france_vehicles:RenaultFT_descr 0 0 - lightTank + lightTank 1 false production development supertest @@ -460,6 +460,25 @@ 1 development production supertest + + 17 + #france_vehicles:F82_AMX_M4_Mle1949_Ter + #france_vehicles:F82_AMX_M4_Mle1949_Ter_short + #france_vehicles:F82_AMX_M4_Mle1949_Ter_descr + 15000 + + 7500 + + 0 + false + heavyTank collectible InGame + 10 + + stormtrooper + werewolf + + development production + 31 #france_vehicles:F19_Lorraine40t @@ -547,4 +566,23 @@ development production + + 67 + #france_vehicles:ARL_44BP + #france_vehicles:ARL_44BP_short + #france_vehicles:ARL_44BP_descr + 500 + + 500 + + 0 + false + heavyTank collectible + 6 + + close_assault + werewolf + + development production + diff --git a/Non-DVPL/Data/XML/item_defs/vehicles/other/list.xml b/Non-DVPL/Data/XML/item_defs/vehicles/other/list.xml deleted file mode 100644 index bfaa6b9..0000000 --- a/Non-DVPL/Data/XML/item_defs/vehicles/other/list.xml +++ /dev/null @@ -1,387 +0,0 @@ - - - 2 - #other_vehicles:Strv_74A2 - #other_vehicles:Strv_74A2_short - 3000 - - 0 - true - mediumTank enhancedTorsions3t_user wetCombatPack_class1_user - 6 - - cavalry - hunter - - production development supertest - - - 3 - #other_vehicles:Sega_Edelweiss - #other_vehicles:Sega_Edelweiss_short - 4900 - - 0 - true - mediumTank enhancedTorsions5t_user mediumCaliberTankRammer_user wetCombatPack_class1_user fictional - 7 - - halfheavy - vampire_2 - - production development supertest - - - 5 - #other_vehicles:Sega_Nameless - #other_vehicles:Sega_Nameless_short - 5000 - - 0 - true - heavyTank enhancedTorsions5t_user largeCaliberTankRammer_user wetCombatPack_class2_user fictional - 7 - - stormtrooper - werewolf_2 - - production development supertest - - - 6 - #other_vehicles:Van_Helsing - #other_vehicles:Van_Helsing_short - 4900 - - 0 - true - AT-SPG mediumAT-SPG eventCamouflage_user wetCombatPack_class1_user fictional - 7 - - close_support - hunter - - production development supertest - - - 7 - #other_vehicles:Akawara - #other_vehicles:Akawara_short - 7300 - - 0 - true - mediumTank enhancedTorsions3t_user mediumCaliberTankRammer_user wetCombatPack_class1_user aimingStabilizer_Mk1_user fictional - 8 - - cavalry - vampire - - production development supertest - - - 8 - #other_vehicles:WZ-135G_FT - #other_vehicles:WZ-135G_FT_short - 5000 - - 0 - true - AT-SPG lightAT-SPG mediumCaliberTankRammer_user wetCombatPack_class1_user enhancedTorsions1t_user fictional - 7 - - long_support - hunter - - production development supertest - - - 248 - #other_vehicles:AMX_dracula - #other_vehicles:AMX_dracula_short - #other_vehicles:AMX_dracula_descr - 4900 - - 0 - true - mediumTank eventCamouflage_user enhancedTorsions3t_user mediumCaliberTankRammer_user wetCombatPack_class1_user fictional - 7 - - scout - vampire_2 - - production development supertest - - - 14 - #other_vehicles:Sega_Lupus - #other_vehicles:Sega_Lupus_short - 5000 - - 0 - true - heavyTank enhancedTorsions5t_user largeCaliberTankRammer_user wetCombatPack_class2_user aimingStabilizer_Mk2_user fictional - 7 - - stormtrooper - werewolf_2 - - production development supertest - - - 0 - #other_vehicles:Oth08_WH_Vindicator - #other_vehicles:Oth08_WH_Vindicator_short - #other_vehicles:Oth08_WH_Vindicator_descr - 5000 - - 2500 - - 0 - true - AT-SPG collectible eventCamouflage_user heavyAT-SPG enhancedTorsions5t_user largeCaliberTankRammer_user wetCombatPack_class2_user fictional - 7 - - devastator - hunter_2 - - production development supertest - - - 4 - #other_vehicles:Oth09_WH_Predator - #other_vehicles:Oth09_WH_Predator_short - #other_vehicles:Oth09_WH_Predator_descr - 5000 - - 2500 - - 0 - true - heavyTank collectible eventCamouflage_user enhancedTorsions5t_user largeCaliberTankRammer_user wetCombatPack_class2_user aimingStabilizer_Mk2_user fictional - 7 - - close_assault - werewolf - - production development supertest - - - 15 - #other_vehicles:Oth11_T-55A - #other_vehicles:Oth11_T-55A_short - #other_vehicles:Oth11_T-55A_descr - 15000 - - 0 - true - mediumTank - 9 - - scout - vampire_2 - - development production - - - 16 - #other_vehicles:Oth10_WarDuck - #other_vehicles:Oth10_WarDuck_short - #other_vehicles:Oth10_WarDuck_descr - 1 - 0 - true - mediumTank secret InGame deprecated fictional - 1 - production development - - - 17 - #other_vehicles:Oth12_Sega_Hafen - #other_vehicles:Oth12_Sega_Hafen_short - #other_vehicles:Oth12_Sega_Hafen_descr - 4900 - - 0 - true - mediumTank fictional - 7 - - halfheavy - vampire_2 - - development production - - - 18 - #other_vehicles:Oth14_MdM_AshKnight - #other_vehicles:Oth14_MdM_AshKnight_short - #other_vehicles:Oth14_MdM_AshKnight_descr - 2500 - 2500 - - 0 - true - heavyTank collectible fictional - 7 - - stormtrooper - werewolf - - development production - - - 19 - #other_vehicles:Oth15_RustCrab - #other_vehicles:Oth15_RustCrab_short - #other_vehicles:Oth15_RustCrab_descr - 250 - 250 - - 0 - true - mediumTank collectible fictional - 5 - - cavalry - vampire_2 - - development production - - - 20 - #other_vehicles:Oth16_KV_TG - #other_vehicles:Oth16_KV_TG_short - #other_vehicles:Oth16_KV_TG_descr - 5600 - 2500 - - 0 - true - heavyTank collectible fictional - 7 - - stormtrooper - werewolf_2 - - development production - - - 21 - #other_vehicles:Oth17_BDT-5A - #other_vehicles:Oth17_BDT-5A_short - #other_vehicles:Oth17_BDT-5A_descr - 2500 - - 0 - true - - scout - vampire - - mediumTank eventCamouflage_user secret InGame fictional - 5 - development production - - - 22 - #other_vehicles:Oth18_BDT-5B - #other_vehicles:Oth18_BDT-5B_short - #other_vehicles:Oth18_BDT-5B_descr - 3500 - - 0 - true - - scout - vampire - - mediumTank eventCamouflage_user secret InGame fictional - 6 - development production - - - 23 - #other_vehicles:Oth19_BDT-5C - #other_vehicles:Oth19_BDT-5C_short - #other_vehicles:Oth19_BDT-5C_descr - 5000 - - 0 - true - - scout - vampire - - mediumTank eventCamouflage_user secret InGame fictional - 7 - development production - - - 24 - #other_vehicles:Oth20_M4FL10 - #other_vehicles:Oth20_M4FL10_short - #other_vehicles:Oth20_M4FL10_descr - 5200 - 0 - true - - cavalry - hunter - - mediumTank - 7 - development production - - - 27 - #other_vehicles:Oth22_Sega_Vulcan - #other_vehicles:Oth22_Sega_Vulcan_short - #other_vehicles:Oth22_Sega_Vulcan_descr - 5000 - - 0 - true - heavyTank fictional - 7 - - close_support - werewolf_2 - - development production - - - 28 - #other_vehicles:Oth23_Werewolf - #other_vehicles:Oth23_Werewolf_short - #other_vehicles:Oth23_Werewolf_descr - 5000 - 0 - true - heavyTank eventCamouflage_user fictional - 7 - - close_assault - werewolf_2 - - production development - - - 29 - #other_vehicles:Oth24_StuH_42HW - #other_vehicles:Oth24_StuH_42HW_short - #other_vehicles:Oth24_StuH_42HW_descr - 250 - 250 - - 0 - true - AT-SPG mediumAT-SPG collectible fictional - 5 - - close_support - hunter_2 - - development production - - diff --git a/Non-DVPL/Data/XML/item_defs/vehicles/uk/list.xml b/Non-DVPL/Data/XML/item_defs/vehicles/uk/list.xml index db3db15..d180b1b 100644 --- a/Non-DVPL/Data/XML/item_defs/vehicles/uk/list.xml +++ b/Non-DVPL/Data/XML/item_defs/vehicles/uk/list.xml @@ -569,7 +569,7 @@ 0 false - heavyTank InGame deprecated improvedVentilation_class1_user mediumCaliberTankRammer_user grousers_user event_battles + heavyTank InGame improvedVentilation_class1_user mediumCaliberTankRammer_user 1 production development supertest diff --git a/Non-DVPL/Data/XML/item_defs/vehicles/usa/list.xml b/Non-DVPL/Data/XML/item_defs/vehicles/usa/list.xml index 087c793..1132992 100644 --- a/Non-DVPL/Data/XML/item_defs/vehicles/usa/list.xml +++ b/Non-DVPL/Data/XML/item_defs/vehicles/usa/list.xml @@ -31,7 +31,7 @@ #usa_vehicles:T1_Cunningham_short 0 0 - lightTank + lightTank 1 false production development supertest @@ -1150,7 +1150,7 @@ 0 false - mediumTank InGame + mediumTank 7 cavalry