diff --git a/bin/locale.cfg b/bin/locale.cfg index 1033fef5..0722646d 100644 --- a/bin/locale.cfg +++ b/bin/locale.cfg @@ -1 +1 @@ -10022 1250 ro +10002 1252 en diff --git a/bin/pack/locale_cz/locale/cz/ui/costume/costume_bg.dds b/bin/pack/locale_cz/locale/cz/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_cz/locale/cz/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_cz/locale/cz/ui/costume/costume_bg.jpg b/bin/pack/locale_cz/locale/cz/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_cz/locale/cz/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_cz/locale/cz/ui/costume_bg.jpg b/bin/pack/locale_cz/locale/cz/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_cz/locale/cz/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_de/locale/de/ui/costume/costume_bg.dds b/bin/pack/locale_de/locale/de/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_de/locale/de/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_de/locale/de/ui/costume/costume_bg.jpg b/bin/pack/locale_de/locale/de/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_de/locale/de/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_de/locale/de/ui/costume_bg.jpg b/bin/pack/locale_de/locale/de/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_de/locale/de/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_dk/locale/dk/ui/costume/costume_bg.dds b/bin/pack/locale_dk/locale/dk/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_dk/locale/dk/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_dk/locale/dk/ui/costume/costume_bg.jpg b/bin/pack/locale_dk/locale/dk/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_dk/locale/dk/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_dk/locale/dk/ui/costume_bg.jpg b/bin/pack/locale_dk/locale/dk/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_dk/locale/dk/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_en/locale/en/ui/costume/costume_bg.dds b/bin/pack/locale_en/locale/en/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_en/locale/en/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_en/locale/en/ui/costume/costume_bg.jpg b/bin/pack/locale_en/locale/en/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_en/locale/en/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_en/locale/en/ui/costume_bg.jpg b/bin/pack/locale_en/locale/en/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_en/locale/en/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_es/locale/es/ui/costume/costume_bg.dds b/bin/pack/locale_es/locale/es/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_es/locale/es/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_es/locale/es/ui/costume/costume_bg.jpg b/bin/pack/locale_es/locale/es/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_es/locale/es/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_es/locale/es/ui/costume_bg.jpg b/bin/pack/locale_es/locale/es/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_es/locale/es/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_fr/locale/fr/ui/costume/costume_bg.dds b/bin/pack/locale_fr/locale/fr/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_fr/locale/fr/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_fr/locale/fr/ui/costume/costume_bg.jpg b/bin/pack/locale_fr/locale/fr/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_fr/locale/fr/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_fr/locale/fr/ui/costume_bg.jpg b/bin/pack/locale_fr/locale/fr/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_fr/locale/fr/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_gr/locale/gr/ui/costume/costume_bg.dds b/bin/pack/locale_gr/locale/gr/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_gr/locale/gr/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_gr/locale/gr/ui/costume/costume_bg.jpg b/bin/pack/locale_gr/locale/gr/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_gr/locale/gr/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_gr/locale/gr/ui/costume_bg.jpg b/bin/pack/locale_gr/locale/gr/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_gr/locale/gr/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_hu/locale/hu/ui/costume/costume_bg.dds b/bin/pack/locale_hu/locale/hu/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_hu/locale/hu/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_hu/locale/hu/ui/costume/costume_bg.jpg b/bin/pack/locale_hu/locale/hu/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_hu/locale/hu/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_hu/locale/hu/ui/costume_bg.jpg b/bin/pack/locale_hu/locale/hu/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_hu/locale/hu/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_it/locale/it/ui/costume/costume_bg.dds b/bin/pack/locale_it/locale/it/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_it/locale/it/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_it/locale/it/ui/costume/costume_bg.jpg b/bin/pack/locale_it/locale/it/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_it/locale/it/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_it/locale/it/ui/costume_bg.jpg b/bin/pack/locale_it/locale/it/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_it/locale/it/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_nl/locale/nl/ui/costume/costume_bg.dds b/bin/pack/locale_nl/locale/nl/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_nl/locale/nl/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_nl/locale/nl/ui/costume/costume_bg.jpg b/bin/pack/locale_nl/locale/nl/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_nl/locale/nl/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_nl/locale/nl/ui/costume_bg.jpg b/bin/pack/locale_nl/locale/nl/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_nl/locale/nl/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_pl/locale/pl/ui/costume/costume_bg.dds b/bin/pack/locale_pl/locale/pl/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_pl/locale/pl/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_pl/locale/pl/ui/costume/costume_bg.jpg b/bin/pack/locale_pl/locale/pl/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_pl/locale/pl/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_pl/locale/pl/ui/costume_bg.jpg b/bin/pack/locale_pl/locale/pl/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_pl/locale/pl/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_pt/locale/pt/ui/costume/costume_bg.dds b/bin/pack/locale_pt/locale/pt/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_pt/locale/pt/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_pt/locale/pt/ui/costume/costume_bg.jpg b/bin/pack/locale_pt/locale/pt/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_pt/locale/pt/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_pt/locale/pt/ui/costume_bg.jpg b/bin/pack/locale_pt/locale/pt/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_pt/locale/pt/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_ro/locale/ro/ui/costume/costume_bg.dds b/bin/pack/locale_ro/locale/ro/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_ro/locale/ro/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_ro/locale/ro/ui/costume/costume_bg.jpg b/bin/pack/locale_ro/locale/ro/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_ro/locale/ro/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_ro/locale/ro/ui/costume_bg.jpg b/bin/pack/locale_ro/locale/ro/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_ro/locale/ro/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_ru/locale/ru/ui/costume/costume_bg.dds b/bin/pack/locale_ru/locale/ru/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_ru/locale/ru/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_ru/locale/ru/ui/costume/costume_bg.jpg b/bin/pack/locale_ru/locale/ru/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_ru/locale/ru/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_ru/locale/ru/ui/costume_bg.jpg b/bin/pack/locale_ru/locale/ru/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_ru/locale/ru/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_tr/locale/tr/ui/costume/costume_bg.dds b/bin/pack/locale_tr/locale/tr/ui/costume/costume_bg.dds new file mode 100644 index 00000000..41af080a Binary files /dev/null and b/bin/pack/locale_tr/locale/tr/ui/costume/costume_bg.dds differ diff --git a/bin/pack/locale_tr/locale/tr/ui/costume/costume_bg.jpg b/bin/pack/locale_tr/locale/tr/ui/costume/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_tr/locale/tr/ui/costume/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/locale_tr/locale/tr/ui/costume_bg.jpg b/bin/pack/locale_tr/locale/tr/ui/costume_bg.jpg deleted file mode 100644 index ce3d966e..00000000 Binary files a/bin/pack/locale_tr/locale/tr/ui/costume_bg.jpg and /dev/null differ diff --git a/bin/pack/uiscript/uiscript/costumewindow.py b/bin/pack/uiscript/uiscript/costumewindow.py index 71ffec01..18854f9e 100644 --- a/bin/pack/uiscript/uiscript/costumewindow.py +++ b/bin/pack/uiscript/uiscript/costumewindow.py @@ -12,7 +12,7 @@ window = { "style" : ("movable", "float",), "width" : 140, - "height" : 180, + "height" : 180 + 47, "children" : ( @@ -25,7 +25,7 @@ window = { "y" : 0, "width" : 140, - "height" : 180, + "height" : 180 + 47, "children" : ( @@ -55,7 +55,7 @@ window = { "x" : 13, "y" : 38, - "image" : uiScriptLocale.LOCALE_UISCRIPT_PATH + "costume/costume_bg.jpg", + "image" : uiScriptLocale.LOCALE_UISCRIPT_PATH + "costume/costume_bg.dds", "children" : ( @@ -71,10 +71,11 @@ window = { "height" : 145, "slot" : ( - {"index":COSTUME_START_INDEX+0, "x":61, "y":45, "width":32, "height":64}, - {"index":COSTUME_START_INDEX+1, "x":61, "y": 8, "width":32, "height":32}, - {"index":COSTUME_START_INDEX+2, "x":5, "y":145, "width":32, "height":32}, - ), + {"index":COSTUME_START_INDEX+0, "x":61, "y":45, "width":32, "height":64}, + {"index":COSTUME_START_INDEX+1, "x":61, "y": 8, "width":32, "height":32}, + {"index":COSTUME_START_INDEX+2, "x":61, "y":125, "width":32, "height":32}, + {"index":COSTUME_START_INDEX+3, "x":10, "y":125, "width":32, "height":32}, + ), }, ), }, diff --git a/build/vcpkg b/build/vcpkg new file mode 160000 index 00000000..bd602277 --- /dev/null +++ b/build/vcpkg @@ -0,0 +1 @@ +Subproject commit bd602277bf7fc3188b3d086b302c6840464db900