From d9b5c57c91ba77b840ede8c4385229cf004f5747 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 15 Feb 2021 15:49:58 -0500 Subject: Added heart glyph and gamestate script object --- res/font.png | Bin 2445 -> 2461 bytes res/font.txt | 2 +- res/maps/map2.tmx | 2 +- res/scripts/common.lua | 2 ++ res/scripts/map2.lua | 13 ++++++++++++- 5 files changed, 16 insertions(+), 3 deletions(-) (limited to 'res') diff --git a/res/font.png b/res/font.png index aacca94..33ba7f7 100644 Binary files a/res/font.png and b/res/font.png differ diff --git a/res/font.txt b/res/font.txt index a089e8c..7b8f586 100644 --- a/res/font.txt +++ b/res/font.txt @@ -67,7 +67,7 @@ Z 4 ] 2 ^ 3 _ 2 -` 0 +` 7 a 5 b 4 c 4 diff --git a/res/maps/map2.tmx b/res/maps/map2.tmx index fe58daf..1ea8c00 100644 --- a/res/maps/map2.tmx +++ b/res/maps/map2.tmx @@ -600,7 +600,7 @@ 63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,81,81,63,63,118,130,87,87,87,88,89,90,106,87,65,66,63,63,63,63,63,63,63,63,134,74,75,76,77,136,137,134,134,74,75,63,63, 63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,64,65,66,73,64,65,66,73,74,75,76,77,81,117,118,124,125,87,87,87,87,108,109,87,87,63,63,63,74,75,76,77,74,75,76,77,134,133,134,134,134,133,63,63,63,63, 63,63,74,63,63,63,63,63,63,63,63,63,63,63,63,63,64,65,66,73,40,65,66,73,2147483735,75,76,77,74,75,76,77,117,127,118,87,87,87,123,120,121,63,63,63,63,63,81,81,81,81,63,134,134,136,137,134,1073741977,1073741952,63,63,1073741887,63,63,63, -63,63,74,75,76,77,63,63,63,63,63,63,63,63,63,63,63,87,3221225618,3221225618,106,3221225618,3221225618,2147483766,2147483775,2147483765,81,103,104,81,81,81,133,81,117,118,87,87,87,87,87,87,63,63,63,63,63,63,63,63,63,63,134,134,1073741977,1073741952,1073741955,1073741911,63,63,63,63,63,63, +63,63,74,75,76,77,63,63,63,63,63,63,63,63,63,63,63,87,3221225618,3221225618,106,3221225618,3221225618,2147483766,2147483775,75,76,103,104,81,81,81,133,81,117,118,87,87,87,87,87,87,63,63,63,63,63,63,63,63,63,63,134,134,1073741977,1073741952,1073741955,1073741911,63,63,63,63,63,63, 63,63,81,81,81,81,63,63,63,63,63,63,63,65,66,73,3221225618,3221225618,3221225618,119,69,3221225618,2147483766,2147483765,74,75,76,77,81,81,103,104,81,103,104,104,63,63,63,127,2147483765,63,63,63,63,63,63,63,63,63,63,63,1073741952,1073741956,1073741955,1073741911,64,65,66,73,63,63,63,63, 63,63,63,63,63,63,63,63,63,63,63,63,3221225618,3221225618,64,65,66,73,124,125,3221225618,87,3221225590,3221225589,136,137,81,103,104,81,81,137,81,136,137,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,64,65,66,73,2147483773,2147483772,87,87,87,63,63,63,63,63, 154,154,154,154,63,63,63,63,98,93,94,99,1073741968,3221225616,3221225617,3221225618,3221225618,3221225618,3221225618,3221225618,3221225618,3221225618,3221225618,3221225590,3221225589,2147483785,2147483784,136,137,81,81,81,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,87,87,87,87,87,64,65,66,73,63,63,63,63, diff --git a/res/scripts/common.lua b/res/scripts/common.lua index 422d157..caab86a 100644 --- a/res/scripts/common.lua +++ b/res/scripts/common.lua @@ -30,6 +30,8 @@ SpriteLayer = { ABOVE = 1 } +gamestate = {} + function Delay(time) while time > 0 do time = time - coroutine.yield() diff --git a/res/scripts/map2.lua b/res/scripts/map2.lua index 1249f7d..c4b588c 100644 --- a/res/scripts/map2.lua +++ b/res/scripts/map2.lua @@ -67,5 +67,16 @@ function map2.mailbox_lightning() end function map2.approach_doria() - SetAnimation("doria", "hearts") + if gamestate.approached_doria then + return + end + + gamestate.approached_doria = true + + StartCutscene() + SetDirection("doria", Direction.DOWN_RIGHT) + SetAnimation("doria", "talk") + DisplayMessage("* Oh my!\n* Is that our little Kumatora I spy? `", "Doria", SpeakerType.MAN) + + HideCutsceneBars() end -- cgit 1.4.1