From 3c76eb4844802fea291ee745ad059a42fb446633 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Sat, 28 Sep 2024 02:51:44 +0400 Subject: [PATCH 1/3] adapt and fix for 1.14.1.e4e7 --- .gitignore | 1 + dodo.py | 154 +++++++++------- src/patches/extrapoint.yaml | 355 +++++++++++++++--------------------- 3 files changed, 238 insertions(+), 272 deletions(-) diff --git a/.gitignore b/.gitignore index c29ea9c..7604030 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ __pycache__ .doit.db *.kate-swp +/vanilla diff --git a/dodo.py b/dodo.py index 3c4556d..eb4a045 100644 --- a/dodo.py +++ b/dodo.py @@ -3,15 +3,17 @@ from pathlib import Path from doit import get_var DOIT_CONFIG = { - 'default_tasks': ['build'], - 'action_string_formatting': 'new' + 'default_tasks': ['build'], + 'action_string_formatting': 'both' } + def files(p): for i in p: if i.is_file(): yield i + class RawFiles(list): def __init__(self, *args, **kwargs): self.src_path = Path(kwargs.pop('src_path')) @@ -21,26 +23,33 @@ class RawFiles(list): def sources(self): for i in self: yield self.src_path/i + def targets(self): for i in self: yield self.image_path/i + class BasePatchwork(dict): patches_path = None patchwork_path = None vanilla_path = None + def __init__(self, *arkg, **kwargs): self.patches_path = Path(kwargs.pop('patches_path')) self.patchwork_path = Path(kwargs.pop('patchwork_path')) self.vanilla_path = Path(kwargs.pop('vanilla_path')) super().__init__(*arkg, **kwargs) + def targets(self): for i in self.keys(): yield self.patchwork_path/i + def key_vanilla(self, orig_key): return self.vanilla_path/orig_key + def key_target(self, orig_key): return self.patchwork_path/orig_key + def tasks(self, actions): def repack_action(action, **kwargs): if callable(action): @@ -54,29 +63,28 @@ class BasePatchwork(dict): patch = self.patches_path/v target = self.patchwork_path/k yield { - 'name' : k, - 'file_dep' : [ original, patch ], - 'targets' : [ target ], - 'actions' : [ repack_action(action, original=original, patch=patch, target=target) - for action in actions ], - 'clean' : True + 'name': k, + 'file_dep': [original, patch], + 'targets': [target], + 'actions': [repack_action(action, original=original, patch=patch, target=target) + for action in actions], + 'clean': True } - class Patchwork(BasePatchwork): def tasks_(self, actions): for k, v in self.items(): yield { - 'name' : k, - 'file_dep' : [ self.patches_path/v, self.vanilla_path/k ], - 'targets' : [ self.patchwork_path/k ], - 'actions' : [ + 'name': k, + 'file_dep': [self.patches_path/v, self.vanilla_path/k], + 'targets': [self.patchwork_path/k], + 'actions': [ f"mkdir -p {self.patchwork_path}/{Path(k).parent}", - f"patch -u --binary -N -o '{self.patchwork_path}/{k}' "\ + f"patch -u --binary -N -o '{self.patchwork_path}/{k}' " f"'{self.vanilla_path}/{k}' '{self.patches_path}/{v}'" - ], # action ( mkdir, patch ) - 'clean' : True + ], # action ( mkdir, patch ) + 'clean': True } @@ -87,9 +95,15 @@ class ScriptedPatchwork(BasePatchwork): super().__init__(*args, **kwargs) with open(file) as s: for key, data in safe_load(s).items(): - discovered_source = next((Path(self.vanilla_path)/'history'/'states').glob(f"{key}*")) - relative_path = discovered_source.relative_to(self.vanilla_path) - self[relative_path] = data + try: + discovered_source = next( + (Path(self.vanilla_path)/'history'/'states').glob(f"{key}*")) + relative_path = discovered_source.relative_to( + self.vanilla_path) + self[relative_path] = data + except StopIteration: + print(f"{key}: not found") + class RasterPatchwork(BasePatchwork): @staticmethod @@ -135,15 +149,18 @@ class Patchset(list): mod_name = 'randchgs' -mod_install_path = get_var('descriptor_mod_path', 'C:/Users/User/Documents/Paradox Interactive/Hearts of Iron IV/mod/randchgs') -dir_vanilla = Path(get_var('vanilla_path', '../vanilla/current')) +mod_install_path = get_var( + 'descriptor_mod_path', 'C:/Users/User/Documents/Paradox Interactive/Hearts of Iron IV/mod/randchgs') +dir_vanilla = Path(get_var('vanilla_path', './vanilla/current')) +if not dir_vanilla.is_dir(): + raise EnvironmentError(dir_vanilla) dir_image = Path('build/image') dir_modimage = dir_image/mod_name dir_src_raw = Path('src/raw') dir_src_raw_files = RawFiles( files(Path(dir_src_raw).rglob("*")), - src_path = dir_src_raw, - image_path = dir_image + src_path=dir_src_raw, + image_path=dir_image ) dir_patches_path = Path('src/patches') dir_patchwork_path = Path('build/patched') @@ -153,26 +170,26 @@ patchwork = Patchwork( 'map/definition.csv': 'map_definition.patch', 'history/countries/ISR - Israel.txt': 'history_countries_ISR.patch', 'history/states/454-Israel.txt': 'history_states_454.patch', - }, - patches_path = dir_patches_path, - patchwork_path = dir_patchwork_path, - vanilla_path = dir_vanilla + }, + patches_path=dir_patches_path, + patchwork_path=dir_patchwork_path, + vanilla_path=dir_vanilla ) patchwork_scripted = ScriptedPatchwork( - source_file = dir_patches_path/'extrapoint.yaml', - patches_path = '.', - patchwork_path = dir_patchwork_path, - vanilla_path = dir_vanilla + source_file=dir_patches_path/'extrapoint.yaml', + patches_path='.', + patchwork_path=dir_patchwork_path, + vanilla_path=dir_vanilla ) patchwork_raster = RasterPatchwork( { - 'map/terrain.bmp' : 'terrain.bmp', + 'map/terrain.bmp': 'terrain.bmp', }, - patches_path = dir_patches_path, - patchwork_path = dir_patchwork_path, - vanilla_path = dir_vanilla + patches_path=dir_patches_path, + patchwork_path=dir_patchwork_path, + vanilla_path=dir_vanilla ) patch_set = Patchset( @@ -182,9 +199,10 @@ patch_set = Patchset( patchwork_scripted, patchwork_raster, ), - modimage_path = dir_modimage + modimage_path=dir_modimage ) + def task_patch_history_states_scripted(): def history_state_patch(task, provinces): source = Path(next(iter(task.file_dep))) @@ -195,45 +213,50 @@ def task_patch_history_states_scripted(): with source.open(newline='') as infile, target.open('w') as outfile: for line_in in infile: outfile.write(line_in) - seen_history = seen_history or ( 'history' in line_in ) + seen_history = seen_history or ('history' in line_in) if not wrote_history and seen_history and '{' in line_in: for province_id, province_info in provinces.items(): outfile.write( - "\t\tvictory_points = {\r\n"\ - f"\t\t\t{province_id} {province_info['points']}\r\n"\ - "\t\t}\r\n"\ + "\t\tvictory_points = {\r\n" + f"\t\t\t{province_id} { + province_info['points']}\r\n" + "\t\t}\r\n" ) wrote_history = True - for state_src, state_data in patchwork_scripted.items(): + for state_src, state_data in patchwork_scripted.items(): yield { - 'name' : state_src, - 'file_dep' : [ patchwork_scripted.key_vanilla(state_src) ], - 'targets' : [ patchwork_scripted.key_target(state_src) ], - 'actions' : [ ( history_state_patch, [], {'provinces' : state_data}) ], - 'clean' : True + 'name': state_src, + 'file_dep': [patchwork_scripted.key_vanilla(state_src)], + 'targets': [patchwork_scripted.key_target(state_src)], + 'actions': [(history_state_patch, [], {'provinces': state_data})], + 'clean': True } + def task_patch_raster(): yield from patchwork_raster.tasks([patchwork_raster.patch_action]) + def task_patch(): def mkdir(target, original, patch): Path(target).parent.mkdir(parents=True, exist_ok=True) yield from patchwork.tasks([ - mkdir, - "patch -u --binary -N -o '{target}' '{original}' '{patch}'" - ]) + mkdir, + "patch -u --binary -N -o '{target}' '{original}' '{patch}'" + ]) + def task_image(): return { - 'file_dep' : list(patch_set.image_sources()), - 'targets' : list(patch_set.image_files()), - 'actions' : [f"mkdir -p {dir_modimage}", - f"rsync -rv {dir_src_raw}/ {patchwork.patchwork_path}/"\ - f" {dir_modimage}/" ], - 'clean' : True + 'file_dep': list(patch_set.image_sources()), + 'targets': list(patch_set.image_files()), + 'actions': [f"mkdir -p {dir_modimage}", + f"rsync -rv {dir_src_raw}/ {patchwork.patchwork_path}/" + f" {dir_modimage}/"], + 'clean': True } + def task_image_mod(): def prepare_modname_mod(task): source = Path(next(iter(task.file_dep))) @@ -244,18 +267,19 @@ def task_image_mod(): o.write(s.read()) o.write(f"\npath=\"{mod_install_path}\"\n") return { - 'file_dep' : [ 'src/raw/descriptor.mod' ], - 'targets' : [f"{dir_image}/{mod_name}.mod" ], - 'actions' : [ prepare_modname_mod ], - 'clean' : True + 'file_dep': ['src/raw/descriptor.mod'], + 'targets': [f"{dir_image}/{mod_name}.mod"], + 'actions': [prepare_modname_mod], + 'clean': True } + def task_build(): return { - 'file_dep' : [f"{dir_image}/{mod_name}.mod" ] + list (patch_set.image_files()), - 'targets' : [f"{dir_image}/{mod_name}.zip" ], - 'actions' : [ "rm -f %(targets)s", - f"cd {dir_image} && zip -r {mod_name}.zip {mod_name}", - f"cd {dir_image} && zip -r {mod_name}.zip {mod_name}.mod" ], - 'clean' : [ 'rm -rf build' ] + 'file_dep': [f"{dir_image}/{mod_name}.mod"] + list(patch_set.image_files()), + 'targets': [f"{dir_image}/{mod_name}.zip"], + 'actions': ["rm -f %(targets)s", + f"cd {dir_image} && zip -r {mod_name}.zip {mod_name}", + f"cd {dir_image} && zip -r {mod_name}.zip {mod_name}.mod"], + 'clean': ['rm -rf build'] } diff --git a/src/patches/extrapoint.yaml b/src/patches/extrapoint.yaml index a8fb01a..9c60d5d 100644 --- a/src/patches/extrapoint.yaml +++ b/src/patches/extrapoint.yaml @@ -1,565 +1,506 @@ +#454: +# 1015: +# points: 1 +# l_russian: Элат 728: 11981: - l_russian: Чжаньцзян points: 1 + l_russian: Чжаньцзян 593: 9970: - l_russian: Шаогуань points: 1 + l_russian: Шаогуань 604: 4964: - l_russian: Юйшу points: 1 + l_russian: Юйшу 755: 10796: - l_russian: Голмуд points: 1 + l_russian: Голмуд 756: 7971: - l_russian: Сучжоу points: 1 + l_russian: Сучжоу 760: 4704: - l_russian: Хами points: 1 + l_russian: Хами 759: 2074: - l_russian: Чарклык points: 1 + l_russian: Чарклык 322: 7926: - l_russian: Сэни points: 1 + l_russian: Сэни 758: 5094: - l_russian: Гегьэ points: 1 + l_russian: Гегьэ 746: 3427: - l_russian: Ордос points: 1 + l_russian: Ордос 621: 4525: - l_russian: Хундлун points: 1 + l_russian: Хундлун 612: 12348: - l_russian: Шилин-Хото points: 1 + l_russian: Шилин-Хото 609: 900: - l_russian: Таншань points: 1 + l_russian: Таншань 610: 11801: - l_russian: Чэндэ points: 1 + l_russian: Чэндэ 761: 7697: - l_russian: Маньчжурия points: 1 + l_russian: Маньчжурия 714: 4506: - l_russian: Цицикар points: 1 + l_russian: Цицикар 717: 6811: - l_russian: Муданьцзян points: 1 + l_russian: Муданьцзян +818: + 1774: + points: 1 + l_russian: Ховд +817: + 12669: + points: 1 + l_russian: Даланзадгад 323: 7374: - l_russian: Бирендранагар points: 1 + l_russian: Бирендранагар 432: 12366: - l_russian: Гувахати points: 1 + l_russian: Гувахати 434: 1116: - l_russian: Итанагар points: 1 + l_russian: Итанагар 426: 10088: + points: 1 l_russian: Кендрапара - points: 1 10116: - l_russian: Бхубанешвар points: 1 + l_russian: Бхубанешвар 441: 8005: - l_russian: Лех points: 1 + l_russian: Лех 424: 4321: - l_russian: Гунтур points: 1 + l_russian: Гунтур 442: 7260: - l_russian: Коломбо points: 1 + l_russian: Коломбо 320: 10149: - l_russian: Пондичерри points: 1 + l_russian: Пондичерри 437: 2105: - l_russian: Индаур points: 1 + l_russian: Индаур 436: 10801: + points: 1 l_russian: Джабалпур - points: 1 -859: - 12702: - l_russian: Даммам - points: 1 -856: - 5037: - l_russian: Мекка - points: 1 855: 12455: - l_russian: Табук points: 1 + l_russian: Табук 678: 8118: - l_russian: Эль-Убайла points: 1 + l_russian: Эль-Убайла 854: 10901: - l_russian: Эль-Джауф points: 1 + l_russian: Эль-Джауф 858: 8030: - l_russian: Шарура points: 1 + l_russian: Шарура 294: 2103: - l_russian: Салала points: 1 + l_russian: Салала 667: 12234: - l_russian: Пайети points: 1 + l_russian: Пайети 721: 12190: - l_russian: Дили points: 1 + l_russian: Дили 668: 1574: - l_russian: Пиру points: 1 + l_russian: Пиру 738: 4579: - l_russian: Ларат points: 1 + l_russian: Ларат 626: 4429: - l_russian: Пуэрто-Принсеса points: 1 + l_russian: Пуэрто-Принсеса 625: 1311: - l_russian: Лаоанг points: 1 + l_russian: Лаоанг 873: 5198: - l_russian: Эроманга points: 1 + l_russian: Эроманга 872: 4648: - l_russian: Уэйпа points: 1 + l_russian: Уэйпа 870: 8209: - l_russian: Дерби points: 1 + l_russian: Дерби 871: 8200: - l_russian: Норсмен points: 1 + l_russian: Норсмен 555: 1399: + points: 1 l_russian: Касивабара - points: 1 -512: - 10953: - l_russian: Комодоро-Ривадавия - points: 1 -511: - 8215: - l_russian: Мендоса - points: 1 -509: - 2106: - l_russian: Корриентес - points: 1 -688: - 10973: - l_russian: Фуэрто-Олимпо - points: 1 -507: - 2161: - l_russian: Койаке - points: 1 300: 1613: + points: 1 l_russian: Куртина - points: 1 -503: - 8181: - l_russian: Куритиба - points: 1 -504: - 2181: - l_russian: Кампу-Гранди - points: 1 -280: - 11010: - l_russian: Педрас-Неграс - points: 1 -495: - 10934: - l_russian: Манаус - points: 1 -487: - 12973: - l_russian: Тринидад - points: 1 -494: - 5166: - l_russian: Куско - points: 1 -490: - 8149: - l_russian: Икитос - points: 1 -491: - 12869: - l_russian: Тарма - points: 1 -486: - 12729: - l_russian: Миту - points: 1 649: 5023: - l_russian: Пуэрто-Вильямиль points: 1 + l_russian: Пуэрто-Вильямиль 740: 7259: - l_russian: Виктория points: 1 + l_russian: Виктория 471: 10548: - l_russian: Принс-Руперт points: 1 + l_russian: Принс-Руперт 472: 10527: - l_russian: Йеллоунайф points: 1 + l_russian: Йеллоунайф 469: 4739: - l_russian: Саскатун points: 1 + l_russian: Саскатун 865: 6779: - l_russian: Ла-Лош points: 1 + l_russian: Ла-Лош 683: 10721: - l_russian: Ранкин-Инлет points: 1 + l_russian: Ранкин-Инлет 867: 5239: - l_russian: Черчилл points: 1 + l_russian: Черчилл 682: 6510: - l_russian: Садбери points: 1 + l_russian: Садбери 466: 13196: - l_russian: Форт-Джордж points: 1 + l_russian: Форт-Джордж 866: 761: - l_russian: Аттавапискат points: 1 + l_russian: Аттавапискат 332: 12503: - l_russian: Хаппи-Валли points: 1 + l_russian: Хаппи-Валли 860: 10715: - l_russian: Сет-Иль points: 1 + l_russian: Сет-Иль 861: 1657: - l_russian: Сагеней points: 1 + l_russian: Сагеней 862: 12205: - l_russian: Валь-д’Ор points: 1 + l_russian: Валь-д’Ор 863: 7893: - l_russian: Шибугамо points: 1 + l_russian: Шибугамо 465: 4285: - l_russian: Сент-Джон points: 1 + l_russian: Сент-Джон 331: 12505: - l_russian: Сент-Джонс points: 1 + l_russian: Сент-Джонс 381: 4723: - l_russian: Шайенн points: 1 + l_russian: Шайенн 379: 4799: - l_russian: Лас-Вегас points: 1 + l_russian: Лас-Вегас (нарисовать город) 230: 4660: - l_russian: Мегри points: 1 + l_russian: Мегри 262: 10723: - l_russian: Печора points: 1 + l_russian: Печора 581: 12502: - l_russian: Воркута points: 1 + l_russian: Воркута 249: 11496: + points: 1 l_russian: Чистополь - points: 1 9385: - l_russian: Набережные Челны points: 1 + l_russian: Набережные Челны 215: 3189: + points: 1 l_russian: Кемь - points: 1 9055: - l_russian: Онега points: 1 + l_russian: Онега 652: 12128: - l_russian: Оренбург points: 1 + l_russian: Оренбург 881: 4389: - l_russian: Караганда points: 1 + l_russian: Караганда 824: 10536: - l_russian: Новый Урегой points: 1 + l_russian: Новый Урегой 878: 2900: - l_russian: Хатанга points: 1 + l_russian: Хатанга 577: 12672: - l_russian: Сургут points: 1 + l_russian: Сургут 576: 12655: - l_russian: Енисейск points: 1 + l_russian: Енисейск 567: 1803: - l_russian: Братск points: 1 + l_russian: Братск 575: 7726: - l_russian: Киренск points: 1 + l_russian: Киренск 876: 1722: - l_russian: Удачный points: 1 + l_russian: Удачный 561: 12657: - l_russian: Благовещенск points: 1 + l_russian: Благовещенск 657: 4725: + points: 1 l_russian: Амурск - points: 1 4246: - l_russian: Биробиджан points: 1 + l_russian: Биробиджан 560: 12559: - l_russian: Николаевск-на-Амур points: 1 + l_russian: Николаевск-на-Амуре 655: 855: - l_russian: Оха points: 1 + l_russian: Оха 562: 12551: - l_russian: Охотск points: 1 + l_russian: Охотск 637: 7878: - l_russian: Петропавловск-Камчатский points: 1 + l_russian: Петропавловск-Камчатский 449: 4047: - l_russian: Сурт points: 1 + l_russian: Сурт 662: 8069: - l_russian: Марада points: 1 + l_russian: Марада 663: 7063: - l_russian: Адждабия points: 1 + l_russian: Адждабия 661: 11940: + points: 1 l_russian: Бени-Валид - points: 1 899: - 8136: - l_russian: Ондангва - points: 1 2012: - l_russian: Кениеба points: 1 + l_russian: Кениеба 898: 7954: - l_russian: Гао points: 1 + l_russian: Гао 900: 8034: - l_russian: Порт-Харкорт points: 1 + l_russian: Порт=Харкорт 902: 4972: - l_russian: Хадеджиа points: 1 + l_russian: Хадеджиа 901: 4997: - l_russian: Майдугури points: 1 + l_russian: Майдугури 551: 2046: - l_russian: Бербер points: 1 + l_russian: Бербер 886: 12887: - l_russian: Эд-Дамазин points: 1 + l_russian: Эд-Дамазин 887: 5060: - l_russian: Эль-Фашер points: 1 + l_russian: Эль-Фашер 549: 10827: - l_russian: Бабануса points: 1 + l_russian: Бабануса 885: 10764: - l_russian: Ямбио points: 1 + l_russian: Ямбио 903: 10761: - l_russian: Гарисса points: 1 + l_russian: Гарисса 904: 11145: - l_russian: Лодвар points: 1 + l_russian: Лодвар 546: 8144: + points: 1 l_russian: Кигома - points: 1 12911: - l_russian: Додома points: 1 + l_russian: Додома 896: 2120: - l_russian: Бейра points: 1 + l_russian: Бейра 897: 2123: - l_russian: Мозамбик points: 1 + l_russian: Мозамбик 708: 13072: - l_russian: Нгазиджа points: 1 + l_russian: Нгазиджа 706: 13017: - l_russian: Сен-Дени points: 1 + l_russian: Сен-Дени 707: 13018: - l_russian: Порт-Луи points: 1 + l_russian: Порт-Луи 543: 5222: - l_russian: Анциранана points: 1 + l_russian: Анциранана 893: 10963: - l_russian: Аус points: 1 + l_russian: Аус 894: 10957: - l_russian: Оучо points: 1 + l_russian: Оучо 891: 1552: - l_russian: Куши points: 1 + l_russian: Куши 888: 9986: - l_russian: Кананга points: 1 + l_russian: Кананга 538: 10071: - l_russian: Мбандака points: 1 + l_russian: Мбандака 718: 1950: - l_russian: Кисангани points: 1 + l_russian: Кисангани 890: 1181: + points: 1 l_russian: Гома - points: 1 -565: - 7759: - l_russian: Бодайбо - points: 1 -505: - 5208: - l_russian: Гояния - points: 1 -848: - 6680: - l_russian: Брегенц - points: 1 -231: - 3658: - l_russian: Кутаиси - points: 1 525: - 11948: - l_russian: Мокихо - points: 1 11977: + points: 1 l_russian: Тэджон + 11948: points: 1 + l_russian: Хэнам 527: - 6928: - l_russian: Ханнам + 6928: points: 1 + l_russian: Хыннам +486: + 12825: + points: 1 + l_russian: Летисия +598: + 1076: + points: 1 + l_russian: Сучжоу +614: + 4190: + points: 1 + l_russian: Тяньцзинь -- 2.45.2 From 1da050232ce78e17b0a0ec87a81e3fdea94149ce Mon Sep 17 00:00:00 2001 From: Aleksey Date: Mon, 14 Oct 2024 03:08:03 +0400 Subject: [PATCH 2/3] scrapping some changes for HOI v1.14.1 closes #7 --- dodo.py | 1 - src/patches/extrapoint.yaml | 34 ++++++++++++++----- src/patches/map_definition.patch | 29 ---------------- .../common/scripted_effects/ISR_effects.txt | 5 --- .../russian/victory_points2_l_russian.yml | 1 + 5 files changed, 27 insertions(+), 43 deletions(-) delete mode 100644 src/patches/map_definition.patch delete mode 100644 src/raw/common/scripted_effects/ISR_effects.txt diff --git a/dodo.py b/dodo.py index eb4a045..edf9a78 100644 --- a/dodo.py +++ b/dodo.py @@ -167,7 +167,6 @@ dir_patchwork_path = Path('build/patched') patchwork = Patchwork( { - 'map/definition.csv': 'map_definition.patch', 'history/countries/ISR - Israel.txt': 'history_countries_ISR.patch', 'history/states/454-Israel.txt': 'history_states_454.patch', }, diff --git a/src/patches/extrapoint.yaml b/src/patches/extrapoint.yaml index 9c60d5d..27ab199 100644 --- a/src/patches/extrapoint.yaml +++ b/src/patches/extrapoint.yaml @@ -1,7 +1,4 @@ -#454: -# 1015: -# points: 1 -# l_russian: Элат +--- 728: 11981: points: 1 @@ -105,6 +102,23 @@ 4321: points: 1 l_russian: Гунтур +565: + 10583: + points: 1 + l_russian: Бодайбо +848: + 6680: + points: 1 + l_russian: Вадуц +945: + 10347: + points: 1 + l_russian: Роча +946: + 1613: + points: 1 + l_russian: Такуарембо + 442: 7260: points: 1 @@ -185,10 +199,6 @@ 1399: points: 1 l_russian: Касивабара -300: - 1613: - points: 1 - l_russian: Куртина 649: 5023: points: 1 @@ -504,3 +514,11 @@ 4190: points: 1 l_russian: Тяньцзинь +213: + 9215: + points: 1 + l_russian: Сосновка +895: + 12519: + points: 1 + l_russian: Рунду diff --git a/src/patches/map_definition.patch b/src/patches/map_definition.patch deleted file mode 100644 index 028fabb..0000000 --- a/src/patches/map_definition.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ../vanilla/current/map/definition.csv 2023-10-10 13:46:35.000000000 +0400 -+++ build/image/randchgs/map/definition.csv 2023-11-27 23:45:22.219054356 +0400 -@@ -1013,7 +1013,7 @@ - 1012;5;17;244;sea;false;ocean;0 - 1013;5;18;30;land;true;plains;5 - 1014;5;18;85;land;true;jungle;6 --1015;5;18;135;land;true;desert;7 -+1015;5;18;135;land;true;urban;7 - 1016;5;19;240;sea;false;ocean;0 - 1017;5;20;248;sea;false;ocean;0 - 1018;5;21;50;land;true;forest;6 -@@ -1063,7 +1063,7 @@ - 1062;5;54;170;land;false;mountain;5 - 1063;5;57;30;land;true;forest;6 - 1064;5;57;85;land;false;desert;5 --1065;5;57;135;land;true;plains;7 -+1065;5;57;135;land;true;urban;7 - 1066;5;60;50;land;false;mountain;6 - 1067;5;60;200;land;true;hills;6 - 1068;5;63;15;land;false;desert;5 -@@ -1084,7 +1084,7 @@ - 1083;5;78;145;land;false;forest;6 - 1084;5;81;5;land;false;plains;6 - 1085;5;81;60;land;true;jungle;4 --1086;5;81;210;land;false;desert;7 -+1086;5;81;210;land;false;urban;7 - 1087;5;84;25;land;false;plains;6 - 1088;5;84;70;land;true;plains;7 - 1089;5;84;175;land;true;hills;6 diff --git a/src/raw/common/scripted_effects/ISR_effects.txt b/src/raw/common/scripted_effects/ISR_effects.txt deleted file mode 100644 index 12675a5..0000000 --- a/src/raw/common/scripted_effects/ISR_effects.txt +++ /dev/null @@ -1,5 +0,0 @@ -ISR_create_ships={ - create_ship { - type = ship_hull_light_1 - } -} diff --git a/src/raw/localisation/russian/victory_points2_l_russian.yml b/src/raw/localisation/russian/victory_points2_l_russian.yml index 68d8dd5..7dd3eb5 100644 --- a/src/raw/localisation/russian/victory_points2_l_russian.yml +++ b/src/raw/localisation/russian/victory_points2_l_russian.yml @@ -144,3 +144,4 @@ VICTORY_POINTS_11977:0 "Тэтджон" VICTORY_POINTS_6928:0 "Ханнам" VICTORY_POINTS_8136:0 "Ондангва" + VICTORY_POINTS_9215:0 "Сосновка" -- 2.45.2 From 38028053fc947484125788c579feb93b39ea8428 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 24 Oct 2024 04:29:38 +0400 Subject: [PATCH 3/3] meddling with localisation --- .../russian/00_victory_points2_l_russian.yml | 133 ++++++++++++++++ .../russian/victory_points2_l_russian.yml | 147 ------------------ 2 files changed, 133 insertions(+), 147 deletions(-) create mode 100644 src/raw/localisation/russian/00_victory_points2_l_russian.yml delete mode 100644 src/raw/localisation/russian/victory_points2_l_russian.yml diff --git a/src/raw/localisation/russian/00_victory_points2_l_russian.yml b/src/raw/localisation/russian/00_victory_points2_l_russian.yml new file mode 100644 index 0000000..39684a4 --- /dev/null +++ b/src/raw/localisation/russian/00_victory_points2_l_russian.yml @@ -0,0 +1,133 @@ +l_russian: + VICTORY_POINTS_11981:0 "Чжаньцзян" + VICTORY_POINTS_9970:0 "Шаогуань" + VICTORY_POINTS_4964:0 "Юйшу" + VICTORY_POINTS_10796:0 "Голмуд" + VICTORY_POINTS_7971:0 "Сучжоу" + VICTORY_POINTS_4704:0 "Хами" + VICTORY_POINTS_2074:0 "Чарклык" + VICTORY_POINTS_7926:0 "Сэни" + VICTORY_POINTS_5094:0 "Гегьэ" + VICTORY_POINTS_3427:0 "Ордос" + VICTORY_POINTS_4525:0 "Хундлун" + VICTORY_POINTS_12348:0 "Шилин-Хото" + VICTORY_POINTS_900:0 "Таншань" + VICTORY_POINTS_11801:0 "Чэндэ" + VICTORY_POINTS_7697:0 "Маньчжурия" + VICTORY_POINTS_4506:0 "Цицикар" + VICTORY_POINTS_6811:0 "Муданьцзян" + VICTORY_POINTS_1774:0 "Ховд" + VICTORY_POINTS_12669:0 "Даланзадгад" + VICTORY_POINTS_7374:0 "Бирендранагар" + VICTORY_POINTS_12366:0 "Гувахати" + VICTORY_POINTS_1116:0 "Итанагар" + VICTORY_POINTS_10088:0 "Кендрапара" + VICTORY_POINTS_10116:0 "Бхубанешвар" + VICTORY_POINTS_8005:0 "Лех" + VICTORY_POINTS_4321:0 "Гунтур" + VICTORY_POINTS_10583:0 "Бодайбо" + VICTORY_POINTS_6680:0 "Вадуц" + VICTORY_POINTS_10347:0 "Роча" + VICTORY_POINTS_1613:0 "Такуарембо" + VICTORY_POINTS_7260:0 "Коломбо" + VICTORY_POINTS_10149:0 "Пондичерри" + VICTORY_POINTS_2105:0 "Индаур" + VICTORY_POINTS_10801:0 "Джабалпур" + VICTORY_POINTS_12455:0 "Табук" + VICTORY_POINTS_8118:0 "Эль-Убайла" + VICTORY_POINTS_10901:0 "Эль-Джауф" + VICTORY_POINTS_8030:0 "Шарура" + VICTORY_POINTS_2103:0 "Салала" + VICTORY_POINTS_12234:0 "Пайети" + VICTORY_POINTS_12190:0 "Дили" + VICTORY_POINTS_1574:0 "Пиру" + VICTORY_POINTS_4579:0 "Ларат" + VICTORY_POINTS_4429:0 "Пуэрто-Принсеса" + VICTORY_POINTS_1311:0 "Лаоанг" + VICTORY_POINTS_5198:0 "Эроманга" + VICTORY_POINTS_4648:0 "Уэйпа" + VICTORY_POINTS_8209:0 "Дерби" + VICTORY_POINTS_8200:0 "Норсмен" + VICTORY_POINTS_1399:0 "Касивабара" + VICTORY_POINTS_5023:0 "Пуэрто-Вильямиль" + VICTORY_POINTS_7259:0 "Виктория" + VICTORY_POINTS_10548:0 "Принс-Руперт" + VICTORY_POINTS_10527:0 "Йеллоунайф" + VICTORY_POINTS_4739:0 "Саскатун" + VICTORY_POINTS_6779:0 "Ла-Лош" + VICTORY_POINTS_10721:0 "Ранкин-Инлет" + VICTORY_POINTS_5239:0 "Черчилл" + VICTORY_POINTS_6510:0 "Садбери" + VICTORY_POINTS_13196:0 "Форт-Джордж" + VICTORY_POINTS_761:0 "Аттавапискат" + VICTORY_POINTS_12503:0 "Хаппи-Валли" + VICTORY_POINTS_10715:0 "Сет-Иль" + VICTORY_POINTS_1657:0 "Сагеней" + VICTORY_POINTS_12205:0 "Валь-д’Ор" + VICTORY_POINTS_7893:0 "Шибугамо" + VICTORY_POINTS_4285:0 "Сент-Джон" + VICTORY_POINTS_12505:0 "Сент-Джонс" + VICTORY_POINTS_4723:0 "Шайенн" + VICTORY_POINTS_4799:0 "Лас-Вегас (нарисовать город)" + VICTORY_POINTS_4660:0 "Мегри" + VICTORY_POINTS_10723:0 "Печора" + VICTORY_POINTS_12502:0 "Воркута" + VICTORY_POINTS_11496:0 "Чистополь" + VICTORY_POINTS_9385:0 "Набережные Челны" + VICTORY_POINTS_3189:0 "Кемь" + VICTORY_POINTS_9055:0 "Онега" + VICTORY_POINTS_12128:0 "Оренбург" + VICTORY_POINTS_4389:0 "Караганда" + VICTORY_POINTS_10536:0 "Новый Урегой" + VICTORY_POINTS_2900:0 "Хатанга" + VICTORY_POINTS_12672:0 "Сургут" + VICTORY_POINTS_12655:0 "Енисейск" + VICTORY_POINTS_1803:0 "Братск" + VICTORY_POINTS_7726:0 "Киренск" + VICTORY_POINTS_1722:0 "Удачный" + VICTORY_POINTS_12657:0 "Благовещенск" + VICTORY_POINTS_4725:0 "Амурск" + VICTORY_POINTS_4246:0 "Биробиджан" + VICTORY_POINTS_12559:0 "Николаевск-на-Амуре" + VICTORY_POINTS_855:0 "Оха" + VICTORY_POINTS_12551:0 "Охотск" + VICTORY_POINTS_7878:0 "Петропавловск-Камчатский" + VICTORY_POINTS_4047:0 "Сурт" + VICTORY_POINTS_8069:0 "Марада" + VICTORY_POINTS_7063:0 "Адждабия" + VICTORY_POINTS_11940:0 "Бени-Валид" + VICTORY_POINTS_2012:0 "Кениеба" + VICTORY_POINTS_7954:0 "Гао" + VICTORY_POINTS_8034:0 "Порт=Харкорт" + VICTORY_POINTS_4972:0 "Хадеджиа" + VICTORY_POINTS_4997:0 "Майдугури" + VICTORY_POINTS_2046:0 "Бербер" + VICTORY_POINTS_12887:0 "Эд-Дамазин" + VICTORY_POINTS_5060:0 "Эль-Фашер" + VICTORY_POINTS_10827:0 "Бабануса" + VICTORY_POINTS_10764:0 "Ямбио" + VICTORY_POINTS_10761:0 "Гарисса" + VICTORY_POINTS_11145:0 "Лодвар" + VICTORY_POINTS_8144:0 "Кигома" + VICTORY_POINTS_12911:0 "Додома" + VICTORY_POINTS_2120:0 "Бейра" + VICTORY_POINTS_2123:0 "Мозамбик" + VICTORY_POINTS_13072:0 "Нгазиджа" + VICTORY_POINTS_13017:0 "Сен-Дени" + VICTORY_POINTS_13018:0 "Порт-Луи" + VICTORY_POINTS_5222:0 "Анциранана" + VICTORY_POINTS_10963:0 "Аус" + VICTORY_POINTS_10957:0 "Оучо" + VICTORY_POINTS_1552:0 "Куши" + VICTORY_POINTS_9986:0 "Кананга" + VICTORY_POINTS_10071:0 "Мбандака" + VICTORY_POINTS_1950:0 "Кисангани" + VICTORY_POINTS_1181:0 "Гома" + VICTORY_POINTS_11977:0 "Тэджон" + VICTORY_POINTS_11948:0 "Хэнам" + VICTORY_POINTS_6928:0 "Хыннам" + VICTORY_POINTS_12825:0 "Летисия" + VICTORY_POINTS_1076:0 "Сучжоу" + VICTORY_POINTS_4190:0 "Тяньцзинь" + VICTORY_POINTS_9215:0 "Сосновка" + VICTORY_POINTS_12519:0 "Рунду" diff --git a/src/raw/localisation/russian/victory_points2_l_russian.yml b/src/raw/localisation/russian/victory_points2_l_russian.yml deleted file mode 100644 index 7dd3eb5..0000000 --- a/src/raw/localisation/russian/victory_points2_l_russian.yml +++ /dev/null @@ -1,147 +0,0 @@ -l_russian: - VICTORY_POINTS_1015:0 "Элат" - VICTORY_POINTS_1065:0 "Назарет" - VICTORY_POINTS_11981:0 "Чжаньцзян" - VICTORY_POINTS_9970:0 "Шаогуань" - VICTORY_POINTS_4964:0 "Юйшу" - VICTORY_POINTS_10796:0 "Голмуд" - VICTORY_POINTS_7971:0 "Сучжоу" - VICTORY_POINTS_4704:0 "Хами" - VICTORY_POINTS_2074:0 "Чарклык" - VICTORY_POINTS_7926:0 "Сэни" - VICTORY_POINTS_5094:0 "Гегьэ" - VICTORY_POINTS_3427:0 "Ордос" - VICTORY_POINTS_4525:0 "Хундлун" - VICTORY_POINTS_12348:0 "Шилин-Хото" - VICTORY_POINTS_900:0 "Таншань" - VICTORY_POINTS_11801:0 "Чэндэ" - VICTORY_POINTS_7697:0 "Маньчжурия" - VICTORY_POINTS_4506:0 "Цицикар" - VICTORY_POINTS_6811:0 "Муданьцзян" - VICTORY_POINTS_1774:0 "Ховд" - VICTORY_POINTS_12669:0 "Даланзадгад" - VICTORY_POINTS_7374:0 "Бирендранагар" - VICTORY_POINTS_12366:0 "Гувахати" - VICTORY_POINTS_1116:0 "Итанагар" - VICTORY_POINTS_10088:0 "Кендрапара" - VICTORY_POINTS_10116:0 "Бхубанешвар" - VICTORY_POINTS_8005:0 "Лех" - VICTORY_POINTS_4321:0 "Гунтур" - VICTORY_POINTS_7260:0 "Коломбо" - VICTORY_POINTS_10149:0 "Пондичерри" - VICTORY_POINTS_2105:0 "Индаур" - VICTORY_POINTS_10801:0 "Джабалпур" - VICTORY_POINTS_12702:0 "Даммам" - VICTORY_POINTS_5037:0 "Мекка" - VICTORY_POINTS_12455:0 "Табук" - VICTORY_POINTS_8118:0 "Эль-Убайла" - VICTORY_POINTS_10901:0 "Эль-Джауф" - VICTORY_POINTS_8030:0 "Шарура" - VICTORY_POINTS_2103:0 "Салала" - VICTORY_POINTS_12234:0 "Пайети" - VICTORY_POINTS_12190:0 "Дили" - VICTORY_POINTS_1574:0 "Пиру" - VICTORY_POINTS_4579:0 "Ларат" - VICTORY_POINTS_4429:0 "Пуэрто-Принсеса" - VICTORY_POINTS_1311:0 "Лаоанг" - VICTORY_POINTS_5198:0 "Эроманга" - VICTORY_POINTS_4648:0 "Уэйпа" - VICTORY_POINTS_8209:0 "Дерби" - VICTORY_POINTS_8200:0 "Норсмен" - VICTORY_POINTS_1399:0 "Касивабара" - VICTORY_POINTS_10953:0 "Комодоро-Ривадавия" - VICTORY_POINTS_8215:0 "Мендоса" - VICTORY_POINTS_2106:0 "Корриентес" - VICTORY_POINTS_10973:0 "Фуэрто-Олимпо" - VICTORY_POINTS_2161:0 "Койаке" - VICTORY_POINTS_1613:0 "Куртина" - VICTORY_POINTS_8181:0 "Куритиба" - VICTORY_POINTS_2181:0 "Кампу-Гранди" - VICTORY_POINTS_11010:0 "Педрас-Неграс" - VICTORY_POINTS_10934:0 "Манаус" - VICTORY_POINTS_12973:0 "Тринидад" - VICTORY_POINTS_5166:0 "Куско" - VICTORY_POINTS_8149:0 "Икитос" - VICTORY_POINTS_12869:0 "Тарма" - VICTORY_POINTS_12729:0 "Миту" - VICTORY_POINTS_5023:0 "Пуэрто-Вильямиль" - VICTORY_POINTS_7259:0 "Виктория" - VICTORY_POINTS_10548:0 "Принс-Руперт" - VICTORY_POINTS_10527:0 "Йеллоунайф" - VICTORY_POINTS_4739:0 "Саскатун" - VICTORY_POINTS_6779:0 "Ла-Лош" - VICTORY_POINTS_10721:0 "Ранкин-Инлет" - VICTORY_POINTS_5239:0 "Черчилл" - VICTORY_POINTS_6510:0 "Садбери" - VICTORY_POINTS_13196:0 "Форт-Джордж" - VICTORY_POINTS_761:0 "Аттавапискат" - VICTORY_POINTS_12503:0 "Хаппи-Валли" - VICTORY_POINTS_10715:0 "Сет-Иль" - VICTORY_POINTS_1657:0 "Сагеней" - VICTORY_POINTS_12205:0 "Валь-д’Ор" - VICTORY_POINTS_7893:0 "Шибугамо" - VICTORY_POINTS_4285:0 "Сент-Джон" - VICTORY_POINTS_12505:0 "Сент-Джонс" - VICTORY_POINTS_4723:0 "Шайенн" - VICTORY_POINTS_4799:0 "Лас-Вегас" - VICTORY_POINTS_4660:0 "Мегри" - VICTORY_POINTS_10723:0 "Печора" - VICTORY_POINTS_12502:0 "Воркута" - VICTORY_POINTS_11496:0 "Чистополь" - VICTORY_POINTS_9385:0 "Набережные Челны" - VICTORY_POINTS_3189:0 "Кемь" - VICTORY_POINTS_9055:0 "Онега" - VICTORY_POINTS_12128:0 "Оренбург" - VICTORY_POINTS_4389:0 "Караганда" - VICTORY_POINTS_10536:0 "Новый Урегой" - VICTORY_POINTS_2900:0 "Хатанга" - VICTORY_POINTS_12672:0 "Сургут" - VICTORY_POINTS_12655:0 "Енисейск" - VICTORY_POINTS_1803:0 "Братск" - VICTORY_POINTS_7726:0 "Киренск" - VICTORY_POINTS_1722:0 "Удачный" - VICTORY_POINTS_12657:0 "Благовещенск" - VICTORY_POINTS_4725:0 "Амурск" - VICTORY_POINTS_4246:0 "Биробиджан" - VICTORY_POINTS_12559:0 "Николаевск-на-Амуре" - VICTORY_POINTS_855:0 "Оха" - VICTORY_POINTS_12551:0 "Охотск" - VICTORY_POINTS_7878:0 "Петропавловск-Камчатский" - VICTORY_POINTS_4047:0 "Сурт" - VICTORY_POINTS_8069:0 "Марада" - VICTORY_POINTS_7063:0 "Адждабия" - VICTORY_POINTS_11940:0 "Бени-Валид" - VICTORY_POINTS_2012:0 "Кениеба" - VICTORY_POINTS_7954:0 "Гао" - VICTORY_POINTS_8034:0 "Порт-Харкорт" - VICTORY_POINTS_4972:0 "Хадеджиа" - VICTORY_POINTS_4997:0 "Майдугури" - VICTORY_POINTS_2046:0 "Бербер" - VICTORY_POINTS_12887:0 "Эд-Дамазин" - VICTORY_POINTS_5060:0 "Эль-Фашер" - VICTORY_POINTS_10827:0 "Бабануса" - VICTORY_POINTS_10764:0 "Ямбио" - VICTORY_POINTS_10761:0 "Гарисса" - VICTORY_POINTS_11145:0 "Лодвар" - VICTORY_POINTS_8144:0 "Кигома" - VICTORY_POINTS_12911:0 "Додома" - VICTORY_POINTS_2120:0 "Бейра" - VICTORY_POINTS_2123:0 "Мозамбик" - VICTORY_POINTS_13072:0 "Нгазиджа" - VICTORY_POINTS_13017:0 "Сен-Дени" - VICTORY_POINTS_13018:0 "Порт-Луи" - VICTORY_POINTS_5222:0 "Анциранана" - VICTORY_POINTS_10963:0 "Аус" - VICTORY_POINTS_10957:0 "Оучо" - VICTORY_POINTS_1552:0 "Куши" - VICTORY_POINTS_9986:0 "Кананга" - VICTORY_POINTS_10071:0 "Мбандака" - VICTORY_POINTS_1950:0 "Кисангани" - VICTORY_POINTS_1181:0 "Гома" - VICTORY_POINTS_5208:0 "Гояния" - VICTORY_POINTS_3658:0 "Кутаиси" - VICTORY_POINTS_11948:0 "Мокихо" - VICTORY_POINTS_11977:0 "Тэтджон" - VICTORY_POINTS_6928:0 "Ханнам" - VICTORY_POINTS_8136:0 "Ондангва" - VICTORY_POINTS_9215:0 "Сосновка" -- 2.45.2