diff --git a/resources/dialogue/translate_dialogues.json b/resources/dialogue/translate_dialogues.json index e7e07b2..22f7d5e 100644 --- a/resources/dialogue/translate_dialogues.json +++ b/resources/dialogue/translate_dialogues.json @@ -2283,7 +2283,7 @@ { "key": "Пока ты не принесешь мне нож из учительской, никуда я тебя не выпущу. Ошо!", "ru": "Пока ты не принесешь мне нож из учительской, никуда я тебя не выпущу. Ошо!", - "en": "Until you bring me a knife from the teachers' room, I won't let you go anywhere." + "en": "Until you bring me a knife from the teachers' room, I won't let you go anywhere. Osho!" }, { "key": "Я слышала она не смогла сдать курсовую по манасоведению.", @@ -2293,7 +2293,7 @@ { "key": "Она прыгнула с окна и разбилась насмерть деп.", "ru": "Она прыгнула с окна и разбилась насмерть деп.", - "en": "She jumped from the window and fell to her death, they said." + "en": "She jumped from the window and fell to her death, dep." }, { "key": "Да она надоела, все время скафнит.", @@ -2308,7 +2308,7 @@ { "key": "Так что жду тебя в универе! Не вздумай прогулять! Ошо!", "ru": "Так что жду тебя в универе! Не вздумай прогулять! Ошо!", - "en": "So I'm waiting for you at the university! Don't even think about skipping!" + "en": "So I'm waiting for you at the university! Don't even think about skipping! Osho!" } ] } \ No newline at end of file diff --git a/resources/w/ui/hud_step5abandroid.json b/resources/w/ui/hud_step5abandroid.json new file mode 100644 index 0000000..773cc4b --- /dev/null +++ b/resources/w/ui/hud_step5abandroid.json @@ -0,0 +1,188 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "width": "match_parent", + "height": "match_parent", + "children": [ + { + "type": "Button", + "name": "phoneButton", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", + "x": -46, + "y": -46, + "width": 229, + "height": 229, + "clickZoneWidth": 104, + "clickZoneHeight": 104, + "textures": { + "normal": "resources/w/ui/img/Phone001_State=Default.png", + "hover": "resources/w/ui/img/Phone001_State=Selected.png", + "pressed": "resources/w/ui/img/Phone001_State=Tap.png" + } + }, + { + "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": "Button", + "name": "inventoryButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 110, + "width": 165, + "height": 165, + "clickZoneWidth": 151, + "clickZoneHeight": 151, + "textures": { + "normal": "resources/w/ui/img/Inventory001_State=Default001.png", + "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", + "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" + } + }, + { + "type": "Button", + "name": "journalButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 220, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Journal001_State=Default.png", + "hover": "resources/w/ui/img/Journal001_State=Selected.png", + "pressed": "resources/w/ui/img/Journal001_State=Tap.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": "StaticImage", + "name": "hint6aarrow", + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "width": 118, + "height": 118, + "x": 80, + "y": 60, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + }, + { + "type": "StaticImage", + "name": "hint6a", + "width": 606, + "height": 234, + "x" : 110, + "y" : 80, + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "texture": "resources/w/ui/img/Hint6a.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint6barrow", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 118, + "height": 118, + "x": 80, + "y": 200, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + }, + { + "type": "StaticImage", + "name": "hint6b", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 630.4, + "height": 249.6, + "x": 80, + "y": 100, + "texture": "resources/w/ui/img/Hint6b.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint7arrow", + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "width": 118, + "height": 118, + "x": 80, + "y": 60, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible":false, + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint7", + "width": 606, + "height": 201, + "x" : 110, + "y" : 80, + "visible":false, + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "texture": "resources/w/ui/img/Hint_m004.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + } + ] + } +} \ No newline at end of file diff --git a/resources/w/ui/hud_top_hint01android.json b/resources/w/ui/hud_top_hint01android.json new file mode 100644 index 0000000..7d7d5ef --- /dev/null +++ b/resources/w/ui/hud_top_hint01android.json @@ -0,0 +1,48 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "width": "match_parent", + "height": "match_parent", + "children": [ + { + "type": "StaticImage", + "name": "hint2", + "width": 36, + "height": 177, + "y": -30, + "x": 0, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_down.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint1", + "width": 660, + "height": 201, + "x": 0, + "y" : 160, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/Hint1.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + } + ] + } +} \ No newline at end of file diff --git a/resources/w/ui/hud_uni_int_step11android.json b/resources/w/ui/hud_uni_int_step11android.json new file mode 100644 index 0000000..1f9e74d --- /dev/null +++ b/resources/w/ui/hud_uni_int_step11android.json @@ -0,0 +1,244 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "width": "match_parent", + "height": "match_parent", + "children": [ + { + "type": "Button", + "name": "phoneButton", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", + "x": -46, + "y": -46, + "width": 229, + "height": 229, + "clickZoneWidth": 104, + "clickZoneHeight": 104, + "textures": { + "normal": "resources/w/ui/img/Phone001_State=Default.png", + "hover": "resources/w/ui/img/Phone001_State=Selected.png", + "pressed": "resources/w/ui/img/Phone001_State=Tap.png" + } + }, + { + "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": "Button", + "name": "inventoryButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 110, + "width": 165, + "height": 165, + "clickZoneWidth": 151, + "clickZoneHeight": 151, + "textures": { + "normal": "resources/w/ui/img/Inventory001_State=Default001.png", + "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", + "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" + } + }, + { + "type": "Button", + "name": "journalButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 220, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Journal001_State=Default.png", + "hover": "resources/w/ui/img/Journal001_State=Selected.png", + "pressed": "resources/w/ui/img/Journal001_State=Tap.png" + } + }, + { + "type": "Button", + "name": "darklandsButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 330, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Darklands002_State=Default003.png", + "hover": "resources/w/ui/img/Darklands002_State=Selected003.png", + "pressed": "resources/w/ui/img/Darklands002_State=Tap003.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Location_uni_int.png" + }, + { + "type": "StaticImage", + "name": "hint_darklands001_arrow", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 118, + "height": 118, + "x": 80, + "y": 310, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + }, + { + "type": "StaticImage", + "name": "hint_darklands001", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 470, + "height": 156, + "x": 100, + "y": 250, + "texture": "resources/w/ui/img/Hint_darklands001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + } + }, + { + "type": "FrameLayout", + "vertical_align": "top", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 528, + "children": [ + { + "type": "StaticImage", + "name": "toast001", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 0, + "visible" : false, + "texture": "resources/w/ui/img/toast/item_received001.png" + }, + { + "type": "StaticImage", + "name": "toast002", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 104, + "visible" : false, + "texture": "resources/w/ui/img/toast/item_removed001.png" + }, + { + "type": "StaticImage", + "name": "toast003", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 208, + "visible" : false, + "texture": "resources/w/ui/img/toast/quest_completed001.png" + }, + { + "type": "TextView", + "name": "toast001text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 62, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "Серебряный нож.", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast002text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 166, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "Серебряный нож 2.", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast003text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 270, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "Серебряный нож 3.", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/resources/w/ui/hud_uni_int_step13android.json b/resources/w/ui/hud_uni_int_step13android.json new file mode 100644 index 0000000..86f5db1 --- /dev/null +++ b/resources/w/ui/hud_uni_int_step13android.json @@ -0,0 +1,260 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "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": "Button", + "name": "inventoryButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 110, + "width": 165, + "height": 165, + "clickZoneWidth": 151, + "clickZoneHeight": 151, + "textures": { + "normal": "resources/w/ui/img/Inventory001_State=Default001.png", + "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", + "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" + } + }, + { + "type": "Button", + "name": "journalButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 220, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Journal001_State=Default.png", + "hover": "resources/w/ui/img/Journal001_State=Selected.png", + "pressed": "resources/w/ui/img/Journal001_State=Tap.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Location_uni_int.png" + }, + { + "type": "StaticImage", + "name": "hint_darklands002", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "width": 470, + "height": 178, + "x": 0, + "y": 80, + "texture": "resources/w/ui/img/Hint_darklands002_attack.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + } + }, + { + "type": "StaticImage", + "name": "healthBarPanel", + "width": 389, + "height": 132.2, + "y": -5, + "x": -5, + "horizontal_gravity": "left", + "vertical_align": "top", + "texture": "resources/w/ui/img/HealthBarBase002.png" + }, + { + "type": "StaticImage", + "name": "healthBarBorder", + "width": 151.2, + "height": 22.8, + "y": 49.8, + "x": 100.6, + "horizontal_gravity": "left", + "vertical_align": "top", + "texture": "resources/w/ui/img/HealthBarBack001.png" + }, + { + "type": "Slider", + "name": "healthBarFill", + "width": 151.2, + "height": 22.8, + "y": 49.8, + "x": 100.6, + "horizontal_gravity": "left", + "vertical_gravity": "top", + "orientation": "horizontal", + "value": 1.0, + "fillMode": true, + "interactive": false, + "textures": { + "track": "resources/w/ui/img/HealthBarFill001.png" + } + }, + { + "type": "TextView", + "name": "healthValue", + "x": 255.0, + "y": 45.5, + "width": 100.0, + "height": 44.0, + "horizontal_gravity": "left", + "vertical_gravity": "top", + "text": "200/200", + "fontSize": 20, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": false, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "FrameLayout", + "vertical_align": "top", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 528, + "children": [ + { + "type": "StaticImage", + "name": "toast001", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 0, + "visible" : false, + "texture": "resources/w/ui/img/toast/item_received001.png" + }, + { + "type": "StaticImage", + "name": "toast002", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 104, + "visible" : false, + "texture": "resources/w/ui/img/toast/item_removed001.png" + }, + { + "type": "StaticImage", + "name": "toast003", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 208, + "visible" : false, + "texture": "resources/w/ui/img/toast/quest_completed001.png" + }, + { + "type": "TextView", + "name": "toast001text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 62, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "Серебряный нож.", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast002text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 166, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "Серебряный нож 2.", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast003text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 270, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "Серебряный нож 3.", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + } + ] + } + ] + } +} diff --git a/resources/w/ui/img/Hint_darklands002_attack.png b/resources/w/ui/img/Hint_darklands002_attack.png index 409094d..71294fb 100644 --- a/resources/w/ui/img/Hint_darklands002_attack.png +++ b/resources/w/ui/img/Hint_darklands002_attack.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc92c54e873525555fa4385a7bbbf5d0887a81a2215bc17978ef782d3c38ba53 -size 355925 +oid sha256:530e8772008574acc0e9a632e5deacb2b706ebbfd363526a9bda5415d46d2fb1 +size 415515 diff --git a/resources/w/ui/img/Hint_m002.png b/resources/w/ui/img/Hint_m002.png index 6c1f73b..46de25d 100644 --- a/resources/w/ui/img/Hint_m002.png +++ b/resources/w/ui/img/Hint_m002.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:416a39fd3e285f157a98904d30ba5c28f7247f839ef6ef57f216d37f83e390ff -size 305037 +oid sha256:b4f46b2045ed77a01a568f81fbe8e2884ddffe37209e9d4c45589ea90729244b +size 354754 diff --git a/resources/w/ui/screen_main_menu.json b/resources/w/ui/screen_main_menu.json index 34293f8..0f87ac2 100644 --- a/resources/w/ui/screen_main_menu.json +++ b/resources/w/ui/screen_main_menu.json @@ -125,7 +125,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.3", + "text": "v. 1.0.4", "fontSize": 24, "textCentered": false, "topAligned": true, diff --git a/resources/w/ui/screen_main_menu_android.json b/resources/w/ui/screen_main_menu_android.json index d13ee1f..7abc234 100644 --- a/resources/w/ui/screen_main_menu_android.json +++ b/resources/w/ui/screen_main_menu_android.json @@ -116,7 +116,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.3", + "text": "v. 1.0.4", "fontSize": 24, "textCentered": false, "topAligned": true, diff --git a/resources/w/ui_en/hud_step5abandroid.json b/resources/w/ui_en/hud_step5abandroid.json new file mode 100644 index 0000000..d185f56 --- /dev/null +++ b/resources/w/ui_en/hud_step5abandroid.json @@ -0,0 +1,188 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "width": "match_parent", + "height": "match_parent", + "children": [ + { + "type": "Button", + "name": "phoneButton", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", + "x": -46, + "y": -46, + "width": 229, + "height": 229, + "clickZoneWidth": 104, + "clickZoneHeight": 104, + "textures": { + "normal": "resources/w/ui/img/Phone001_State=Default.png", + "hover": "resources/w/ui/img/Phone001_State=Selected.png", + "pressed": "resources/w/ui/img/Phone001_State=Tap.png" + } + }, + { + "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": "Button", + "name": "inventoryButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 110, + "width": 165, + "height": 165, + "clickZoneWidth": 151, + "clickZoneHeight": 151, + "textures": { + "normal": "resources/w/ui/img/Inventory001_State=Default001.png", + "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", + "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" + } + }, + { + "type": "Button", + "name": "journalButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 220, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Journal001_State=Default.png", + "hover": "resources/w/ui/img/Journal001_State=Selected.png", + "pressed": "resources/w/ui/img/Journal001_State=Tap.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": "StaticImage", + "name": "hint6aarrow", + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "width": 118, + "height": 118, + "x": 80, + "y": 60, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + }, + { + "type": "StaticImage", + "name": "hint6a", + "width": 606, + "height": 207, + "x" : 110, + "y" : 80, + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "texture": "resources/w/ui_en/img/Hint6a.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint6barrow", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 118, + "height": 118, + "x": 80, + "y": 200, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + }, + { + "type": "StaticImage", + "name": "hint6b", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 630.4, + "height": 220.8, + "x": 80, + "y": 100, + "texture": "resources/w/ui_en/img/Hint6b.png", + "pulse": { + "minScale": 0.82, + "maxScale": 0.9, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint7arrow", + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "width": 118, + "height": 118, + "x": 80, + "y": 60, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible":false, + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint7", + "width": 579.2, + "height": 214.4, + "x" : 110, + "y" : 80, + "visible":false, + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "texture": "resources/w/ui_en/img/Hint_m004android.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + } + ] + } +} \ No newline at end of file diff --git a/resources/w/ui_en/hud_top_hint01android.json b/resources/w/ui_en/hud_top_hint01android.json new file mode 100644 index 0000000..5787d4e --- /dev/null +++ b/resources/w/ui_en/hud_top_hint01android.json @@ -0,0 +1,48 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "width": "match_parent", + "height": "match_parent", + "children": [ + { + "type": "StaticImage", + "name": "hint2", + "width": 36, + "height": 177, + "y": -30, + "x": 0, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_down.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + }, + { + "type": "StaticImage", + "name": "hint1", + "width": 630.4, + "height": 214.4, + "x": 0, + "y" : 160, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui_en/img/Hint1android.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } + } + ] + } +} \ No newline at end of file diff --git a/resources/w/ui_en/hud_uni_int_step11android.json b/resources/w/ui_en/hud_uni_int_step11android.json new file mode 100644 index 0000000..a5e6fd1 --- /dev/null +++ b/resources/w/ui_en/hud_uni_int_step11android.json @@ -0,0 +1,244 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "width": "match_parent", + "height": "match_parent", + "children": [ + { + "type": "Button", + "name": "phoneButton", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", + "x": -46, + "y": -46, + "width": 229, + "height": 229, + "clickZoneWidth": 104, + "clickZoneHeight": 104, + "textures": { + "normal": "resources/w/ui/img/Phone001_State=Default.png", + "hover": "resources/w/ui/img/Phone001_State=Selected.png", + "pressed": "resources/w/ui/img/Phone001_State=Tap.png" + } + }, + { + "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": "Button", + "name": "inventoryButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 110, + "width": 165, + "height": 165, + "clickZoneWidth": 151, + "clickZoneHeight": 151, + "textures": { + "normal": "resources/w/ui/img/Inventory001_State=Default001.png", + "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", + "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" + } + }, + { + "type": "Button", + "name": "journalButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 220, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Journal001_State=Default.png", + "hover": "resources/w/ui/img/Journal001_State=Selected.png", + "pressed": "resources/w/ui/img/Journal001_State=Tap.png" + } + }, + { + "type": "Button", + "name": "darklandsButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 330, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Darklands002_State=Default003.png", + "hover": "resources/w/ui/img/Darklands002_State=Selected003.png", + "pressed": "resources/w/ui/img/Darklands002_State=Tap003.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui_en/img/Location_uni_int.png" + }, + { + "type": "StaticImage", + "name": "hint_darklands001_arrow", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 118, + "height": 118, + "x": 80, + "y": 310, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + }, + { + "type": "StaticImage", + "name": "hint_darklands001", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 470, + "height": 138, + "x": 100, + "y": 250, + "texture": "resources/w/ui_en/img/Hint_darklands001android.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + } + }, + { + "type": "FrameLayout", + "vertical_align": "top", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 528, + "children": [ + { + "type": "StaticImage", + "name": "toast001", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 0, + "visible" : false, + "texture": "resources/w/ui_en/img/toast/item_received001.png" + }, + { + "type": "StaticImage", + "name": "toast002", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 104, + "visible" : false, + "texture": "resources/w/ui_en/img/toast/item_removed001.png" + }, + { + "type": "StaticImage", + "name": "toast003", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 208, + "visible" : false, + "texture": "resources/w/ui_en/img/toast/quest_completed001.png" + }, + { + "type": "TextView", + "name": "toast001text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 62, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast002text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 166, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast003text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 270, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/resources/w/ui_en/hud_uni_int_step13android.json b/resources/w/ui_en/hud_uni_int_step13android.json new file mode 100644 index 0000000..b7f36fb --- /dev/null +++ b/resources/w/ui_en/hud_uni_int_step13android.json @@ -0,0 +1,260 @@ +{ + "root": { + "type": "FrameLayout", + "name": "hud_root", + "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": "Button", + "name": "inventoryButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 110, + "width": 165, + "height": 165, + "clickZoneWidth": 151, + "clickZoneHeight": 151, + "textures": { + "normal": "resources/w/ui/img/Inventory001_State=Default001.png", + "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", + "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" + } + }, + { + "type": "Button", + "name": "journalButton", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "x": -18, + "y": 220, + "width": 165, + "height": 165, + "clickZoneWidth": 89, + "clickZoneHeight": 89, + "textures": { + "normal": "resources/w/ui/img/Journal001_State=Default.png", + "hover": "resources/w/ui/img/Journal001_State=Selected.png", + "pressed": "resources/w/ui/img/Journal001_State=Tap.png" + } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui_en/img/Location_uni_int.png" + }, + { + "type": "StaticImage", + "name": "hint_darklands002", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "width": 446, + "height": 158, + "x": 0, + "y": 80, + "texture": "resources/w/ui_en/img/Hint_darklands002_attackandroid.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + } + }, + { + "type": "StaticImage", + "name": "healthBarPanel", + "width": 389, + "height": 132.2, + "y": -5, + "x": -5, + "horizontal_gravity": "left", + "vertical_align": "top", + "texture": "resources/w/ui/img/HealthBarBase002.png" + }, + { + "type": "StaticImage", + "name": "healthBarBorder", + "width": 151.2, + "height": 22.8, + "y": 49.8, + "x": 100.6, + "horizontal_gravity": "left", + "vertical_align": "top", + "texture": "resources/w/ui/img/HealthBarBack001.png" + }, + { + "type": "Slider", + "name": "healthBarFill", + "width": 151.2, + "height": 22.8, + "y": 49.8, + "x": 100.6, + "horizontal_gravity": "left", + "vertical_gravity": "top", + "orientation": "horizontal", + "value": 1.0, + "fillMode": true, + "interactive": false, + "textures": { + "track": "resources/w/ui/img/HealthBarFill001.png" + } + }, + { + "type": "TextView", + "name": "healthValue", + "x": 255.0, + "y": 45.5, + "width": 100.0, + "height": 44.0, + "horizontal_gravity": "left", + "vertical_gravity": "top", + "text": "200/200", + "fontSize": 20, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": false, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "FrameLayout", + "vertical_align": "top", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 528, + "children": [ + { + "type": "StaticImage", + "name": "toast001", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 0, + "visible" : false, + "texture": "resources/w/ui_en/img/toast/item_received001.png" + }, + { + "type": "StaticImage", + "name": "toast002", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 104, + "visible" : false, + "texture": "resources/w/ui_en/img/toast/item_removed001.png" + }, + { + "type": "StaticImage", + "name": "toast003", + "horizontal_gravity": "center", + "width": 504, + "height": 132, + "y": 208, + "visible" : false, + "texture": "resources/w/ui_en/img/toast/quest_completed001.png" + }, + { + "type": "TextView", + "name": "toast001text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 62, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast002text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 166, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "type": "TextView", + "name": "toast003text", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "y": 270, + "x": 54, + "width": 400, + "height": 100, + "visible" : false, + "text": "", + "fontSize": 24, + "fontPath": "resources/fonts/DroidSans.ttf", + "textCentered": false, + "topAligned": true, + "wrap": true, + "color": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + } + ] + } + ] + } +} diff --git a/resources/w/ui_en/img/Hint1android.png b/resources/w/ui_en/img/Hint1android.png new file mode 100644 index 0000000..c74c1f4 --- /dev/null +++ b/resources/w/ui_en/img/Hint1android.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14f8d3d98d70d7e3d192edcaee990264a1b7de6452e2e2884de06a04a13eb66c +size 310106 diff --git a/resources/w/ui_en/img/Hint_darklands001android.png b/resources/w/ui_en/img/Hint_darklands001android.png new file mode 100644 index 0000000..73b27c8 --- /dev/null +++ b/resources/w/ui_en/img/Hint_darklands001android.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2277eeecbc3733ccfb0327def186f66d4af94767b05ec0d94d80f996ba074a9a +size 338892 diff --git a/resources/w/ui_en/img/Hint_darklands002_attack.png b/resources/w/ui_en/img/Hint_darklands002_attack.png index a541cf1..a83d3cb 100644 --- a/resources/w/ui_en/img/Hint_darklands002_attack.png +++ b/resources/w/ui_en/img/Hint_darklands002_attack.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:777b597949f3f473536c87d27613185b1f0b53f1667c6283685e0c09eb442abf -size 318379 +oid sha256:9dc052607866f058cd4c4028e54dd1d479a724512b462fd0b738c5c59a273c65 +size 376149 diff --git a/resources/w/ui_en/img/Hint_darklands002_attackandroid.png b/resources/w/ui_en/img/Hint_darklands002_attackandroid.png new file mode 100644 index 0000000..a715024 --- /dev/null +++ b/resources/w/ui_en/img/Hint_darklands002_attackandroid.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:954cbcdbfdc9f9d85fe1e60c41ba67286234f32a3239fdbb3b6764828d6fc7c1 +size 375507 diff --git a/resources/w/ui_en/img/Hint_m002.png b/resources/w/ui_en/img/Hint_m002.png index 6f3c797..5018255 100644 --- a/resources/w/ui_en/img/Hint_m002.png +++ b/resources/w/ui_en/img/Hint_m002.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9a3084168893759e9826be58f9c946766e2c5afc5aed451960c4400a3763a43 -size 277930 +oid sha256:a3df74c14528efcca892a9da31409559f234344a28334e92a5a8edf60bf56635 +size 326345 diff --git a/resources/w/ui_en/img/Hint_m004android.png b/resources/w/ui_en/img/Hint_m004android.png new file mode 100644 index 0000000..0f960b9 --- /dev/null +++ b/resources/w/ui_en/img/Hint_m004android.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e333f2c36bdd970f7fda158e20ae14e43175ebd2b3e410bf296015a9c300c5ec +size 301026 diff --git a/resources/w/ui_en/screen_main_menu.json b/resources/w/ui_en/screen_main_menu.json index 1f33e53..84021bd 100644 --- a/resources/w/ui_en/screen_main_menu.json +++ b/resources/w/ui_en/screen_main_menu.json @@ -125,7 +125,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.3", + "text": "v. 1.0.4", "fontSize": 24, "textCentered": false, "topAligned": true, diff --git a/resources/w/ui_en/screen_main_menu_android.json b/resources/w/ui_en/screen_main_menu_android.json index 6181a14..21a267f 100644 --- a/resources/w/ui_en/screen_main_menu_android.json +++ b/resources/w/ui_en/screen_main_menu_android.json @@ -125,7 +125,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.3", + "text": "v. 1.0.4", "fontSize": 24, "textCentered": false, "topAligned": true, diff --git a/src/Environment.cpp b/src/Environment.cpp index 158d72f..4bdf8e1 100644 --- a/src/Environment.cpp +++ b/src/Environment.cpp @@ -23,7 +23,7 @@ int Environment::height = CONST_DEFAULT_HEIGHT; float Environment::zoom = DEFAULT_ZOOM; -bool Environment::enableLogging = true; +bool Environment::enableLogging = false; SDL_Window* Environment::window = nullptr; diff --git a/src/Game.cpp b/src/Game.cpp index deae13a..2d22473 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -396,13 +396,11 @@ namespace FRG }); -#ifdef __ANDROID__ loadSteps.push([this]() { if (menuManager.shadowsEnabled) { createShadowMapAndProparateToLocations(); } }); -#endif loadSteps.push([this]() { loadingCompleted = true; diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index c8a7e3a..d4cd7c1 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -173,15 +173,32 @@ namespace FRG { #else hudStep3Root = loadLocalizedUi("resources/w/ui/hud_step3.json", zipFile); #endif + hudStep4Root = loadLocalizedUi("resources/w/ui/hud_step4.json", zipFile); hudStep5aRoot = loadLocalizedUi("resources/w/ui/hud_step5a.json", zipFile); hudStep5bRoot = loadLocalizedUi("resources/w/ui/hud_step5b.json", zipFile); - hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5ab.json", zipFile); + +#ifdef __ANDROID__ + hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5abandroid.json", zipFile); +#else + hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5ab.json", zipFile); +#endif + hudUniExtRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext.json", zipFile); hudUniIntStep10Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step10.json", zipFile); - hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11.json", zipFile); - hudUniIntStep12Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step12.json", zipFile); - hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13.json", zipFile); + +#ifdef __ANDROID__ + hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11android.json", zipFile); +#else + hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11.json", zipFile); +#endif + hudUniIntStep12Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step12.json", zipFile); + +#ifdef __ANDROID__ + hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13android.json", zipFile); +#else + hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13.json", zipFile); +#endif hudUniIntFullRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_full.json", zipFile); hudUniIntDarkFullRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_dark_full.json", zipFile); hudUniExtDarkRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext_dark.json", zipFile);