Compare commits

...
2 Commits
Author SHA1 Message Date
Vladislav Khorev e9f71a7959 Fixing stuff 2026-09-30 00:15:34 +06:00
Vladislav Khorev c288c81e7e First version 2026-09-30 00:07:49 +06:00
18 changed files with 248 additions and 387 deletions

No files matched your search

+228 -245
View File
@@ -2,25 +2,36 @@
"chatHistory": [
[],
[],
[]
[
{
"incoming": true,
"text": "Bishkek residents are increasingly complaining of depression and apathy. Watch the latest video about this on our channel!"
}
]
],
"chatPreviewMsg": [
"Бекзат, ты где? Я жду....",
"",
"",
""
"Bishkek residents are ..."
],
"chatUnread": [
true,
true,
true
false
],
"currentLocationName": "",
"currentLocationName": "uni_interior",
"globalFloats": {
"player_hp": 200.0
},
"globalInts": {},
"globalInts": {
"lection_is_over": 1,
"news_chat_opened": 1
},
"inventory": {
"items": []
"items": [
"phone",
"journal"
]
},
"isDarklands": false,
"isDawn": false,
@@ -28,9 +39,7 @@
"locations": {
"location_dorm": {
"dialogueState": {
"active": true,
"currentNodeId": "line_1",
"dialogueId": "dialog_start001"
"active": false
},
"interactiveObjectStates": [
{
@@ -265,57 +274,27 @@
},
{
"alpha": 1.0,
"animTask": {
"durationMs": 10.0,
"elapsedMs": 0.0,
"startPosX": 1.100000023841858,
"startPosY": 0.9695000052452087,
"startPosZ": -19.950000762939453,
"startRotY": 0.0,
"startScale": 1.0,
"targetPosX": 1.100000023841858,
"targetPosY": 0.9695000052452087,
"targetPosZ": -19.950000762939453,
"targetRotY": 1.5707963705062866,
"targetScale": 1.0,
"type": 1
},
"isActive": true,
"isAnimating": true,
"isAnimating": false,
"positionX": 1.100000023841858,
"positionY": 0.9695000052452087,
"positionZ": -19.950000762939453,
"rotationY": 0.0,
"rotationY": 1.5707963705062866,
"scale": 1.0
},
{
"alpha": 1.0,
"animTask": {
"durationMs": 10.0,
"elapsedMs": 0.0,
"startPosX": -1.100000023841858,
"startPosY": 0.9695000052452087,
"startPosZ": -19.950000762939453,
"startRotY": 0.0,
"startScale": 1.0,
"targetPosX": -1.100000023841858,
"targetPosY": 0.9695000052452087,
"targetPosZ": -19.950000762939453,
"targetRotY": -1.5707963705062866,
"targetScale": 1.0,
"type": 1
},
"isActive": true,
"isAnimating": true,
"isAnimating": false,
"positionX": -1.100000023841858,
"positionY": 0.9695000052452087,
"positionZ": -19.950000762939453,
"rotationY": 0.0,
"rotationY": -1.5707963705062866,
"scale": 1.0
},
{
"alpha": 1.0,
"isActive": true,
"isActive": false,
"isAnimating": false,
"positionX": 6.664400577545166,
"positionY": 0.8999999761581421,
@@ -325,7 +304,7 @@
},
{
"alpha": 1.0,
"isActive": true,
"isActive": false,
"isAnimating": false,
"positionX": 5.842959880828857,
"positionY": 0.9284919500350952,
@@ -380,7 +359,7 @@
"positionX": 1.100000023841858,
"positionY": 0.9695000052452087,
"positionZ": -15.699999809265137,
"rotationY": 0.0,
"rotationY": 1.5707963705062866,
"scale": 1.0
},
{
@@ -424,8 +403,8 @@
"scale": 1.0
},
{
"alpha": 1.0,
"isActive": true,
"alpha": 0.0,
"isActive": false,
"isAnimating": false,
"positionX": 0.0,
"positionY": 2.8500001430511475,
@@ -444,8 +423,8 @@
"scale": 1.0
},
{
"alpha": 1.0,
"isActive": true,
"alpha": 0.0,
"isActive": false,
"isAnimating": false,
"positionX": 4.949999809265137,
"positionY": 2.8500001430511475,
@@ -454,8 +433,8 @@
"scale": 1.0
},
{
"alpha": 1.0,
"isActive": true,
"alpha": 0.0,
"isActive": false,
"isAnimating": false,
"positionX": -4.949999809265137,
"positionY": 2.8500001430511475,
@@ -475,9 +454,9 @@
}
],
"locationState": {
"activeNavigationIndex": 0,
"cameraAzimuth": -2.3499999046325684,
"cameraInclination": 1.103600025177002,
"activeNavigationIndex": 2,
"cameraAzimuth": -2.805004358291626,
"cameraInclination": 0.5385987758636475,
"isDarklands": false,
"isDawn": false,
"isNight": false,
@@ -485,18 +464,34 @@
"targetInteractiveObjectIndex": -1,
"targetTeleportZoneIndex": -1,
"taxi": {
"taxiArrivedCallbackCalled": false,
"taxiArrivedCallbackCalled": true,
"taxiCar": {
"currentWaypoint": 0,
"currentWaypoint": 3,
"mode": 1,
"positionX": -20.850000381469727,
"positionX": -18.432445526123047,
"positionY": 0.0,
"positionZ": 64.0,
"rotation": 0.0,
"steeringAngle": 0.0,
"velocity": 0.0,
"positionZ": -0.437654584646225,
"rotation": -0.05602673813700676,
"steeringAngle": 3.249874258592911e-10,
"velocity": 3.600008487701416,
"waypointReachRadius": 5.0,
"waypoints": []
"waypoints": [
{
"x": -20.850000381469727,
"y": 0.0,
"z": 30.0
},
{
"x": -19.350000381469727,
"y": 0.0,
"z": 24.0
},
{
"x": -19.350000381469727,
"y": 0.0,
"z": 14.0
}
]
},
"taxiCarInitialState": {
"currentWaypoint": 0,
@@ -531,7 +526,7 @@
}
]
},
"tutorialInteractiveObjectsLocked": true
"tutorialInteractiveObjectsLocked": false
},
"npcStates": [
{
@@ -550,13 +545,7 @@
-15.038200378417969
],
"hp": 100.0,
"pathWaypoints": [
[
-6.296899795532227,
0.0,
-15.041899681091309
]
],
"pathWaypoints": [],
"position": [
-6.334780216217041,
0.0,
@@ -571,9 +560,9 @@
"targetFacingAngle": 0.0,
"visibleRange": 6.0,
"walkTarget": [
-6.296899795532227,
-6.334780216217041,
0.0,
-15.041899681091309
-15.038200378417969
]
}
],
@@ -581,11 +570,11 @@
"attackTargetIndex": -1,
"attack_cooldown": 0.0,
"battle_state": 0,
"currentState": 0,
"currentState": 1,
"currentWaypointIndex": 0,
"enabled": true,
"faceTargetIndex": -1,
"facingAngle": 0.0,
"facingAngle": -1.6831790208816528,
"homeDriftCheckTimer": 5.0,
"homePosition": [
0.0,
@@ -595,40 +584,40 @@
"hp": 200.0,
"pathWaypoints": [
[
6.8031005859375,
-11.399999618530273,
0.0,
-14.641900062561035
0.0
]
],
"position": [
6.7634501457214355,
-10.641555786132813,
0.0,
-14.60219955444336
0.3920173943042755
],
"requestedWalkTarget": [
6.7634501457214355,
-11.399999618530273,
0.0,
-14.60219955444336
0.0
],
"showWeapon": true,
"targetFacingAngle": 0.0,
"showWeapon": false,
"targetFacingAngle": -1.0937435626983643,
"visibleRange": 6.0,
"walkTarget": [
6.8031005859375,
-11.399999618530273,
0.0,
-14.641900062561035
0.0
]
},
"scriptGlobals": {
"alik_door_opened": false,
"bathroom_door_opened": false,
"journal_picked_up": false,
"phone_picked_up": false,
"player_door_opened": false
"journal_picked_up": true,
"phone_picked_up": true,
"player_door_opened": true
},
"teleportZoneState": {
"tp_dorm_to_2floor": false,
"tp_dorm_to_loc2": false
"tp_dorm_to_loc2": true
},
"triggerZoneState": {
"ladder_zone001": {
@@ -640,7 +629,7 @@
"playerInside": false
},
"taxi_zone001": {
"enabled": true,
"enabled": false,
"playerInside": false
}
}
@@ -683,8 +672,8 @@
],
"locationState": {
"activeNavigationIndex": 0,
"cameraAzimuth": -2.3499999046325684,
"cameraInclination": 1.103600025177002,
"cameraAzimuth": -0.06499999761581421,
"cameraInclination": 1.1135984659194946,
"isDarklands": false,
"isDawn": false,
"isNight": false,
@@ -745,11 +734,11 @@
"attackTargetIndex": -1,
"attack_cooldown": 0.0,
"battle_state": 0,
"currentState": 0,
"currentState": 1,
"currentWaypointIndex": 0,
"enabled": true,
"faceTargetIndex": -1,
"facingAngle": 0.0,
"facingAngle": -1.5379809141159058,
"homeDriftCheckTimer": 5.0,
"homePosition": [
0.0,
@@ -757,24 +746,30 @@
0.0
],
"hp": 200.0,
"pathWaypoints": [],
"pathWaypoints": [
[
6.633500099182129,
0.0,
-9.649999618530273
]
],
"position": [
5.0,
8.072282791137695,
0.0,
-18.399999618530273
-9.602767944335938
],
"requestedWalkTarget": [
5.0,
6.633500099182129,
0.0,
-18.399999618530273
-9.649999618530273
],
"showWeapon": true,
"targetFacingAngle": 0.0,
"showWeapon": false,
"targetFacingAngle": -1.5379809141159058,
"visibleRange": 6.0,
"walkTarget": [
5.0,
6.633500099182129,
0.0,
-18.399999618530273
-9.649999618530273
]
},
"scriptGlobals": null,
@@ -947,32 +942,17 @@
"positionX": 1.5,
"positionY": 0.9750000238418579,
"positionZ": 6.400000095367432,
"rotationY": 0.0,
"rotationY": -1.5707963705062866,
"scale": 1.0
},
{
"alpha": 1.0,
"animTask": {
"durationMs": 10.0,
"elapsedMs": 0.0,
"startPosX": 1.5,
"startPosY": 0.9750000238418579,
"startPosZ": -1.5999999046325684,
"startRotY": 0.0,
"startScale": 1.0,
"targetPosX": 1.5,
"targetPosY": 0.9750000238418579,
"targetPosZ": -1.5999999046325684,
"targetRotY": -1.5707963705062866,
"targetScale": 1.0,
"type": 1
},
"isActive": true,
"isAnimating": true,
"isAnimating": false,
"positionX": 1.5,
"positionY": 0.9750000238418579,
"positionZ": -1.5999999046325684,
"rotationY": 0.0,
"rotationY": -1.5707963705062866,
"scale": 1.0
},
{
@@ -1002,7 +982,7 @@
"positionX": 0.0,
"positionY": 0.9750000238418579,
"positionZ": 8.000000953674316,
"rotationY": 0.0,
"rotationY": 1.5707963705062866,
"scale": 1.0
},
{
@@ -1026,8 +1006,8 @@
"scale": 1.0
},
{
"alpha": 1.0,
"isActive": true,
"alpha": 0.0,
"isActive": false,
"isAnimating": false,
"positionX": 0.0,
"positionY": 2.4499998092651367,
@@ -1066,8 +1046,8 @@
"scale": 1.0
},
{
"alpha": 1.0,
"isActive": true,
"alpha": 0.0,
"isActive": false,
"isAnimating": false,
"positionX": 3.75,
"positionY": 2.4499998092651367,
@@ -1087,9 +1067,9 @@
}
],
"locationState": {
"activeNavigationIndex": 0,
"cameraAzimuth": -2.3499999046325684,
"cameraInclination": 1.103600025177002,
"activeNavigationIndex": 2,
"cameraAzimuth": 0.7391971945762634,
"cameraInclination": 0.9035983681678772,
"isDarklands": false,
"isDawn": false,
"isNight": false,
@@ -1136,40 +1116,34 @@
"battle_state": 0,
"currentState": 0,
"currentWaypointIndex": 0,
"enabled": false,
"enabled": true,
"faceTargetIndex": -1,
"facingAngle": 0.0,
"homeDriftCheckTimer": 5.0,
"facingAngle": 3.1415927410125732,
"homeDriftCheckTimer": 4.749999046325684,
"homePosition": [
-0.2859399914741516,
4.941939830780029,
0.0,
13.964099884033203
6.641109943389893
],
"hp": 100.0,
"pathWaypoints": [
[
-0.31001949310302734,
0.0,
13.974998474121094
]
],
"pathWaypoints": [],
"position": [
-0.2859399914741516,
4.911655902862549,
0.0,
13.964099884033203
6.640154838562012
],
"requestedWalkTarget": [
-0.2859399914741516,
4.941939830780029,
0.0,
13.964099884033203
6.641109943389893
],
"showWeapon": true,
"targetFacingAngle": 0.0,
"showWeapon": false,
"targetFacingAngle": 3.1415927410125732,
"visibleRange": 6.0,
"walkTarget": [
-0.31001949310302734,
4.941939830780029,
0.0,
13.974998474121094
6.641109943389893
]
},
{
@@ -1178,23 +1152,17 @@
"battle_state": 0,
"currentState": 0,
"currentWaypointIndex": 0,
"enabled": false,
"enabled": true,
"faceTargetIndex": -1,
"facingAngle": 3.1415927410125732,
"homeDriftCheckTimer": 5.0,
"homeDriftCheckTimer": 2.8999974727630615,
"homePosition": [
0.7996190190315247,
0.0,
-9.556790351867676
],
"hp": 100.0,
"pathWaypoints": [
[
0.7899808883666992,
0.0,
-9.52500057220459
]
],
"pathWaypoints": [],
"position": [
0.7996190190315247,
0.0,
@@ -1205,8 +1173,8 @@
0.0,
-9.556790351867676
],
"showWeapon": true,
"targetFacingAngle": 0.0,
"showWeapon": false,
"targetFacingAngle": 3.1415927410125732,
"visibleRange": 6.0,
"walkTarget": [
0.7899808883666992,
@@ -1230,13 +1198,7 @@
13.964099884033203
],
"hp": 35.0,
"pathWaypoints": [
[
-0.010019302368164063,
0.0,
13.974998474121094
]
],
"pathWaypoints": [],
"position": [
0.0,
0.0,
@@ -1251,9 +1213,9 @@
"targetFacingAngle": 0.0,
"visibleRange": 5.5,
"walkTarget": [
-0.010019302368164063,
0.0,
13.974998474121094
0.0,
13.964099884033203
]
},
{
@@ -1272,13 +1234,7 @@
-6.400000095367432
],
"hp": 35.0,
"pathWaypoints": [
[
-0.010019302368164063,
0.0,
-6.425000190734863
]
],
"pathWaypoints": [],
"position": [
0.0,
0.0,
@@ -1293,9 +1249,9 @@
"targetFacingAngle": 0.0,
"visibleRange": 6.5,
"walkTarget": [
-0.010019302368164063,
0.0,
-6.425000190734863
0.0,
-6.400000095367432
]
},
{
@@ -1314,13 +1270,7 @@
12.0
],
"hp": 35.0,
"pathWaypoints": [
[
-5.010019302368164,
0.0,
11.974998474121094
]
],
"pathWaypoints": [],
"position": [
-5.0,
0.0,
@@ -1335,9 +1285,9 @@
"targetFacingAngle": 0.0,
"visibleRange": 6.0,
"walkTarget": [
-5.010019302368164,
-5.0,
0.0,
11.974998474121094
12.0
]
},
{
@@ -1356,13 +1306,7 @@
12.0
],
"hp": 35.0,
"pathWaypoints": [
[
4.889980316162109,
0.0,
11.875
]
],
"pathWaypoints": [],
"position": [
5.0,
0.0,
@@ -1377,51 +1321,96 @@
"targetFacingAngle": 0.0,
"visibleRange": 4.800000190734863,
"walkTarget": [
4.889980316162109,
5.0,
0.0,
11.875
12.0
]
},
{
"attackTargetIndex": -1,
"attack_cooldown": 0.0,
"battle_state": 0,
"currentState": 0,
"currentWaypointIndex": 0,
"enabled": false,
"currentState": 1,
"currentWaypointIndex": 4,
"enabled": true,
"faceTargetIndex": -1,
"facingAngle": 3.1415927410125732,
"homeDriftCheckTimer": 5.0,
"facingAngle": -0.2980719804763794,
"homeDriftCheckTimer": 4.749999046325684,
"homePosition": [
3.9899799823760986,
5.289979934692383,
0.0,
10.375
-5.525000095367432
],
"hp": 100.0,
"pathWaypoints": [
[
3.989980697631836,
3.489980697631836,
0.0,
10.375
13.674999237060547
],
[
2.789980888366699,
0.0,
13.775001525878906
],
[
1.489980697631836,
0.0,
13.674999237060547
],
[
1.2899808883666992,
0.0,
13.275001525878906
],
[
-0.21001911163330078,
0.0,
8.375
],
[
0.0899801254272461,
0.0,
7.274999618530273
],
[
0.9899806976318359,
0.0,
-1.625
],
[
1.989980697631836,
0.0,
-1.8250007629394531
],
[
4.489980697631836,
0.0,
-5.325000762939453
],
[
5.289979934692383,
0.0,
-5.525000095367432
]
],
"position": [
3.9899799823760986,
0.7987902164459229,
0.0,
10.375
11.658617973327637
],
"requestedWalkTarget": [
3.9899799823760986,
5.289979934692383,
0.0,
10.375
-5.525000095367432
],
"showWeapon": true,
"targetFacingAngle": 0.0,
"showWeapon": false,
"targetFacingAngle": -0.2980719804763794,
"visibleRange": 6.0,
"walkTarget": [
3.989980697631836,
5.289979934692383,
0.0,
10.375
-5.525000095367432
]
}
],
@@ -1433,38 +1422,32 @@
"currentWaypointIndex": 0,
"enabled": true,
"faceTargetIndex": -1,
"facingAngle": 0.0,
"facingAngle": 1.3097667694091797,
"homeDriftCheckTimer": 5.0,
"homePosition": [
-4.909999847412109,
0.0,
0.0,
0.0
10.375
],
"hp": 200.0,
"pathWaypoints": [
[
0.9899806976318359,
0.0,
-9.625000953674316
]
],
"pathWaypoints": [],
"position": [
0.9426940083503723,
3.073923349380493,
0.0,
-9.6310396194458
6.071750164031982
],
"requestedWalkTarget": [
0.9426940083503723,
3.1117358207702637,
0.0,
-9.6310396194458
6.061649322509766
],
"showWeapon": true,
"targetFacingAngle": 0.0,
"showWeapon": false,
"targetFacingAngle": 1.3097667694091797,
"visibleRange": 6.0,
"walkTarget": [
0.9899806976318359,
3.1117358207702637,
0.0,
-9.625000953674316
6.061649322509766
]
},
"scriptGlobals": {
@@ -1472,11 +1455,11 @@
"CONST_MSG_WHERE": "Бекзат, ты где? Я жду...",
"first_time_darklands": true,
"ghost_gone": false,
"hall_door_opened": false,
"hall_door_opened": true,
"morning_can_open_door_index": 0,
"morning_did_open_door_index": 0,
"player_hold_book": false,
"teacher_arrived_to_library": false,
"teacher_arrived_to_library": true,
"teacher_door_opened": false,
"teacher_told_about_book": false,
"was_day_when_player_left": 0,
@@ -1505,7 +1488,7 @@
}
}
},
"money": 5500,
"money": 5000,
"playerHp": 200.0,
"playerMaxHp": 200.0,
"questJournal": {
@@ -1515,17 +1498,17 @@
"id": "tutorial_take_items",
"objectives": [
{
"completed": false,
"completed": true,
"id": "take_phone",
"visible": true
},
{
"completed": false,
"completed": true,
"id": "take_journal",
"visible": true
}
],
"status": 1
"status": 2
},
{
"activeObjectiveIndex": 0,
@@ -1593,7 +1576,7 @@
"id": "study_beginning",
"objectives": [
{
"completed": false,
"completed": true,
"id": "study_beginning_lecture",
"visible": true
},
@@ -1651,13 +1634,13 @@
}
]
},
"savedAt": "2026-07-24 23:40",
"savedAt": "2026-09-29 23:22",
"taxiIsCalled": false,
"tutorialJournalPickedUp": false,
"tutorialJournalScreenOpened": false,
"tutorialJournalPickedUp": true,
"tutorialJournalScreenOpened": true,
"tutorialNeedOpenTaxiScreen": false,
"tutorialPhoneChatScreenOpened": false,
"tutorialPhonePickedUp": false,
"tutorialStep": 0,
"tutorialPhoneChatScreenOpened": true,
"tutorialPhonePickedUp": true,
"tutorialStep": 5,
"uniIntTutorialState": 0
}
+1 -27
View File
@@ -56,7 +56,7 @@
"pressed": "resources/w/ui/img/Journal001_State=Tap.png"
}
},
{
{
"type": "StaticImage",
"name": "location",
"width": 380,
@@ -65,32 +65,6 @@
"horizontal_gravity": "center",
"vertical_gravity": "bottom",
"texture": "resources/w/ui/img/Location_uni_int.png"
},
{
"type": "StaticImage",
"name": "hint_darklands003_arrow",
"width": 24,
"height": 118,
"x": 210,
"y": 110,
"texture": "resources/w/ui/img/hint_arrow_up.png"
},
{
"type": "StaticImage",
"name": "hint_darklands003",
"width": 470,
"height": 202,
"x": 130,
"y": 200,
"texture": "resources/w/ui/img/Hint_darklands003_hp.png",
"pulse": {
"minScale": 0.92,
"maxScale": 1.08,
"periodMs": 1500
},
"fadeIn": {
"durationMs": 600
}
},
{
"type": "StaticImage",
-19
View File
@@ -65,25 +65,6 @@
"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",
@@ -65,25 +65,6 @@
"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",
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -27
View File
@@ -56,7 +56,7 @@
"pressed": "resources/w/ui/img/Journal001_State=Tap.png"
}
},
{
{
"type": "StaticImage",
"name": "location",
"width": 380,
@@ -65,32 +65,6 @@
"horizontal_gravity": "center",
"vertical_gravity": "bottom",
"texture": "resources/w/ui_en/img/Location_uni_int.png"
},
{
"type": "StaticImage",
"name": "hint_darklands003_arrow",
"width": 24,
"height": 118,
"x": 210,
"y": 110,
"texture": "resources/w/ui/img/hint_arrow_up.png"
},
{
"type": "StaticImage",
"name": "hint_darklands003",
"width": 442,
"height": 188,
"x": 130,
"y": 200,
"texture": "resources/w/ui_en/img/Hint_darklands003_hp.png",
"pulse": {
"minScale": 0.92,
"maxScale": 1.08,
"periodMs": 1500
},
"fadeIn": {
"durationMs": 600
}
},
{
"type": "StaticImage",
-19
View File
@@ -65,25 +65,6 @@
"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_attack.png",
"pulse": {
"minScale": 0.92,
"maxScale": 1.08,
"periodMs": 1500
},
"fadeIn": {
"durationMs": 600
}
},
{
"type": "StaticImage",
@@ -65,25 +65,6 @@
"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",
+6 -4
View File
@@ -394,7 +394,8 @@ namespace FRG
menuManager.startGameFunc = [this]() {
mainThreadHandler.EnqueueMainThreadTask([this]() {
performResetToInitialState();
gameState.currentLocationName = "location_dorm";
//gameState.currentLocationName = "location_dorm";
gameState.currentLocationName = "uni_interior";
currentLocation()->scriptEngine.callLocationEnterCallback();
this->audioPlayer->crossFadeMusicAsync("music/obshaga.ogg");
menuManager.lastMusicTrack = "music/obshaga.ogg";
@@ -1458,7 +1459,7 @@ namespace FRG
}
if (event.key.keysym.sym == SDLK_2)
{
startDarklandsTransition();
startDarklandsTransition(true);
}
if (event.key.keysym.sym == SDLK_3)
{
@@ -1510,6 +1511,7 @@ namespace FRG
return n;
}
void Game::activateSlowMoEffect() {
if (!currentLocation()) return;
@@ -1753,9 +1755,9 @@ namespace FRG
}
}
bool Game::startDarklandsTransition()
bool Game::startDarklandsTransition(bool force)
{
if (!gameState.isNight)
if (!force && !gameState.isNight)
{
currentLocation()->dialogueSystem.startDialogue("darklands_day_dialog001");
return false;
+1 -1
View File
@@ -74,7 +74,7 @@ namespace FRG {
EditorMode editorMode = EditorMode::None;
// Returns false if a transition is already in progress.
bool startDarklandsTransition();
bool startDarklandsTransition(bool force = false);
bool startNightTransition();
std::unique_ptr<AudioPlayerAsync> audioPlayer;
+1 -1
View File
@@ -1412,7 +1412,7 @@ namespace FRG
if (!a || !b) continue;
if (a->getHp() <= 0.f || b->getHp() <= 0.f || !a->state.enabled || !b->state.enabled) continue;
const float minDist = a->state.collisionRadius + b->state.collisionRadius;
const float minDist = (a->state.collisionRadius + b->state.collisionRadius) * 0.3;
if (minDist <= 0.f) continue;
const Eigen::Vector2f pa(a->state.position.x(), a->state.position.z());
+9 -5
View File
@@ -419,12 +419,13 @@ namespace FRG {
void MenuManager::enterGameplay(bool isFromLoad) {
if (!isFromLoad && uiState_ == GameUiState::MainMenu && startGameFunc) startGameFunc();
uiState_ = GameUiState::Gameplay;
uiManager.replaceRoot(hudRoot);
topUiManager.replaceRoot(hudTopHintRoot_);
if (isFromLoad) {
//uiManager.replaceRoot(hudRoot);
//uiManager.replaceRoot(hudStep5abRoot);
//topUiManager.replaceRoot(hudTopHintRoot_);
//if (isFromLoad) {
uiManager.clearMenuStack();
topUiManager.clearMenuStack();
}
//}
applyCurrentHealthBar();
@@ -437,8 +438,12 @@ namespace FRG {
});
}
//onLocationChanged(gameState_.currentLocationName);
if (isFromLoad)
applyHudForCurrentState();
//applyHudForCurrentState();
applyUniIntHud();
}
void MenuManager::applyHudForCurrentState() {
@@ -556,7 +561,6 @@ namespace FRG {
uiManager.setTextButtonCallback("menuStartButton", [this](const std::string&) {
audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
enterGameplay();
});
uiManager.setTextButtonCallback("menuAboutButton", [this](const std::string&) {
showAboutScreen();
+1 -1
View File
@@ -63,7 +63,7 @@ public:
private:
float cellSize = 0.4f;
float agentRadius = 0.45f;
float agentRadius = 0.15f;
float floorY = 0.0f;
float objectPadding = 0.25f;
float boundaryPadding = 0.0f;