summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-02-15 15:49:58 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-02-15 15:49:58 -0500
commitd9b5c57c91ba77b840ede8c4385229cf004f5747 (patch)
tree94f2a445250dd38ec578eec547f16c0f9f67b0e9
parent5834a85dcfafd50a1863a00fc2daf2cf1e8bb7e9 (diff)
downloadtanetane-d9b5c57c91ba77b840ede8c4385229cf004f5747.tar.gz
tanetane-d9b5c57c91ba77b840ede8c4385229cf004f5747.tar.bz2
tanetane-d9b5c57c91ba77b840ede8c4385229cf004f5747.zip
Added heart glyph and gamestate script object
-rw-r--r--res/font.pngbin2445 -> 2461 bytes
-rw-r--r--res/font.txt2
-rw-r--r--res/maps/map2.tmx2
-rw-r--r--res/scripts/common.lua2
-rw-r--r--res/scripts/map2.lua13
5 files changed, 16 insertions, 3 deletions
diff --git a/res/font.png b/res/font.png index aacca94..33ba7f7 100644 --- a/res/font.png +++ b/res/font.png
Binary files 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
67] 2 67] 2
68^ 3 68^ 3
69_ 2 69_ 2
70` 0 70` 7
71a 5 71a 5
72b 4 72b 4
73c 4 73c 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 @@
60063,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, 60063,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,
60163,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, 60163,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,
60263,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, 60263,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,
60363,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, 60363,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,
60463,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, 60463,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,
60563,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, 60563,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,
606154,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, 606154,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 = {
30 ABOVE = 1 30 ABOVE = 1
31} 31}
32 32
33gamestate = {}
34
33function Delay(time) 35function Delay(time)
34 while time > 0 do 36 while time > 0 do
35 time = time - coroutine.yield() 37 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()
67end 67end
68 68
69function map2.approach_doria() 69function map2.approach_doria()
70 SetAnimation("doria", "hearts") 70 if gamestate.approached_doria then
71 return
72 end
73
74 gamestate.approached_doria = true
75
76 StartCutscene()
77 SetDirection("doria", Direction.DOWN_RIGHT)
78 SetAnimation("doria", "talk")
79 DisplayMessage("* Oh my!\n* Is that our little Kumatora I spy? `", "Doria", SpeakerType.MAN)
80
81 HideCutsceneBars()
71end 82end