summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-02-13 22:32:21 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-02-13 22:32:21 -0500
commit73c9b0fb4eb35e73d0005f896462e748a207d2b1 (patch)
treec539f7f81b2cc32c640faa85d468611c67b55447
parent470b1d43fb6f8e17624ee90f87270de5bd6ff77e (diff)
downloadtanetane-73c9b0fb4eb35e73d0005f896462e748a207d2b1.tar.gz
tanetane-73c9b0fb4eb35e73d0005f896462e748a207d2b1.tar.bz2
tanetane-73c9b0fb4eb35e73d0005f896462e748a207d2b1.zip
Added sfx to electrocution event
-rw-r--r--res/scripts/common.lua6
-rw-r--r--res/scripts/map2.lua4
-rw-r--r--res/sfx/lightning_crackle.wavbin0 -> 266072 bytes
-rw-r--r--res/sfx/lightning_explosion.wavbin0 -> 509418 bytes
-rw-r--r--res/sprites/lucas_anim.txt2
5 files changed, 11 insertions, 1 deletions
diff --git a/res/scripts/common.lua b/res/scripts/common.lua index 04f6c5a..75b86a8 100644 --- a/res/scripts/common.lua +++ b/res/scripts/common.lua
@@ -30,6 +30,12 @@ SpriteLayer = {
30 ABOVE = 1 30 ABOVE = 1
31} 31}
32 32
33function Delay(time)
34 while time > 0 do
35 time = time - coroutine.yield()
36 end
37end
38
33function StartCutscene() 39function StartCutscene()
34 local playerId = getPlayerSprite() 40 local playerId = getPlayerSprite()
35 local playerSprite = getSprite(playerId) 41 local playerSprite = getSprite(playerId)
diff --git a/res/scripts/map2.lua b/res/scripts/map2.lua index 1ef1235..8058aa2 100644 --- a/res/scripts/map2.lua +++ b/res/scripts/map2.lua
@@ -29,9 +29,13 @@ function map2.mailbox_lightning()
29 DisplayMessage("* ...?", "", SpeakerType.NONE) 29 DisplayMessage("* ...?", "", SpeakerType.NONE)
30 WaitForEndOfMessage() 30 WaitForEndOfMessage()
31 31
32 PlaySound("lightning_crackle.wav")
33 Delay(1196)
34
32 local lucasPos = GetPosition("lucas") 35 local lucasPos = GetPosition("lucas")
33 CreateAnimatedSpriteAtPosition("lightning_from_mailbox", "lightning", lucasPos:x() + 56, lucasPos:y() - 72, "strike", Direction.DOWN_LEFT, SpriteLayer.ABOVE) 36 CreateAnimatedSpriteAtPosition("lightning_from_mailbox", "lightning", lucasPos:x() + 56, lucasPos:y() - 72, "strike", Direction.DOWN_LEFT, SpriteLayer.ABOVE)
34 37
38 PlaySound("lightning_explosion.wav")
35 SetDirection("lucas", Direction.DOWN) 39 SetDirection("lucas", Direction.DOWN)
36 SetAnimation("lucas", "lightning_electrocute!") 40 SetAnimation("lucas", "lightning_electrocute!")
37 WaitForAnimation("lucas") 41 WaitForAnimation("lucas")
diff --git a/res/sfx/lightning_crackle.wav b/res/sfx/lightning_crackle.wav new file mode 100644 index 0000000..dba4683 --- /dev/null +++ b/res/sfx/lightning_crackle.wav
Binary files differ
diff --git a/res/sfx/lightning_explosion.wav b/res/sfx/lightning_explosion.wav new file mode 100644 index 0000000..0c45636 --- /dev/null +++ b/res/sfx/lightning_explosion.wav
Binary files differ
diff --git a/res/sprites/lucas_anim.txt b/res/sprites/lucas_anim.txt index d03e213..10a4521 100644 --- a/res/sprites/lucas_anim.txt +++ b/res/sprites/lucas_anim.txt
@@ -32,5 +32,5 @@ run[up]: 71,79,87,95
32run[up_right]: 72,80,88,96 32run[up_right]: 72,80,88,96
33run[right]: 73,81,89,97 33run[right]: 73,81,89,97
34run[down_right]: 74,82,90,98 34run[down_right]: 74,82,90,98
35lightning_electrocute![down]: 116,117,118,116,117,118,116,117,118,116 35lightning_electrocute![down]: 116,117,118,116,117,118
36lightning_collapse![down]: 119,120,121,122 \ No newline at end of file 36lightning_collapse![down]: 119,120,121,122 \ No newline at end of file