From cdaebc3c0c7a08a3f7047e0caddc41d35104eb8b Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Tue, 7 Jul 2026 19:03:58 +0300 Subject: [PATCH] Working more on translations, fixing tree bugs --- resources/config/gameobjects_dorm_new_x.json | 172 +++++++++--------- .../config/gameobjects_uni_exterior_x.json | 164 ++++++++--------- .../config/gameobjects_uni_interior_x.json | 164 ++++++++--------- resources/config_en/items.json | 2 +- resources/dialogue/translate_dialogues.json | 6 +- resources/rotateYourDevice.png | 3 - resources/start_uni_interior.lua | 8 +- resources/w/exterior/DTree_Tree_1_002.txt.bin | Bin 0 -> 16288 bytes resources/w/exterior/DTree_Wood_1_002.txt.bin | Bin 0 -> 31148 bytes resources/w/ui/hud_step1.json | 56 +++--- resources/w/ui/hud_step2.json | 54 +++--- resources/w/ui/hud_step4.json | 56 +++--- resources/w/ui_en/hud_step1.json | 54 +++--- resources/w/ui_en/hud_step2.json | 54 +++--- resources/w/ui_en/hud_step3.json | 54 +++--- resources/w/ui_en/hud_step4.json | 56 +++--- resources/w/ui_en/screen_phone_chat_list.json | 6 +- .../ui_en/screen_phone_chat_list_hint001.json | 6 +- src/Game.cpp | 19 +- src/Game.h | 4 +- src/MenuManager.cpp | 53 ++++-- src/MenuManager.h | 14 +- src/ScriptEngine.cpp | 24 ++- 23 files changed, 542 insertions(+), 487 deletions(-) delete mode 100644 resources/rotateYourDevice.png create mode 100644 resources/w/exterior/DTree_Tree_1_002.txt.bin create mode 100644 resources/w/exterior/DTree_Wood_1_002.txt.bin diff --git a/resources/config/gameobjects_dorm_new_x.json b/resources/config/gameobjects_dorm_new_x.json index babb56b..6ee9252 100644 --- a/resources/config/gameobjects_dorm_new_x.json +++ b/resources/config/gameobjects_dorm_new_x.json @@ -421,7 +421,7 @@ "scale": 1.0 }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_1", "positionX": 43.1999626159668, "positionY": -0.10000000149011612, @@ -433,7 +433,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_1", "positionX": 43.1999626159668, "positionY": -0.10000000149011612, @@ -445,7 +445,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_2", "positionX": 38.24382019042969, "positionY": -0.10000000149011612, @@ -457,7 +457,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_2", "positionX": 38.24382019042969, "positionY": -0.10000000149011612, @@ -469,7 +469,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_3", "positionX": 30.798585891723633, "positionY": -0.10000000149011612, @@ -481,7 +481,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_3", "positionX": 30.798585891723633, "positionY": -0.10000000149011612, @@ -493,7 +493,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_4", "positionX": 24.59586524963379, "positionY": -0.10000000149011612, @@ -505,7 +505,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_4", "positionX": 24.59586524963379, "positionY": -0.10000000149011612, @@ -517,7 +517,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_5", "positionX": 30.583667755126953, "positionY": -0.10000000149011612, @@ -529,7 +529,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_5", "positionX": 30.583667755126953, "positionY": -0.10000000149011612, @@ -541,7 +541,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_6", "positionX": 19.502925872802734, "positionY": -0.10000000149011612, @@ -553,7 +553,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_6", "positionX": 19.502925872802734, "positionY": -0.10000000149011612, @@ -565,7 +565,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_7", "positionX": 13.830914497375488, "positionY": -0.10000000149011612, @@ -577,7 +577,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_7", "positionX": 13.830914497375488, "positionY": -0.10000000149011612, @@ -589,7 +589,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_8", "positionX": 44.45012664794922, "positionY": -0.10000000149011612, @@ -601,7 +601,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_8", "positionX": 44.45012664794922, "positionY": -0.10000000149011612, @@ -613,7 +613,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_9", "positionX": 42.37114715576172, "positionY": -0.10000000149011612, @@ -625,7 +625,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_9", "positionX": 42.37114715576172, "positionY": -0.10000000149011612, @@ -637,7 +637,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_10", "positionX": 35.2324104309082, "positionY": -0.10000000149011612, @@ -649,7 +649,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_10", "positionX": 35.2324104309082, "positionY": -0.10000000149011612, @@ -661,7 +661,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_11", "positionX": 27.289621353149414, "positionY": -0.10000000149011612, @@ -673,7 +673,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_11", "positionX": 27.289621353149414, "positionY": -0.10000000149011612, @@ -685,7 +685,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_12", "positionX": 23.148643493652344, "positionY": -0.10000000149011612, @@ -697,7 +697,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_12", "positionX": 23.148643493652344, "positionY": -0.10000000149011612, @@ -709,7 +709,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_13", "positionX": 16.287235260009766, "positionY": -0.10000000149011612, @@ -721,7 +721,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_13", "positionX": 16.287235260009766, "positionY": -0.10000000149011612, @@ -733,7 +733,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_14", "positionX": 36.28240203857422, "positionY": -0.10000000149011612, @@ -745,7 +745,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_14", "positionX": 36.28240203857422, "positionY": -0.10000000149011612, @@ -757,7 +757,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_15", "positionX": 23.501392364501953, "positionY": -0.10000000149011612, @@ -769,7 +769,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_15", "positionX": 23.501392364501953, "positionY": -0.10000000149011612, @@ -781,7 +781,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_16", "positionX": 32.66380310058594, "positionY": -0.10000000149011612, @@ -793,7 +793,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_16", "positionX": 32.66380310058594, "positionY": -0.10000000149011612, @@ -805,7 +805,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_17", "positionX": 18.3758487701416, "positionY": -0.10000000149011612, @@ -817,7 +817,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_17", "positionX": 18.3758487701416, "positionY": -0.10000000149011612, @@ -829,7 +829,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_18", "positionX": 27.87108039855957, "positionY": -0.10000000149011612, @@ -841,7 +841,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_18", "positionX": 27.87108039855957, "positionY": -0.10000000149011612, @@ -853,7 +853,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_19", "positionX": 14.924304962158203, "positionY": -0.10000000149011612, @@ -865,7 +865,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_19", "positionX": 14.924304962158203, "positionY": -0.10000000149011612, @@ -877,7 +877,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_20", "positionX": 3.6129589080810547, "positionY": -0.10000000149011612, @@ -889,7 +889,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_20", "positionX": 3.6129589080810547, "positionY": -0.10000000149011612, @@ -901,7 +901,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_21", "positionX": -12.661178588867188, "positionY": -0.10000000149011612, @@ -913,7 +913,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_21", "positionX": -12.661178588867188, "positionY": -0.10000000149011612, @@ -925,7 +925,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_22", "positionX": 13.384355545043945, "positionY": -0.10000000149011612, @@ -937,7 +937,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_22", "positionX": 13.384355545043945, "positionY": -0.10000000149011612, @@ -949,7 +949,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_23", "positionX": 14.32064151763916, "positionY": -0.10000000149011612, @@ -961,7 +961,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_23", "positionX": 14.32064151763916, "positionY": -0.10000000149011612, @@ -973,7 +973,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_24", "positionX": 13.16691780090332, "positionY": -0.10000000149011612, @@ -985,7 +985,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_24", "positionX": 13.16691780090332, "positionY": -0.10000000149011612, @@ -997,7 +997,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_25", "positionX": 3.7424449920654297, "positionY": -0.10000000149011612, @@ -1009,7 +1009,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_25", "positionX": 3.7424449920654297, "positionY": -0.10000000149011612, @@ -1021,7 +1021,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_26", "positionX": -8.782635688781738, "positionY": -0.10000000149011612, @@ -1033,7 +1033,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_26", "positionX": -8.782635688781738, "positionY": -0.10000000149011612, @@ -1045,7 +1045,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_27", "positionX": -33.941402435302734, "positionY": -0.10000000149011612, @@ -1057,7 +1057,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_27", "positionX": -33.941402435302734, "positionY": -0.10000000149011612, @@ -1069,7 +1069,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_28", "positionX": -41.60282516479492, "positionY": -0.10000000149011612, @@ -1081,7 +1081,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_28", "positionX": -41.60282516479492, "positionY": -0.10000000149011612, @@ -1093,7 +1093,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_29", "positionX": -33.38269805908203, "positionY": -0.10000000149011612, @@ -1105,7 +1105,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_29", "positionX": -33.38269805908203, "positionY": -0.10000000149011612, @@ -1117,7 +1117,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_30", "positionX": -33.403724670410156, "positionY": -0.10000000149011612, @@ -1129,7 +1129,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_30", "positionX": -33.403724670410156, "positionY": -0.10000000149011612, @@ -1141,7 +1141,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_31", "positionX": -33.104835510253906, "positionY": -0.10000000149011612, @@ -1153,7 +1153,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_31", "positionX": -33.104835510253906, "positionY": -0.10000000149011612, @@ -1165,7 +1165,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_32", "positionX": -33.29906463623047, "positionY": -0.10000000149011612, @@ -1177,7 +1177,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_32", "positionX": -33.29906463623047, "positionY": -0.10000000149011612, @@ -1189,7 +1189,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_x1", "positionX": -33.332733154296875, "positionY": -0.10000000149011612, @@ -1201,7 +1201,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_x1", "positionX": -33.332733154296875, "positionY": -0.10000000149011612, @@ -1213,7 +1213,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_x2", "positionX": -34.756858825683594, "positionY": -0.10000000149011612, @@ -1225,7 +1225,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_x2", "positionX": -34.756858825683594, "positionY": -0.10000000149011612, @@ -1237,7 +1237,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_x3", "positionX": -43.25038528442383, "positionY": -0.10000000149011612, @@ -1249,7 +1249,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_x3", "positionX": -43.25038528442383, "positionY": -0.10000000149011612, @@ -1261,7 +1261,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_x4", "positionX": -13.056654930114746, "positionY": -0.10000000149011612, @@ -1273,7 +1273,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_x4", "positionX": -13.056654930114746, "positionY": -0.10000000149011612, @@ -1285,7 +1285,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_3_001.txt.bin", "name": "editor_wood_x5", "positionX": -13.015312194824219, "positionY": -0.10000000149011612, @@ -1297,7 +1297,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_3_001.txt.bin", "name": "editor_tree_x5", "positionX": -13.015312194824219, "positionY": -0.10000000149011612, @@ -1309,7 +1309,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_x6", "positionX": -12.799440383911133, "positionY": -0.10000000149011612, @@ -1321,7 +1321,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_x6", "positionX": -12.799440383911133, "positionY": -0.10000000149011612, @@ -1333,7 +1333,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_x7", "positionX": -12.944127082824707, "positionY": -0.10000000149011612, @@ -1345,7 +1345,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_x7", "positionX": -12.944127082824707, "positionY": -0.10000000149011612, @@ -1357,7 +1357,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_x8", "positionX": -13.023813247680664, "positionY": -0.10000000149011612, @@ -1369,7 +1369,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_x8", "positionX": -13.023813247680664, "positionY": -0.10000000149011612, @@ -1381,7 +1381,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_x9", "positionX": -12.888455390930176, "positionY": -0.10000000149011612, @@ -1393,7 +1393,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_x9", "positionX": -12.888455390930176, "positionY": -0.10000000149011612, @@ -1405,7 +1405,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_x10", "positionX": -12.926657676696777, "positionY": -0.10000000149011612, @@ -1417,7 +1417,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_x10", "positionX": -12.926657676696777, "positionY": -0.10000000149011612, @@ -1429,7 +1429,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Wood_2_001.txt.bin", "name": "editor_wood_x11", "positionX": -13.020533561706543, "positionY": -0.10000000149011612, @@ -1441,7 +1441,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt", + "meshPath": "resources/w/exterior/DTree_Tree_2_001.txt.bin", "name": "editor_tree_x11", "positionX": -13.020533561706543, "positionY": -0.10000000149011612, diff --git a/resources/config/gameobjects_uni_exterior_x.json b/resources/config/gameobjects_uni_exterior_x.json index fc7fe1d..d509c9c 100644 --- a/resources/config/gameobjects_uni_exterior_x.json +++ b/resources/config/gameobjects_uni_exterior_x.json @@ -166,7 +166,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_3", "positionX": -44.690895080566406, "positionY": 0.0, @@ -178,7 +178,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_3", "positionX": -44.690895080566406, "positionY": 0.0, @@ -190,7 +190,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_4", "positionX": -27.385875701904297, "positionY": 0.0, @@ -202,7 +202,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_4", "positionX": -27.385875701904297, "positionY": 0.0, @@ -238,7 +238,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_6", "positionX": -32.574527740478516, "positionY": 0.0, @@ -250,7 +250,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_6", "positionX": -32.574527740478516, "positionY": 0.0, @@ -406,7 +406,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_13", "positionX": -66.5842514038086, "positionY": 0.0, @@ -418,7 +418,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_13", "positionX": -66.5842514038086, "positionY": 0.0, @@ -430,7 +430,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_14", "positionX": -63.19084167480469, "positionY": 0.0, @@ -442,7 +442,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_14", "positionX": -63.19084167480469, "positionY": 0.0, @@ -478,7 +478,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_16", "positionX": -76.99790954589844, "positionY": 0.0, @@ -490,7 +490,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_16", "positionX": -76.99790954589844, "positionY": 0.0, @@ -550,7 +550,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_19", "positionX": -41.91582489013672, "positionY": 0.0, @@ -562,7 +562,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_19", "positionX": -41.91582489013672, "positionY": 0.0, @@ -670,7 +670,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_24", "positionX": -58.96484375, "positionY": 0.0, @@ -682,7 +682,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_24", "positionX": -58.96484375, "positionY": 0.0, @@ -766,7 +766,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_28", "positionX": -64.92254638671875, "positionY": 0.0, @@ -778,7 +778,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_28", "positionX": -64.92254638671875, "positionY": 0.0, @@ -814,7 +814,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_30", "positionX": -74.68647003173828, "positionY": 0.0, @@ -826,7 +826,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_30", "positionX": -74.68647003173828, "positionY": 0.0, @@ -838,7 +838,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_31", "positionX": -61.504512786865234, "positionY": 0.0, @@ -850,7 +850,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_31", "positionX": -61.504512786865234, "positionY": 0.0, @@ -862,7 +862,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_32", "positionX": -56.605987548828125, "positionY": 0.0, @@ -874,7 +874,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_32", "positionX": -56.605987548828125, "positionY": 0.0, @@ -958,7 +958,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_36", "positionX": -66.65809631347656, "positionY": 0.0, @@ -970,7 +970,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_36", "positionX": -66.65809631347656, "positionY": 0.0, @@ -1126,7 +1126,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_43", "positionX": -43.52067565917969, "positionY": 0.0, @@ -1138,7 +1138,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_43", "positionX": -43.52067565917969, "positionY": 0.0, @@ -1222,7 +1222,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_47", "positionX": -18.57537841796875, "positionY": 0.0, @@ -1234,7 +1234,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_47", "positionX": -18.57537841796875, "positionY": 0.0, @@ -1246,7 +1246,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_48", "positionX": -26.706348419189453, "positionY": 0.0, @@ -1258,7 +1258,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_48", "positionX": -26.706348419189453, "positionY": 0.0, @@ -1342,7 +1342,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_52", "positionX": -29.828750610351563, "positionY": 0.0, @@ -1354,7 +1354,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_52", "positionX": -29.828750610351563, "positionY": 0.0, @@ -1366,7 +1366,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_53", "positionX": -28.290407180786133, "positionY": 0.0, @@ -1378,7 +1378,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_53", "positionX": -28.290407180786133, "positionY": 0.0, @@ -1390,7 +1390,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_54", "positionX": -21.429716110229492, "positionY": 0.0, @@ -1402,7 +1402,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_54", "positionX": -21.429716110229492, "positionY": 0.0, @@ -1414,7 +1414,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_55", "positionX": -9.357202529907227, "positionY": 0.0, @@ -1426,7 +1426,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_55", "positionX": -9.357202529907227, "positionY": 0.0, @@ -1750,7 +1750,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_69", "positionX": -0.6092414855957031, "positionY": 0.0, @@ -1762,7 +1762,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_69", "positionX": -0.6092414855957031, "positionY": 0.0, @@ -1798,7 +1798,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_71", "positionX": 14.684800148010254, "positionY": 0.0, @@ -1810,7 +1810,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_71", "positionX": 14.684800148010254, "positionY": 0.0, @@ -1822,7 +1822,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_72", "positionX": 29.413284301757813, "positionY": 0.0, @@ -1834,7 +1834,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_72", "positionX": 29.413284301757813, "positionY": 0.0, @@ -1894,7 +1894,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_75", "positionX": 44.61367416381836, "positionY": 0.0, @@ -1906,7 +1906,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_75", "positionX": 44.61367416381836, "positionY": 0.0, @@ -1942,7 +1942,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_77", "positionX": 30.211170196533203, "positionY": 0.0, @@ -1954,7 +1954,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_77", "positionX": 30.211170196533203, "positionY": 0.0, @@ -2014,7 +2014,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_80", "positionX": 27.12729263305664, "positionY": 0.0, @@ -2026,7 +2026,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_80", "positionX": 27.12729263305664, "positionY": 0.0, @@ -2278,7 +2278,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_91", "positionX": 18.20602798461914, "positionY": 0.0, @@ -2290,7 +2290,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_91", "positionX": 18.20602798461914, "positionY": 0.0, @@ -2398,7 +2398,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_96", "positionX": 42.20805740356445, "positionY": 0.0, @@ -2410,7 +2410,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_96", "positionX": 42.20805740356445, "positionY": 0.0, @@ -2446,7 +2446,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_98", "positionX": 29.144359588623047, "positionY": 0.0, @@ -2458,7 +2458,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_98", "positionX": 29.144359588623047, "positionY": 0.0, @@ -2470,7 +2470,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_99", "positionX": 22.395423889160156, "positionY": 0.0, @@ -2482,7 +2482,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_99", "positionX": 22.395423889160156, "positionY": 0.0, @@ -2494,7 +2494,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_100", "positionX": 25.797927856445313, "positionY": 0.0, @@ -2506,7 +2506,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_100", "positionX": 25.797927856445313, "positionY": 0.0, @@ -2566,7 +2566,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_103", "positionX": 17.974000930786133, "positionY": 0.0, @@ -2578,7 +2578,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_103", "positionX": 17.974000930786133, "positionY": 0.0, @@ -2590,7 +2590,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_104", "positionX": 36.7161865234375, "positionY": 0.0, @@ -2602,7 +2602,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_104", "positionX": 36.7161865234375, "positionY": 0.0, @@ -2710,7 +2710,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_109", "positionX": 34.38239288330078, "positionY": 0.0, @@ -2722,7 +2722,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_109", "positionX": 34.38239288330078, "positionY": 0.0, @@ -2734,7 +2734,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_110", "positionX": 25.663957595825195, "positionY": 0.0, @@ -2746,7 +2746,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_110", "positionX": 25.663957595825195, "positionY": 0.0, @@ -2782,7 +2782,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_112", "positionX": 18.735952377319336, "positionY": 0.0, @@ -2794,7 +2794,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_112", "positionX": 18.735952377319336, "positionY": 0.0, @@ -2806,7 +2806,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_113", "positionX": 8.67741584777832, "positionY": 0.0, @@ -2818,7 +2818,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_113", "positionX": 8.67741584777832, "positionY": 0.0, @@ -2878,7 +2878,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_116", "positionX": 6.125237464904785, "positionY": 0.0, @@ -2890,7 +2890,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_116", "positionX": 6.125237464904785, "positionY": 0.0, @@ -3022,7 +3022,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_122", "positionX": -3.0502519607543945, "positionY": 0.0, @@ -3034,7 +3034,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_122", "positionX": -3.0502519607543945, "positionY": 0.0, @@ -3046,7 +3046,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_123", "positionX": -7.668870449066162, "positionY": 0.0, @@ -3058,7 +3058,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_123", "positionX": -7.668870449066162, "positionY": 0.0, @@ -3238,7 +3238,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_131", "positionX": 13.072427749633789, "positionY": 0.0, @@ -3250,7 +3250,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_131", "positionX": 13.072427749633789, "positionY": 0.0, diff --git a/resources/config/gameobjects_uni_interior_x.json b/resources/config/gameobjects_uni_interior_x.json index 46ac298..ab54783 100644 --- a/resources/config/gameobjects_uni_interior_x.json +++ b/resources/config/gameobjects_uni_interior_x.json @@ -399,7 +399,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_3", "positionX": -44.690895080566406, "positionY": -5.0, @@ -411,7 +411,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_3", "positionX": -44.690895080566406, "positionY": -5.0, @@ -423,7 +423,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_4", "positionX": -27.385875701904297, "positionY": -5.0, @@ -435,7 +435,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_4", "positionX": -27.385875701904297, "positionY": -5.0, @@ -471,7 +471,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_6", "positionX": -32.574527740478516, "positionY": -5.0, @@ -483,7 +483,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_6", "positionX": -32.574527740478516, "positionY": -5.0, @@ -639,7 +639,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_13", "positionX": -66.5842514038086, "positionY": -5.0, @@ -651,7 +651,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_13", "positionX": -66.5842514038086, "positionY": -5.0, @@ -663,7 +663,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_14", "positionX": -63.19084167480469, "positionY": -5.0, @@ -675,7 +675,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_14", "positionX": -63.19084167480469, "positionY": -5.0, @@ -711,7 +711,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_16", "positionX": -76.99790954589844, "positionY": -5.0, @@ -723,7 +723,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_16", "positionX": -76.99790954589844, "positionY": -5.0, @@ -783,7 +783,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_19", "positionX": -41.91582489013672, "positionY": -5.0, @@ -795,7 +795,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_19", "positionX": -41.91582489013672, "positionY": -5.0, @@ -903,7 +903,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_24", "positionX": -58.96484375, "positionY": -5.0, @@ -915,7 +915,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_24", "positionX": -58.96484375, "positionY": -5.0, @@ -999,7 +999,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_28", "positionX": -64.92254638671875, "positionY": -5.0, @@ -1011,7 +1011,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_28", "positionX": -64.92254638671875, "positionY": -5.0, @@ -1047,7 +1047,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_30", "positionX": -74.68647003173828, "positionY": -5.0, @@ -1059,7 +1059,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_30", "positionX": -74.68647003173828, "positionY": -5.0, @@ -1071,7 +1071,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_31", "positionX": -61.504512786865234, "positionY": -5.0, @@ -1083,7 +1083,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_31", "positionX": -61.504512786865234, "positionY": -5.0, @@ -1095,7 +1095,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_32", "positionX": -56.605987548828125, "positionY": -5.0, @@ -1107,7 +1107,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_32", "positionX": -56.605987548828125, "positionY": -5.0, @@ -1191,7 +1191,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_36", "positionX": -66.65809631347656, "positionY": -5.0, @@ -1203,7 +1203,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_36", "positionX": -66.65809631347656, "positionY": -5.0, @@ -1359,7 +1359,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_43", "positionX": -43.52067565917969, "positionY": -5.0, @@ -1371,7 +1371,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_43", "positionX": -43.52067565917969, "positionY": -5.0, @@ -1455,7 +1455,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_47", "positionX": -18.57537841796875, "positionY": -5.0, @@ -1467,7 +1467,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_47", "positionX": -18.57537841796875, "positionY": -5.0, @@ -1479,7 +1479,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_48", "positionX": -26.706348419189453, "positionY": -5.0, @@ -1491,7 +1491,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_48", "positionX": -26.706348419189453, "positionY": -5.0, @@ -1575,7 +1575,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_52", "positionX": -29.828750610351563, "positionY": -5.0, @@ -1587,7 +1587,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_52", "positionX": -29.828750610351563, "positionY": -5.0, @@ -1599,7 +1599,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_53", "positionX": -28.290407180786133, "positionY": -5.0, @@ -1611,7 +1611,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_53", "positionX": -28.290407180786133, "positionY": -5.0, @@ -1623,7 +1623,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_54", "positionX": -21.429716110229492, "positionY": -5.0, @@ -1635,7 +1635,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_54", "positionX": -21.429716110229492, "positionY": -5.0, @@ -1647,7 +1647,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_55", "positionX": -9.357202529907227, "positionY": -5.0, @@ -1659,7 +1659,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_55", "positionX": -9.357202529907227, "positionY": -5.0, @@ -1983,7 +1983,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_69", "positionX": -0.6092414855957031, "positionY": -5.0, @@ -1995,7 +1995,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_69", "positionX": -0.6092414855957031, "positionY": -5.0, @@ -2031,7 +2031,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_71", "positionX": 14.684800148010254, "positionY": -5.0, @@ -2043,7 +2043,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_71", "positionX": 14.684800148010254, "positionY": -5.0, @@ -2055,7 +2055,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_72", "positionX": 29.413284301757813, "positionY": -5.0, @@ -2067,7 +2067,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_72", "positionX": 29.413284301757813, "positionY": -5.0, @@ -2127,7 +2127,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_75", "positionX": 44.61367416381836, "positionY": -5.0, @@ -2139,7 +2139,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_75", "positionX": 44.61367416381836, "positionY": -5.0, @@ -2175,7 +2175,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_77", "positionX": 30.211170196533203, "positionY": -5.0, @@ -2187,7 +2187,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_77", "positionX": 30.211170196533203, "positionY": -5.0, @@ -2247,7 +2247,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_80", "positionX": 27.12729263305664, "positionY": -5.0, @@ -2259,7 +2259,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_80", "positionX": 27.12729263305664, "positionY": -5.0, @@ -2511,7 +2511,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_91", "positionX": 18.20602798461914, "positionY": -5.0, @@ -2523,7 +2523,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_91", "positionX": 18.20602798461914, "positionY": -5.0, @@ -2631,7 +2631,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_96", "positionX": 42.20805740356445, "positionY": -5.0, @@ -2643,7 +2643,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_96", "positionX": 42.20805740356445, "positionY": -5.0, @@ -2679,7 +2679,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_98", "positionX": 29.144359588623047, "positionY": -5.0, @@ -2691,7 +2691,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_98", "positionX": 29.144359588623047, "positionY": -5.0, @@ -2703,7 +2703,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_99", "positionX": 22.395423889160156, "positionY": -5.0, @@ -2715,7 +2715,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_99", "positionX": 22.395423889160156, "positionY": -5.0, @@ -2727,7 +2727,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_100", "positionX": 25.797927856445313, "positionY": -5.0, @@ -2739,7 +2739,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_100", "positionX": 25.797927856445313, "positionY": -5.0, @@ -2799,7 +2799,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_103", "positionX": 17.974000930786133, "positionY": -5.0, @@ -2811,7 +2811,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_103", "positionX": 17.974000930786133, "positionY": -5.0, @@ -2823,7 +2823,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_104", "positionX": 36.7161865234375, "positionY": -5.0, @@ -2835,7 +2835,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_104", "positionX": 36.7161865234375, "positionY": -5.0, @@ -2943,7 +2943,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_109", "positionX": 34.38239288330078, "positionY": -5.0, @@ -2955,7 +2955,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_109", "positionX": 34.38239288330078, "positionY": -5.0, @@ -2967,7 +2967,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_110", "positionX": 25.663957595825195, "positionY": -5.0, @@ -2979,7 +2979,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_110", "positionX": 25.663957595825195, "positionY": -5.0, @@ -3015,7 +3015,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_112", "positionX": 18.735952377319336, "positionY": -5.0, @@ -3027,7 +3027,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_112", "positionX": 18.735952377319336, "positionY": -5.0, @@ -3039,7 +3039,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_113", "positionX": 8.67741584777832, "positionY": -5.0, @@ -3051,7 +3051,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_113", "positionX": 8.67741584777832, "positionY": -5.0, @@ -3111,7 +3111,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_116", "positionX": 6.125237464904785, "positionY": -5.0, @@ -3123,7 +3123,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_116", "positionX": 6.125237464904785, "positionY": -5.0, @@ -3255,7 +3255,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_122", "positionX": -3.0502519607543945, "positionY": -5.0, @@ -3267,7 +3267,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_122", "positionX": -3.0502519607543945, "positionY": -5.0, @@ -3279,7 +3279,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_123", "positionX": -7.668870449066162, "positionY": -5.0, @@ -3291,7 +3291,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_123", "positionX": -7.668870449066162, "positionY": -5.0, @@ -3471,7 +3471,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Wood_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Wood_1_002.txt.bin", "name": "editor_wood_131", "positionX": 13.072427749633789, "positionY": -5.0, @@ -3483,7 +3483,7 @@ "texturePath": "resources/w/exterior/texAtlas001.png" }, { - "meshPath": "resources/w/exterior/DTree_Tree_1_001.txt.bin", + "meshPath": "resources/w/exterior/DTree_Tree_1_002.txt.bin", "name": "editor_tree_131", "positionX": 13.072427749633789, "positionY": -5.0, diff --git a/resources/config_en/items.json b/resources/config_en/items.json index 1399d8c..a6ee70c 100644 --- a/resources/config_en/items.json +++ b/resources/config_en/items.json @@ -45,7 +45,7 @@ { "id": "report_card", "name": "Begimai's grade book", - "description": "This is Begimai's grade book. This is where you need to put your grade for your coursework.", + "description": "This is Begimai's grade book. This is where a teacher should write grades for each subject or coursework.", "icon": "resources/w/ui/img/inv/ItemReportCard001.png", "selectedIcon": "resources/w/ui/img/inv/ItemSelReportCard001.png" }, diff --git a/resources/dialogue/translate_dialogues.json b/resources/dialogue/translate_dialogues.json index f3ea585..4323032 100644 --- a/resources/dialogue/translate_dialogues.json +++ b/resources/dialogue/translate_dialogues.json @@ -23,7 +23,7 @@ { "key": "Бекзат, сынок, мы c мамой тебе отправили немного денег, постарайся прожить на эти деньги до конца недели!", "ru": "Бекзат, сынок, мы c мамой тебе отправили немного денег, постарайся прожить на эти деньги до конца недели!", - "en": "Bekzat, son, your mom and I sent you some money, try to live on this money until the end of the week!" + "en": "Bekzat, son, I and your mom sent you some money, try to live on this money until the end of the week!" }, { "key": "Спасибо!", @@ -913,7 +913,7 @@ { "key": "Бекзат, зачетка Бегимай у тебя. Отправляйся в теневой мир и покажи зачетку призраку Бегимай, чтобы она освободилась.", "ru": "Бекзат, зачетка Бегимай у тебя. Отправляйся в теневой мир и покажи зачетку призраку Бегимай, чтобы она освободилась.", - "en": "Bekzat, you have Begimai's grade book. Go to the shadow world and show the grade book to Begimai's ghost so she can be released." + "en": "Bekzat, you have Begimai's grade book. Go to the dark lands and show the grade book to Begimai's ghost so she can be released." }, { "key": "Хорошо!", @@ -948,7 +948,7 @@ { "key": "Теперь иди в теневой мир и покажи зачетку Бегимай. Расскажи ей, что она сдала курсовую работу.", "ru": "Теперь иди в теневой мир и покажи зачетку Бегимай. Расскажи ей, что она сдала курсовую работу.", - "en": "Now go to the shadow world and show Begimai her grade book. Tell her she passed her coursework." + "en": "Now go to the dark lands and show Begimai her grade book. Tell her she passed her coursework." }, { "key": "Мне стоит вернуть книгу на место, прежде чем уходить из библиотеки.", diff --git a/resources/rotateYourDevice.png b/resources/rotateYourDevice.png deleted file mode 100644 index 9d578b9..0000000 --- a/resources/rotateYourDevice.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d676836531093a5b9b160f2be918e87d253eab389e59d730b6e231ea05807bb -size 25523 diff --git a/resources/start_uni_interior.lua b/resources/start_uni_interior.lua index 98fab1f..43cad6a 100644 --- a/resources/start_uni_interior.lua +++ b/resources/start_uni_interior.lua @@ -1,3 +1,6 @@ +CONST_MSG_EMPTY = "(пусто)" +CONST_MSG_WHERE = "Бекзат, ты где? Я жду..." + hall_door_opened = false teacher_door_opened = false --lection_is_over = false @@ -27,6 +30,7 @@ was_day_when_player_left = 0 morning_can_open_door_index = 0 morning_did_open_door_index = 0 + ghost_gone = false function dialog_aiperi_give_key() @@ -40,7 +44,7 @@ function dialog_aiperi_give_key() local aiperi_chat_opened = game_api.getIntValue("aiperi_chat_opened") if (aiperi_chat_opened == 0) then - game_api.set_chat_unread(0, false, "(пусто)") + game_api.set_chat_unread(0, false, CONST_MSG_EMPTY) end end end @@ -657,7 +661,7 @@ game_api.set_cutscene_callback("lection_cutscene001", function() local aiperi_knife_aware = game_api.getIntValue("aiperi_knife_aware") if (aiperi_knife_aware == 0) then - game_api.set_chat_unread(0, true, "Бекзат, ты где? Я жду...") + game_api.set_chat_unread(0, true, CONST_MSG_WHERE) end end) diff --git a/resources/w/exterior/DTree_Tree_1_002.txt.bin b/resources/w/exterior/DTree_Tree_1_002.txt.bin new file mode 100644 index 0000000000000000000000000000000000000000..001671f46ac7091e7205a7930209fee6cfbeb17d GIT binary patch literal 16288 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 L5z5slcf|hz&TP>M literal 0 HcmV?d00001 diff --git a/resources/w/ui/hud_step1.json b/resources/w/ui/hud_step1.json index 29c718b..5d445bf 100644 --- a/resources/w/ui/hud_step1.json +++ b/resources/w/ui/hud_step1.json @@ -5,34 +5,6 @@ "width": "match_parent", "height": "match_parent", "children": [ - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint2", - "width": 660, - "height": 201, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint2.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - }, { "type": "Button", "name": "settingsButton", @@ -59,6 +31,34 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint2", + "width": 660, + "height": 201, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint2.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + } + ] } ] } diff --git a/resources/w/ui/hud_step2.json b/resources/w/ui/hud_step2.json index 43d898e..5ef3812 100644 --- a/resources/w/ui/hud_step2.json +++ b/resources/w/ui/hud_step2.json @@ -5,6 +5,33 @@ "width": "match_parent", "height": "match_parent", "children": [ + { + "type": "Button", + "name": "settingsButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -35, + "y": -35, + "width": 200, + "height": 200, + "clickZoneWidth": 176, + "clickZoneHeight": 176, + "textures": { + "normal": "resources/w/ui/img/Settings001_State=Default001.png", + "hover": "resources/w/ui/img/Settings001_State=Selected001.png", + "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Location_dorm.png" + }, { "type": "LinearLayout", "orientation": "vertical", @@ -32,33 +59,6 @@ } } ] - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" } ] } diff --git a/resources/w/ui/hud_step4.json b/resources/w/ui/hud_step4.json index 1eceb64..0519aab 100644 --- a/resources/w/ui/hud_step4.json +++ b/resources/w/ui/hud_step4.json @@ -5,34 +5,6 @@ "width": "match_parent", "height": "match_parent", "children": [ - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint5", - "width": 606, - "height": 201, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint5.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - }, { "type": "Button", "name": "settingsButton", @@ -59,6 +31,34 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint5", + "width": 606, + "height": 201, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint5.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + } + ] } ] } diff --git a/resources/w/ui_en/hud_step1.json b/resources/w/ui_en/hud_step1.json index 48b7b5f..2024d50 100644 --- a/resources/w/ui_en/hud_step1.json +++ b/resources/w/ui_en/hud_step1.json @@ -5,6 +5,33 @@ "width": "match_parent", "height": "match_parent", "children": [ + { + "type": "Button", + "name": "settingsButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -35, + "y": -35, + "width": 200, + "height": 200, + "clickZoneWidth": 176, + "clickZoneHeight": 176, + "textures": { + "normal": "resources/w/ui/img/Settings001_State=Default001.png", + "hover": "resources/w/ui/img/Settings001_State=Selected001.png", + "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui_en/img/Location_dorm.png" + }, { "type": "LinearLayout", "orientation": "vertical", @@ -32,33 +59,6 @@ } } ] - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" } ] } diff --git a/resources/w/ui_en/hud_step2.json b/resources/w/ui_en/hud_step2.json index 4746fcc..3a23404 100644 --- a/resources/w/ui_en/hud_step2.json +++ b/resources/w/ui_en/hud_step2.json @@ -5,6 +5,33 @@ "width": "match_parent", "height": "match_parent", "children": [ + { + "type": "Button", + "name": "settingsButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -35, + "y": -35, + "width": 200, + "height": 200, + "clickZoneWidth": 176, + "clickZoneHeight": 176, + "textures": { + "normal": "resources/w/ui/img/Settings001_State=Default001.png", + "hover": "resources/w/ui/img/Settings001_State=Selected001.png", + "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui_en/img/Location_dorm.png" + }, { "type": "LinearLayout", "orientation": "vertical", @@ -32,33 +59,6 @@ } } ] - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" } ] } diff --git a/resources/w/ui_en/hud_step3.json b/resources/w/ui_en/hud_step3.json index 524ecca..986f720 100644 --- a/resources/w/ui_en/hud_step3.json +++ b/resources/w/ui_en/hud_step3.json @@ -5,6 +5,33 @@ "width": "match_parent", "height": "match_parent", "children": [ + { + "type": "Button", + "name": "settingsButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -35, + "y": -35, + "width": 200, + "height": 200, + "clickZoneWidth": 176, + "clickZoneHeight": 176, + "textures": { + "normal": "resources/w/ui/img/Settings001_State=Default001.png", + "hover": "resources/w/ui/img/Settings001_State=Selected001.png", + "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui_en/img/Location_dorm.png" + }, { "type": "LinearLayout", "orientation": "vertical", @@ -32,33 +59,6 @@ } } ] - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" } ] } diff --git a/resources/w/ui_en/hud_step4.json b/resources/w/ui_en/hud_step4.json index 6159c4f..383af83 100644 --- a/resources/w/ui_en/hud_step4.json +++ b/resources/w/ui_en/hud_step4.json @@ -5,34 +5,6 @@ "width": "match_parent", "height": "match_parent", "children": [ - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint5", - "width": 606, - "height": 234.7, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint5.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - }, { "type": "Button", "name": "settingsButton", @@ -59,6 +31,34 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Location_dorm.png" + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint5", + "width": 606, + "height": 234.7, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint5.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + } + ] } ] } diff --git a/resources/w/ui_en/screen_phone_chat_list.json b/resources/w/ui_en/screen_phone_chat_list.json index 5e12e0f..00d5f2c 100644 --- a/resources/w/ui_en/screen_phone_chat_list.json +++ b/resources/w/ui_en/screen_phone_chat_list.json @@ -97,7 +97,7 @@ "y": 36.0, "width": 446.25, "height": 88.2, - "text": "", + "text": "Bekzat, remember we ...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, @@ -161,7 +161,7 @@ "y": 36.0, "width": 446.25, "height": 88.2, - "text": "", + "text": "Bekzat, son, I and ...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, @@ -225,7 +225,7 @@ "y": 36.0, "width": 446.25, "height": 88.2, - "text": "", + "text": "Bishkek residents are ...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, diff --git a/resources/w/ui_en/screen_phone_chat_list_hint001.json b/resources/w/ui_en/screen_phone_chat_list_hint001.json index 996d107..f70ff9c 100644 --- a/resources/w/ui_en/screen_phone_chat_list_hint001.json +++ b/resources/w/ui_en/screen_phone_chat_list_hint001.json @@ -116,7 +116,7 @@ "y": 36.0, "width": 446.25, "height": 88.2, - "text": "", + "text": "Bekzat, remember we ...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, @@ -180,7 +180,7 @@ "y": 36.0, "width": 446.25, "height": 88.2, - "text": "", + "text": "Bekzat, son, I and ...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, @@ -244,7 +244,7 @@ "y": 36.0, "width": 446.25, "height": 88.2, - "text": "", + "text": "Bishkek residents are ...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, diff --git a/src/Game.cpp b/src/Game.cpp index 342ec4f..53f4b5a 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -251,23 +251,15 @@ namespace ZL createLocations(); - renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/item_received001.png", CONST_ZIP_FILE, true); - renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/item_removed001.png", CONST_ZIP_FILE, true); - - mobileRotateTexture = renderer.textureManager.LoadFromPng( - "resources/rotateYourDevice.png", CONST_ZIP_FILE, true); - - - // Wire inventory callbacks: tutorial tracking + toast notifications. gameState.inventory.onItemAdded = [this](const std::string& itemId) { menuManager.onItemPickedUp(itemId); const Item* item = ItemRegistry::instance().findById(itemId); - if (item) menuManager.showToast("resources/w/ui/img/toast/item_received001.png", item->name); + if (item) menuManager.showToast(menuManager.toastTextureItemAdded, item->name); }; gameState.inventory.onItemRemoved = [this](const std::string& itemId) { const Item* item = ItemRegistry::instance().findById(itemId); - if (item) menuManager.showToast("resources/w/ui/img/toast/item_removed001.png", item->name); + if (item) menuManager.showToast(menuManager.toastTextureItemRemoved, item->name); }; // Wire phone dialogue start function so MenuManager can trigger dialogues. @@ -472,15 +464,16 @@ namespace ZL uniExteriorParams.interactiveObjectsJsonPath = "resources/config/interactive_objects_uni_exterior_x.json"; //uniExteriorParams.navigationJsonPaths = {"resources/navigation/uni_exterior3_all.json"}; + /* uniExteriorParams.navigationJsonPaths = { "resources/navigation/uni_exterior3_trees_car.json", "resources/navigation/uni_exterior3_trees.json", - }; - /* + };*/ + uniExteriorParams.navigationJsonPaths = { "resources/navigation/uni_exterior3_trees_car.txt", "resources/navigation/uni_exterior3_trees.txt", - };*/ + }; uniExteriorParams.teleportsJsonPath = "resources/config/teleports_uni_exterior.json"; uniExteriorParams.triggerZonesJsonPath = "resources/config/trigger_zones_uni_exterior.json"; diff --git a/src/Game.h b/src/Game.h index 947b2ca..60ff77b 100644 --- a/src/Game.h +++ b/src/Game.h @@ -148,11 +148,11 @@ namespace ZL { void drawDarklandsFlash(); // Portrait-mode overlay (mobile / portrait browsers) - std::shared_ptr mobileRotateTexture; + /*std::shared_ptr mobileRotateTexture; VertexRenderStruct mobileRotateMesh; float mobileRotateMeshLastW = -1.0f; float mobileRotateMeshLastH = -1.0f; - + */ //void drawMobilePortraitOverlay(); int64_t newTickCount; diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index bd09ca2..5ba27ac 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -84,6 +84,13 @@ namespace ZL { result += digits[i]; } if (negative) result = "-" + result; + + + + if (g_currentLanguage == Language::English) + { + return result + " som"; + } return result + " сом"; } @@ -124,6 +131,20 @@ namespace ZL { return loadUiFromFile(basePath, renderer, zipFile); } + std::shared_ptr MenuManager::loadLocalizedTexture(const std::string& basePath, const std::string& zipFile) { + static const std::string marker = "resources/w/ui/"; + if (basePath.rfind(marker, 0) == 0) { + const std::string localizedPath = "resources/w/ui_" + languageToCode(g_currentLanguage) + "/" + basePath.substr(marker.size()); + try { + return renderer.textureManager.LoadFromPng(localizedPath, zipFile, true); + } + catch (const std::exception&) { + // Localized screen not available — fall back to the base path below. + } + } + return renderer.textureManager.LoadFromPng(basePath, zipFile, true); + } + void MenuManager::loadUiRoots(const std::string& zipFile) { hudRoot = loadLocalizedUi("resources/w/ui/hud_step0.json", zipFile); hudStep1Root = loadLocalizedUi("resources/w/ui/hud_step1.json", zipFile); @@ -197,26 +218,29 @@ namespace ZL { texObjectiveCompleted_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/quest_objective_completed.png", zipFile, true); texObjectiveBlank_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/quest_objective_blank.png", zipFile, true); + texItemSelected_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/ButtonBkg001.png", zipFile, true); texItemTransparent_ = renderer.textureManager.LoadFromPng("resources/w/ui/img/journal/ButtonBkgTransparent001.png", zipFile, true); gameState_.questJournal.loadFromFile("resources/config/quests.json", zipFile); - renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/quest_new001.png", zipFile, true); - renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/quest_completed001.png", zipFile, true); - renderer.textureManager.LoadFromPng("resources/w/ui/img/toast/quest_failed001.png", zipFile, true); + toastTextureQuestNew = loadLocalizedTexture("resources/w/ui/img/toast/quest_new001.png", zipFile); + toastTextureQuestCompleted = loadLocalizedTexture("resources/w/ui/img/toast/quest_completed001.png", zipFile); + toastTextureQuestFailed = loadLocalizedTexture("resources/w/ui/img/toast/quest_failed001.png", zipFile); + toastTextureItemAdded = loadLocalizedTexture("resources/w/ui/img/toast/item_received001.png", zipFile); + toastTextureItemRemoved = loadLocalizedTexture("resources/w/ui/img/toast/item_removed001.png", zipFile); gameState_.questJournal.onQuestUnlocked = [this](const std::string& id) { const Quest::QuestState* q = gameState_.questJournal.findQuest(id); - if (q) showToast("resources/w/ui/img/toast/quest_new001.png", q->definition.title); + if (q) showToast(toastTextureQuestNew, q->definition.title); }; gameState_.questJournal.onQuestCompleted = [this](const std::string& id) { const Quest::QuestState* q = gameState_.questJournal.findQuest(id); - if (q) showToast("resources/w/ui/img/toast/quest_completed001.png", q->definition.title); + if (q) showToast(toastTextureQuestCompleted, q->definition.title); }; gameState_.questJournal.onQuestFailed = [this](const std::string& id) { const Quest::QuestState* q = gameState_.questJournal.findQuest(id); - if (q) showToast("resources/w/ui/img/toast/quest_failed001.png", q->definition.title); + if (q) showToast(toastTextureQuestFailed, q->definition.title); }; const std::string imgDir = "resources/w/ui/img/phone/"; @@ -465,6 +489,13 @@ namespace ZL { loadUiRoots(CONST_ZIP_FILE); + toastTextureQuestNew = loadLocalizedTexture("resources/w/ui/img/toast/quest_new001.png", CONST_ZIP_FILE); + toastTextureQuestCompleted = loadLocalizedTexture("resources/w/ui/img/toast/quest_completed001.png", CONST_ZIP_FILE); + toastTextureQuestFailed = loadLocalizedTexture("resources/w/ui/img/toast/quest_failed001.png", CONST_ZIP_FILE); + toastTextureItemAdded = loadLocalizedTexture("resources/w/ui/img/toast/item_received001.png", CONST_ZIP_FILE); + toastTextureItemRemoved = loadLocalizedTexture("resources/w/ui/img/toast/item_removed001.png", CONST_ZIP_FILE); + + showMainMenu(); } @@ -1722,14 +1753,14 @@ namespace ZL { return 0.0f; } - void MenuManager::showToast(const std::string& iconPath, const std::string& text) { + void MenuManager::showToast(std::shared_ptr toastTexture, const std::string& text) { if (activeToasts_.size() < 3) { ToastEntry e; - e.iconPath = iconPath; + e.toastTexture = toastTexture; e.text = text; activeToasts_.push_back(std::move(e)); } else { - toastQueue_.push_back({ iconPath, text }); + toastQueue_.push_back({ toastTexture, text }); } applyToastsToUi(); } @@ -1758,7 +1789,7 @@ namespace ZL { // Promote queued messages into free slots while (!toastQueue_.empty() && activeToasts_.size() < 3) { ToastEntry e; - e.iconPath = toastQueue_.front().iconPath; + e.toastTexture = toastQueue_.front().toastTexture; e.text = toastQueue_.front().text; toastQueue_.pop_front(); activeToasts_.push_back(std::move(e)); @@ -1782,7 +1813,7 @@ namespace ZL { auto tv = uiManager.findTextView(txtNames[i]); if (img) { - img->texture = renderer.textureManager.LoadFromPng(e.iconPath, CONST_ZIP_FILE, true); + img->texture = e.toastTexture; img->alpha = a; } if (tv) { diff --git a/src/MenuManager.h b/src/MenuManager.h index 53f0664..2bf0bae 100644 --- a/src/MenuManager.h +++ b/src/MenuManager.h @@ -108,9 +108,15 @@ namespace ZL { void loadSettings(); // Toast notification system - void showToast(const std::string& iconPath, const std::string& text); + void showToast(std::shared_ptr toastTexture, const std::string& text); void update(float deltaMs); + std::shared_ptr toastTextureQuestNew; + std::shared_ptr toastTextureQuestCompleted; + std::shared_ptr toastTextureQuestFailed; + std::shared_ptr toastTextureItemAdded; + std::shared_ptr toastTextureItemRemoved; + protected: Renderer& renderer; @@ -123,6 +129,7 @@ namespace ZL { void refreshQuestJournalUi(); void reloadLocalizedGameContent(); std::shared_ptr loadLocalizedUi(const std::string& basePath, const std::string& zipFile); + std::shared_ptr loadLocalizedTexture(const std::string& basePath, const std::string& zipFile); void loadUiRoots(const std::string& zipFile); void selectQuestByIndex(int index); void refreshItemPickupHud(); @@ -157,13 +164,13 @@ namespace ZL { // Toast internals struct ToastEntry { - std::string iconPath; + std::shared_ptr toastTexture; std::string text; float timer = 0.0f; enum class State { FadeIn, Visible, FadeOut } state = State::FadeIn; float currentAlpha() const; }; - struct ToastMessage { std::string iconPath; std::string text; }; + struct ToastMessage { std::shared_ptr toastTexture; std::string text; }; void updateToasts(float deltaMs); void applyToastsToUi(); @@ -257,6 +264,7 @@ namespace ZL { std::shared_ptr texItemSelected_; std::shared_ptr texItemTransparent_; + void applyCurrentHealthBar(); bool isPortraitMode() const; diff --git a/src/ScriptEngine.cpp b/src/ScriptEngine.cpp index bf2cd65..ba54566 100644 --- a/src/ScriptEngine.cpp +++ b/src/ScriptEngine.cpp @@ -402,8 +402,30 @@ namespace ZL { std::cerr << "[script] set_chat_unread: callback not wired\n"; return; } - const std::string msg = previewMsg.is() + std::string msg = previewMsg.is() ? previewMsg.as() : ""; + + + //Some translations: + + //See start_uni_interior.lua for more details + //CONST_MSG_EMPTY = "(пусто)" + //CONST_MSG_WHERE = "Бекзат, ты где? Я жду..." + + if (msg == "(пусто)") + { + if (g_currentLanguage == Language::English) + { + msg = "(empty)"; + } + } + else if (msg == "Бекзат, ты где? Я жду...") + { + if (g_currentLanguage == Language::English) + { + msg = "Bekzat, where are you? ..."; + } + } loc->requestSetChatUnread(chatIndex, unread, msg); });