diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 12:18:22 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 12:18:22 -0500 |
| commit | 4be70b7d55493cdc2d5e909d5101e70a16bee6f1 (patch) | |
| tree | 18c4fcd55da55a7445fc7827c35ce5b7760ba44a | |
| parent | 3c793733b6350451fb3000a8a5e41aa5cfe98bfb (diff) | |
| download | tanetane-4be70b7d55493cdc2d5e909d5101e70a16bee6f1.tar.gz tanetane-4be70b7d55493cdc2d5e909d5101e70a16bee6f1.tar.bz2 tanetane-4be70b7d55493cdc2d5e909d5101e70a16bee6f1.zip | |
Added underwater music and fixed music not changing bug
| -rw-r--r-- | res/maps/underwater_start.tmx | 3 | ||||
| -rw-r--r-- | res/music/barren_factory.wav | bin | 0 -> 8063540 bytes | |||
| -rw-r--r-- | res/scripts/common.lua | 2 |
3 files changed, 4 insertions, 1 deletions
| diff --git a/res/maps/underwater_start.tmx b/res/maps/underwater_start.tmx index 161bb3e..7f9cb8c 100644 --- a/res/maps/underwater_start.tmx +++ b/res/maps/underwater_start.tmx | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="4"> | 2 | <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="4"> |
| 3 | <properties> | ||
| 4 | <property name="music" value="barren_factory"/> | ||
| 5 | </properties> | ||
| 3 | <tileset firstgid="1" source="underwater.tsx"/> | 6 | <tileset firstgid="1" source="underwater.tsx"/> |
| 4 | <layer id="1" name="Lower" width="32" height="32"> | 7 | <layer id="1" name="Lower" width="32" height="32"> |
| 5 | <data encoding="csv"> | 8 | <data encoding="csv"> |
| diff --git a/res/music/barren_factory.wav b/res/music/barren_factory.wav new file mode 100644 index 0000000..272a3fb --- /dev/null +++ b/res/music/barren_factory.wav | |||
| Binary files differ | |||
| diff --git a/res/scripts/common.lua b/res/scripts/common.lua index a5e7873..23b881a 100644 --- a/res/scripts/common.lua +++ b/res/scripts/common.lua | |||
| @@ -264,7 +264,7 @@ function ChangeMap(map, warp, options) | |||
| 264 | 264 | ||
| 265 | if (mixer():isPlayingMusic() and not getMap():hasMusic()) then | 265 | if (mixer():isPlayingMusic() and not getMap():hasMusic()) then |
| 266 | mixer():fadeoutMusic(150) | 266 | mixer():fadeoutMusic(150) |
| 267 | elseif (getMap():hasMusic() and (not mixer():isPlayingMusic() or not mixer():getPlayingTrack() == getMap():getMusic())) then | 267 | elseif (getMap():hasMusic() and (not mixer():isPlayingMusic() or not (mixer():getPlayingTrack() == getMap():getMusic()))) then |
| 268 | mixer():playMusic(getMap():getMusic(), 150) | 268 | mixer():playMusic(getMap():getMusic(), 150) |
| 269 | end | 269 | end |
| 270 | 270 | ||