Skip to content

Commit

Permalink
Intro sequence; mayor expansion
Browse files Browse the repository at this point in the history
  • Loading branch information
@godai78
godai78 committed Dec 23, 2021
1 parent 33061d3 commit 373d6a9
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 51 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ Labirinth Game Boy game changelog

## alpha 0.5 ()

* Introduced Health HUD
* Added Health HUD
* Added death handling
* Added intro sequence
* Updated various UI elements

## alpha 0.4 (2021-12-22)
Expand Down
181 changes: 138 additions & 43 deletions Labirynt.gbsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"id": "382961a1-e615-4b92-92a7-f1a791b50b7a",
"name": "Logo",
"backgroundId": "f8b1c7ad-7bb2-44b2-8189-175ae8698f11",
"x": 152.5,
"y": 30.5,
"x": 60,
"y": 30,
"width": 20,
"height": 18,
"actors": [],
Expand Down Expand Up @@ -442,8 +442,8 @@
"id": "4912bee2-387a-472f-ae4f-6679b6149517",
"name": "Title Screen",
"backgroundId": "efc13411-f124-4c43-8bf5-b57e84c4992f",
"x": 166,
"y": 213,
"x": 257,
"y": 35,
"width": 20,
"height": 18,
"actors": [],
Expand Down Expand Up @@ -857,8 +857,8 @@
"id": "5d114c03-947a-49a3-a8bf-14c00fe72147",
"command": "EVENT_SWITCH_SCENE",
"args": {
"sceneId": "71a6912a-438b-46fa-ba1d-0f21dd22cc95",
"x": 2,
"sceneId": "848165f9-3a31-4712-b28b-cd3462f44614",
"x": 9,
"y": 1,
"direction": "down",
"fadeSpeed": "4"
Expand Down Expand Up @@ -8516,39 +8516,16 @@
"command": "EVENT_TEXT",
"args": {
"text": [
"Where am I?",
"But where am I?",
"What is this\nplace seriously?",
"And where are all\nmy friends?"
"And where are\nmy friends?"
],
"avatarId": ""
"avatarId": "122f04ab-ec64-4a75-9419-689b18059d26"
},
"id": "13a6a092-a56a-46d3-ae3e-4d91f83b47af"
}
],
"leaveScript": []
},
{
"name": "",
"id": "5152e595-d3b9-4686-abf9-03e4c0d28038",
"x": 2,
"y": 0,
"width": 2,
"height": 1,
"script": [
{
"command": "EVENT_TEXT",
"args": {
"text": [
"Looks like a wall.\nA solid one...",
"How could you come\nfrom here?",
"Strange..."
],
"avatarId": ""
},
"id": "778a1132-8bec-49b8-82e2-38be5339d8f1"
}
],
"leaveScript": []
}
],
"paletteIds": [
Expand Down Expand Up @@ -13346,6 +13323,14 @@
},
"children": {
"true": [
{
"command": "EVENT_ACTOR_EMOTE",
"args": {
"actorId": "$self$",
"emoteId": "eba8386e-9f3e-45d6-b2f0-c8be24d37adc"
},
"id": "9735bfba-29e4-40fe-a9d1-82b4c330db1e"
},
{
"id": "b010930e-7a59-43f4-adb6-8ee2e369f4cc",
"command": "EVENT_TEXT",
Expand Down Expand Up @@ -32938,7 +32923,9 @@
"command": "EVENT_TEXT",
"args": {
"text": [
"The forrester will\nlet you pass."
"Thank you for\nyour help!",
"The forrester will\nlet you pass",
"into the forest."
],
"avatarId": "",
"__collapse": false
Expand All @@ -32956,29 +32943,66 @@
},
"id": "156f59b2-4527-4cd7-b94b-6c6a316c7594"
},
{
"command": "EVENT_TEXT",
"args": {
"text": [
"I need a pass\nfor the soldier."
],
"avatarId": "122f04ab-ec64-4a75-9419-689b18059d26"
},
"id": "e2aba5fa-f6cd-46e2-9349-cf32c9a7e132"
},
{
"id": "7cec816a-6e1c-4355-8609-8aca725319e5",
"command": "EVENT_TEXT",
"args": {
"text": [
"That's terrible!",
"I... I can't\neven...",
"*Sob*",
"Cookie, one of my\nhamsters...",
"She escaped to the\nforest!",
"Please, find her\nbefore...",
"Oh, I can't even\nthink about it!"
"*Sob*"
],
"avatarId": "",
"__collapse": false
}
},
{
"command": "EVENT_ACTOR_EMOTE",
"args": {
"actorId": "$self$",
"emoteId": "eba8386e-9f3e-45d6-b2f0-c8be24d37adc"
},
"id": "a27883bf-147e-4651-8f2f-49c01973e396"
},
{
"command": "EVENT_TEXT",
"args": {
"text": [
"Well? What\nhappened?"
],
"avatarId": "122f04ab-ec64-4a75-9419-689b18059d26"
},
"id": "dae78944-2a29-4778-a037-1e6151553800"
},
{
"command": "EVENT_TEXT",
"args": {
"text": [
"Cookie, one of my\nhamsters...",
"She escaped to the\nforest!",
"Oh, I can't even\nthink about it!",
"Please, find her\nbefore..."
],
"avatarId": ""
},
"id": "d7101574-d083-46fa-bde7-8140ef603e52"
},
{
"command": "EVENT_ACTOR_EMOTE",
"args": {
"actorId": "$self$",
"emoteId": "390b4ea1-69b0-4afe-9333-2d3255b399c3",
"__collapse": true
"__collapse": false
},
"id": "5d029acd-4d01-4a24-977e-cda55d7c219c"
},
Expand All @@ -32988,7 +33012,7 @@
"args": {
"variable": "7",
"trueText": "Oh, OK, I guess.",
"falseText": "Nah.",
"falseText": "Nah. Gotta go.",
"__collapse": false
}
}
Expand Down Expand Up @@ -48718,7 +48742,9 @@
"command": "EVENT_TEXT",
"args": {
"text": [
"Oh, thank you!\nThank you so much!"
"Oh, thank you!\nThank you so much!",
"And here's the\ntravel pass.",
"Good luck!"
],
"avatarId": "",
"__collapse": false
Expand Down Expand Up @@ -49812,6 +49838,68 @@
"playerHit1Script": [],
"playerHit2Script": [],
"playerHit3Script": []
},
{
"name": "Wake up",
"backgroundId": "1da35172-aea4-40b4-8215-7992d9245b34",
"width": 20,
"height": 18,
"type": "TOPDOWN",
"paletteIds": [],
"spritePaletteIds": [],
"collisions": [],
"id": "848165f9-3a31-4712-b28b-cd3462f44614",
"x": 180,
"y": 234,
"actors": [],
"triggers": [],
"script": [
{
"command": "EVENT_ACTOR_HIDE",
"args": {
"actorId": "$self$"
},
"id": "bd8f6b8b-8efe-4aaa-9fdb-ea9d4f13fb30"
},
{
"command": "EVENT_TEXT",
"args": {
"text": [
"Ouch...",
"My head..."
],
"avatarId": "122f04ab-ec64-4a75-9419-689b18059d26"
},
"id": "fa850539-9880-45cb-b08b-dc1cdeaeae31"
},
{
"command": "EVENT_TEXT",
"args": {
"text": [
"What happened\nmiss Liddell?",
"We were in the\nmuseum...",
"We visited the\nunderground...",
"Well, this looks\nlike one surely."
],
"avatarId": "122f04ab-ec64-4a75-9419-689b18059d26"
},
"id": "45e95bf3-fa75-4544-85c5-60f2304152ab"
},
{
"command": "EVENT_SWITCH_SCENE",
"args": {
"sceneId": "71a6912a-438b-46fa-ba1d-0f21dd22cc95",
"x": 2,
"y": 1,
"direction": "",
"fadeSpeed": "2"
},
"id": "6af0a090-8d69-449a-af89-413f8b7d84a4"
}
],
"playerHit1Script": [],
"playerHit2Script": [],
"playerHit3Script": []
}
],
"backgrounds": [
Expand Down Expand Up @@ -75474,6 +75562,13 @@
}
],
"avatars": [
{
"id": "122f04ab-ec64-4a75-9419-689b18059d26",
"name": "player_face",
"width": 16,
"height": 16,
"filename": "player_face.png"
},
{
"id": "e5a7cfb3-6b41-480d-b98a-6f69eb3da694",
"name": "steven",
Expand Down Expand Up @@ -75764,8 +75859,8 @@
"startDirection": "down",
"showCollisions": true,
"showConnections": true,
"worldScrollX": 668,
"worldScrollY": 0,
"worldScrollX": 2159,
"worldScrollY": 300,
"zoom": 100,
"customColorsEnabled": false,
"sgbEnabled": false,
Expand Down
23 changes: 16 additions & 7 deletions Labirynt.gbsproj.bak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8565,7 +8565,7 @@
},
{
"name": "Success",
"backgroundId": "1da35172-aea4-40b4-8215-7992d9245b34",
"backgroundId": "95de92c5-8dba-49a6-8a3f-fb96b0015c11",
"width": 20,
"height": 18,
"collisions": [],
Expand Down Expand Up @@ -10957,7 +10957,7 @@
},
{
"name": "Credits",
"backgroundId": "1da35172-aea4-40b4-8215-7992d9245b34",
"backgroundId": "95de92c5-8dba-49a6-8a3f-fb96b0015c11",
"width": 20,
"height": 18,
"collisions": [],
Expand Down Expand Up @@ -49677,7 +49677,7 @@
},
{
"name": "Death",
"backgroundId": "6fad1892-bcb2-4924-bd1c-1e4d03dfeabb",
"backgroundId": "95de92c5-8dba-49a6-8a3f-fb96b0015c11",
"width": 20,
"height": 18,
"type": "TOPDOWN",
Expand Down Expand Up @@ -49736,7 +49736,7 @@
},
{
"name": "Ending",
"backgroundId": "1da35172-aea4-40b4-8215-7992d9245b34",
"backgroundId": "95de92c5-8dba-49a6-8a3f-fb96b0015c11",
"width": 20,
"height": 18,
"type": "TOPDOWN",
Expand Down Expand Up @@ -52200,6 +52200,15 @@
0
]
},
{
"id": "95de92c5-8dba-49a6-8a3f-fb96b0015c11",
"name": "end_bg",
"width": 20,
"height": 18,
"imageWidth": 160,
"imageHeight": 144,
"filename": "end_bg.png"
},
{
"id": "481e920a-10b8-4d5b-b6a2-dffa96b57bf0",
"name": "hidden_cave",
Expand Down Expand Up @@ -75755,9 +75764,9 @@
"startDirection": "down",
"showCollisions": true,
"showConnections": true,
"worldScrollX": 3353,
"worldScrollY": 945,
"zoom": 400,
"worldScrollX": 668,
"worldScrollY": 0,
"zoom": 100,
"customColorsEnabled": false,
"sgbEnabled": false,
"customHead": "",
Expand Down
Binary file added assets/avatars/player_face.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 373d6a9

Please sign in to comment.