diff --git a/.gitignore b/.gitignore index 32210f8..b6929a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .directory /build -/image/* /patchwork +/image +/install diff --git a/Makefile b/Makefile index 45cd0ed..faaff8c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ all: patch/tree/map/definition.csv +DESTDIR ?= install +MODNAME ?= randchgs +MODPATH ?= C:/Users/User/Documents/Paradox Interactive/Hearts of Iron IV/mod/randchgs # patch VANILLA_SRC ?= ../vanilla @@ -13,14 +16,22 @@ build: mkdir $@ release: build/release.zip +image/$(MODNAME): src/* $(patched_requisites) + mkdir -p $@ + rsync -rv src/ $@/ + rsync -rv patchwork/ $@/ +image/$(MODNAME).zip: image/$(MODNAME) image/$(MODNAME).mod + cd image && zip -r $(MODNAME).zip $(MODNAME) + cd image && zip $(MODNAME).zip $(MODNAME).mod +image/$(MODNAME).mod: src/descriptor.mod + cp $< $@ + printf '\n%s\n' 'path="$(MODPATH)/$(MODNAME)"' >> $@ + build/release.zip: src/* $(patched_requisites) | build cd src && zip -r ../build/$(@F) ./ cd patchwork && zip -r ../build/$(@F) ./ # install -DESTDIR ?= image -MODNAME ?= randchgs -MODPATH ?= C:/Users/User/Documents/Paradox Interactive/Hearts of Iron IV/mod/randchgs install: $(DESTDIR)/$(MODNAME).mod | $(DESTDIR)/$(MODNAME) $(DESTDIR)/$(MODNAME) $(DESTDIR): mkdir -p $@ @@ -32,5 +43,5 @@ $(DESTDIR)/$(MODNAME).mod: $(DESTDIR)/$(MODNAME)/descriptor.mod #clean clean: - rm -rf patchwork build image + rm -rf patchwork build .PHONY: all release clean patch install diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..292af1e --- /dev/null +++ b/Pipfile @@ -0,0 +1,12 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +pillow = "*" + +[dev-packages] + +[requires] +python_version = "3.11" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..3d44118 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,81 @@ +{ + "_meta": { + "hash": { + "sha256": "4edb4c046dc5fce710f674ab69074bd8a4811ed87cb04e6c1fc78b1803e2e486" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.11" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "pillow": { + "hashes": [ + "sha256:00f438bb841382b15d7deb9a05cc946ee0f2c352653c7aa659e75e592f6fa17d", + "sha256:0248f86b3ea061e67817c47ecbe82c23f9dd5d5226200eb9090b3873d3ca32de", + "sha256:04f6f6149f266a100374ca3cc368b67fb27c4af9f1cc8cb6306d849dcdf12616", + "sha256:062a1610e3bc258bff2328ec43f34244fcec972ee0717200cb1425214fe5b839", + "sha256:0a026c188be3b443916179f5d04548092e253beb0c3e2ee0a4e2cdad72f66099", + "sha256:0f7c276c05a9767e877a0b4c5050c8bee6a6d960d7f0c11ebda6b99746068c2a", + "sha256:1a8413794b4ad9719346cd9306118450b7b00d9a15846451549314a58ac42219", + "sha256:1ab05f3db77e98f93964697c8efc49c7954b08dd61cff526b7f2531a22410106", + "sha256:1c3ac5423c8c1da5928aa12c6e258921956757d976405e9467c5f39d1d577a4b", + "sha256:1c41d960babf951e01a49c9746f92c5a7e0d939d1652d7ba30f6b3090f27e412", + "sha256:1fafabe50a6977ac70dfe829b2d5735fd54e190ab55259ec8aea4aaea412fa0b", + "sha256:1fb29c07478e6c06a46b867e43b0bcdb241b44cc52be9bc25ce5944eed4648e7", + "sha256:24fadc71218ad2b8ffe437b54876c9382b4a29e030a05a9879f615091f42ffc2", + "sha256:2cdc65a46e74514ce742c2013cd4a2d12e8553e3a2563c64879f7c7e4d28bce7", + "sha256:2ef6721c97894a7aa77723740a09547197533146fba8355e86d6d9a4a1056b14", + "sha256:3b834f4b16173e5b92ab6566f0473bfb09f939ba14b23b8da1f54fa63e4b623f", + "sha256:3d929a19f5469b3f4df33a3df2983db070ebb2088a1e145e18facbc28cae5b27", + "sha256:41f67248d92a5e0a2076d3517d8d4b1e41a97e2df10eb8f93106c89107f38b57", + "sha256:47e5bf85b80abc03be7455c95b6d6e4896a62f6541c1f2ce77a7d2bb832af262", + "sha256:4d0152565c6aa6ebbfb1e5d8624140a440f2b99bf7afaafbdbf6430426497f28", + "sha256:50d08cd0a2ecd2a8657bd3d82c71efd5a58edb04d9308185d66c3a5a5bed9610", + "sha256:61f1a9d247317fa08a308daaa8ee7b3f760ab1809ca2da14ecc88ae4257d6172", + "sha256:6932a7652464746fcb484f7fc3618e6503d2066d853f68a4bd97193a3996e273", + "sha256:7a7e3daa202beb61821c06d2517428e8e7c1aab08943e92ec9e5755c2fc9ba5e", + "sha256:7dbaa3c7de82ef37e7708521be41db5565004258ca76945ad74a8e998c30af8d", + "sha256:7df5608bc38bd37ef585ae9c38c9cd46d7c81498f086915b0f97255ea60c2818", + "sha256:806abdd8249ba3953c33742506fe414880bad78ac25cc9a9b1c6ae97bedd573f", + "sha256:883f216eac8712b83a63f41b76ddfb7b2afab1b74abbb413c5df6680f071a6b9", + "sha256:912e3812a1dbbc834da2b32299b124b5ddcb664ed354916fd1ed6f193f0e2d01", + "sha256:937bdc5a7f5343d1c97dc98149a0be7eb9704e937fe3dc7140e229ae4fc572a7", + "sha256:9882a7451c680c12f232a422730f986a1fcd808da0fd428f08b671237237d651", + "sha256:9a92109192b360634a4489c0c756364c0c3a2992906752165ecb50544c251312", + "sha256:9d7bc666bd8c5a4225e7ac71f2f9d12466ec555e89092728ea0f5c0c2422ea80", + "sha256:a5f63b5a68daedc54c7c3464508d8c12075e56dcfbd42f8c1bf40169061ae666", + "sha256:a646e48de237d860c36e0db37ecaecaa3619e6f3e9d5319e527ccbc8151df061", + "sha256:a89b8312d51715b510a4fe9fc13686283f376cfd5abca8cd1c65e4c76e21081b", + "sha256:a92386125e9ee90381c3369f57a2a50fa9e6aa8b1cf1d9c4b200d41a7dd8e992", + "sha256:ae88931f93214777c7a3aa0a8f92a683f83ecde27f65a45f95f22d289a69e593", + "sha256:afc8eef765d948543a4775f00b7b8c079b3321d6b675dde0d02afa2ee23000b4", + "sha256:b0eb01ca85b2361b09480784a7931fc648ed8b7836f01fb9241141b968feb1db", + "sha256:b1c25762197144e211efb5f4e8ad656f36c8d214d390585d1d21281f46d556ba", + "sha256:b4005fee46ed9be0b8fb42be0c20e79411533d1fd58edabebc0dd24626882cfd", + "sha256:b920e4d028f6442bea9a75b7491c063f0b9a3972520731ed26c83e254302eb1e", + "sha256:baada14941c83079bf84c037e2d8b7506ce201e92e3d2fa0d1303507a8538212", + "sha256:bb40c011447712d2e19cc261c82655f75f32cb724788df315ed992a4d65696bb", + "sha256:c0949b55eb607898e28eaccb525ab104b2d86542a85c74baf3a6dc24002edec2", + "sha256:c9aeea7b63edb7884b031a35305629a7593272b54f429a9869a4f63a1bf04c34", + "sha256:cfe96560c6ce2f4c07d6647af2d0f3c54cc33289894ebd88cfbb3bcd5391e256", + "sha256:d27b5997bdd2eb9fb199982bb7eb6164db0426904020dc38c10203187ae2ff2f", + "sha256:d921bc90b1defa55c9917ca6b6b71430e4286fc9e44c55ead78ca1a9f9eba5f2", + "sha256:e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38", + "sha256:eaed6977fa73408b7b8a24e8b14e59e1668cfc0f4c40193ea7ced8e210adf996", + "sha256:fa1d323703cfdac2036af05191b969b910d8f115cf53093125e4058f62012c9a", + "sha256:fe1e26e1ffc38be097f0ba1d0d07fcade2bcfd1d023cda5b29935ae8052bd793" + ], + "index": "pypi", + "version": "==10.1.0" + } + }, + "develop": {} +} diff --git a/map_/terrain.xcf b/map_/terrain.xcf deleted file mode 100644 index b472c71..0000000 Binary files a/map_/terrain.xcf and /dev/null differ diff --git a/map_/terrain/colormap_rgb_cityemissivemask_a.dds b/map_/terrain/colormap_rgb_cityemissivemask_a.dds deleted file mode 100644 index c136811..0000000 Binary files a/map_/terrain/colormap_rgb_cityemissivemask_a.dds and /dev/null differ diff --git a/map_/terrain/colormap_rgb_cityemissivemask_a.xcf b/patches/colormap_rgb_cityemissivemask_a.xcf similarity index 100% rename from map_/terrain/colormap_rgb_cityemissivemask_a.xcf rename to patches/colormap_rgb_cityemissivemask_a.xcf diff --git a/patches/terrain.bmp b/patches/terrain.bmp index 1d3c2bc..4e7ce8c 100644 Binary files a/patches/terrain.bmp and b/patches/terrain.bmp differ diff --git a/src/localisation/russian/victory_points2_l_russian.yml b/src/localisation/russian/victory_points2_l_russian.yml index 0992181..e41472d 100644 --- a/src/localisation/russian/victory_points2_l_russian.yml +++ b/src/localisation/russian/victory_points2_l_russian.yml @@ -1,3 +1,140 @@ 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 "Гома"